her 0.8.2 → 0.8.3

data/spec/model/introspection_spec.rb

@@ -4,15 +4,15 @@ require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 describe Her::Model::Introspection do
   context "introspecting a resource" do
     before do
-      Her::API.setup :url => "https://api.example.com" do |builder|
+      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| [200, {}, { :id => 1, :name => "Tobias Funke" }.to_json] }
-          stub.get("/users/1")    { |env| [200, {}, { :id => 1, :name => "Tobias Funke" }.to_json] }
-          stub.put("/users/1")    { |env| [200, {}, { :id => 1, :name => "Tobias Funke" }.to_json] }
-          stub.delete("/users/1") { |env| [200, {}, { :id => 1, :name => "Tobias Funke" }.to_json] }
-          stub.get("/projects/1/comments") { |env| [200, {}, [{ :id => 1, :body => "Hello!" }].to_json] }
+          stub.post("/users")     { [200, {}, { id: 1, name: "Tobias Funke" }.to_json] }
+          stub.get("/users/1")    { [200, {}, { id: 1, name: "Tobias Funke" }.to_json] }
+          stub.put("/users/1")    { [200, {}, { id: 1, name: "Tobias Funke" }.to_json] }
+          stub.delete("/users/1") { [200, {}, { id: 1, name: "Tobias Funke" }.to_json] }
+          stub.get("/projects/1/comments") { [200, {}, [{ id: 1, body: "Hello!" }].to_json] }
         end
       end
 
@@ -25,33 +25,37 @@ describe Her::Model::Introspection do
     describe "#inspect" do
       it "outputs resource attributes for an existing resource" do
         @user = Foo::User.find(1)
-        ["#<Foo::User(users/1) name=\"Tobias Funke\" id=1>", "#<Foo::User(users/1) id=1 name=\"Tobias Funke\">"].should include(@user.inspect)
+        expect(["#<Foo::User(users/1) name=\"Tobias Funke\" id=1>", "#<Foo::User(users/1) id=1 name=\"Tobias Funke\">"]).to include(@user.inspect)
       end
 
       it "outputs resource attributes for an not-saved-yet resource" do
-        @user = Foo::User.new(:name => "Tobias Funke")
-        @user.inspect.should == "#<Foo::User(users) name=\"Tobias Funke\">"
+        @user = Foo::User.new(name: "Tobias Funke")
+        expect(@user.inspect).to eq("#<Foo::User(users) name=\"Tobias Funke\">")
       end
 
       it "outputs resource attributes using getters" do
-        @user = Foo::User.new(:name => "Tobias Funke", :password => "Funke")
-        @user.instance_eval {def password; 'filtered'; end}
-        @user.inspect.should include("name=\"Tobias Funke\"")
-        @user.inspect.should include("password=\"filtered\"")
-        @user.inspect.should_not include("password=\"Funke\"")
+        @user = Foo::User.new(name: "Tobias Funke", password: "Funke")
+        @user.instance_eval do
+          def password
+            "filtered"
+                             end
+        end
+        expect(@user.inspect).to include("name=\"Tobias Funke\"")
+        expect(@user.inspect).to include("password=\"filtered\"")
+        expect(@user.inspect).not_to 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\"")
+        expect(@user.inspect).to include("life-span=\"3 years\"")
       end
     end
 
     describe "#inspect with errors in resource path" do
       it "prints the resource path as “unknown”" do
-        @comment = Foo::Comment.where(:project_id => 1).first
-        path = '<unknown path, missing `project_id`>'
-        ["#<Foo::Comment(#{path}) body=\"Hello!\" id=1>", "#<Foo::Comment(#{path}) id=1 body=\"Hello!\">"].should include(@comment.inspect)
+        @comment = Foo::Comment.where(project_id: 1).first
+        path = "<unknown path, missing `project_id`>"
+        expect(["#<Foo::Comment(#{path}) body=\"Hello!\" id=1>", "#<Foo::Comment(#{path}) id=1 body=\"Hello!\">"]).to include(@comment.inspect)
       end
     end
   end
@@ -66,10 +70,10 @@ describe Her::Model::Introspection do
       end
 
       it "returns a sibling class, if found" do
-        Foo::User.her_nearby_class("AccessRecord").should == Foo::AccessRecord
-        AccessRecord.her_nearby_class("Log").should == Log
-        Foo::User.her_nearby_class("Log").should == Log
-        Foo::User.her_nearby_class("X").should be_nil
+        expect(Foo::User.her_nearby_class("AccessRecord")).to eq(Foo::AccessRecord)
+        expect(AccessRecord.her_nearby_class("Log")).to eq(Log)
+        expect(Foo::User.her_nearby_class("Log")).to eq(Log)
+        expect(Foo::User.her_nearby_class("X")).to be_nil
       end
     end
   end

data/spec/model/nested_attributes_spec.rb

@@ -4,40 +4,40 @@ require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 describe Her::Model::NestedAttributes do
   context "with a belongs_to association" do
     before do
-      Her::API.setup :url => "https://api.example.com" do |builder|
+      Her::API.setup url: "https://api.example.com" do |builder|
         builder.use Her::Middleware::FirstLevelParseJSON
         builder.use Faraday::Request::UrlEncoded
       end
 
       spawn_model "Foo::User" do
-        belongs_to :company, :path => "/organizations/:id", :foreign_key => :organization_id
+        belongs_to :company, path: "/organizations/:id", foreign_key: :organization_id
         accepts_nested_attributes_for :company
       end
 
       spawn_model "Foo::Company"
 
-      @user_with_data_through_nested_attributes = Foo::User.new :name => "Test", :company_attributes => { :name => "Example Company" }
+      @user_with_data_through_nested_attributes = Foo::User.new name: "Test", company_attributes: { name: "Example Company" }
     end
 
     context "when child does not yet exist" do
       it "creates an instance of the associated class" do
-        @user_with_data_through_nested_attributes.company.should be_a(Foo::Company)
-        @user_with_data_through_nested_attributes.company.name.should == "Example Company"
+        expect(@user_with_data_through_nested_attributes.company).to be_a(Foo::Company)
+        expect(@user_with_data_through_nested_attributes.company.name).to eq("Example Company")
       end
     end
 
     context "when child does exist" do
       it "updates the attributes of the associated object" do
-        @user_with_data_through_nested_attributes.company_attributes = { :name => "Fünke's Company" }
-        @user_with_data_through_nested_attributes.company.should be_a(Foo::Company)
-        @user_with_data_through_nested_attributes.company.name.should == "Fünke's Company"
+        @user_with_data_through_nested_attributes.company_attributes = { name: "Fünke's Company" }
+        expect(@user_with_data_through_nested_attributes.company).to be_a(Foo::Company)
+        expect(@user_with_data_through_nested_attributes.company.name).to eq("Fünke's Company")
       end
     end
   end
 
   context "with a has_one association" do
     before do
-      Her::API.setup :url => "https://api.example.com" do |builder|
+      Her::API.setup url: "https://api.example.com" do |builder|
         builder.use Her::Middleware::FirstLevelParseJSON
         builder.use Faraday::Request::UrlEncoded
       end
@@ -49,28 +49,28 @@ describe Her::Model::NestedAttributes do
 
       spawn_model "Foo::Pet"
 
-      @user_with_data_through_nested_attributes = Foo::User.new :name => "Test", :pet_attributes => { :name => "Hasi" }
+      @user_with_data_through_nested_attributes = Foo::User.new name: "Test", pet_attributes: { name: "Hasi" }
     end
 
     context "when child does not yet exist" do
       it "creates an instance of the associated class" do
-        @user_with_data_through_nested_attributes.pet.should be_a(Foo::Pet)
-        @user_with_data_through_nested_attributes.pet.name.should == "Hasi"
+        expect(@user_with_data_through_nested_attributes.pet).to be_a(Foo::Pet)
+        expect(@user_with_data_through_nested_attributes.pet.name).to eq("Hasi")
       end
     end
 
     context "when child does exist" do
       it "updates the attributes of the associated object" do
-        @user_with_data_through_nested_attributes.pet_attributes = { :name => "Rodriguez" }
-        @user_with_data_through_nested_attributes.pet.should be_a(Foo::Pet)
-        @user_with_data_through_nested_attributes.pet.name.should == "Rodriguez"
+        @user_with_data_through_nested_attributes.pet_attributes = { name: "Rodriguez" }
+        expect(@user_with_data_through_nested_attributes.pet).to be_a(Foo::Pet)
+        expect(@user_with_data_through_nested_attributes.pet.name).to eq("Rodriguez")
       end
     end
   end
 
   context "with a has_many association" do
     before do
-      Her::API.setup :url => "https://api.example.com" do |builder|
+      Her::API.setup url: "https://api.example.com" do |builder|
         builder.use Her::Middleware::FirstLevelParseJSON
         builder.use Faraday::Request::UrlEncoded
       end
@@ -82,23 +82,23 @@ describe Her::Model::NestedAttributes do
 
       spawn_model "Foo::Pet"
 
-      @user_with_data_through_nested_attributes = Foo::User.new :name => "Test", :pets_attributes => [{ :name => "Hasi" }, { :name => "Rodriguez" }]
+      @user_with_data_through_nested_attributes = Foo::User.new name: "Test", pets_attributes: [{ name: "Hasi" }, { name: "Rodriguez" }]
     end
 
     context "when children do not yet exist" do
       it "creates an instance of the associated class" do
-        @user_with_data_through_nested_attributes.pets.length.should == 2
-        @user_with_data_through_nested_attributes.pets[0].should be_a(Foo::Pet)
-        @user_with_data_through_nested_attributes.pets[1].should be_a(Foo::Pet)
-        @user_with_data_through_nested_attributes.pets[0].name.should == "Hasi"
-        @user_with_data_through_nested_attributes.pets[1].name.should == "Rodriguez"
+        expect(@user_with_data_through_nested_attributes.pets.length).to eq(2)
+        expect(@user_with_data_through_nested_attributes.pets[0]).to be_a(Foo::Pet)
+        expect(@user_with_data_through_nested_attributes.pets[1]).to be_a(Foo::Pet)
+        expect(@user_with_data_through_nested_attributes.pets[0].name).to eq("Hasi")
+        expect(@user_with_data_through_nested_attributes.pets[1].name).to eq("Rodriguez")
       end
     end
   end
 
   context "with a has_many association as a Hash" do
     before do
-      Her::API.setup :url => "https://api.example.com" do |builder|
+      Her::API.setup url: "https://api.example.com" do |builder|
         builder.use Her::Middleware::FirstLevelParseJSON
         builder.use Faraday::Request::UrlEncoded
       end
@@ -110,25 +110,25 @@ describe Her::Model::NestedAttributes do
 
       spawn_model "Foo::Pet"
 
-      @user_with_data_through_nested_attributes_as_hash = Foo::User.new :name => "Test", :pets_attributes => { '0' => { :name => "Hasi" }, '1' => { :name => "Rodriguez" }}
+      @user_with_data_through_nested_attributes_as_hash = Foo::User.new name: "Test", pets_attributes: { "0" => { name: "Hasi" }, "1" => { name: "Rodriguez" } }
     end
 
     context "when children do not yet exist" do
       it "creates an instance of the associated class" do
-        @user_with_data_through_nested_attributes_as_hash.pets.length.should == 2
-        @user_with_data_through_nested_attributes_as_hash.pets[0].should be_a(Foo::Pet)
-        @user_with_data_through_nested_attributes_as_hash.pets[1].should be_a(Foo::Pet)
-        @user_with_data_through_nested_attributes_as_hash.pets[0].name.should == "Hasi"
-        @user_with_data_through_nested_attributes_as_hash.pets[1].name.should == "Rodriguez"
+        expect(@user_with_data_through_nested_attributes_as_hash.pets.length).to eq(2)
+        expect(@user_with_data_through_nested_attributes_as_hash.pets[0]).to be_a(Foo::Pet)
+        expect(@user_with_data_through_nested_attributes_as_hash.pets[1]).to be_a(Foo::Pet)
+        expect(@user_with_data_through_nested_attributes_as_hash.pets[0].name).to eq("Hasi")
+        expect(@user_with_data_through_nested_attributes_as_hash.pets[1].name).to eq("Rodriguez")
       end
     end
   end
 
   context "with an unknown association" do
     it "raises an error" do
-      expect {
+      expect do
         spawn_model("Foo::User") { accepts_nested_attributes_for :company }
-      }.to raise_error(Her::Errors::AssociationUnknownError, 'Unknown association name :company')
+      end.to raise_error(Her::Errors::AssociationUnknownError, "Unknown association name :company")
     end
   end
 end

data/spec/model/orm_spec.rb

@@ -5,14 +5,14 @@ describe Her::Model::ORM do
   context "mapping data to Ruby objects" do
     before do
       api = Her::API.new
-      api.setup :url => "https://api.example.com" do |builder|
+      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") { |env| [200, {}, { :id => 1, :name => "Tobias Fünke" }.to_json] }
-          stub.get("/users") { |env| [200, {}, [{ :id => 1, :name => "Tobias Fünke" }, { :id => 2, :name => "Lindsay Fünke" }].to_json] }
-          stub.get("/admin_users") { |env| [200, {}, [{ :admin_id => 1, :name => "Tobias Fünke" }, { :admin_id => 2, :name => "Lindsay Fünke" }].to_json] }
-          stub.get("/admin_users/1") { |env| [200, {}, { :admin_id => 1, :name => "Tobias Fünke" }.to_json] }
+          stub.get("/users/1") { [200, {}, { id: 1, name: "Tobias Fünke" }.to_json] }
+          stub.get("/users") { [200, {}, [{ id: 1, name: "Tobias Fünke" }, { id: 2, name: "Lindsay Fünke" }].to_json] }
+          stub.get("/admin_users") { [200, {}, [{ admin_id: 1, name: "Tobias Fünke" }, { admin_id: 2, name: "Lindsay Fünke" }].to_json] }
+          stub.get("/admin_users/1") { [200, {}, { admin_id: 1, name: "Tobias Fünke" }.to_json] }
         end
       end
 
@@ -28,53 +28,55 @@ describe Her::Model::ORM do
 
     it "maps a single resource to a Ruby object" do
       @user = Foo::User.find(1)
-      @user.id.should == 1
-      @user.name.should == "Tobias Fünke"
+      expect(@user.id).to eq(1)
+      expect(@user.name).to eq("Tobias Fünke")
 
       @admin = Foo::AdminUser.find(1)
-      @admin.id.should == 1
-      @admin.name.should == "Tobias Fünke"
+      expect(@admin.id).to eq(1)
+      expect(@admin.name).to eq("Tobias Fünke")
     end
 
     it "maps a collection of resources to an array of Ruby objects" do
       @users = Foo::User.all
-      @users.length.should == 2
-      @users.first.name.should == "Tobias Fünke"
+      expect(@users.length).to eq(2)
+      expect(@users.first.name).to eq("Tobias Fünke")
 
       @users = Foo::AdminUser.all
-      @users.length.should == 2
-      @users.first.name.should == "Tobias Fünke"
+      expect(@users.length).to eq(2)
+      expect(@users.first.name).to eq("Tobias Fünke")
     end
 
     it "handles new resource" do
-      @new_user = Foo::User.new(:fullname => "Tobias Fünke")
-      @new_user.new?.should be_truthy
-      @new_user.new_record?.should be_truthy
-      @new_user.fullname.should == "Tobias Fünke"
+      @new_user = Foo::User.new(fullname: "Tobias Fünke")
+      expect(@new_user.new?).to be_truthy
+      expect(@new_user.new_record?).to be_truthy
+      expect(@new_user.fullname).to eq("Tobias Fünke")
 
       @existing_user = Foo::User.find(1)
-      @existing_user.new?.should be_falsey
-      @existing_user.new_record?.should be_falsey
+      expect(@existing_user.new?).to be_falsey
+      expect(@existing_user.new_record?).to be_falsey
     end
 
-    it 'handles new resource with custom primary key' do
-      @new_user = Foo::AdminUser.new(:fullname => 'Lindsay Fünke', :id => -1)
-      @new_user.should be_new
+    it "handles new resource with custom primary key" do
+      @new_user = Foo::AdminUser.new(fullname: "Lindsay Fünke", id: -1)
+      expect(@new_user).to be_new
 
       @existing_user = Foo::AdminUser.find(1)
-      @existing_user.should_not be_new
+      expect(@existing_user).not_to be_new
     end
   end
 
   context "mapping data, metadata and error data to Ruby objects" do
     before do
       api = Her::API.new
-      api.setup :url => "https://api.example.com" do |builder|
+      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") { [200, {}, { data: [{ id: 1, name: "Tobias Fünke" }, { id: 2, name: "Lindsay Fünke" }], metadata: { total_pages: 10, next_page: 2 }, errors: %w(Oh My God) }.to_json] }
           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] }
+          stub.delete("/users/1") { |env| [200, {}, { :data => { :id => 1 }, :metadata => { :foo => "bar" }, :errors => ["Yes", "Sir"] }.to_json] }
         end
       end
 
@@ -85,21 +87,31 @@ describe Her::Model::ORM do
 
     it "handles metadata on a collection" do
       @users = User.all
-      @users.metadata[:total_pages].should == 10
+      expect(@users.metadata[:total_pages]).to eq(10)
     end
 
     it "handles error data on a collection" do
       @users = User.all
-      @users.errors.length.should == 3
+      expect(@users.errors.length).to eq(3)
     end
 
     it "handles metadata on a resource" do
-      @user = User.create(:name => "George Michael Bluth")
-      @user.metadata[:foo].should == "bar"
+      @user = User.create(name: "George Michael Bluth")
+      expect(@user.metadata[:foo]).to eq("bar")
     end
 
     it "handles error data on a resource" do
-      @user = User.create(:name => "George Michael Bluth")
+      @user = User.create(name: "George Michael Bluth")
+      expect(@user.response_errors).to eq(%w(Yes Sir))
+    end
+
+    it "handles metadata on a destroyed resource" do
+      @user = User.destroy_existing(1)
+      @user.metadata[:foo].should == "bar"
+    end
+
+    it "handles error data on a destroyed resource" do
+      @user = User.destroy_existing(1)
       @user.response_errors.should == ["Yes", "Sir"]
     end
   end
@@ -107,12 +119,12 @@ describe Her::Model::ORM do
   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|
+      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] }
+          stub.get("/users") { [200, {}, { data: [{ id: 1, name: "Tobias Fünke" }, { id: 2, name: "Lindsay Fünke" }], metadata: { total_pages: 10, next_page: 2 }, errors: %w(Oh My God) }.to_json] }
+          stub.post("/users") { [200, {}, { data: { name: "George Michael Bluth" }, metadata: { foo: "bar" }, errors: %w(Yes Sir) }.to_json] }
         end
       end
 
@@ -123,34 +135,34 @@ describe Her::Model::ORM do
 
     it "handles metadata on a collection" do
       @users = User.all
-      @users.metadata[:total_pages].should == 10
+      expect(@users.metadata[:total_pages]).to eq(10)
     end
 
     it "handles error data on a collection" do
       @users = User.all
-      @users.errors.length.should == 3
+      expect(@users.errors.length).to eq(3)
     end
 
     it "handles metadata on a resource" do
-      @user = User.create(:name => "George Michael Bluth")
-      @user.metadata[:foo].should == "bar"
+      @user = User.create(name: "George Michael Bluth")
+      expect(@user.metadata[:foo]).to eq("bar")
     end
 
     it "handles error data on a resource" do
-      @user = User.create(:name => "George Michael Bluth")
-      @user.response_errors.should == ["Yes", "Sir"]
+      @user = User.create(name: "George Michael Bluth")
+      expect(@user.response_errors).to eq(%w(Yes Sir))
     end
   end
 
   context "defining custom getters and setters" do
     before do
       api = Her::API.new
-      api.setup :url => "https://api.example.com" do |builder|
+      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") { |env| [200, {}, { :id => 1, :friends => ["Maeby", "GOB", "Anne"] }.to_json] }
-          stub.get("/users/2") { |env| [200, {}, { :id => 1 }.to_json] }
+          stub.get("/users/1") { [200, {}, { id: 1, friends: %w(Maeby GOB Anne) }.to_json] }
+          stub.get("/users/2") { [200, {}, { id: 1 }.to_json] }
         end
       end
 
@@ -159,7 +171,7 @@ describe Her::Model::ORM do
         belongs_to :organization
 
         def friends=(val)
-          val = val.gsub("\r", "").split("\n").map { |friend| friend.gsub(/^\s*\*\s*/, "") } if val and val.is_a?(String)
+          val = val.delete("\r").split("\n").map { |friend| friend.gsub(/^\s*\*\s*/, "") } if val && val.is_a?(String)
           @attributes[:friends] = val
         end
 
@@ -171,18 +183,18 @@ describe Her::Model::ORM do
 
     it "handles custom setters" do
       @user = User.find(1)
-      @user.friends.should == "* Maeby\n* GOB\n* Anne"
+      expect(@user.friends).to eq("* Maeby\n* GOB\n* Anne")
       @user.instance_eval do
-        @attributes[:friends] = ["Maeby", "GOB", "Anne"]
+        @attributes[:friends] = %w(Maeby GOB Anne)
       end
     end
 
     it "handles custom getters" do
       @user = User.new
       @user.friends = "* George\n* Oscar\n* Lucille"
-      @user.friends.should == "* George\n* Oscar\n* Lucille"
+      expect(@user.friends).to eq("* George\n* Oscar\n* Lucille")
       @user.instance_eval do
-        @attributes[:friends] = ["George", "Oscar", "Lucille"]
+        @attributes[:friends] = %w(George Oscar Lucille)
       end
     end
   end
@@ -190,16 +202,16 @@ describe Her::Model::ORM do
   context "finding resources" do
     before do
       api = Her::API.new
-      api.setup :url => "https://api.example.com" do |builder|
+      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") { |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] }
+          stub.get("/users/1") { [200, {}, { id: 1, age: 42 }.to_json] }
+          stub.get("/users/2") { [200, {}, { id: 2, age: 34 }.to_json] }
+          stub.get("/users?id[]=1&id[]=2") { [200, {}, [{ id: 1, age: 42 }, { id: 2, age: 34 }].to_json] }
+          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] }
         end
       end
 
@@ -210,58 +222,58 @@ describe Her::Model::ORM do
 
     it "handles finding by a single id" do
       @user = User.find(1)
-      @user.id.should == 1
+      expect(@user.id).to eq(1)
     end
 
     it "handles finding by multiple ids" do
       @users = User.find(1, 2)
-      @users.should be_kind_of(Array)
-      @users.length.should == 2
-      @users[0].id.should == 1
-      @users[1].id.should == 2
+      expect(@users).to be_kind_of(Array)
+      expect(@users.length).to eq(2)
+      expect(@users[0].id).to eq(1)
+      expect(@users[1].id).to eq(2)
     end
 
     it "handles finding by an array of ids" do
       @users = User.find([1, 2])
-      @users.should be_kind_of(Array)
-      @users.length.should == 2
-      @users[0].id.should == 1
-      @users[1].id.should == 2
+      expect(@users).to be_kind_of(Array)
+      expect(@users.length).to eq(2)
+      expect(@users[0].id).to eq(1)
+      expect(@users[1].id).to eq(2)
     end
 
     it "handles finding by an array of ids of length 1" do
       @users = User.find([1])
-      @users.should be_kind_of(Array)
-      @users.length.should == 1
-      @users[0].id.should == 1
+      expect(@users).to be_kind_of(Array)
+      expect(@users.length).to eq(1)
+      expect(@users[0].id).to eq(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
+      expect(@users).to be_kind_of(Array)
+      expect(@users.length).to eq(2)
+      expect(@users[0].id).to eq(1)
+      expect(@users[1].id).to eq(2)
     end
 
-    it 'handles finding with id parameter as an array' do
+    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
+      expect(@users).to be_kind_of(Array)
+      expect(@users.length).to eq(2)
+      expect(@users[0].id).to eq(1)
+      expect(@users[1].id).to eq(2)
     end
 
     it "handles finding with other parameters" do
-      @users = User.where(:age => 42, :foo => "bar").all
-      @users.should be_kind_of(Array)
-      @users.first.id.should == 3
+      @users = User.where(age: 42, foo: "bar").all
+      expect(@users).to be_kind_of(Array)
+      expect(@users.first.id).to eq(3)
     end
 
     it "handles finding with other parameters and scoped" do
       @users = User.scoped
-      @users.where(:age => 42).should be_all { |u| u.age == 42 }
-      @users.where(:age => 40).should be_all { |u| u.age == 40 }
+      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
   end
 
@@ -272,20 +284,20 @@ describe Her::Model::ORM do
       end
 
       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_truthy
-        @new_user.fullname.should == "Tobias Fünke"
+        expect(Foo::User).not_to receive(:request)
+        @new_user = Foo::User.build(fullname: "Tobias Fünke")
+        expect(@new_user.new?).to be_truthy
+        expect(@new_user.fullname).to eq("Tobias Fünke")
       end
     end
 
     context "when request_new_object_on_build is set" do
       before do
-        Her::API.setup :url => "https://api.example.com" do |builder|
+        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/new") { |env| ok! :id => nil, :fullname => params(env)[:fullname], :email => "tobias@bluthcompany.com" }
+            stub.get("/users/new") { |env| ok! id: nil, fullname: params(env)[:fullname], email: "tobias@bluthcompany.com" }
           end
         end
 
@@ -293,23 +305,23 @@ describe Her::Model::ORM do
       end
 
       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_truthy
-        @new_user.fullname.should == "Tobias Fünke"
-        @new_user.email.should == "tobias@bluthcompany.com"
+        expect(Foo::User).to receive(:request).once.and_call_original
+        @new_user = Foo::User.build(fullname: "Tobias Fünke")
+        expect(@new_user.new?).to be_truthy
+        expect(@new_user.fullname).to eq("Tobias Fünke")
+        expect(@new_user.email).to eq("tobias@bluthcompany.com")
       end
     end
   end
 
   context "creating resources" do
     before do
-      Her::API.setup :url => "https://api.example.com" do |builder|
+      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| [200, {}, { :id => 1, :fullname => Faraday::Utils.parse_query(env[:body])['fullname'], :email => Faraday::Utils.parse_query(env[:body])['email'] }.to_json] }
-          stub.post("/companies") { |env| [200, {}, { :errors => ["name is required"] }.to_json] }
+          stub.post("/users") { |env| [200, {}, { id: 1, fullname: Faraday::Utils.parse_query(env[:body])["fullname"], email: Faraday::Utils.parse_query(env[:body])["email"] }.to_json] }
+          stub.post("/companies") { [200, {}, { errors: ["name is required"] }.to_json] }
         end
       end
 
@@ -318,27 +330,27 @@ describe Her::Model::ORM do
     end
 
     it "handle one-line resource creation" do
-      @user = Foo::User.create(:fullname => "Tobias Fünke", :email => "tobias@bluth.com")
-      @user.id.should == 1
-      @user.fullname.should == "Tobias Fünke"
-      @user.email.should == "tobias@bluth.com"
+      @user = Foo::User.create(fullname: "Tobias Fünke", email: "tobias@bluth.com")
+      expect(@user.id).to eq(1)
+      expect(@user.fullname).to eq("Tobias Fünke")
+      expect(@user.email).to eq("tobias@bluth.com")
     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"
+      @user = Foo::User.new(fullname: "Tobias Fünke")
+      expect(@user.save).to be_truthy
+      expect(@user.fullname).to eq("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"
+      @user = Foo::User.new(fullname: "Tobias Fünke")
+      expect(@user.save!).to be_truthy
+      expect(@user.fullname).to eq("Tobias Fünke")
     end
 
     it "returns false when #save gets errors" do
       @company = Foo::Company.new
-      @company.save.should be_falsey
+      expect(@company.save).to be_falsey
     end
 
     it "raises ResourceInvalid when #save! gets errors" do
@@ -347,20 +359,20 @@ describe Her::Model::ORM do
     end
 
     it "don't overwrite data if response is empty" do
-      @company = Foo::Company.new(:name => 'Company Inc.')
-      @company.save.should be_falsey
-      @company.name.should == "Company Inc."
+      @company = Foo::Company.new(name: "Company Inc.")
+      expect(@company.save).to be_falsey
+      expect(@company.name).to eq("Company Inc.")
     end
   end
 
   context "updating resources" do
     before do
-      Her::API.setup :url => "https://api.example.com" do |builder|
+      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") { |env| [200, {}, { :id => 1, :fullname => "Tobias Fünke" }.to_json] }
-          stub.put("/users/1") { |env| [200, {}, { :id => 1, :fullname => "Lindsay Fünke" }.to_json] }
+          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] }
         end
       end
 
@@ -369,32 +381,32 @@ describe Her::Model::ORM do
 
     it "handle resource data update without saving it" do
       @user = Foo::User.find(1)
-      @user.fullname.should == "Tobias Fünke"
+      expect(@user.fullname).to eq("Tobias Fünke")
       @user.fullname = "Kittie Sanchez"
-      @user.fullname.should == "Kittie Sanchez"
+      expect(@user.fullname).to eq("Kittie Sanchez")
     end
 
     it "handle resource update through the .update class method" do
-      @user = Foo::User.save_existing(1, { :fullname => "Lindsay Fünke" })
-      @user.fullname.should == "Lindsay Fünke"
+      @user = Foo::User.save_existing(1, fullname: "Lindsay Fünke")
+      expect(@user.fullname).to eq("Lindsay Fünke")
     end
 
     it "handle resource update through #save on an existing resource" do
       @user = Foo::User.find(1)
       @user.fullname = "Lindsay Fünke"
       @user.save
-      @user.fullname.should == "Lindsay Fünke"
+      expect(@user.fullname).to eq("Lindsay Fünke")
     end
   end
 
   context "deleting resources" do
     before do
-      Her::API.setup :url => "https://api.example.com" do |builder|
+      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") { |env| [200, {}, { :id => 1, :fullname => "Tobias Fünke", :active => true }.to_json] }
-          stub.delete("/users/1") { |env| [200, {}, { :id => 1, :fullname => "Lindsay Fünke", :active => false }.to_json] }
+          stub.get("/users/1") { [200, {}, { id: 1, fullname: "Tobias Fünke", active: true }.to_json] }
+          stub.delete("/users/1") { [200, {}, { id: 1, fullname: "Lindsay Fünke", active: false }.to_json] }
         end
       end
 
@@ -403,103 +415,103 @@ 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_falsey
-      @user.should be_destroyed
+      expect(@user.active).to be_falsey
+      expect(@user).to 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_falsey
-      @user.should be_destroyed
+      expect(@user.active).to be_falsey
+      expect(@user).to be_destroyed
     end
 
     context "with params" do
       before do
-        Her::API.setup :url => "https://api.example.com" do |builder|
+        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.delete("/users/1?delete_type=soft") { |env| [200, {}, { :id => 1, :fullname => "Lindsay Fünke", :active => false }.to_json] }
+            stub.delete("/users/1?delete_type=soft") { [200, {}, { id: 1, fullname: "Lindsay Fünke", active: false }.to_json] }
           end
         end
       end
 
       it "handle resource deletion through the .destroy class method" do
-        @user = Foo::User.destroy_existing(1, delete_type: 'soft')
-        @user.active.should be_false
-        @user.should be_destroyed
+        @user = Foo::User.destroy_existing(1, delete_type: "soft")
+        expect(@user.active).to be_falsey
+        expect(@user).to be_destroyed
       end
 
       it "handle resource deletion through #destroy on an existing resource" do
         @user = Foo::User.find(1)
-        @user.destroy(delete_type: 'soft')
-        @user.active.should be_false
-        @user.should be_destroyed
+        @user.destroy(delete_type: "soft")
+        expect(@user.active).to be_falsey
+        expect(@user).to be_destroyed
       end
     end
   end
 
-  context 'customizing HTTP methods' do
+  context "customizing HTTP methods" do
     before do
-      Her::API.setup :url => "https://api.example.com" do |builder|
+      Her::API.setup url: "https://api.example.com" do |builder|
         builder.use Her::Middleware::FirstLevelParseJSON
         builder.use Faraday::Request::UrlEncoded
       end
     end
 
-    context 'create' do
+    context "create" do
       before do
         Her::API.default_api.connection.adapter :test do |stub|
-          stub.put('/users') { |env| [200, {}, { :id => 1, :fullname => 'Tobias Fünke' }.to_json] }
+          stub.put("/users") { [200, {}, { id: 1, fullname: "Tobias Fünke" }.to_json] }
         end
-        spawn_model 'Foo::User' do
+        spawn_model "Foo::User" do
           attributes :fullname, :email
-          method_for :create, 'PUT'
+          method_for :create, "PUT"
         end
       end
 
-      context 'for top-level class' 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_truthy
+      context "for top-level class" do
+        it "uses the custom method (PUT) instead of default method (POST)" do
+          user = Foo::User.new(fullname: "Tobias Fünke")
+          expect(user).to be_new
+          expect(user.save).to be_truthy
         end
       end
 
-      context 'for children class' do
+      context "for children class" do
         before do
           class User < Foo::User; end
           @spawned_models << :User
         end
 
-        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_truthy
+        it "uses the custom method (PUT) instead of default method (POST)" do
+          user = User.new(fullname: "Tobias Fünke")
+          expect(user).to be_new
+          expect(user.save).to be_truthy
         end
       end
     end
 
-    context 'update' do
+    context "update" do
       before do
         Her::API.default_api.connection.adapter :test do |stub|
-          stub.get('/users/1') { |env| [200, {}, { :id => 1, :fullname => 'Lindsay Fünke' }.to_json] }
-          stub.post('/users/1') { |env| [200, {}, { :id => 1, :fullname => 'Tobias Fünke' }.to_json] }
+          stub.get("/users/1") { [200, {}, { id: 1, fullname: "Lindsay Fünke" }.to_json] }
+          stub.post("/users/1") { [200, {}, { id: 1, fullname: "Tobias Fünke" }.to_json] }
         end
 
-        spawn_model 'Foo::User' do
+        spawn_model "Foo::User" do
           attributes :fullname, :email
           method_for :update, :post
         end
       end
 
-      it 'uses the custom method (POST) instead of default method (PUT)' do
+      it "uses the custom method (POST) instead of default method (PUT)" do
         user = Foo::User.find(1)
-        user.fullname.should eq 'Lindsay Fünke'
-        user.fullname = 'Toby Fünke'
+        expect(user.fullname).to eq "Lindsay Fünke"
+        user.fullname = "Toby Fünke"
         user.save
-        user.fullname.should eq 'Tobias Fünke'
+        expect(user.fullname).to eq "Tobias Fünke"
       end
     end
   end