Extend on_demand_resources DSL to allow the ability to specify a category.
#697
Conversation
spec/specification/consumer_spec.rb
Outdated
| @@ -463,25 +463,37 @@ module Pod | |||
|
|
|||
| it 'returns the on demand resources specified as a string wrapped in an array' do | |||
| @spec.on_demand_resources = { 'Maps' => 'MapView/Map/Resources/*.png' } | |||
| @consumer.on_demand_resources.should == { 'Maps' => ['MapView/Map/Resources/*.png'] } | |||
| @consumer.on_demand_resources.should == { 'Maps' => { :paths => ['MapView/Map/Resources/*.png'], :category => :on_demand } } | |||
There was a problem hiding this comment.
consumer now normalizes all values to be a hash with 2 keys, :paths and :category in which :paths is always an array and :category a symbol.
spec/specification/json_spec.rb
Outdated
| result = Specification.from_json(json) | ||
| result.on_demand_resources.count.should.equal 3 | ||
| result.on_demand_resources.should == { | ||
| 'tag1' => { 'paths' => 'Tag1Resources/*', 'category' => 'on_demand' }, |
There was a problem hiding this comment.
the specification just stores the attribute which means the key can be a string if its coming from JSON. Using consumer would normalize this and ensure all keys are symbols, so this is fine.
There was a problem hiding this comment.
What's the difference between on_demand and download_on_demand?
There was a problem hiding this comment.
good catch this was a bad test! I had started this PR calling it on_demand and then switched to download_on_demand to be explicit. will update!
dnkoutso
force-pushed
the
odr_category
branch
2 times, most recently
from
b4decc5
to
95c9d66
Compare
| @@ -463,25 +463,37 @@ module Pod | |||
|
|
|||
| it 'returns the on demand resources specified as a string wrapped in an array' do | |||
| @spec.on_demand_resources = { 'Maps' => 'MapView/Map/Resources/*.png' } | |||
| @consumer.on_demand_resources.should == { 'Maps' => ['MapView/Map/Resources/*.png'] } | |||
There was a problem hiding this comment.
Should the deleted line also be supported with a default category?
There was a problem hiding this comment.
it actually is. consumer now will always normalize and return a hash with :path and :category. I think the test ensures that if the user doesnt use the hash DSL then consumer would do the right thing.
spec/specification/json_spec.rb
Outdated
| result = Specification.from_json(json) | ||
| result.on_demand_resources.count.should.equal 3 | ||
| result.on_demand_resources.should == { | ||
| 'tag1' => { 'paths' => 'Tag1Resources/*', 'category' => 'on_demand' }, |
There was a problem hiding this comment.
What's the difference between on_demand and download_on_demand?
dnkoutso
force-pushed
the
odr_category
branch
3 times, most recently
from
4ac3f74
to
378c81d
Compare
| # Performs validations related to the `on_demand_resources` attribute. | ||
| # | ||
| def _validate_on_demand_resources(h) | ||
| category = h.dig(h.keys.first, :category)&.to_sym |
There was a problem hiding this comment.
this is actually wrong, we need to collect all :category from all entries. will fix and update the test.
There was a problem hiding this comment.
fixed and test updated. pushed.
|
Will be merging this once I get the CocoaPods gem PR ready in case I need something else from it. |
No description provided.