spyke 1.8.9 → 1.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b73653b9952f7257a838b16b11abc70770ce471
-  data.tar.gz: 3f753f7c24bcaad6bc5365a2721a28e5b1df99fc
+  metadata.gz: cb655efdf295f174e10b37f5893a28c53aa329f1
+  data.tar.gz: f7fbe0a4cb68f336f4d5d62af2dc726447dc4b74
 SHA512:
-  metadata.gz: 40e9090eed648f8a51d6af63ad3e1476b9d64e5e054cd90c42810952670c747e3cc1af14af3ba0b31dedf981257b097b368c6225ca9f00d136ab1fd3b197e815
-  data.tar.gz: 97b830a87cbec15d5f4c74226b0a60841b81b9b9e46a6e60a6b3c4ca0d27f19331845c58ccf3a2d9bbc7103d588b9fbbc48d613c95415e2be0dc8a55dd6a51b9
+  metadata.gz: 03dc96bfc86a3719c9872104b2c93d7a9b9b3627c39fe8400e9fd11b9c59a7aa69bb44bac4d22abee982f589f8399b9c9510f4856fbf8372ce10d71b07ec7243
+  data.tar.gz: 728e5be62a2edddcc6b8ddab44f98146aacdda3b82157f5175293517cf7ea0eb917ff50d005f129909d9783ce251119b595562a07fb94072a13dd45715797cdb

data/README.md

@@ -112,16 +112,16 @@ You can specify custom URIs on both the class and association level:
 
 ```ruby
 class User < Spyke::Base
-  uri '/v1/users/(:id)' # id optional, both /v1/users and /v1/users/4 are valid
+  uri 'people/(:id)' # id optional, both /people and /people/4 are valid
 
-  has_many :posts, uri: '/posts/for_user/:user_id' # user_id is required
+  has_many :posts, uri: 'posts/for_user/:user_id' # user_id is required
   has_one :image, uri: nil # only use embedded JSON
 end
 
 class Post < Spyke::Base
 end
 
-user = User.find(3) # => GET http://api.com/v1/users/3
+user = User.find(3) # => GET http://api.com/people/3
 user.image # Will only use embedded JSON and never call out to api
 user.posts # => GET http://api.com/posts/for_user/3
 Post.find(4) # => GET http://api.com/posts/4

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.param_key}_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.plural}/:#{foreign_key}/#{@name}/(:id)")
         @params[foreign_key] = parent.id
       end
 

data/lib/spyke/associations/has_one.rb

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

data/lib/spyke/attribute_assignment.rb

@@ -10,10 +10,20 @@ module Spyke
     end
 
     module ClassMethods
-      def attributes(*args)
-        args.each do |attr|
-          define_method attr do
-            attribute(attr)
+      # By adding instance methods via an included module,
+      # they become overridable with "super".
+      # http://thepugautomatic.com/2013/dsom/
+      def attributes(*names)
+        unless @spyke_instance_method_container
+          @spyke_instance_method_container = Module.new
+          include @spyke_instance_method_container
+        end
+
+        @spyke_instance_method_container.module_eval do
+          names.each do |name|
+            define_method(name) do
+              attribute(name)
+            end
           end
         end
       end

data/lib/spyke/http.rb

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

data/lib/spyke/version.rb

@@ -1,3 +1,3 @@
 module Spyke
-  VERSION = '1.8.9'
+  VERSION = '1.8.10'
 end

data/test/attributes_test.rb

@@ -70,13 +70,28 @@ module Spyke
       recipe = Recipe.new
       assert_equal nil, recipe.title
       assert_raises NoMethodError do
-        recipe.description
+        recipe.not_set
       end
 
       recipe = Recipe.new(title: 'Fish')
       assert_equal 'Fish', recipe.title
     end
 
+    def test_super_with_explicit_attributes
+      assert_equal nil, Recipe.new.description
+    end
+
+    def test_inheriting_explicit_attributes
+      assert_equal nil, Image.new.description
+      assert_equal nil, Image.new.caption
+      assert_raises NoMethodError do
+        Image.new.note
+      end
+      assert_equal nil, StepImage.new.description
+      assert_equal nil, StepImage.new.caption
+      assert_equal nil, StepImage.new.note
+    end
+
     def test_converting_files_to_faraday_io
       Faraday::UploadIO.stubs(:new).with('/photo.jpg', 'image/jpeg').returns('UploadIO')
       file = mock
@@ -96,7 +111,7 @@ module Spyke
 
     def test_inspect
       recipe = Recipe.new(id: 2, title: 'Pizza', description: 'Delicious')
-      assert_equal '#<Recipe(/recipes/2) id: 2 title: "Pizza" description: "Delicious">', recipe.inspect
+      assert_equal '#<Recipe(recipes/2) id: 2 title: "Pizza" description: "Delicious">', recipe.inspect
     end
 
     def test_rejecting_wrong_number_of_args

data/test/orm_test.rb

@@ -156,5 +156,16 @@ module Spyke
       RecipeImage.where(recipe_id: 1).destroy
       assert_requested endpoint
     end
+
+    def test_relative_uris
+      previous = Spyke::Config.connection.url_prefix
+      Spyke::Config.connection.url_prefix = 'http://sushi.com/api/v2/'
+
+      endpoint = stub_request(:get, 'http://sushi.com/api/v2/recipes')
+      Recipe.all.to_a
+      assert_requested endpoint
+
+      Spyke::Config.connection.url_prefix = previous
+    end
   end
 end

data/test/support/fixtures.rb

@@ -3,12 +3,12 @@ class Recipe < Spyke::Base
   has_many :gallery_images, class_name: 'Image'
   has_one :image
   has_one :background_image, class_name: 'Image', uri: nil
-  has_one :alternate, class_name: 'Recipe', uri: '/recipes/:recipe_id/alternates/recipe'
+  has_one :alternate, class_name: 'Recipe', uri: 'recipes/:recipe_id/alternates/recipe'
   belongs_to :user
 
   scope :published, -> { where(status: 'published') }
   scope :approved, -> { where(approved: true) }
-  attributes :title
+  attributes :title, :description
 
   before_save :before_save_callback
   before_create :before_create_callback
@@ -22,6 +22,10 @@ class Recipe < Spyke::Base
     result
   end
 
+  def description
+    super
+  end
+
   def ingredients
     groups.flat_map(&:ingredients)
   end
@@ -35,14 +39,16 @@ end
 
 class Image < Spyke::Base
   method_for :create, :put
+  attributes :description, :caption
 end
 
 class StepImage < Image
   include_root_in_json 'step_image_root'
+  attributes :note
 end
 
 class RecipeImage < Image
-  uri '/recipes/:recipe_id/image'
+  uri 'recipes/:recipe_id/image'
   validates :url, presence: true
   attributes :url
 
@@ -62,7 +68,7 @@ class Group < Spyke::Base
 end
 
 class Ingredient < Spyke::Base
-  uri '/recipes/:recipe_id/ingredients/(:id)'
+  uri 'recipes/:recipe_id/ingredients/(:id)'
 end
 
 class User < Spyke::Base
@@ -70,7 +76,7 @@ class User < Spyke::Base
 end
 
 class Photo < Spyke::Base
-  uri '/images/photos/(:id)'
+  uri 'images/photos/(:id)'
 end
 
 class Comment < Spyke::Base
@@ -93,8 +99,8 @@ end
 
 module Cookbook
   class Tip < Spyke::Base
-    uri '/tips/(:id)'
-    has_many :likes, class_name: 'Cookbook::Like', uri: '/tips/:cookbook_tip_id/likes/(:id)'
+    uri 'tips/(:id)'
+    has_many :likes, class_name: 'Cookbook::Like', uri: 'tips/:cookbook_tip_id/likes/(:id)'
     has_many :favorites
     has_many :votes
     has_many :photos, class_name: 'Photo'

metadata

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