spyke 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e544879dfca5f90ba78e73e05f7370170445fff8
-  data.tar.gz: 991433596aec9c35a3f7065d0c71dcb798c58f12
+  metadata.gz: 2ce71952fe595064f132a92bbbc41179614be927
+  data.tar.gz: bdf0fc8ed096c28303c3014ddcb588a666a39a04
 SHA512:
-  metadata.gz: 1f9f7d0219671080bb9d91e083d763eb10c15ed624d77c40ff5691c0e3e0880960d7d2b97175473213d8df290ccfdde20333a1e2721301c7720a17e0cb55bf9d
-  data.tar.gz: 4eed190ef156ea97ea07e4d0911a98d75f48f70d7692f3a1d908bc3126c92df064adb7ae33f2738a27342cfbcdbbf8e0a8b047f63f70017b3bd501673090fd8b
+  metadata.gz: 8799dbc60fb64c096241990fb35d53d802dcc83c98a45f71e1573649261b3b11ea8558af102e335ed7eabde7678056bc13912984de7a7e51665d75be9cae6f82
+  data.tar.gz: df55a3f1dc825c5a10d3e0c142b42bed0739cb942e8c32bc2da501a9215f897200fa3fd6a162cdcebb19241369868fafd802dd7ab5349f9f0a858e2d0b63fc1f

data/README.md

@@ -128,16 +128,16 @@ Post.find(4) # => GET http://api.com/posts/4
 
 ### Custom requests
 
-Custom request methods and the `using` scope methods allow you to
+Custom request methods and the `with` scope methods allow you to
 perform requests for non-REST actions:
 
-The `.using` scope:
+The `.with` scope:
 
 ```ruby
-Post.using('posts/recent') # => GET http://api.com/posts/recent
-Post.using(:recent) # => GET http://api.com/posts/recent
-Post.using(:recent).where(status: 'draft') # => GET http://api.com/posts/recent?status=draft
-Post.using(:recent).post # => POST http://api.com/posts/recent
+Post.with('posts/recent') # => GET http://api.com/posts/recent
+Post.with(:recent) # => GET http://api.com/posts/recent
+Post.with(:recent).where(status: 'draft') # => GET http://api.com/posts/recent?status=draft
+Post.with(:recent).post # => POST http://api.com/posts/recent
 ```
 
 Custom requests from instance:

data/lib/spyke/attribute_assignment.rb

@@ -48,9 +48,14 @@ module Spyke
       attributes[:id] = value if value.present?
     end
 
+    def hash
+      id.hash
+    end
+
     def ==(other)
-      other.is_a?(Spyke::Base) && id == other.id
+      other.instance_of?(self.class) && id? && id == other.id
     end
+    alias :eql? :==
 
     def inspect
       "#<#{self.class}(#{uri}) id: #{id.inspect} #{inspect_attributes}>"

data/lib/spyke/relation.rb

@@ -18,7 +18,7 @@ module Spyke
       relation
     end
 
-    def using(uri)
+    def with(uri)
       if uri.is_a? Symbol
         @options[:uri] = File.join @options[:uri], uri.to_s
       else

data/lib/spyke/scoping.rb

@@ -7,7 +7,7 @@ module Spyke
 
     module ClassMethods
       delegate :where, :build, :any?, :empty?, to: :all
-      delegate :using, to: :all
+      delegate :with, to: :all
 
       def all
         current_scope || Relation.new(self, uri: uri)

data/lib/spyke/version.rb

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

data/test/attributes_test.rb

@@ -63,6 +63,18 @@ module Spyke
       assert_equal Recipe.new(id: 2, title: 'Fish'), Recipe.new(id: 2, title: 'Fish')
       refute_equal Recipe.new(id: 2, title: 'Fish'), Recipe.new(id: 1, title: 'Fish')
       refute_equal Recipe.new(id: 2, title: 'Fish'), 'not_a_spyke_object'
+      refute_equal Recipe.new(id: 2, title: 'Fish'), Image.new(id: 2, title: 'Fish')
+      refute_equal Recipe.new, Recipe.new
+      refute_equal StepImage.new(id: 1), Image.new(id: 1)
+    end
+
+    def test_uniqueness
+      recipe_1 = Recipe.new(id: 1)
+      recipe_2 = Recipe.new(id: 1)
+      recipe_3 = Recipe.new(id: 2)
+      image_1 = Image.new(id: 2)
+      records = [recipe_1, recipe_2, recipe_3, image_1]
+      assert_equal [recipe_1, recipe_3, image_1], records.uniq
     end
 
     def test_explicit_attributes

data/test/custom_request_test.rb

@@ -4,38 +4,38 @@ module Spyke
   class CustomRequestTest < MiniTest::Test
     def test_custom_get_request_from_class
       endpoint = stub_request(:get, 'http://sushi.com/recipes/recent').to_return_json(result: [{ id: 1, title: 'Bread' }])
-      recipes = Recipe.using('/recipes/recent').get
+      recipes = Recipe.with('/recipes/recent').get
       assert_equal %w{ Bread }, recipes.map(&:title)
       assert_requested endpoint
     end
 
     def test_custom_put_request_from_class
       endpoint = stub_request(:put, 'http://sushi.com/recipes/publish_all')
-      Recipe.using('/recipes/publish_all').put
+      Recipe.with('/recipes/publish_all').put
       assert_requested endpoint
     end
 
     def test_custom_request_with_prepended_scope
       endpoint = stub_request(:get, 'http://sushi.com/recipes/recent?status=published')
-      Recipe.published.using('/recipes/recent').to_a
+      Recipe.published.with('/recipes/recent').to_a
       assert_requested endpoint
     end
 
     def test_custom_request_with_appended_scope
       endpoint = stub_request(:get, 'http://sushi.com/recipes/recent?status=published')
-      Recipe.using('/recipes/recent').published.to_a
+      Recipe.with('/recipes/recent').published.to_a
       assert_requested endpoint
     end
 
     def test_custom_request_with_symbol_and_appended_scope
       endpoint = stub_request(:get, 'http://sushi.com/recipes/recent?status=published')
-      Recipe.using(:recent).published.to_a
+      Recipe.with(:recent).published.to_a
       assert_requested endpoint
     end
 
     def test_create_on_custom_request
       endpoint = stub_request(:post, 'http://sushi.com/recipes/recent').with(body: { recipe: { status: 'published' } })
-      Recipe.using(:recent).published.create
+      Recipe.with(:recent).published.create
       assert_requested endpoint
     end
 

metadata

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