her 0.6.8 → 0.7

data/lib/her/model/associations/has_many_association.rb

@@ -2,6 +2,7 @@ module Her
   module Model
     module Associations
       class HasManyAssociation < Association
+
         # @private
         def self.attach(klass, name, opts)
           opts = {
@@ -19,7 +20,7 @@ module Her
               cached_name = :"@_her_association_#{name}"
 
               cached_data = (instance_variable_defined?(cached_name) && instance_variable_get(cached_name))
-              cached_data || instance_variable_set(cached_name, Her::Model::Associations::HasManyAssociation.new(self, #{opts.inspect}))
+              cached_data || instance_variable_set(cached_name, Her::Model::Associations::HasManyAssociation.proxy(self, #{opts.inspect}))
             end
           RUBY
         end

data/lib/her/model/associations/has_one_association.rb

@@ -2,6 +2,7 @@ module Her
   module Model
     module Associations
       class HasOneAssociation < Association
+
         # @private
         def self.attach(klass, name, opts)
           opts = {
@@ -18,7 +19,7 @@ module Her
               cached_name = :"@_her_association_#{name}"
 
               cached_data = (instance_variable_defined?(cached_name) && instance_variable_get(cached_name))
-              cached_data || instance_variable_set(cached_name, Her::Model::Associations::HasOneAssociation.new(self, #{opts.inspect}))
+              cached_data || instance_variable_set(cached_name, Her::Model::Associations::HasOneAssociation.proxy(self, #{opts.inspect}))
             end
           RUBY
         end

data/lib/her/model/attributes.rb

@@ -33,8 +33,12 @@ module Her
       # @private
       def self.initialize_collection(klass, parsed_data={})
         collection_data = klass.extract_array(parsed_data).map do |item_data|
-          resource = klass.new(klass.parse(item_data))
-          resource.run_callbacks :find
+          if item_data.kind_of?(klass)
+            resource = item_data
+          else
+            resource = klass.new(klass.parse(item_data))
+            resource.run_callbacks :find
+          end
           resource
         end
         Her::Collection.new(collection_data, parsed_data[:metadata], parsed_data[:errors])
@@ -77,14 +81,9 @@ module Her
         end
       end
 
-      # @private
-      def respond_to?(method, include_private = false)
-        method.to_s.end_with?('=') || method.to_s.end_with?('?') || @attributes.include?(method) || super
-      end
-
       # @private
       def respond_to_missing?(method, include_private = false)
-        method.to_s.end_with?('=') || method.to_s.end_with?('?') || @attributes.include?(method) || @attributes.include?(method) || super
+        method.to_s.end_with?('=') || method.to_s.end_with?('?') || @attributes.include?(method) || super
       end
 
       # Assign new attributes to a resource
@@ -168,6 +167,7 @@ module Her
         #
         # @private
         def new_from_parsed_data(parsed_data)
+          parsed_data = parsed_data.with_indifferent_access
           new(parse(parsed_data[:data]).merge :_metadata => parsed_data[:metadata], :_errors => parsed_data[:errors])
         end
 
@@ -185,20 +185,19 @@ module Her
           attributes.each do |attribute|
             attribute = attribute.to_sym
 
-            class_eval <<-RUBY, __FILE__, __LINE__ + 1
-              unless instance_methods.include?(:'#{attribute}=')
-                def #{attribute}=(value)
-                  self.send(:"#{attribute}_will_change!") if @attributes[:'#{attribute}'] != value
-                  @attributes[:'#{attribute}'] = value
-                end
+            unless instance_methods.include?(:"#{attribute}=")
+              define_method("#{attribute}=") do |value|
+                @attributes[:"#{attribute}"] = nil unless @attributes.include?(:"#{attribute}")
+                self.send(:"#{attribute}_will_change!") if @attributes[:'#{attribute}'] != value
+                @attributes[:"#{attribute}"] = value
               end
+            end
 
-              unless instance_methods.include?(:'#{attribute}?')
-                def #{attribute}?
-                  @attributes.include?(:'#{attribute}') && @attributes[:'#{attribute}'].present?
-                end
+            unless instance_methods.include?(:"#{attribute}?")
+              define_method("#{attribute}?") do
+                @attributes.include?(:"#{attribute}") && @attributes[:"#{attribute}"].present?
               end
-            RUBY
+            end
           end
         end
 

data/lib/her/model/http.rb

@@ -39,9 +39,13 @@ module Her
             superclass.use_api if superclass.respond_to?(:use_api)
           end
 
-          return @_her_use_api unless value
+          unless value
+            return (@_her_use_api.respond_to? :call) ? @_her_use_api.call : @_her_use_api
+          end
+
           @_her_use_api = value
         end
+
         alias her_api use_api
         alias uses_api use_api
 

data/lib/her/model/orm.rb

@@ -46,7 +46,10 @@ module Her
               @response_errors = parsed_data[:errors]
 
               return false if !response.success? || @response_errors.any?
-              self.changed_attributes.clear if self.changed_attributes.present?
+              if self.changed_attributes.present?
+                @previously_changed = self.changed_attributes.clone
+                self.changed_attributes.clear
+              end
             end
           end
         end
@@ -54,6 +57,14 @@ module Her
         self
       end
 
+      # Similar to save(), except that ResourceInvalid is raised if the save fails
+      def save!
+        if !self.save
+          raise Her::Errors::ResourceInvalid, self
+        end
+        self
+      end
+
       # Destroy a resource
       #
       # @example

data/lib/her/model/parse.rb

@@ -10,7 +10,7 @@ module Her
       #   @user.to_params
       #   # => { :id => 1, :name => 'John Smith' }
       def to_params
-        self.class.to_params(self.attributes)
+        self.class.to_params(self.attributes, self.changes)
       end
 
       module ClassMethods
@@ -23,8 +23,15 @@ module Her
         end
 
         # @private
-        def to_params(attributes)
-          include_root_in_json? ? { included_root_element => attributes.dup.symbolize_keys } : attributes.dup.symbolize_keys
+        def to_params(attributes, changes={})
+          filtered_attributes = attributes.dup.symbolize_keys
+          if her_api.options[:send_only_modified_attributes]
+            filtered_attributes = changes.symbolize_keys.keys.inject({}) do |hash, attribute|
+              hash[attribute] = filtered_attributes[attribute]
+              hash
+            end
+          end
+          include_root_in_json? ? { included_root_element => filtered_attributes } : filtered_attributes
         end
 
         # Return or change the value of `include_root_in_json`
@@ -34,15 +41,13 @@ module Her
         #     include Her::Model
         #     include_root_in_json true
         #   end
-        def include_root_in_json(value = nil)
-          @_her_include_root_in_json ||= begin
-            superclass.include_root_in_json if superclass.respond_to?(:include_root_in_json)
-          end
-
-          return @_her_include_root_in_json unless value
+        def include_root_in_json(value)
           @_her_include_root_in_json = value
         end
-        alias include_root_in_json? include_root_in_json
+
+        def include_root_in_json?
+          @_her_include_root_in_json || (superclass.respond_to?(:include_root_in_json?) && superclass.include_root_in_json?)
+        end
 
         # Return or change the value of `parse_root_in`
         #
@@ -51,16 +56,14 @@ module Her
         #     include Her::Model
         #     parse_root_in_json true
         #   end
-        def parse_root_in_json(value = nil, options = {})
-          @_her_parse_root_in_json ||= begin
-            superclass.parse_root_in_json if superclass.respond_to?(:parse_root_in_json)
-          end
-
-          return @_her_parse_root_in_json unless value
+        def parse_root_in_json(value, options = {})
           @_her_parse_root_in_json = value
           @_her_parse_root_in_json_format = options[:format]
         end
-        alias parse_root_in_json? parse_root_in_json
+
+        def parse_root_in_json?
+          @_her_parse_root_in_json || (superclass.respond_to?(:parse_root_in_json?) && superclass.parse_root_in_json?)
+        end
 
         # Return or change the value of `request_new_object_on_build`
         #
@@ -70,14 +73,12 @@ module Her
         #     request_new_object_on_build true
         #   end
         def request_new_object_on_build(value = nil)
-          @_her_request_new_object_on_build ||= begin
-            superclass.request_new_object_on_build if superclass.respond_to?(:request_new_object_on_build)
-          end
-
-          return @_her_request_new_object_on_build unless value
           @_her_request_new_object_on_build = value
         end
-        alias request_new_object_on_build? request_new_object_on_build
+
+        def request_new_object_on_build?
+          @_her_request_new_object_on_build || (superclass.respond_to?(:request_new_object_on_build?) && superclass.request_new_object_on_build?)
+        end
 
         # Return or change the value of `root_element`. Always defaults to the base name of the class.
         #
@@ -132,17 +133,17 @@ module Her
 
         # @private
         def included_root_element
-          include_root_in_json == true ? root_element : include_root_in_json
+          include_root_in_json? == true ? root_element : include_root_in_json?
         end
 
         # @private
         def parsed_root_element
-          parse_root_in_json == true ? root_element : parse_root_in_json
+          parse_root_in_json? == true ? root_element : parse_root_in_json?
         end
 
         # @private
         def active_model_serializers_format?
-          @_her_parse_root_in_json_format == :active_model_serializers
+          @_her_parse_root_in_json_format == :active_model_serializers || (superclass.respond_to?(:active_model_serializers_format?) && superclass.active_model_serializers_format?)
         end
       end
     end

data/lib/her/model/paths.rb

@@ -94,7 +94,7 @@ module Her
           unless path.is_a?(String)
             parameters = path.try(:with_indifferent_access) || parameters
             path =
-              if parameters.include?(primary_key) && parameters[primary_key]
+              if parameters.include?(primary_key) && parameters[primary_key] && !parameters[primary_key].kind_of?(Array)
                 resource_path.dup
               else
                 collection_path.dup

data/lib/her/model/relation.rb

@@ -84,6 +84,7 @@ module Her
       #   # Fetched via GET "/users/1" and GET "/users/2"
       def find(*ids)
         params = @params.merge(ids.last.is_a?(Hash) ? ids.pop : {})
+        ids = Array(params[@parent.primary_key]) if params.key?(@parent.primary_key)
 
         results = ids.flatten.compact.uniq.map do |id|
           resource = nil
@@ -95,6 +96,7 @@ module Her
           @parent.request(request_params) do |parsed_data, response|
             if response.success?
               resource = @parent.new_from_parsed_data(parsed_data)
+              resource.instance_variable_set(:@changed_attributes, {})
               resource.run_callbacks :find
             else
               return nil

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "0.6.8"
+  VERSION = "0.7"
 end

data/spec/middleware/first_level_parse_json_spec.rb

@@ -7,6 +7,7 @@ describe Her::Middleware::FirstLevelParseJSON do
   let(:body_with_errors) { "{\"id\": 1, \"name\": \"Tobias Fünke\", \"errors\": { \"name\": [ \"not_valid\", \"should_be_present\" ] }, \"metadata\": 3}" }
   let(:body_with_malformed_json) { "wut." }
   let(:body_with_invalid_json) { "true" }
+  let(:empty_body) { '' }
   let(:nil_body) { nil }
 
   it "parses body as json" do
@@ -45,6 +46,10 @@ describe Her::Middleware::FirstLevelParseJSON do
     subject.parse(nil_body)[:data].should eq({})
   end
 
+  it 'ensures that an empty response returns an empty hash' do
+    subject.parse(empty_body)[:data].should eq({})
+  end
+
   context 'with status code 204' do
     it 'returns an empty body' do
       env = { :status => 204 }

data/spec/model/associations_spec.rb

@@ -59,7 +59,7 @@ describe Her::Model::Associations do
         its([:has_many]) { should eql [{ :name => :comments, :data_key => :user_comments, :default => {}, :class_name => "Post", :path => "/comments", :inverse_of => :admin }] }
       end
 
-      context "signle has_one association" do
+      context "single has_one association" do
         before { Foo::User.has_one :category, :class_name => "Topic", :foreign_key => "topic_id", :data_key => :topic, :default => nil }
         its([:has_one]) { should eql [{ :name => :category, :data_key => :topic, :default => nil, :class_name => "Topic", :foreign_key => "topic_id", :path => "/category" }] }
       end
@@ -146,11 +146,11 @@ describe Her::Model::Associations do
     end
 
     it "does not refetch the parents models data if they have been fetched before" do
-      @user_with_included_data.comments.first.user.fetch.object_id.should == @user_with_included_data.object_id
+      @user_with_included_data.comments.first.user.object_id.should == @user_with_included_data.object_id
     end
 
     it "uses the given inverse_of key to set the parent model" do
-      @user_with_included_data.posts.first.admin.fetch.object_id.should == @user_with_included_data.object_id
+      @user_with_included_data.posts.first.admin.object_id.should == @user_with_included_data.object_id
     end
 
     it "fetches data that was not included through has_many" do
@@ -198,8 +198,8 @@ describe Her::Model::Associations do
     end
 
     it "can tell if it has a association" do
-      @user_without_included_data.has_association?(:unknown_association).should be_false
-      @user_without_included_data.has_association?(:organization).should be_true
+      @user_without_included_data.has_association?(:unknown_association).should be false
+      @user_without_included_data.has_association?(:organization).should be true
     end
 
     it "fetches the resource corresponding to a named association" do
@@ -217,6 +217,11 @@ describe Her::Model::Associations do
       comment.id.should eq(5)
     end
 
+    it "'s associations responds to #empty?" do
+      @user_without_included_data.organization.respond_to?(:empty?).should be_truthy
+      @user_without_included_data.organization.should_not be_empty
+    end
+
     [:create, :save_existing, :destroy].each do |type|
       context "after #{type}" do
         let(:subject) { self.send("user_with_included_data_after_#{type}")}
@@ -244,6 +249,7 @@ describe Her::Model::Associations do
         builder.use Faraday::Request::UrlEncoded
         builder.adapter :test do |stub|
           stub.get("/users/1") { |env| [200, {}, { :id => 1, :name => "Tobias Fünke", :organization => { :id => 1, :name => "Bluth Company Inc." }, :organization_id => 1 }.to_json] }
+          stub.get("/users/4") { |env| [200, {}, { :id => 1, :name => "Tobias Fünke", :organization => { :id => 1, :name => "Bluth Company Inc." } }.to_json] }
           stub.get("/users/2") { |env| [200, {}, { :id => 2, :name => "Lindsay Fünke", :organization_id => 1 }.to_json] }
           stub.get("/users/3") { |env| [200, {}, { :id => 2, :name => "Lindsay Fünke", :company => nil }.to_json] }
           stub.get("/companies/1") { |env| [200, {}, { :id => 1, :name => "Bluth Company" }.to_json] }
@@ -259,6 +265,7 @@ describe Her::Model::Associations do
       @user_with_included_data = Foo::User.find(1)
       @user_without_included_data = Foo::User.find(2)
       @user_with_included_nil_data = Foo::User.find(3)
+      @user_with_included_data_but_no_fk = Foo::User.find(4)
     end
 
     it "maps an array of included data through belongs_to" do
@@ -276,6 +283,57 @@ describe Her::Model::Associations do
       @user_without_included_data.company.id.should == 1
       @user_without_included_data.company.name.should == "Bluth Company"
     end
+
+    it "does not require foreugn key to have nested object" do
+      @user_with_included_data_but_no_fk.company.name.should == "Bluth Company Inc."
+    end
+  end
+
+  context "object returned by the association method" do
+    before do
+      spawn_model "Foo::Role" do
+        def present?
+          "of_course"
+        end
+      end
+      spawn_model "Foo::User" do
+        has_one :role
+      end
+    end
+
+    let(:associated_value) { Foo::Role.new }
+    let(:user_with_role) do
+      Foo::User.new.tap { |user| user.role = associated_value }
+    end
+
+    subject { user_with_role.role }
+
+    it "doesnt mask the object's basic methods" do
+      subject.class.should == Foo::Role
+    end
+
+    it "doesnt mask core methods like extend" do
+      committer = Module.new
+      subject.extend  committer
+      associated_value.should be_kind_of committer
+    end
+
+    it "can return the association object" do
+      subject.association.should be_kind_of Her::Model::Associations::Association
+    end
+
+    it "still can call fetch via the association" do
+      subject.association.fetch.should eq associated_value
+    end
+
+    it "calls missing methods on associated value" do
+      subject.present?.should == "of_course"
+    end
+
+    it "can use association methods like where" do
+      subject.where(role: 'committer').association.
+        params.should include :role
+    end
   end
 
   context "building and creating association data" do
@@ -318,5 +376,18 @@ describe Her::Model::Associations do
         @user.comments.should == [@comment]
       end
     end
+
+    context "with #new" do
+      it "creates nested models from hash attibutes" do
+        user = Foo::User.new(:name => "vic", :comments => [{:text => "hello"}])
+        user.comments.first.text.should == "hello"
+      end
+
+      it "assigns nested models if given as already constructed objects" do
+        bye = Foo::Comment.new(:text => "goodbye")
+        user = Foo::User.new(:name => 'vic', :comments => [bye])
+        user.comments.first.text.should == 'goodbye'
+      end
+    end
   end
 end

data/spec/model/attributes_spec.rb

@@ -7,7 +7,7 @@ describe Her::Model::Attributes do
 
     it "handles new resource" do
       @new_user = Foo::User.new(:fullname => "Tobias Fünke")
-      @new_user.new?.should be_true
+      @new_user.new?.should be_truthy
       @new_user.fullname.should == "Tobias Fünke"
     end
 
@@ -19,17 +19,17 @@ describe Her::Model::Attributes do
     it "handles method missing for getter" do
       @new_user = Foo::User.new(:fullname => 'Mayonegg')
       expect { @new_user.unknown_method_for_a_user }.to raise_error(NoMethodError)
-      expect { @new_user.fullname }.to_not raise_error(NoMethodError)
+      expect { @new_user.fullname }.not_to raise_error()
     end
 
     it "handles method missing for setter" do
       @new_user = Foo::User.new
-      expect { @new_user.fullname = "Tobias Fünke" }.to_not raise_error(NoMethodError)
+      expect { @new_user.fullname = "Tobias Fünke" }.not_to raise_error()
     end
 
     it "handles method missing for query" do
       @new_user = Foo::User.new
-      expect { @new_user.fullname? }.to_not raise_error(NoMethodError)
+      expect { @new_user.fullname? }.not_to raise_error()
     end
 
     it "handles respond_to for getter" do
@@ -59,6 +59,12 @@ describe Her::Model::Attributes do
       @new_user.get_attribute(:unknown_method_for_a_user).should be_nil
       @new_user.get_attribute(:fullname).should == 'Mayonegg'
     end
+
+    it "handles get_attribute for getter with dash" do
+      @new_user = Foo::User.new(:'life-span' => '3 years')
+      @new_user.get_attribute(:unknown_method_for_a_user).should be_nil
+      @new_user.get_attribute(:'life-span').should == '3 years'
+    end
   end
 
 
@@ -113,14 +119,14 @@ describe Her::Model::Attributes do
     end
 
     it "returns false for a non-resource with the same data" do
-      fake_user = stub(:data => { :id => 1, :fullname => "Lindsay Fünke" })
+      fake_user = double(:data => { :id => 1, :fullname => "Lindsay Fünke" })
       user.should_not == fake_user
     end
 
     it "delegates eql? to ==" do
       other = Object.new
       user.should_receive(:==).with(other).and_return(true)
-      user.eql?(other).should be_true
+      user.eql?(other).should be_truthy
     end
 
     it "treats equal resources as equal for Array#uniq" do
@@ -249,13 +255,13 @@ describe Her::Model::Attributes do
 
       it "byoasses Her's method" do
         @user = Foo::User.find(1)
-        @user.document?.should be_false
+        @user.document?.should be_falsey
 
         @user = Foo::User.find(1)
-        @user.document?.should be_false
+        @user.document?.should be_falsey
 
         @user = Foo::User.find(2)
-        @user.document?.should be_true
+        @user.document?.should be_truthy
       end
     end
   end