spyke 5.4.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7de3203151c0bbf40af24c4ebb7926f60b497e61cd4a7edd3d5b0dcc12f302e5
-  data.tar.gz: 9cea6becd607f2f4a74258a5984055e619206f0df881c56fb444716e6e91b8af
+  metadata.gz: 46c56a1975e770acc9b1e9d40abdfbfd7d59b15705da333d293d0ecb18678628
+  data.tar.gz: bbc4a65e7cc6293ce9e93410eae69dd4003ede73364207c17bff79c1736770a2
 SHA512:
-  metadata.gz: db5b33e37fe25bc7f2f56215ca904a37c40541804acaa8338c9b63d23ac10e9e7724f65b6abf4ac98501b354fd1d802cd0bff0483b3a2b64673797d299043750
-  data.tar.gz: 34252e5c0e56a6b7a3fc83343ed955d39f6dc46250da3c8e90817df01609adcb9e09105cc9bb6b96bfd4b8c66bf06d3dbcbc20fbf4ccc7cd11ef016800019c5a
+  metadata.gz: 6e741d1302b7a404d2f052329814b74af2aab61f17a5edff94b06f1bb5fadf78a8bbb43c93dbd2ed4a48064721dad8e57a28d53fde35b5d14f7a44f19fe01a31
+  data.tar.gz: 9a7cbdf9fd0b504c9772dd5388ff949b1ab5abe666277e11efc8e347e3aae22e5337cba0b506388f90f9cc2b68f5ddb97bf4dd8b08b50694a43e1f2d99c32a9a

data/lib/spyke/attribute_assignment.rb

@@ -83,7 +83,7 @@ module Spyke
         # Set id attribute directly if using a custom primary key alongside an attribute named "id" to avoid clobbering
         set_attribute :id, attributes.delete(:id) if conflicting_ids?(attributes)
 
-        attributes.each do |key, value|
+        attributes.to_h.each do |key, value|
           send "#{key}=", value
         end
       end

data/lib/spyke/http.rb

@@ -50,8 +50,8 @@ module Spyke
             request.body = params
           end
         end
-        rescue Faraday::ConnectionFailed, Faraday::TimeoutError
-          raise ConnectionError
+      rescue Faraday::ConnectionFailed, Faraday::TimeoutError
+        raise ConnectionError
       end
 
       private

data/lib/spyke/version.rb

@@ -1,3 +1,3 @@
 module Spyke
-  VERSION = '5.4.0'
+  VERSION = '5.4.1'
 end

data/spyke.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday_middleware', '>= 0.9.1', '< 2.0'
   spec.add_dependency 'addressable', '>= 2.5.2'
 
+  spec.add_development_dependency 'actionpack', '>= 4.0.0'
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'coveralls', '~> 0.7'
   spec.add_development_dependency 'minitest'

data/test/associations_test.rb

@@ -301,6 +301,22 @@ module Spyke
       assert_equal %w{ starter sauce }, recipe.groups.map(&:title)
     end
 
+    def test_nested_attributes_has_one_using_strong_params
+      recipe = Recipe.new(image_attributes: strong_params(file: 'bob.jpg').permit!)
+      assert_equal 'bob.jpg', recipe.image.file
+    end
+
+    def test_nested_attributes_belongs_to_using_strong_params
+      recipe = Recipe.new(user_attributes: strong_params({ name: 'Bob' }).permit!)
+      assert_equal 'Bob', recipe.user.name
+    end
+
+    def test_nested_attributes_has_many_using_strong_params
+      params = strong_params(groups_attributes: [strong_params(title: 'starter').permit!, strong_params(title: 'sauce').permit!]).permit!
+      recipe = Recipe.new(params)
+      assert_equal %w{ starter sauce }, recipe.groups.map(&:title)
+    end
+
     def test_nested_attributes_replacing_existing_when_no_ids_present
       recipe = Recipe.new(groups_attributes: [{ title: 'starter' }, { title: 'sauce' }])
       recipe.attributes = { groups_attributes: [{ title: 'flavor' }] }
@@ -325,6 +341,17 @@ module Spyke
       assert_equal %w{ starter sauce }, recipe.groups.map(&:title)
     end
 
+    def test_nested_attributes_has_many_using_strong_params_with_hash_syntax
+      params = strong_params(
+        groups_attributes: strong_params(
+          '0' => strong_params(title: 'starter').permit!,
+          '1' => strong_params(title: 'sauce').permit!,
+        ).permit!
+      ).permit!
+      recipe = Recipe.new(params)
+      assert_equal %w{ starter sauce }, recipe.groups.map(&:title)
+    end
+
     def test_deeply_nested_attributes_has_many_using_array_syntax
       params = { groups_attributes: [{ id: 1, ingredients_attributes: [{ id: 1, name: 'Salt' }, { id: 2, name: 'Pepper' } ]}] }
       recipe = Recipe.new(params)
@@ -357,6 +384,40 @@ module Spyke
       assert_equal %w{ Salt Pepper }, recipe.ingredients.map(&:name)
     end
 
+    def test_deeply_nested_attributes_has_many_using_strong_params_with_array_syntax
+      params = strong_params(
+        groups_attributes: [
+          strong_params(
+            ingredients_attributes: [
+              strong_params(id: '', name: 'Salt').permit!,
+              strong_params(id: '', name: 'Pepper').permit!,
+            ]
+          ).permit!
+        ]
+      ).permit!
+      recipe = Recipe.new(params)
+      assert_equal %w{ Salt Pepper }, recipe.ingredients.map(&:name)
+      recipe.attributes = params
+      assert_equal %w{ Salt Pepper }, recipe.ingredients.map(&:name)
+    end
+
+    def test_deeply_nested_attributes_has_many_using_strong_params_with_hash_syntax
+      params = strong_params(
+        groups_attributes: strong_params(
+          '0' => strong_params(
+            ingredients_attributes: strong_params(
+              '0' => strong_params(id: '', name: 'Salt').permit!,
+              '1' => strong_params(id: '', name: 'Pepper').permit!,
+            ).permit!
+          ).permit!
+        ).permit!
+      ).permit!
+      recipe = Recipe.new(params)
+      assert_equal %w{ Salt Pepper }, recipe.ingredients.map(&:name)
+      recipe.attributes = params
+      assert_equal %w{ Salt Pepper }, recipe.ingredients.map(&:name)
+    end
+
     def test_reflect_on_association
       assert_equal Group, Recipe.reflect_on_association(:group).klass
       assert_equal Cookbook::Like, Cookbook::Tip.reflect_on_association(:like).klass

data/test/attributes_test.rb

@@ -11,6 +11,18 @@ module Spyke
       assert_equal 'Tasty', recipe.description
     end
 
+    def test_initializing_using_permitted_strong_params
+      ingredient = Ingredient.new(strong_params(name: 'Flour').permit!)
+
+      assert_equal 'Flour', ingredient.name
+    end
+
+    def test_initializing_using_unpermitted_strong_params
+      assert_raises ActionController::UnfilteredParameters do
+        Ingredient.new(strong_params(name: 'Flour'))
+      end
+    end
+
     def test_to_params
       attr = Attributes.new(id: 3, 'title' => 'Fish', groups: [ Group.new(name: 'Starter'), { name: 'Dessert' } ])
       assert_equal({ 'id' => 3 , 'title' => 'Fish', 'groups' => [{ 'name' => 'Starter' }, { 'name' => 'Dessert' }] }, attr.to_params)

data/test/orm_test.rb

@@ -54,6 +54,22 @@ module Spyke
       assert_requested endpoint
     end
 
+    def test_save_hash_attribute
+      endpoint = stub_request(:post, 'http://sushi.com/recipes').with(body: { recipe: { meta: { foo: 'bar' } } })
+
+      Recipe.create(meta: { foo: 'bar' })
+
+      assert_requested endpoint
+    end
+
+    def test_save_hash_attribute_with_strong_params
+      endpoint = stub_request(:post, 'http://sushi.com/recipes').with(body: { recipe: { meta: { foo: 'bar' } } })
+
+      Recipe.create(strong_params(meta: { foo: 'bar' }).permit!)
+
+      assert_requested endpoint
+    end
+
     def test_update_attributes
       endpoint = stub_request(:put, 'http://sushi.com/recipes/1').with(body: { recipe: { title: 'Sushi' } }).to_return_json(result: { id: 1, title: 'Sushi (saved)' })
 

data/test/test_helper.rb

@@ -18,3 +18,10 @@ Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
 
 # Pretty colors
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+
+# For testing strong params
+require 'action_controller/metal/strong_parameters'
+
+def strong_params(params)
+  ActionController::Parameters.new(params)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spyke
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1
 platform: ruby
 authors:
 - Jens Balvig
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -92,6 +92,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.2
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement