her 0.6.8 → 0.7

data/spec/model/dirty_spec.rb

@@ -22,24 +22,33 @@ describe "Her::Model and ActiveModel::Dirty" do
     end
 
     context "for existing resource" do
+      let(:user) { Foo::User.find(1) }
+      it "has no changes" do
+        user.changes.should be_empty
+        user.should_not be_changed
+      end
       context "with successful save" do
         it "tracks dirty attributes" do
-          user = Foo::User.find(1)
           user.fullname = "Tobias Fünke"
-          user.fullname_changed?.should be_true
-          user.email_changed?.should be_false
+          user.fullname_changed?.should be_truthy
+          user.email_changed?.should be_falsey
           user.should be_changed
           user.save
           user.should_not be_changed
         end
+        it "tracks previous changes" do
+          user.fullname = "Tobias Fünke"
+          user.save
+          user.previous_changes.should eq({"fullname"=>"Lindsay Fünke"})
+        end
       end
 
       context "with erroneous save" do
         it "tracks dirty attributes" do
           user = Foo::User.find(2)
           user.fullname = "Tobias Fünke"
-          user.fullname_changed?.should be_true
-          user.email_changed?.should be_false
+          user.fullname_changed?.should be_truthy
+          user.email_changed?.should be_falsey
           user.should be_changed
           user.save
           user.should be_changed
@@ -48,10 +57,13 @@ describe "Her::Model and ActiveModel::Dirty" do
     end
 
     context "for new resource" do
+      let(:user) { Foo::User.new(:fullname => "Lindsay Fünke") }
+      it "has changes" do
+        user.should be_changed
+      end
       it "tracks dirty attributes" do
-        user = Foo::User.new
         user.fullname = "Tobias Fünke"
-        user.fullname_changed?.should be_true
+        user.fullname_changed?.should be_truthy
         user.should be_changed
         user.save
         user.should_not be_changed

data/spec/model/http_spec.rb

@@ -24,6 +24,14 @@ describe Her::Model::HTTP do
       its(:base_uri) { should == "https://api.example.com" }
     end
 
+    context "when using a proc for uses_api" do
+      before do
+        Foo::User.uses_api lambda { Her::API.new :url => 'http://api-lambda.example.com' }
+      end
+
+      specify { Foo::User.her_api.base_uri.should == 'http://api-lambda.example.com' }
+    end
+
     context "when binding two models to two different instances of Her::API" do
       before do
         Foo::User.uses_api api1

data/spec/model/introspection_spec.rb

@@ -40,6 +40,11 @@ describe Her::Model::Introspection do
         @user.inspect.should include("password=\"filtered\"")
         @user.inspect.should_not include("password=\"Funke\"")
       end
+
+      it "support dash on attribute" do
+        @user = Foo::User.new(:'life-span' => "3 years")
+        @user.inspect.should include("life-span=\"3 years\"")
+      end
     end
 
     describe "#inspect with errors in resource path" do

data/spec/model/orm_spec.rb

@@ -48,11 +48,11 @@ describe Her::Model::ORM 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"
 
       @existing_user = Foo::User.find(1)
-      @existing_user.new?.should be_false
+      @existing_user.new?.should be_falsey
     end
 
     it 'handles new resource with custom primary key' do
@@ -102,6 +102,44 @@ describe Her::Model::ORM do
     end
   end
 
+  context "mapping data, metadata and error data in string keys to Ruby objects" do
+    before do
+      api = Her::API.new
+      api.setup :url => "https://api.example.com" do |builder|
+        builder.use Her::Middleware::SecondLevelParseJSON
+        builder.use Faraday::Request::UrlEncoded
+        builder.adapter :test do |stub|
+          stub.get("/users") { |env| [200, {}, { 'data' => [{ :id => 1, :name => "Tobias Fünke" }, { :id => 2, :name => "Lindsay Fünke" }], 'metadata' => { :total_pages => 10, :next_page => 2 }, 'errors' => ["Oh", "My", "God"] }.to_json] }
+          stub.post("/users") { |env| [200, {}, { 'data' => { :name => "George Michael Bluth" }, 'metadata' => { :foo => "bar" }, 'errors' => ["Yes", "Sir"] }.to_json] }
+        end
+      end
+
+      spawn_model :User do
+        uses_api api
+      end
+    end
+
+    it "handles metadata on a collection" do
+      @users = User.all
+      @users.metadata[:total_pages].should == 10
+    end
+
+    it "handles error data on a collection" do
+      @users = User.all
+      @users.errors.length.should == 3
+    end
+
+    it "handles metadata on a resource" do
+      @user = User.create(:name => "George Michael Bluth")
+      @user.metadata[:foo].should == "bar"
+    end
+
+    it "handles error data on a resource" do
+      @user = User.create(:name => "George Michael Bluth")
+      @user.response_errors.should == ["Yes", "Sir"]
+    end
+  end
+
   context "defining custom getters and setters" do
     before do
       api = Her::API.new
@@ -156,6 +194,7 @@ describe Her::Model::ORM do
         builder.adapter :test do |stub|
           stub.get("/users/1") { |env| [200, {}, { :id => 1, :age => 42 }.to_json] }
           stub.get("/users/2") { |env| [200, {}, { :id => 2, :age => 34 }.to_json] }
+          stub.get("/users?id[]=1&id[]=2") { |env| [200, {}, [{ :id => 1, :age => 42 }, { :id => 2, :age => 34 }].to_json] }
           stub.get("/users?age=42&foo=bar") { |env| [200, {}, [{ :id => 3, :age => 42 }].to_json] }
           stub.get("/users?age=42") { |env| [200, {}, [{ :id => 1, :age => 42 }].to_json] }
           stub.get("/users?age=40") { |env| [200, {}, [{ :id => 1, :age => 40 }].to_json] }
@@ -195,6 +234,22 @@ describe Her::Model::ORM do
       @users[0].id.should == 1
     end
 
+    it "handles finding by an array id param of length 2" do
+      @users = User.find(id: [1, 2])
+      @users.should be_kind_of(Array)
+      @users.length.should == 2
+      @users[0].id.should == 1
+      @users[1].id.should == 2
+    end
+
+    it 'handles finding with id parameter as an array' do
+      @users = User.where(id: [1, 2])
+      @users.should be_kind_of(Array)
+      @users.length.should == 2
+      @users[0].id.should == 1
+      @users[1].id.should == 2
+    end
+
     it "handles finding with other parameters" do
       @users = User.where(:age => 42, :foo => "bar").all
       @users.should be_kind_of(Array)
@@ -217,7 +272,7 @@ describe Her::Model::ORM do
       it "builds a new resource without requesting it" do
         Foo::User.should_not_receive(:request)
         @new_user = Foo::User.build(:fullname => "Tobias Fünke")
-        @new_user.new?.should be_true
+        @new_user.new?.should be_truthy
         @new_user.fullname.should == "Tobias Fünke"
       end
     end
@@ -238,7 +293,7 @@ describe Her::Model::ORM do
       it "requests a new resource" do
         Foo::User.should_receive(:request).once.and_call_original
         @new_user = Foo::User.build(:fullname => "Tobias Fünke")
-        @new_user.new?.should be_true
+        @new_user.new?.should be_truthy
         @new_user.fullname.should == "Tobias Fünke"
         @new_user.email.should == "tobias@bluthcompany.com"
       end
@@ -269,18 +324,29 @@ describe Her::Model::ORM do
 
     it "handle resource creation through Model.new + #save" do
       @user = Foo::User.new(:fullname => "Tobias Fünke")
-      @user.save.should be_true
+      @user.save.should be_truthy
+      @user.fullname.should == "Tobias Fünke"
+    end
+
+    it "handle resource creation through Model.new + #save!" do
+      @user = Foo::User.new(:fullname => "Tobias Fünke")
+      @user.save!.should be_truthy
       @user.fullname.should == "Tobias Fünke"
     end
 
     it "returns false when #save gets errors" do
       @company = Foo::Company.new
-      @company.save.should be_false
+      @company.save.should be_falsey
+    end
+
+    it "raises ResourceInvalid when #save! gets errors" do
+      @company = Foo::Company.new
+      expect { @company.save! }.to raise_error Her::Errors::ResourceInvalid, "Remote validation failed: name is required"
     end
 
     it "don't overwrite data if response is empty" do
       @company = Foo::Company.new(:name => 'Company Inc.')
-      @company.save.should be_false
+      @company.save.should be_falsey
       @company.name.should == "Company Inc."
     end
   end
@@ -335,14 +401,14 @@ describe Her::Model::ORM do
 
     it "handle resource deletion through the .destroy class method" do
       @user = Foo::User.destroy_existing(1)
-      @user.active.should be_false
+      @user.active.should be_falsey
       @user.should be_destroyed
     end
 
     it "handle resource deletion through #destroy on an existing resource" do
       @user = Foo::User.find(1)
       @user.destroy
-      @user.active.should be_false
+      @user.active.should be_falsey
       @user.should be_destroyed
     end
   end
@@ -370,7 +436,7 @@ describe Her::Model::ORM do
         it 'uses the custom method (PUT) instead of default method (POST)' do
           user = Foo::User.new(:fullname => 'Tobias Fünke')
           user.should be_new
-          user.save.should be_true
+          user.save.should be_truthy
         end
       end
 
@@ -383,7 +449,7 @@ describe Her::Model::ORM do
         it 'uses the custom method (PUT) instead of default method (POST)' do
           user = User.new(:fullname => 'Tobias Fünke')
           user.should be_new
-          user.save.should be_true
+          user.save.should be_truthy
         end
       end
     end

data/spec/model/parse_spec.rb

@@ -135,9 +135,10 @@ describe Her::Model::Parse do
       before do
         Her::API.default_api.connection.adapter :test do |stub|
           stub.post("/users") { |env| [200, {}, { :user => { :id => 1, :fullname => "Lindsay Fünke" } }.to_json] }
+          stub.get("/users") { |env| [200, {}, { :users => [ { :id => 1, :fullname => "Lindsay Fünke" } ] }.to_json] }
         end
 
-        spawn_model("Foo::Model") { parse_root_in_json true }
+        spawn_model("Foo::Model") { parse_root_in_json true, format: :active_model_serializers }
         class User < Foo::Model
           collection_path "/users"
         end
@@ -149,6 +150,11 @@ describe Her::Model::Parse do
         @new_user = User.create(:fullname => "Lindsay Fünke")
         @new_user.fullname.should == "Lindsay Fünke"
       end
+
+      it "parses the collection of data" do
+        @users = User.all
+        @users.first.fullname.should == "Lindsay Fünke"
+      end
     end
 
     context "to true with :format => :active_model_serializers" do
@@ -224,4 +230,27 @@ describe Her::Model::Parse do
       @user.fullname.should == "Lindsay Fünke"
     end
   end
+
+  context 'when send_only_modified_attributes is set' do
+    before do
+      Her::API.setup :url => "https://api.example.com", :send_only_modified_attributes => true do |builder|
+        builder.use Her::Middleware::FirstLevelParseJSON
+        builder.use Faraday::Request::UrlEncoded
+      end
+
+      Her::API.default_api.connection.adapter :test do |stub|
+        stub.get("/users/1") { |env| [200, {}, { :id => 1, :first_name => "Gooby", :last_name => "Pls" }.to_json] }
+      end
+
+      spawn_model "Foo::User" do
+        include_root_in_json true
+      end
+    end
+
+    it 'only sends the attributes that were modified' do
+      user = Foo::User.find 1
+      user.first_name = 'Someone'
+      expect(user.to_params).to eql(:user => {:first_name => 'Someone'})
+    end
+  end
 end

data/spec/model/paths_spec.rb

@@ -232,10 +232,10 @@ describe Her::Model::Paths do
     describe "handling new resource" do
       it "handles new resource" do
         @new_user = Foo::User.new(:fullname => "Tobias Fünke", :organization_id => 2)
-        @new_user.new?.should be_true
+        @new_user.new?.should be_truthy
 
         @existing_user = Foo::User.find(1, :_organization_id => 2)
-        @existing_user.new?.should be_false
+        @existing_user.new?.should be_falsey
       end
     end
 
@@ -277,13 +277,13 @@ describe Her::Model::Paths do
     context "deleting resources" do
       it "handle resource deletion through the .destroy class method" do
         @user = Foo::User.destroy_existing(1, :_organization_id => 2)
-        @user.active.should be_false
+        @user.active.should be_falsey
       end
 
       it "handle resource deletion through #destroy on an existing resource" do
         @user = Foo::User.find(1, :_organization_id => 2)
         @user.destroy
-        @user.active.should be_false
+        @user.active.should be_falsey
       end
     end
   end

data/spec/model/relation_spec.rb

@@ -38,7 +38,7 @@ describe Her::Model::Relation do
         Foo::User.should_receive(:request).once.and_call_original
         @users = Foo::User.where(:admin => 1)
         @users.should respond_to(:length)
-        @users.should have(1).items
+        @users.size.should eql 1
       end
 
       it "chains multiple where statements" do
@@ -47,9 +47,9 @@ describe Her::Model::Relation do
       end
 
       it "does not reuse relations" do
-        Foo::User.all.should have(2).items
+        Foo::User.all.size.should eql 2
         Foo::User.create(:fullname => 'George Michael Bluth').id.should == 3
-        Foo::User.all.should have(3).items
+        Foo::User.all.size.should eql 3
       end
     end
 
@@ -114,7 +114,7 @@ describe Her::Model::Relation do
 
     it "handles new resource with build" do
       @new_user = Foo::User.where(:fullname => "Tobias Fünke").build
-      @new_user.new?.should be_true
+      @new_user.new?.should be_truthy
       @new_user.fullname.should == "Tobias Fünke"
     end
   end

data/spec/spec_helper.rb

@@ -1,11 +1,15 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require "rspec"
+require "rspec/its"
 require "her"
 
 # Require everything in `spec/support`
 Dir[File.expand_path('../../spec/support/**/*.rb', __FILE__)].map(&method(:require))
 
+# Remove ActiveModel deprecation message
+I18n.enforce_available_locales = false
+
 RSpec.configure do |config|
   config.include Her::Testing::Macros::ModelMacros
   config.include Her::Testing::Macros::RequestMacros

data/spec/support/macros/request_macros.rb

@@ -11,7 +11,15 @@ module Her
         end
 
         def params(env)
-          @params ||= Faraday::Utils.parse_nested_query(env[:body]).with_indifferent_access.merge(env[:params])
+          @params ||= begin
+            parsed_query = Faraday::Utils.parse_nested_query(env[:body])
+
+            if parsed_query
+              parsed_query.with_indifferent_access.merge(env[:params])
+            else
+              env[:params].with_indifferent_access
+            end
+          end
         end
       end
     end

metadata

@@ -1,142 +1,157 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 0.6.8
-  prerelease: 
+  version: '0.7'
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: fivemat
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 description: Her is an ORM that maps REST resources and collections to Ruby objects
@@ -146,10 +161,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -158,6 +173,7 @@ files:
 - UPGRADE.md
 - gemfiles/Gemfile.activemodel-3.2.x
 - gemfiles/Gemfile.activemodel-4.0
+- gemfiles/Gemfile.activemodel-4.1
 - her.gemspec
 - lib/her.rb
 - lib/her/api.rb
@@ -171,6 +187,7 @@ files:
 - lib/her/model.rb
 - lib/her/model/associations.rb
 - lib/her/model/associations/association.rb
+- lib/her/model/associations/association_proxy.rb
 - lib/her/model/associations/belongs_to_association.rb
 - lib/her/model/associations/has_many_association.rb
 - lib/her/model/associations/has_one_association.rb
@@ -212,33 +229,26 @@ files:
 homepage: http://her-rb.org
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2536489429371279776
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2536489429371279776
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple Representational State Transfer-based Hypertext Transfer Protocol-powered
   Object Relational Mapper. Her?
 test_files: