her 0.6.2 → 0.6.3

data/lib/her/model/introspection.rb

@@ -22,7 +22,6 @@ module Her
       end
 
       private
-      # @private
       def attribute_for_inspect(value)
         if value.is_a?(String) && value.length > 50
           "#{value[0..50]}...".inspect
@@ -35,6 +34,7 @@ module Her
 
       module ClassMethods
         # Finds a class at the same level as this one or at the global level.
+        #
         # @private
         def her_nearby_class(name)
           her_sibling_class(name) || name.constantize rescue nil
@@ -42,6 +42,7 @@ module Her
 
         protected
         # Looks for a class at the same level as this one with the given name.
+        #
         # @private
         def her_sibling_class(name)
           if mod = self.her_containing_module
@@ -51,6 +52,7 @@ module Her
         end
 
         # If available, returns the containing Module for this class.
+        #
         # @private
         def her_containing_module
           return unless self.name =~ /::/

data/lib/her/model/nested_attributes.rb

@@ -4,54 +4,42 @@ module Her
       extend ActiveSupport::Concern
 
       module ClassMethods
+        # Allow nested attributes for an association
+        #
+        # @example
+        #   class User
+        #     include Her::Model
+        #
+        #     has_one :role
+        #     accepts_nested_attributes_for :role
+        #   end
+        #
+        #   class Role
+        #     include Her::Model
+        #   end
+        #
+        #   user = User.new(name: "Tobias", role_attributes: { title: "moderator" })
+        #   user.role # => #<Role title="moderator">
         def accepts_nested_attributes_for(*association_names)
+          allowed_association_names = associations.inject([]) { |memo, (name, details)| memo << details }.flatten.map { |a| a[:name] }
+
           association_names.each do |association_name|
-            type = nil
-            [:belongs_to, :has_one, :has_many].each do |association_type|
-              if !associations[association_type].nil? && associations[association_type].any? { |association| association[:name] == association_name }
-                type = association_type
-              end
+            unless allowed_association_names.include?(association_name)
+              raise Her::Errors::AssociationUnknownError.new("Unknown association name :#{association_name}")
             end
-            if type.nil?
-              raise(AssociationUnknownError.new("Unknown association name :#{association_name}"))
-            end
-            class_eval <<-eoruby, __FILE__, __LINE__ + 1
+
+            class_eval <<-RUBY, __FILE__, __LINE__ + 1
               if method_defined?(:#{association_name}_attributes=)
                 remove_method(:#{association_name}_attributes=)
               end
+
               def #{association_name}_attributes=(attributes)
-                assign_nested_attributes_for_#{type}_association(:#{association_name}, attributes)
+                self.#{association_name}.assign_nested_attributes(attributes)
               end
-            eoruby
+            RUBY
           end
         end
       end
-
-      def assign_nested_attributes_for_belongs_to_association(association_name, attributes)
-        assign_nested_attributes_for_simple_association(:belongs_to, association_name, attributes)
-      end
-
-      def assign_nested_attributes_for_has_one_association(association_name, attributes)
-        assign_nested_attributes_for_simple_association(:has_one, association_name, attributes)
-      end
-
-      def assign_nested_attributes_for_has_many_association(association_name, attributes)
-        association = self.class.associations[:has_many].find { |association| association[:name] == association_name }
-        klass = self.class.her_nearby_class(association[:class_name])
-        self.send("#{association[:name]}=", Her::Model::Attributes.initialize_collection(klass, :data => attributes))
-      end
-
-      private
-      def assign_nested_attributes_for_simple_association(association_type, association_name, attributes)
-        association = self.class.associations[association_type].find { |association| association[:name] == association_name }
-        if has_data?(association[:name])
-          self.send(association[:name]).assign_data(attributes)
-        else
-          klass = self.class.her_nearby_class(association[:class_name])
-          instance = klass.new(klass.parse(attributes))
-          self.send("#{association[:name]}=", instance)
-        end
-      end
     end
   end
 end

data/lib/her/model/orm.rb

@@ -131,12 +131,33 @@ module Her
 
         # @private
         def scoped
-          Relation.new(self)
+          @_her_default_scope || blank_relation
+        end
+
+        # Define the default scope for the model
+        #
+        # @example
+        #   class User
+        #     include Her::Model
+        #
+        #     default_scope lambda { where(:admin => 1) }
+        #   enc
+        #
+        #   User.all # Called via GET "/users?admin=1"
+        #   User.new.admin # => 1
+        def default_scope(block=nil)
+          @_her_default_scope ||= superclass.respond_to?(:default_scope) ? superclass.default_scope : scoped
+          @_her_default_scope = @_her_default_scope.instance_exec(&block) unless block.nil?
+          @_her_default_scope
         end
 
         # Delegate the following methods to `scoped`
         [:all, :where, :create, :build, :first_or_create, :first_or_initialize].each do |method|
-          define_method(method) { |*attrs| scoped.send(method, *attrs) }
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def #{method}(*attrs)
+              scoped.send(#{method.to_sym.inspect}, *attrs)
+            end
+          RUBY
         end
 
         # Save an existing resource and return it
@@ -174,6 +195,12 @@ module Her
           return @method_for[action] if method.nil?
           @method_for[action] = method.to_s.downcase.to_sym
         end
+
+        private
+        # @private
+        def blank_relation
+          @blank_relation ||= Relation.new(self)
+        end
       end
     end
   end

data/lib/her/model/parse.rb

@@ -36,7 +36,7 @@ module Her
           return @_her_include_root_in_json unless value
           @_her_include_root_in_json = value
         end
-        alias :include_root_in_json? :include_root_in_json
+        alias include_root_in_json? include_root_in_json
 
         # Return or change the value of `parse_root_in`
         #
@@ -53,7 +53,7 @@ module Her
           return @_her_parse_root_in_json unless value
           @_her_parse_root_in_json = value
         end
-        alias :parse_root_in_json? :parse_root_in_json
+        alias parse_root_in_json? parse_root_in_json
 
         # Return or change the value of `root_element`. Always defaults to the base name of the class.
         #

data/lib/her/model/relation.rb

@@ -9,6 +9,11 @@ module Her
         @query_attrs = {}
       end
 
+      # @private
+      def apply_to(attributes)
+        @query_attrs.merge(attributes)
+      end
+
       # Build a new resource
       def build(attrs = {})
         @parent.new(@query_attrs.merge(attrs))
@@ -25,10 +30,17 @@ module Her
       alias all where
 
       # Bubble all methods to the fetched collection
+      #
+      # @private
       def method_missing(method, *args, &blk)
         fetch.send(method, *args, &blk)
       end
 
+      # @private
+      def respond_to?(method, *args)
+        super || fetch.respond_to?(method, *args)
+      end
+
       # @private
       def nil?
         fetch.nil?

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/model/associations_spec.rb

@@ -93,7 +93,7 @@ describe Her::Model::Associations do
           stub.get("/users/2/comments") { |env| [200, {}, [{ :comment => { :id => 4, :body => "They're having a FIRESALE?" } }, { :comment => { :id => 5, :body => "Is this the tiny town from Footloose?" } }].to_json] }
           stub.get("/users/2/role") { |env| [200, {}, { :id => 2, :body => "User" }.to_json] }
           stub.get("/users/1/role") { |env| [200, {}, { :id => 3, :body => "User" }.to_json] }
-          stub.get("/users/1/posts") { |env| [200, {}, {:id => 1, :body => 'blogging stuff', :admin_id => 1 }.to_json] }
+          stub.get("/users/1/posts") { |env| [200, {}, [{:id => 1, :body => 'blogging stuff', :admin_id => 1 }].to_json] }
           stub.get("/organizations/1") { |env| [200, {}, { :organization =>  { :id => 1, :name => "Bluth Company Foo" } }.to_json] }
           stub.post("/users") { |env| [200, {}, { :id => 5, :name => "Mr. Krabs", :comments => [{ :comment => { :id => 99, :body => "Rodríguez, nasibisibusi?", :user_id => 5 } }], :role => { :id => 1, :body => "Admin" }, :organization => { :id => 3, :name => "Krusty Krab" }, :organization_id => 3 }.to_json] }
           stub.put("/users/5") { |env| [200, {}, { :id => 5, :name => "Clancy Brown", :comments => [{ :comment => { :id => 99, :body => "Rodríguez, nasibisibusi?", :user_id => 5 } }], :role => { :id => 1, :body => "Admin" }, :organization => { :id => 3, :name => "Krusty Krab" }, :organization_id => 3 }.to_json] }

data/spec/model/attributes_spec.rb

@@ -18,7 +18,7 @@ describe Her::Model::Attributes do
 
     it "handles method missing for getter" do
       @new_user = Foo::User.new(:fullname => 'Mayonegg')
-      lambda { @new_user.unknown_method_for_a_user }.should raise_error(NoMethodError)
+      expect { @new_user.unknown_method_for_a_user }.to raise_error(NoMethodError)
       expect { @new_user.fullname }.to_not raise_error(NoMethodError)
     end
 
@@ -48,16 +48,16 @@ describe Her::Model::Attributes do
       @new_user.should respond_to(:fullname?)
     end
 
-    it "handles has_data? for getter" do
+    it "handles has_attribute? for getter" do
       @new_user = Foo::User.new(:fullname => 'Mayonegg')
-      @new_user.should_not have_data(:unknown_method_for_a_user)
-      @new_user.should have_data(:fullname)
+      @new_user.should_not have_attribute(:unknown_method_for_a_user)
+      @new_user.should have_attribute(:fullname)
     end
 
-    it "handles get_data for getter" do
+    it "handles get_attribute for getter" do
       @new_user = Foo::User.new(:fullname => 'Mayonegg')
-      @new_user.get_data(:unknown_method_for_a_user).should be_nil
-      @new_user.get_data(:fullname).should == 'Mayonegg'
+      @new_user.get_attribute(:unknown_method_for_a_user).should be_nil
+      @new_user.get_attribute(:fullname).should == 'Mayonegg'
     end
   end
 

data/spec/model/nested_attributes_spec.rb

@@ -95,4 +95,12 @@ describe Her::Model::NestedAttributes do
       end
     end
   end
+
+  context "with an unknown association" do
+    it "raises an error" do
+      expect {
+        spawn_model("Foo::User") { accepts_nested_attributes_for :company }
+      }.to raise_error(Her::Errors::AssociationUnknownError, 'Unknown association name :company')
+    end
+  end
 end

data/spec/model/relation_spec.rb

@@ -18,14 +18,15 @@ describe Her::Model::Relation do
       end
 
       it "doesn't fetch the data immediatly" do
-        Her::Model::Relation.any_instance.should_receive(:fetch).never
+        Foo::User.should_receive(:request).never
         @users = Foo::User.where(:admin => 1)
       end
 
       it "fetches the data and passes query parameters" do
-        Her::Model::Relation.any_instance.should_receive(:fetch).once.and_call_original
+        Foo::User.should_receive(:request).once.and_call_original
         @users = Foo::User.where(:admin => 1)
-        @users.length.should == 1
+        @users.should respond_to(:length)
+        @users.should have(1).items
       end
 
       it "chains multiple where statements" do
@@ -133,4 +134,56 @@ describe Her::Model::Relation do
       @user.id.should == 4
     end
   end
+
+  describe :default_scope do
+    context "for new objects" do
+      before do
+        spawn_model 'Foo::User' do
+          default_scope lambda { where(:active => true) }
+          default_scope lambda { where(:admin => true) }
+        end
+      end
+
+      it "should apply the scope to the attributes" do
+        Foo::User.new.should be_active
+        Foo::User.new.should be_admin
+      end
+    end
+
+    context "for fetched resources" do
+      before do
+        Her::API.setup :url => "https://api.example.com" do |builder|
+          builder.use Her::Middleware::FirstLevelParseJSON
+          builder.use Faraday::Request::UrlEncoded
+          builder.adapter :test do |stub|
+            stub.post("/users") { |env| ok! :id => 3, :active => (params(env)[:active] == "true" ? true : false) }
+          end
+        end
+
+        spawn_model 'Foo::User' do
+          default_scope lambda { where(:active => true) }
+        end
+      end
+
+      it("should apply the scope to the request") { Foo::User.create.should be_active }
+    end
+
+    context "for fetched collections" do
+      before do
+        Her::API.setup :url => "https://api.example.com" do |builder|
+          builder.use Her::Middleware::FirstLevelParseJSON
+          builder.use Faraday::Request::UrlEncoded
+          builder.adapter :test do |stub|
+            stub.get("/users?active=true") { |env| ok! [{ :id => 3, :active => (params(env)[:active] == "true" ? true : false) }] }
+          end
+        end
+
+        spawn_model 'Foo::User' do
+          default_scope lambda { where(:active => true) }
+        end
+      end
+
+      it("should apply the scope to the request") { Foo::User.all.first.should be_active }
+    end
+  end
 end

data/spec/support/macros/request_macros.rb

@@ -11,7 +11,7 @@ module Her
         end
 
         def params(env)
-          @params ||= Faraday::Utils.parse_query(env[:body]).with_indifferent_access
+          @params ||= Faraday::Utils.parse_query(env[:body]).with_indifferent_access.merge(env[:params])
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -142,6 +142,7 @@ files:
 - lib/her/model/associations/has_one_association.rb
 - lib/her/model/attributes.rb
 - lib/her/model/base.rb
+- lib/her/model/deprecated_methods.rb
 - lib/her/model/http.rb
 - lib/her/model/introspection.rb
 - lib/her/model/nested_attributes.rb