spyke 1.8.5 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cad85c078caa849ff351e6f096085b23bc3aa447
-  data.tar.gz: 8a28b48d15894f136d3b95f67c071fd2b9e2989e
+  metadata.gz: 21babce7ddc3d045a984d9efc4501ac4b811f497
+  data.tar.gz: bb6a369931ec88d716aed6fe2831928ac9f42e60
 SHA512:
-  metadata.gz: e17e259553eb5310cac7194d4711047486b26a1021da2ea43c2fa5a8813b0b0a57fed1c7411232fb8e33670560572878f05e1b9b366f94b213b47ef25d580c22
-  data.tar.gz: 6deb4d9939c5e818c4d29287024b794e8dba9c2be7abb61d53bedd7db740281a771c25a7e3c9e3cbe867d7d32539192419d83d93fb1a5f378c83ce19c52c2067
+  metadata.gz: c298b3f6569a9a0367129b54b76d3b1ccc042b3ddc0f829c1f0ef279666aaa84e576b3427fc63006cc5cf542ebda1e38a4ce890f6c177a031b4d0a63c3664d3e
+  data.tar.gz: bfd3b3b44721671a22be2c9732917b495d710a4504d4eccd892c88b81790f1370a4e6f73092f6e3afe9a89ae5a692af2dd50b1ee8dadab3a3d8af9b5e4caddf8

data/lib/spyke/associations.rb

@@ -1,4 +1,5 @@
 require 'spyke/associations/association'
+require 'spyke/associations/builder'
 require 'spyke/associations/has_many'
 require 'spyke/associations/has_one'
 require 'spyke/associations/belongs_to'
@@ -14,7 +15,7 @@ module Spyke
 
     module ClassMethods
       def has_many(name, options = {})
-        self.associations = associations.merge(name => options.merge(type: HasMany))
+        create_association(name, HasMany, options)
 
         define_method "#{name.to_s.singularize}_ids=" do |ids|
           attributes[name] = []
@@ -27,7 +28,7 @@ module Spyke
       end
 
       def has_one(name, options = {})
-        self.associations = associations.merge(name => options.merge(type: HasOne))
+        create_association(name, HasOne, options)
 
         define_method "build_#{name}" do |attributes = nil|
           association(name).build(attributes)
@@ -35,7 +36,7 @@ module Spyke
       end
 
       def belongs_to(name, options = {})
-        self.associations = associations.merge(name => options.merge(type: BelongsTo))
+        create_association(name, BelongsTo, options)
 
         define_method "build_#{name}" do |attributes = nil|
           association(name).build(attributes)
@@ -54,9 +55,14 @@ module Spyke
 
       def reflect_on_association(name)
         # Just enough to support nested_form gem
-        assoc = associations[name] || associations[name.to_s.pluralize.to_sym]
-        Association.new(nil, name, assoc)
+        associations[name] || associations[name.to_s.pluralize.to_sym]
       end
+
+      private
+
+        def create_association(name, type, options)
+          self.associations = associations.merge(name => Builder.new(self, name, type, options))
+        end
     end
   end
 end

data/lib/spyke/associations/association.rb

@@ -6,8 +6,8 @@ module Spyke
     class Association < Relation
       attr_reader :parent, :name
 
-      def initialize(parent, name, options = {})
-        super (options[:class_name] || name.to_s).classify.constantize, options
+      def initialize(klass, parent, name, options = {})
+        super(klass, options)
         @parent, @name = parent, name
       end
 

data/lib/spyke/associations/builder.rb

@@ -0,0 +1,35 @@
+module Spyke
+  module Associations
+    class Builder
+      def initialize(parent_class, name, type, options = {})
+        @parent_class, @name, @type, @options = parent_class, name, type, options
+      end
+
+      def build(parent)
+        @type.new(klass, parent, @name, @options)
+      end
+
+      def klass
+        @klass ||= compute_class(@options[:class_name] || @name)
+      end
+
+      private
+
+        # https://github.com/rails/rails/blob/70ac072976c8cc6f013f0df3777e54ccae3f4f8c/activerecord/lib/active_record/inheritance.rb#L132-L150
+        def compute_class(type_name)
+          parent_name = @parent_class.to_s
+          type_name = type_name.to_s.classify
+
+          candidates = []
+          parent_name.scan(/::|$/) { candidates.unshift "#{$`}::#{type_name}" }
+          candidates << type_name
+
+          candidates.each do |candidate|
+            constant = ActiveSupport::Dependencies.safe_constantize(candidate)
+            return constant if candidate == constant.to_s
+          end
+          raise NameError.new("uninitialized constant #{candidates.first}", candidates.first)
+        end
+    end
+  end
+end

data/lib/spyke/attribute_assignment.rb

@@ -73,8 +73,7 @@ module Spyke
       end
 
       def association(name)
-        options = associations[name]
-        options[:type].new(self, name, options)
+        associations[name].build(self)
       end
 
       def attribute?(name)

data/lib/spyke/relation.rb

@@ -4,8 +4,8 @@ module Spyke
   class Relation
     include Enumerable
 
-    attr_reader :klass, :params
-    attr_writer :params
+    attr_reader :klass
+    attr_accessor :params
     delegate :to_ary, :[], :any?, :empty?, :last, :size, :metadata, to: :find_some
 
     def initialize(klass, options = {})

data/lib/spyke/version.rb

@@ -1,3 +1,3 @@
 module Spyke
-  VERSION = '1.8.5'
+  VERSION = '1.8.6'
 end

data/test/associations_test.rb

@@ -370,5 +370,24 @@ module Spyke
       assert_equal %w{ Condiments Tools }, recipe.groups.map(&:name)
       assert_equal %w{ Salt Spoon }, recipe.ingredients.map(&:name)
     end
+
+    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
+      assert_requested tip_endpoint
+      assert_requested likes_endpoint
+    end
+
+    def test_namespaced_association_class_auto_detect
+      favorite = Cookbook::Tip.new.favorites.build
+      assert_equal Cookbook::Favorite, favorite.class
+    end
+
+    def test_raising_exception_if_class_not_found
+      assert_raises NameError do
+        Cookbook::Tip.new.votes
+      end
+    end
   end
 end

data/test/relation_test.rb

@@ -124,18 +124,16 @@ module Spyke
       assert_requested endpoint_2, times: 1
     end
 
-    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
-      assert_requested tip_endpoint
-      assert_requested likes_endpoint
-    end
-
     def test_path_validation
       assert_raises Spyke::InvalidPathError do
         Recipe.new.groups.to_a
       end
     end
+
+    def test_raise_no_method_error
+      assert_raises NoMethodError do
+        Recipe.new.groups.unknown_method
+      end
+    end
   end
 end

data/test/support/fixtures.rb

@@ -94,8 +94,13 @@ 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 :favorites
+    has_many :votes
   end
 
   class Like < Spyke::Base
   end
+
+  class Favorite < Spyke::Base
+  end
 end

data/test/test_helper.rb

@@ -1,6 +1,10 @@
 # Coverage
 require 'coveralls'
 Coveralls.wear!
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+  add_filter 'test'
+end
 
 require 'spyke'
 require 'faraday_middleware'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spyke
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.6
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -268,6 +268,7 @@ files:
 - lib/spyke/associations.rb
 - lib/spyke/associations/association.rb
 - lib/spyke/associations/belongs_to.rb
+- lib/spyke/associations/builder.rb
 - lib/spyke/associations/has_many.rb
 - lib/spyke/associations/has_one.rb
 - lib/spyke/attribute_assignment.rb