her 0.8.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd29346168938bbc64f498b73226188938c7cdb5
-  data.tar.gz: 86554e2fa519f825aedb4fa63a3c82e50b4a8731
+  metadata.gz: 458601a1de64f520013856ef805b17e8293bfb9d
+  data.tar.gz: 1e965c550664039d6b6f649a9b10a7821d90f717
 SHA512:
-  metadata.gz: ffd1a26120cb29cab5d879515b8c587c65f5729aaa61735998dd5e94a6f5af717399e8c4f03dcb2098fbc4385645312335b477f14e3559e90afd348a850cf087
-  data.tar.gz: f2a023b8d8c0330988c104664026c26ffa5e6e34554724b4379f7d2edddb4aec306de9b6fe032b1c75d85b0c0238e170db20534d8e54bc9236b985b937c3754a
+  metadata.gz: e7d147d58050f847942df92440c9e71013c1fc54fbb56d0a6e5dd9d6167a1ffc4e30c329524f1bac07a378d06991198cb1bf44215067ab911f2d0ff1ee5b95f7
+  data.tar.gz: 1c3ab969c7fbe8f90f730945cd9392f9e2d3df6b3df577291f86f97aa7405758f1086a7708e2586760d674a362703c465bd66516f828d1c1a389fb7c304f4a16

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 sudo: false
 
 rvm:
+  - 2.4.1
   - 2.3.1
   - 2.2.2
   - 2.1.6

data/README.md

@@ -1,4 +1,5 @@
 # Maintenance Update 29th Sept 2016
+
 Hi folks, [@edtjones](https://github.com/edtjones) here. Rémi has handed me the keys to Her and [@foxpaul](https://github.com/foxpaul) and I will be trying to do the library justice with the help of the community. There's loads to do; we'll get in touch with everyone who's raised a PR as soon as possible and figure out a plan of action.
 
 # Rails 5 support
@@ -15,6 +16,7 @@ If you need Rails 5 support, version 0.8.2 is for you!
   <a href="https://codeclimate.com/github/remiprev/her"><img src="http://img.shields.io/codeclimate/github/remiprev/her.svg" /></a>
   <a href='https://gemnasium.com/remiprev/her'><img src="http://img.shields.io/gemnasium/remiprev/her.svg" /></a>
   <a href="https://travis-ci.org/remiprev/her"><img src="http://img.shields.io/travis/remiprev/her/master.svg" /></a>
+  <a href="https://gitter.im/her-orm/Lobby"><img src="https://badges.gitter.im/her-orm/Lobby.png" alt="Gitter chat" title="" data-pin-nopin="true"></a>
 </p>
 
 ---
@@ -182,7 +184,7 @@ Her::API.setup url: "https://api.example.com" do |c|
   # Request
   c.use Faraday::Request::BasicAuthentication, 'myusername', 'mypassword'
   c.use Faraday::Request::UrlEncoded
-  
+
   # Response
   c.use Her::Middleware::DefaultParseJSON
 
@@ -611,7 +613,7 @@ users = Users.all
 #### JSON API support
 
 To consume a JSON API 1.0 compliant service, it must return data in accordance with the [JSON API spec](http://jsonapi.org/). The general format
-of the data is as follows: 
+of the data is as follows:
 
 ```json
 { "data": {

data/lib/her/api.rb

@@ -6,7 +6,7 @@ module Her
     attr_reader :connection, :options
 
     # Constants
-    FARADAY_OPTIONS = [:request, :proxy, :ssl, :builder, :url, :parallel_manager, :params, :headers, :builder_class, :timeout, :open_timeout].freeze
+    FARADAY_OPTIONS = [:request, :proxy, :ssl, :builder, :url, :parallel_manager, :params, :headers, :builder_class].freeze
 
     # Setup a default API connection. Accepted arguments and options are the same as {API#setup}.
     def self.setup(opts={}, &block)

data/lib/her/middleware/json_api_parser.rb

@@ -25,7 +25,7 @@ module Her
       # @private
       def on_complete(env)
         env[:body] = case env[:status]
-        when 204
+        when 204, 304
           parse('{}')
         else
           parse(env[:body])

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

@@ -49,6 +49,7 @@ module Her
 
           return @cached_result unless @params.any? || @cached_result.nil?
           return @parent.attributes[@name] unless @params.any? || @parent.attributes[@name].blank?
+          return @opts[:default].try(:dup) if @parent.new?
 
           path = build_association_path lambda { "#{@parent.request_path(@params)}#{@opts[:path]}" }
           @klass.get(path, @params).tap do |result|
@@ -65,6 +66,13 @@ module Her
           end
         end
 
+        # @private
+        def reset
+          @params = {}
+          @cached_result = nil
+          @parent.attributes.delete(@name)
+        end
+
         # Add query parameters to the HTTP request performed to fetch the data
         #
         # @example
@@ -97,6 +105,29 @@ module Her
           @klass.get_resource(path, @params)
         end
 
+        # Refetches the association and puts the proxy back in its initial state,
+        # which is unloaded. Cached associations are cleared.
+        #
+        # @example
+        #   class User
+        #     include Her::Model
+        #     has_many :comments
+        #   end
+        #
+        #   class Comment
+        #     include Her::Model
+        #   end
+        #
+        #   user = User.find(1)
+        #   user.comments = [#<Comment(comments/2) id=2 body="Hello!">]
+        #   user.comments.first.id = "Oops"
+        #   user.comments.reload # => [#<Comment(comments/2) id=2 body="Hello!">]
+        #   # Fetched again via GET "/users/1/comments"
+        def reload
+          reset
+          fetch
+        end
+
       end
     end
   end

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

@@ -15,7 +15,7 @@ module Her
         end
 
         install_proxy_methods :association,
-          :build, :create, :where, :find, :all, :assign_nested_attributes
+          :build, :create, :where, :find, :all, :assign_nested_attributes, :reload
 
         # @private
         def initialize(association)

data/lib/her/model/attributes.rb

@@ -25,6 +25,8 @@ module Her
 
         attributes = self.class.default_scope.apply_to(attributes)
         assign_attributes(attributes)
+
+        yield self if block_given?
         run_callbacks :initialize
       end
 

data/lib/her/model/orm.rb

@@ -39,8 +39,8 @@ module Her
         callback = new? ? :create : :update
         method = self.class.method_for(callback)
 
-        run_callbacks callback do
-          run_callbacks :save do
+        run_callbacks :save do
+          run_callbacks callback do
             params = to_params
             self.class.request(to_params.merge(:_method => method, :_path => request_path)) do |parsed_data, response|
               assign_attributes(self.class.parse(parsed_data[:data])) if parsed_data[:data].any?
@@ -49,7 +49,7 @@ module Her
 
               return false if !response.success? || @response_errors.any?
               if self.changed_attributes.present?
-                @previously_changed = self.changed_attributes.clone
+                @previously_changed = self.changes.clone
                 self.changed_attributes.clear
               end
             end
@@ -86,6 +86,75 @@ module Her
         self
       end
 
+      # Refetches the resource
+      #
+      # This method finds the resource by its primary key (which could be
+      # assigned manually) and modifies the object in-place.
+      #
+      # @example
+      #   user = User.find(1)
+      #   # => #<User(users/1) id=1 name="Tobias Fünke">
+      #   user.name = "Oops"
+      #   user.reload # Fetched again via GET "/users/1"
+      #   # => #<User(users/1) id=1 name="Tobias Fünke">
+      def reload(options = nil)
+        fresh_object = self.class.find(id)
+        assign_attributes(fresh_object.attributes)
+        self
+      end
+
+      # Assigns to +attribute+ the boolean opposite of <tt>attribute?</tt>. So
+      # if the predicate returns +true+ the attribute will become +false+. This
+      # method toggles directly the underlying value without calling any setter.
+      # Returns +self+.
+      #
+      # @example
+      #   user = User.first
+      #   user.admin? # => false
+      #   user.toggle(:admin)
+      #   user.admin? # => true
+      def toggle(attribute)
+        attributes[attribute] = !public_send("#{attribute}?")
+        self
+      end
+
+      # Wrapper around #toggle that saves the resource. Saving is subjected to
+      # validation checks. Returns +true+ if the record could be saved.
+      def toggle!(attribute)
+        toggle(attribute) && save
+      end
+
+      # Initializes +attribute+ to zero if +nil+ and adds the value passed as
+      # +by+ (default is 1). The increment is performed directly on the
+      # underlying attribute, no setter is invoked. Only makes sense for
+      # number-based attributes. Returns +self+.
+      def increment(attribute, by = 1)
+        attributes[attribute] ||= 0
+        attributes[attribute] += by
+        self
+      end
+
+      # Wrapper around #increment that saves the resource. Saving is subjected
+      # to validation checks. Returns +self+.
+      def increment!(attribute, by = 1)
+        increment(attribute, by) && save
+        self
+      end
+
+      # Initializes +attribute+ to zero if +nil+ and substracts the value passed as
+      # +by+ (default is 1). The decrement is performed directly on the
+      # underlying attribute, no setter is invoked. Only makes sense for
+      # number-based attributes. Returns +self+.
+      def decrement(attribute, by = 1)
+        increment(attribute, -by)
+      end
+
+      # Wrapper around #decrement that saves the resource. Saving is subjected
+      # to validation checks. Returns +self+.
+      def decrement!(attribute, by = 1)
+        increment!(attribute, -by)
+      end
+
       module ClassMethods
         # Create a new chainable scope
         #
@@ -134,7 +203,8 @@ module Her
         end
 
         # Delegate the following methods to `scoped`
-        [:all, :where, :create, :build, :find, :first_or_create, :first_or_initialize].each do |method|
+        [:all, :where, :create, :build, :find, :find_by, :find_or_create_by,
+         :find_or_initialize_by, :first_or_create, :first_or_initialize].each do |method|
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{method}(*params)
               scoped.send(#{method.to_sym.inspect}, *params)

data/lib/her/model/parse.rb

@@ -52,20 +52,16 @@ module Her
           end
         end
 
-
         # @private
-        # TODO: Handle has_one
         def embeded_params(attributes)
-          associations[:has_many].select { |a| attributes.include?(a[:data_key])}.compact.inject({}) do |hash, association|
-            params = attributes[association[:data_key]].map(&:to_params)
-            next hash if params.empty?
-            if association[:class_name].constantize.include_root_in_json?
-              root = association[:class_name].constantize.root_element
-              hash[association[:data_key]] = params.map { |n| n[root] }
-            else
-              hash[association[:data_key]] = params
-            end
-            hash
+          associations.values.flatten.each_with_object({}) do |definition, hash|
+            value = case association = attributes[definition[:name]]
+                    when Her::Collection, Array
+                      association.map { |a| a.to_params }.reject(&:empty?)
+                    when Her::Model
+                      association.to_params
+                    end
+            hash[definition[:data_key]] = value if value.present?
           end
         end
 

data/lib/her/model/relation.rb

@@ -65,7 +65,7 @@ module Her
       # @private
       def fetch
         @_fetch ||= begin
-          path = @parent.build_request_path(@params)
+          path = @parent.build_request_path(@parent.collection_path, @params)
           method = @parent.method_for(:find)
           @parent.request(@params.merge(:_method => method, :_path => path)) do |parsed_data, response|
             @parent.new_collection(parsed_data)
@@ -109,6 +109,50 @@ module Her
         ids.length > 1 || ids.first.kind_of?(Array) ? results : results.first
       end
 
+      # Fetch first resource with the given attributes.
+      #
+      # If no resource is found, returns <tt>nil</tt>.
+      #
+      # @example
+      #   @user = User.find_by(name: "Tobias", age: 42)
+      #   # Called via GET "/users?name=Tobias&age=42"
+      def find_by(params)
+        where(params).first
+      end
+
+      # Fetch first resource with the given attributes, or create a resource
+      # with the attributes if one is not found.
+      #
+      # @example
+      #   @user = User.find_or_create_by(email: "remi@example.com")
+      #
+      #   # Returns the first item in the collection if present:
+      #   # Called via GET "/users?email=remi@example.com"
+      #
+      #   # If collection is empty:
+      #   # POST /users with `email=remi@example.com`
+      #   @user.email # => "remi@example.com"
+      #   @user.new? # => false
+      def find_or_create_by(attributes)
+        find_by(attributes) || create(attributes)
+      end
+
+      # Fetch first resource with the given attributes, or initialize a resource
+      # with the attributes if one is not found.
+      #
+      # @example
+      #   @user = User.find_or_initialize_by(email: "remi@example.com")
+      #
+      #   # Returns the first item in the collection if present:
+      #   # Called via GET "/users?email=remi@example.com"
+      #
+      #   # If collection is empty:
+      #   @user.email # => "remi@example.com"
+      #   @user.new? # => true
+      def find_or_initialize_by(attributes)
+        find_by(attributes) || build(attributes)
+      end
+
       # Create a resource and return it
       #
       # @example

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "0.8.6"
+  VERSION = "0.9.0"
 end

data/spec/middleware/json_api_parser_spec.rb

@@ -22,6 +22,26 @@ describe Her::Middleware::JsonApiParser do
     end
   end
 
+  context "with status code 204" do
+    it "returns an empty body" do
+      env = { status: 204 }
+      subject.on_complete(env)
+      env[:body].tap do |json|
+        expect(json[:data]).to eq({})
+      end
+    end
+  end
+
+  context 'with status code 304' do
+    it 'returns an empty body' do
+      env = { :status => 304 }
+      subject.on_complete(env)
+      env[:body].tap do |json|
+        expect(json[:data]).to eq({})
+      end
+    end
+  end
+
   # context "with invalid JSON body" do
   #  let(:body) { '"foo"' }
   #  it 'ensures that invalid JSON throws an exception' do

data/spec/model/associations_spec.rb

@@ -153,14 +153,16 @@ describe Her::Model::Associations do
 
       spawn_model "Foo::User" do
         has_many :comments, class_name: "Foo::Comment"
-        has_one :role
-        belongs_to :organization
+        has_one :role, class_name: "Foo::Role"
+        belongs_to :organization, class_name: "Foo::Organization"
         has_many :posts, inverse_of: :admin
       end
+
       spawn_model "Foo::Comment" do
         belongs_to :user
         parse_root_in_json true
       end
+
       spawn_model "Foo::Post" do
         belongs_to :admin, class_name: "Foo::User"
       end
@@ -180,6 +182,7 @@ describe Her::Model::Associations do
     let(:user_with_included_data_after_save_existing) { Foo::User.save_existing(5, name: "Clancy Brown") }
     let(:user_with_included_data_after_destroy) { Foo::User.new(id: 5).destroy }
     let(:comment_without_included_parent_data) { Foo::Comment.new(id: 7, user_id: 1) }
+    let(:new_user) { Foo::User.new }
 
     it "maps an array of included data through has_many" do
       expect(@user_with_included_data.comments.first).to be_a(Foo::Comment)
@@ -204,6 +207,12 @@ describe Her::Model::Associations do
       expect(@user_with_included_data.posts.first.admin.object_id).to eq(@user_with_included_data.object_id)
     end
 
+    it "doesn't attempt to fetch association data for a new resource" do
+      expect(new_user.comments).to eq([])
+      expect(new_user.role).to be_nil
+      expect(new_user.organization).to be_nil
+    end
+
     it "fetches data that was not included through has_many" do
       expect(@user_without_included_data.comments.first).to be_a(Foo::Comment)
       expect(@user_without_included_data.comments.length).to eq(2)
@@ -223,6 +232,10 @@ describe Her::Model::Associations do
       expect(@user_without_included_data.comments.first.object_id).not_to eq(@user_without_included_data.comments.where(foo_id: 1).first.object_id)
     end
 
+    it "fetches data again after being reloaded" do
+      expect { @user_without_included_data.comments.reload }.to change { @user_without_included_data.comments.first.object_id }
+    end
+
     it "maps an array of included data through has_one" do
       expect(@user_with_included_data.role).to be_a(Foo::Role)
       expect(@user_with_included_data.role.object_id).to eq(@user_with_included_data.role.object_id)
@@ -292,6 +305,18 @@ describe Her::Model::Associations do
       expect(params[:comments].length).to eq(2)
     end
 
+    it "includes has_one relationship in params by default" do
+      params = @user_with_included_data.to_params
+      expect(params[:role]).to be_kind_of(Hash)
+      expect(params[:role]).not_to be_empty
+    end
+
+    it "includes belongs_to relationship in params by default" do
+      params = @user_with_included_data.to_params
+      expect(params[:organization]).to be_kind_of(Hash)
+      expect(params[:organization]).not_to be_empty
+    end
+
     [:create, :save_existing, :destroy].each do |type|
       context "after #{type}" do
         let(:subject) { send("user_with_included_data_after_#{type}") }
@@ -326,15 +351,24 @@ describe Her::Model::Associations do
           stub.get("/organizations/1") { [200, {}, { organization:  { id: 1, name: "Bluth Company Foo" } }.to_json] }
         end
       end
+
       spawn_model "Foo::User" do
         parse_root_in_json true, format: :active_model_serializers
         has_many :comments, class_name: "Foo::Comment"
-        belongs_to :organization
+        has_one :role, class_name: "Foo::Role"
+        belongs_to :organization, class_name: "Foo::Organization"
       end
+
+      spawn_model "Foo::Role" do
+        belongs_to :user
+        parse_root_in_json true, format: :active_model_serializers
+      end
+
       spawn_model "Foo::Comment" do
         belongs_to :user
         parse_root_in_json true, format: :active_model_serializers
       end
+
       spawn_model "Foo::Organization" do
         parse_root_in_json true, format: :active_model_serializers
       end
@@ -392,6 +426,18 @@ describe Her::Model::Associations do
       expect(params[:comments]).to be_kind_of(Array)
       expect(params[:comments].length).to eq(2)
     end
+
+    it "includes has_one relationships in params by default" do
+      params = @user_with_included_data.to_params
+      expect(params[:role]).to be_kind_of(Hash)
+      expect(params[:role]).not_to be_empty
+    end
+
+    it "includes belongs_to relationship in params by default" do
+      params = @user_with_included_data.to_params
+      expect(params[:organization]).to be_kind_of(Hash)
+      expect(params[:organization]).not_to be_empty
+    end
   end
 
   context "handling associations with details" do

data/spec/model/attributes_spec.rb

@@ -11,6 +11,14 @@ describe Her::Model::Attributes do
       expect(@new_user.fullname).to eq("Tobias Fünke")
     end
 
+    it "handles new resource with block" do
+      @new_user = Foo::User.new do |user|
+        user.fullname = "Tobias Fünke"
+      end
+      expect(@new_user.new?).to be_truthy
+      expect(@new_user.fullname).to eq("Tobias Fünke")
+    end
+
     it "accepts new resource with strings as hash keys" do
       @new_user = Foo::User.new("fullname" => "Tobias Fünke")
       expect(@new_user.fullname).to eq("Tobias Fünke")

data/spec/model/dirty_spec.rb

@@ -49,7 +49,7 @@ describe "Her::Model and ActiveModel::Dirty" do
         it "tracks previous changes" do
           user.fullname = "Tobias Fünke"
           user.save
-          expect(user.previous_changes).to eq("fullname" => "Lindsay Fünke")
+          expect(user.previous_changes).to eq("fullname" => ["Lindsay Fünke", "Tobias Fünke"])
         end
 
         it "tracks dirty attribute for mass assign for dynamic created attributes" do

data/spec/model/orm_spec.rb

@@ -107,12 +107,12 @@ describe Her::Model::ORM do
 
     it "handles metadata on a destroyed resource" do
       @user = User.destroy_existing(1)
-      @user.metadata[:foo].should == "bar"
+      expect(@user.metadata[:foo]).to eq("bar")
     end
 
     it "handles error data on a destroyed resource" do
       @user = User.destroy_existing(1)
-      @user.response_errors.should == ["Yes", "Sir"]
+      expect(@user.response_errors).to eq(%w(Yes Sir))
     end
   end
 
@@ -212,6 +212,8 @@ describe Her::Model::ORM do
           stub.get("/users?age=42&foo=bar") { [200, {}, [{ id: 3, age: 42 }].to_json] }
           stub.get("/users?age=42") { [200, {}, [{ id: 1, age: 42 }].to_json] }
           stub.get("/users?age=40") { [200, {}, [{ id: 1, age: 40 }].to_json] }
+          stub.get("/users?name=baz") { [200, {}, [].to_json] }
+          stub.post("/users") { [200, {}, { id: 5, name: "baz" }.to_json] }
         end
       end
 
@@ -264,6 +266,24 @@ describe Her::Model::ORM do
       expect(@users[1].id).to eq(2)
     end
 
+    it "handles finding by attributes" do
+      @user = User.find_by(age: 42)
+      expect(@user).to be_a(User)
+      expect(@user.id).to eq(1)
+    end
+
+    it "handles find or create by attributes" do
+      @user = User.find_or_create_by(name: "baz")
+      expect(@user).to be_a(User)
+      expect(@user.id).to eq(5)
+    end
+
+    it "handles find or initialize by attributes" do
+      @user = User.find_or_initialize_by(name: "baz")
+      expect(@user).to be_a(User)
+      expect(@user).to_not be_persisted
+    end
+
     it "handles finding with other parameters" do
       @users = User.where(age: 42, foo: "bar").all
       expect(@users).to be_kind_of(Array)
@@ -275,6 +295,14 @@ describe Her::Model::ORM do
       expect(@users.where(age: 42)).to be_all { |u| u.age == 42 }
       expect(@users.where(age: 40)).to be_all { |u| u.age == 40 }
     end
+
+    it "handles reloading a resource" do
+      @user = User.find(1)
+      @user.age = "Oops"
+      @user.reload
+      expect(@user.age).to eq 42
+      expect(@user).to be_persisted
+    end
   end
 
   context "building resources" do
@@ -371,12 +399,15 @@ describe Her::Model::ORM do
         builder.use Her::Middleware::FirstLevelParseJSON
         builder.use Faraday::Request::UrlEncoded
         builder.adapter :test do |stub|
-          stub.get("/users/1") { [200, {}, { id: 1, fullname: "Tobias Fünke" }.to_json] }
-          stub.put("/users/1") { [200, {}, { id: 1, fullname: "Lindsay Fünke" }.to_json] }
+          stub.get("/users/1") { [200, {}, { id: 1, fullname: "Tobias Fünke", admin: false }.to_json] }
+          stub.put("/users/1") { [200, {}, { id: 1, fullname: "Lindsay Fünke", admin: true }.to_json] }
+          stub.get("/pages/1") { [200, {}, { id: 1, views: 1, unique_visitors: 4 }.to_json] }
+          stub.put("/pages/1") { [200, {}, { id: 1, views: 2, unique_visitors: 3 }.to_json] }
         end
       end
 
       spawn_model "Foo::User"
+      spawn_model "Foo::Page"
     end
 
     it "handle resource data update without saving it" do
@@ -397,6 +428,58 @@ describe Her::Model::ORM do
       @user.save
       expect(@user.fullname).to eq("Lindsay Fünke")
     end
+
+    it "handles resource update through #toggle without saving it" do
+      @user = Foo::User.find(1)
+      expect(@user.admin).to be_falsey
+      expect(@user).to_not receive(:save)
+      @user.toggle(:admin)
+      expect(@user.admin).to be_truthy
+    end
+
+    it "handles resource update through #toggle!" do
+      @user = Foo::User.find(1)
+      expect(@user.admin).to be_falsey
+      expect(@user).to receive(:save).and_return(true)
+      @user.toggle!(:admin)
+      expect(@user.admin).to be_truthy
+    end
+
+    it "handles resource update through #increment without saving it" do
+      page = Foo::Page.find(1)
+      expect(page.views).to be 1
+      expect(page).to_not receive(:save)
+      page.increment(:views)
+      expect(page.views).to be 2
+      page.increment(:views, 2)
+      expect(page.views).to be 4
+    end
+
+    it "handles resource update through #increment!" do
+      page = Foo::Page.find(1)
+      expect(page.views).to be 1
+      expect(page).to receive(:save).and_return(true)
+      page.increment!(:views)
+      expect(page.views).to be 2
+    end
+
+    it "handles resource update through #decrement without saving it" do
+      page = Foo::Page.find(1)
+      expect(page.unique_visitors).to be 4
+      expect(page).to_not receive(:save)
+      page.decrement(:unique_visitors)
+      expect(page.unique_visitors).to be 3
+      page.decrement(:unique_visitors, 2)
+      expect(page.unique_visitors).to be 1
+    end
+
+    it "handles resource update through #decrement!" do
+      page = Foo::Page.find(1)
+      expect(page.unique_visitors).to be 4
+      expect(page).to receive(:save).and_return(true)
+      page.decrement!(:unique_visitors)
+      expect(page.unique_visitors).to be 3
+    end
   end
 
   context "deleting resources" do
@@ -530,4 +613,51 @@ describe Her::Model::ORM do
       end
     end
   end
+
+  context "registering callbacks" 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/1") { [200, {}, { id: 1, fullname: "Tobias Fünke" }.to_json] }
+          stub.put("/users/1") { [200, {}, { id: 1, fullname: "Tobias Fünke" }.to_json] }
+          stub.post("/users")  { [200, {}, { id: 2, fullname: "Lindsay Fünke" }.to_json] }
+        end
+      end
+
+      spawn_model "User" do
+        before_save :before_save_callback
+        before_create :before_create_callback
+        before_update :before_update_callback
+        after_update :after_update_callback
+        after_create :after_create_callback
+        after_save :after_save_callback
+        def before_save_callback; end
+        def before_create_callback; end
+        def before_update_callback; end
+        def after_update_callback; end
+        def after_create_callback; end
+        def after_save_callback; end
+      end
+    end
+
+    it "runs create callbacks in the correct order" do
+      @user = User.new(fullname: "Tobias Fünke")
+      expect(@user).to receive(:before_save_callback).ordered
+      expect(@user).to receive(:before_create_callback).ordered
+      expect(@user).to receive(:after_create_callback).ordered
+      expect(@user).to receive(:after_save_callback).ordered
+      @user.save
+    end
+
+    it "runs update callbacks in the correct order" do
+      @user = User.find(1)
+      expect(@user).to receive(:before_save_callback).ordered
+      expect(@user).to receive(:before_update_callback).ordered
+      expect(@user).to receive(:after_update_callback).ordered
+      expect(@user).to receive(:after_save_callback).ordered
+      @user.save
+    end
+  end
 end

data/spec/model/relation_spec.rb

@@ -10,6 +10,7 @@ describe Her::Model::Relation do
           builder.adapter :test do |stub|
             stub.get("/users?foo=1&bar=2") { ok! [{ id: 2, fullname: "Tobias Fünke" }] }
             stub.get("/users?admin=1") { ok! [{ id: 1, fullname: "Tobias Fünke" }] }
+            stub.get("/users?id=3&foo=2") { ok! [{ id: 3, fullname: "Tobias Fünke" }] }
 
             stub.get("/users") do
               ok! [
@@ -41,6 +42,13 @@ describe Her::Model::Relation do
         expect(@users.size).to eql 1
       end
 
+      it "fetches the data by parameters including primary_key" do
+        expect(Foo::User).to receive(:request).once.and_call_original
+        @users = Foo::User.where(id: 3, foo: 2)
+        expect(@users).to respond_to(:length)
+        expect(@users.size).to eql 1
+      end
+
       it "chains multiple where statements" do
         @user = Foo::User.where(foo: 1).where(bar: 2).first
         expect(@user.id).to eq(2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake