spyke 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6779fa06becdb47897220855b4e40d59658023f1
-  data.tar.gz: 3cfe8b3ee6430491574925643cbfeee651e1da91
+  metadata.gz: c511b748bec0a2438f2c05d6cd2e76346b55f387
+  data.tar.gz: 67f632949d0fd0429bb3576d84e771c9709f74c8
 SHA512:
-  metadata.gz: c272d4e8115b633f5946c95085096a79deef8a1b5a64aa790af8bb3d066397bc9bdef99d4ac2a9be9ed1a3f3eccb6bac6692f196ed8c28ae68b3dcd9576c0994
-  data.tar.gz: 4fe79e4c7c0b0c5a7e2c9dcdb8267e12c8b93bcf59dc417176f2aea9e4cf0dcadd490939c6002a5d62460ead053fc6c549682c29fe64b7ae85afd720b2e7dd9b
+  metadata.gz: 1241be3c296ac93e9bfa523ec598f0f550aa122897a34b2a322f378251d9a943b8a7a07818abab823ffcf686c8aa064f3e46c2b824df5ec4471f81a05e28dc2a
+  data.tar.gz: accfea484c16960b90f02696489ddb98bd02682779c2e6cf4ceae21ee448e430153f07edd32241c36297c93114c94f5780477d314d4ea1a0ff285c06a63ac96a

data/lib/spyke/orm.rb

@@ -49,8 +49,8 @@ module Spyke
     end
 
     def to_params
-      if include_root?
-        { self.class.model_name.param_key => attributes.to_params.except(*uri.variables)}
+      if param_root
+        { param_root => attributes.to_params.except(*uri.variables)}
       else
         attributes.to_params.except(*uri.variables)
       end
@@ -81,5 +81,15 @@ module Spyke
     def reload
       self.attributes = self.class.find(id).attributes
     end
+
+    private
+
+      def param_root
+        if include_root.is_a? String
+          include_root
+        elsif include_root?
+          self.class.model_name.param_key
+        end
+      end
   end
 end

data/lib/spyke/version.rb

@@ -1,3 +1,3 @@
 module Spyke
-  VERSION = '1.8.2'
+  VERSION = '1.8.3'
 end

data/test/orm_test.rb

@@ -119,10 +119,14 @@ module Spyke
       assert_requested endpoint
     end
 
-    def test_non_nested_params
+    def test_to_params_without_root
       assert_equal({ 'url' => 'bob.jpg' }, RecipeImage.new(url: 'bob.jpg').to_params)
     end
 
+    def test_to_params_with_custom_root
+      assert_equal({ 'step_image_root' => { 'url' => 'bob.jpg' } }, StepImage.new(url: 'bob.jpg').to_params)
+    end
+
     def test_destroy
       endpoint = stub_request(:delete, 'http://sushi.com/recipes/1')
       Recipe.new(id: 1).destroy

data/test/support/fixtures.rb

@@ -37,12 +37,14 @@ class Image < Spyke::Base
 end
 
 class StepImage < Image
+  include_root_in_json 'step_image_root'
 end
 
 class RecipeImage < Image
   uri '/recipes/:recipe_id/image'
   validates :url, presence: true
   attributes :url
+
   include_root_in_json false
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spyke
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport