spyke 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: debb215522b638dd3b33070246527635aabfc284
-  data.tar.gz: 5e02ddc322d6a4811229cf939616eb5227e0d90c
+  metadata.gz: e544879dfca5f90ba78e73e05f7370170445fff8
+  data.tar.gz: 991433596aec9c35a3f7065d0c71dcb798c58f12
 SHA512:
-  metadata.gz: 123c24f04e9f34ed7f0f3a3335c94573266f39171d9c2183d1125d7235ed239a44766e6cf9771bcd6ca40e41ac8411756551777b215b27438def9ee1be233d44
-  data.tar.gz: ebf9567257ae4c3b2ec20c7a837b667f2107f1877d3c18471ec886779b25916f7de0617ca37919a6a3da7c5384b29ec46ad6808a1b1d1ef8c74ec7d6d4ad2cff
+  metadata.gz: 1f9f7d0219671080bb9d91e083d763eb10c15ed624d77c40ff5691c0e3e0880960d7d2b97175473213d8df290ccfdde20333a1e2721301c7720a17e0cb55bf9d
+  data.tar.gz: 4eed190ef156ea97ea07e4d0911a98d75f48f70d7692f3a1d908bc3126c92df064adb7ae33f2738a27342cfbcdbbf8e0a8b047f63f70017b3bd501673090fd8b

data/README.md

@@ -167,6 +167,24 @@ remap it in Faraday to match the above. Doing this will allow you to
 show errors returned from the server in forms and f.ex using
 `@post.errors.full_messages` just like ActiveRecord.
 
+### Attributes-wrapping
+
+Spyke, like Rails, by default wraps sent attributes in a root element,
+but this can be disabled or customized:
+
+```ruby
+class Article < Spyke::Base
+  # Default
+  include_root_in_json  true # { article: { title: ...} }
+
+  # Custom
+  include_root_in_json :post # { post: { title: ...} }
+
+  # Disabled
+  include_root_in_json false # { title: ... }
+end
+```
+
 ### Using multiple APIs
 
 If you need to use different APIs, instead of configuring `Spyke::Base`

data/lib/spyke/associations/association.rb

@@ -36,7 +36,7 @@ module Spyke
         end
 
         def foreign_key
-          (@options[:foreign_key] || "#{parent.class.model_name.param_key}_id").to_sym
+          (@options[:foreign_key] || "#{parent.class.model_name.element}_id").to_sym
         end
 
         def fetch

data/lib/spyke/associations/belongs_to.rb

@@ -3,7 +3,7 @@ module Spyke
     class BelongsTo < Association
       def initialize(*args)
         super
-        @options.reverse_merge!(uri: "#{@name.to_s.pluralize}/:id", foreign_key: "#{klass.model_name.param_key}_id")
+        @options.reverse_merge!(uri: "#{@name.to_s.pluralize}/:id", foreign_key: "#{klass.model_name.element}_id")
         @params[:id] = parent.try(foreign_key)
       end
     end

data/lib/spyke/associations/has_many.rb

@@ -3,7 +3,7 @@ module Spyke
     class HasMany < Association
       def initialize(*args)
         super
-        @options.reverse_merge!(uri: "#{parent.class.model_name.plural}/:#{foreign_key}/#{@name}/(:id)")
+        @options.reverse_merge!(uri: "#{parent.class.model_name.element.pluralize}/:#{foreign_key}/#{@name}/(:id)")
         @params[foreign_key] = parent.id
       end
 

data/lib/spyke/http.rb

@@ -72,7 +72,7 @@ module Spyke
         end
 
         def default_uri
-          "#{model_name.plural}/(:id)"
+          "#{model_name.element.pluralize}/(:id)"
         end
     end
 

data/lib/spyke/version.rb

@@ -1,3 +1,3 @@
 module Spyke
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/test/associations_test.rb

@@ -391,12 +391,23 @@ module Spyke
 
     def test_namespaced_model
       tip_endpoint = stub_request(:get, 'http://sushi.com/tips/1').to_return_json(result: { id: 1 })
-      likes_endpoint = stub_request(:get, 'http://sushi.com/tips/1/likes')
-      Cookbook::Tip.find(1).likes.first
+      nested_likes_endpoint = stub_request(:get, 'http://sushi.com/tips/1/likes')
+      likes_endpoint = stub_request(:get, 'http://sushi.com/likes')
+
+      Cookbook::Tip.new(id: 1).likes.first
+      Cookbook::Like.new(tip_id: 1).tip
+      Cookbook::Like.all.to_a
+
       assert_requested tip_endpoint
+      assert_requested nested_likes_endpoint
       assert_requested likes_endpoint
     end
 
+    def test_namespaced_foreign_key
+      like = Cookbook::Tip.new(id: 1).likes.build
+      assert_equal 1, like.tip_id
+    end
+
     def test_namespaced_association_class_auto_detect
       favorite = Cookbook::Tip.new.favorites.build
       assert_equal Cookbook::Favorite, favorite.class

data/test/{relation_test.rb → scopes_test.rb}

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Spyke
-  class RelationTest < MiniTest::Test
+  class ScopesTest < MiniTest::Test
     def test_all
       stub_request(:get, 'http://sushi.com/recipes').to_return_json(result: [{ id: 1, title: 'Sushi' }, { id: 2, title: 'Nigiri' }], metadata: 'meta')
 

data/test/support/fixtures.rb

@@ -130,13 +130,14 @@ end
 module Cookbook
   class Tip < Spyke::Base
     uri 'tips/(:id)'
-    has_many :likes, class_name: 'Cookbook::Like', uri: 'tips/:cookbook_tip_id/likes/(:id)'
+    has_many :likes, class_name: 'Cookbook::Like'
     has_many :favorites
     has_many :votes
     has_many :photos, class_name: 'Photo'
   end
 
   class Like < Spyke::Base
+    belongs_to :tip
   end
 
   class Favorite < Spyke::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spyke
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jens Balvig
@@ -295,7 +295,7 @@ files:
 - test/custom_request_test.rb
 - test/orm_test.rb
 - test/path_test.rb
-- test/relation_test.rb
+- test/scopes_test.rb
 - test/support/fixtures.rb
 - test/support/webmock.rb
 - test/test_helper.rb
@@ -330,7 +330,7 @@ test_files:
 - test/custom_request_test.rb
 - test/orm_test.rb
 - test/path_test.rb
-- test/relation_test.rb
+- test/scopes_test.rb
 - test/support/fixtures.rb
 - test/support/webmock.rb
 - test/test_helper.rb