spyke 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c511b748bec0a2438f2c05d6cd2e76346b55f387
-  data.tar.gz: 67f632949d0fd0429bb3576d84e771c9709f74c8
+  metadata.gz: 2321a4ffd56617ec8f489fbe3ddb96061c4ece5f
+  data.tar.gz: f7f97d6d1b1356db71a0f384e8c5257ffe81f9ef
 SHA512:
-  metadata.gz: 1241be3c296ac93e9bfa523ec598f0f550aa122897a34b2a322f378251d9a943b8a7a07818abab823ffcf686c8aa064f3e46c2b824df5ec4471f81a05e28dc2a
-  data.tar.gz: accfea484c16960b90f02696489ddb98bd02682779c2e6cf4ceae21ee448e430153f07edd32241c36297c93114c94f5780477d314d4ea1a0ff285c06a63ac96a
+  metadata.gz: 6d7f5283de00b250dae9734458d8ef06ceb20705b99f809ec321a5d5701520342ec78114b8d1c9902c4bae75b482050c750ac22fef551c6850fee055083bea3a
+  data.tar.gz: 61c0cfe2bd04c618512da051ac1c4c35de569b5ba6dc5405580aea0615c2d04377967c4e3c5bf2dd6a0998c1c34284a012eed504169e8399fcb70cb6e307a098

data/lib/spyke/http.rb

@@ -11,7 +11,7 @@ module Spyke
     module ClassMethods
       METHODS.each do |method|
         define_method(method) do |path, params = {}|
-          new_or_collection_from_result send("#{method}_raw", path, params)
+          new_instance_or_collection_from_result send("#{method}_raw", path, params)
         end
 
         define_method("#{method}_raw") do |path, params = {}|
@@ -19,30 +19,7 @@ module Spyke
         end
       end
 
-      def request(method, path, params = {})
-        ActiveSupport::Notifications.instrument('request.spyke', method: method) do |payload|
-          response = connection.send(method) do |request|
-            if method == :get
-              request.url path.to_s, params
-            else
-              request.url path.to_s
-              request.body = params
-            end
-          end
-          payload[:url], payload[:status] = response.env.url, response.status
-          Result.new_from_response(response)
-        end
-      end
-
-      def new_or_collection_from_result(result)
-        if result.data.is_a?(Array)
-          new_collection_from_result(result)
-        else
-          new_from_result(result)
-        end
-      end
-
-      def new_from_result(result)
+      def new_instance_from_result(result)
         new result.data if result.data
       end
 
@@ -50,13 +27,46 @@ module Spyke
         Collection.new Array(result.data).map { |record| new(record) }, result.metadata
       end
 
-      def uri(uri_template = "/#{model_name.plural}/(:id)")
-        @uri ||= uri_template
+      def uri(uri_template = nil)
+        @uri ||= uri_template || superclass_uri || default_uri
       end
 
       def connection
         Config.connection
       end
+
+      private
+
+        def request(method, path, params = {})
+          ActiveSupport::Notifications.instrument('request.spyke', method: method) do |payload|
+            response = connection.send(method) do |request|
+              if method == :get
+                request.url path.to_s, params
+              else
+                request.url path.to_s
+                request.body = params
+              end
+            end
+            payload[:url], payload[:status] = response.env.url, response.status
+            Result.new_from_response(response)
+          end
+        end
+
+        def new_instance_or_collection_from_result(result)
+          if result.data.is_a?(Array)
+            new_collection_from_result(result)
+          else
+            new_instance_from_result(result)
+          end
+        end
+
+        def superclass_uri
+          superclass.uri.dup.freeze if superclass != Base
+        end
+
+        def default_uri
+          "/#{model_name.plural}/(:id)"
+        end
     end
 
     METHODS.each do |method|

data/lib/spyke/relation.rb

@@ -24,7 +24,7 @@ module Spyke
     end
 
     def find_one
-      @find_one ||= klass.new_from_result(fetch)
+      @find_one ||= klass.new_instance_from_result(fetch)
     end
 
     def find_some

data/lib/spyke/version.rb

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

data/test/custom_request_test.rb

@@ -19,7 +19,7 @@ module Spyke
     def test_get_request_with_appended_scope
       skip 'wishlisted'
       endpoint = stub_request(:get, 'http://sushi.com/recipes/recent?status=published')
-      Recipe.get('/recipes/recent').published.fetch
+      Recipe.get('/recipes/recent').published.to_a
       assert_requested endpoint
     end
 

data/test/orm_test.rb

@@ -113,12 +113,18 @@ module Spyke
       assert_requested endpoint
     end
 
-    def test_inheritance_using_custom_method
-      endpoint = stub_request(:put, 'http://sushi.com/step_images')
+    def test_inheritance_passes_on_custom_method_and_uri
+      endpoint = stub_request(:put, 'http://sushi.com/images')
       StepImage.create
       assert_requested endpoint
     end
 
+    def test_inheritance_not_overwriting_custom_uri
+      endpoint = stub_request(:put, 'http://sushi.com/recipes/1/image')
+      RecipeImage.where(recipe_id: 1).create
+      assert_requested endpoint
+    end
+
     def test_to_params_without_root
       assert_equal({ 'url' => 'bob.jpg' }, RecipeImage.new(url: 'bob.jpg').to_params)
     end

data/test/test_helper.rb

@@ -16,3 +16,10 @@ Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
 
 # Pretty colors
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+
+# Don't raise but report uncaught net connections
+WebMock.allow_net_connect!
+WebMock.stub_request(:any, /.*/).to_return do |request|
+  puts "\e[35mUNSTUBBED REQUEST:\e[0m #{request.method.upcase} #{request.uri}"
+  { body: nil }
+end

metadata

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