her 0.8.2 → 0.8.3

data/spec/model/callbacks_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 
 describe "Her::Model and ActiveModel::Callbacks" 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
     end
 
@@ -11,11 +11,11 @@ describe "Her::Model and ActiveModel::Callbacks" do
   end
 
   context :before_save do
-    subject { Foo::User.create(:name => "Tobias Funke") }
+    subject { Foo::User.create(name: "Tobias Funke") }
     before do
       Her::API.default_api.connection.adapter :test do |stub|
-        stub.post("/users") { |env| [200, {}, { :id => 1, :name => env[:body][:name] }.to_json] }
-        stub.put("/users/1") { |env| [200, {}, { :id => 1, :name => env[:body][:name] }.to_json] }
+        stub.post("/users") { |env| [200, {}, { id: 1, name: env[:body][:name] }.to_json] }
+        stub.put("/users/1") { |env| [200, {}, { id: 1, name: env[:body][:name] }.to_json] }
       end
     end
 
@@ -23,21 +23,29 @@ describe "Her::Model and ActiveModel::Callbacks" do
       before do
         class Foo::User
           before_save :alter_name
-          def alter_name; self.name.upcase!;  end
+          def alter_name
+            name.upcase!
+          end
         end
       end
 
-      its(:name) { should == "TOBIAS FUNKE" }
+      describe "#name" do
+        subject { super().name }
+        it { is_expected.to eq("TOBIAS FUNKE") }
+      end
     end
 
     context "when using a block callback" do
       before do
         class Foo::User
-          before_save lambda { self.name.upcase! }
+          before_save -> { name.upcase! }
         end
       end
 
-      its(:name) { should == "TOBIAS FUNKE" }
+      describe "#name" do
+        subject { super().name }
+        it { is_expected.to eq("TOBIAS FUNKE") }
+      end
     end
 
     context "when changing a value of an existing resource in a callback" do
@@ -51,18 +59,18 @@ describe "Her::Model and ActiveModel::Callbacks" do
       end
 
       it "should call the server with the canged value" do
-        subject.name.should == "Tobias Funke"
+        expect(subject.name).to eq("Tobias Funke")
         subject.save
-        subject.name.should == "Lumberjack"
+        expect(subject.name).to eq("Lumberjack")
       end
     end
   end
 
   context :before_create do
-    subject { Foo::User.create(:name => "Tobias Funke") }
+    subject { Foo::User.create(name: "Tobias Funke") }
     before do
       Her::API.default_api.connection.adapter :test do |stub|
-        stub.post("/users") { |env| [200, {}, { :id => 1, :name => env[:body][:name] }.to_json] }
+        stub.post("/users") { |env| [200, {}, { id: 1, name: env[:body][:name] }.to_json] }
       end
     end
 
@@ -70,21 +78,29 @@ describe "Her::Model and ActiveModel::Callbacks" do
       before do
         class Foo::User
           before_create :alter_name
-          def alter_name; self.name.upcase!;  end
+          def alter_name
+            name.upcase!
+          end
         end
       end
 
-      its(:name) { should == "TOBIAS FUNKE" }
+      describe "#name" do
+        subject { super().name }
+        it { is_expected.to eq("TOBIAS FUNKE") }
+      end
     end
 
     context "when using a block callback" do
       before do
         class Foo::User
-          before_create lambda { self.name.upcase! }
+          before_create -> { name.upcase! }
         end
       end
 
-      its(:name) { should == "TOBIAS FUNKE" }
+      describe "#name" do
+        subject { super().name }
+        it { is_expected.to eq("TOBIAS FUNKE") }
+      end
     end
   end
 
@@ -92,7 +108,7 @@ describe "Her::Model and ActiveModel::Callbacks" do
     subject { Foo::User.find(1) }
     before do
       Her::API.default_api.connection.adapter :test do |stub|
-        stub.get("/users/1") { |env| [200, {}, { :id => 1, :name => "Tobias Funke" }.to_json] }
+        stub.get("/users/1") { [200, {}, { id: 1, name: "Tobias Funke" }.to_json] }
       end
     end
 
@@ -100,46 +116,62 @@ describe "Her::Model and ActiveModel::Callbacks" do
       before do
         class Foo::User
           after_find :alter_name
-          def alter_name; self.name.upcase!;  end
+          def alter_name
+            name.upcase!
+          end
         end
       end
 
-      its(:name) { should == "TOBIAS FUNKE" }
+      describe "#name" do
+        subject { super().name }
+        it { is_expected.to eq("TOBIAS FUNKE") }
+      end
     end
 
     context "when using a block callback" do
       before do
         class Foo::User
-          after_find lambda { self.name.upcase! }
+          after_find -> { name.upcase! }
         end
       end
 
-      its(:name) { should == "TOBIAS FUNKE" }
+      describe "#name" do
+        subject { super().name }
+        it { is_expected.to eq("TOBIAS FUNKE") }
+      end
     end
   end
 
   context :after_initialize do
-    subject { Foo::User.new(:name => "Tobias Funke") }
+    subject { Foo::User.new(name: "Tobias Funke") }
 
     context "when using a symbol callback" do
       before do
         class Foo::User
           after_initialize :alter_name
-          def alter_name; self.name.upcase!;  end
+          def alter_name
+            name.upcase!
+          end
         end
       end
 
-      its(:name) { should == "TOBIAS FUNKE" }
+      describe "#name" do
+        subject { super().name }
+        it { is_expected.to eq("TOBIAS FUNKE") }
+      end
     end
 
     context "when using a block callback" do
       before do
         class Foo::User
-          after_initialize lambda { self.name.upcase! }
+          after_initialize -> { name.upcase! }
         end
       end
 
-      its(:name) { should == "TOBIAS FUNKE" }
+      describe "#name" do
+        subject { super().name }
+        it { is_expected.to eq("TOBIAS FUNKE") }
+      end
     end
   end
 end

data/spec/model/dirty_spec.rb

@@ -4,16 +4,16 @@ require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 describe "Her::Model and ActiveModel::Dirty" do
   context "checking dirty attributes" 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 => "Lindsay Fünke" }.to_json] }
-          stub.get("/users/2") { |env| [200, {}, { :id => 2, :fullname => "Maeby Fünke" }.to_json] }
-          stub.get("/users/3") { |env| [200, {}, { :user_id => 3, :fullname => "Maeby Fünke" }.to_json] }
-          stub.put("/users/1") { |env| [200, {}, { :id => 1, :fullname => "Tobias Fünke" }.to_json] }
-          stub.put("/users/2") { |env| [400, {}, { :errors => ["Email cannot be blank"] }.to_json] }
-          stub.post("/users") { |env| [200, {}, { :id => 1, :fullname => "Tobias Fünke" }.to_json] }
+          stub.get("/users/1") { [200, {}, { id: 1, fullname: "Lindsay Fünke" }.to_json] }
+          stub.get("/users/2") { [200, {}, { id: 2, fullname: "Maeby Fünke" }.to_json] }
+          stub.get("/users/3") { [200, {}, { user_id: 3, fullname: "Maeby Fünke" }.to_json] }
+          stub.put("/users/1") { [200, {}, { id: 1, fullname: "Tobias Fünke" }.to_json] }
+          stub.put("/users/2") { [400, {}, { errors: ["Email cannot be blank"] }.to_json] }
+          stub.post("/users")  { [200, {}, { id: 1, fullname: "Tobias Fünke" }.to_json] }
         end
       end
 
@@ -28,36 +28,36 @@ describe "Her::Model and ActiveModel::Dirty" do
     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
+        expect(user.changes).to be_empty
+        expect(user).not_to be_changed
       end
       context "with successful save" do
         it "tracks dirty attributes" do
           user.fullname = "Tobias Fünke"
-          user.fullname_changed?.should be_truthy
-          user.email_changed?.should be_falsey
-          user.should be_changed
+          expect(user.fullname_changed?).to be_truthy
+          expect(user.email_changed?).to be_falsey
+          expect(user).to be_changed
           user.save
-          user.should_not be_changed
+          expect(user).not_to be_changed
         end
 
         it "tracks only changed dirty attributes" do
           user.fullname = user.fullname
-          user.fullname_changed?.should be_falsey
+          expect(user.fullname_changed?).to be_falsey
         end
 
         it "tracks previous changes" do
           user.fullname = "Tobias Fünke"
           user.save
-          user.previous_changes.should eq({"fullname"=>"Lindsay Fünke"})
+          expect(user.previous_changes).to eq("fullname" => "Lindsay Fünke")
         end
 
-        it 'tracks dirty attribute for mass assign for dynamic created attributes' do
+        it "tracks dirty attribute for mass assign for dynamic created attributes" do
           user = Dynamic::User.find(3)
-          user.assign_attributes(:fullname => 'New Fullname')
-          user.fullname_changed?.should be_truthy
-          user.should be_changed
-          user.changes.length.should eq(1)
+          user.assign_attributes(fullname: "New Fullname")
+          expect(user.fullname_changed?).to be_truthy
+          expect(user).to be_changed
+          expect(user.changes.length).to eq(1)
         end
       end
 
@@ -65,27 +65,28 @@ describe "Her::Model and ActiveModel::Dirty" do
         it "tracks dirty attributes" do
           user = Foo::User.find(2)
           user.fullname = "Tobias Fünke"
-          user.fullname_changed?.should be_truthy
-          user.email_changed?.should be_falsey
-          user.should be_changed
+          expect(user.fullname_changed?).to be_truthy
+          expect(user.email_changed?).to be_falsey
+          expect(user).to be_changed
           user.save
-          user.should be_changed
+          expect(user).to be_changed
         end
       end
     end
 
     context "for new resource" do
-      let(:user) { Foo::User.new(:fullname => "Lindsay Fünke") }
+      let(:user) { Foo::User.new(fullname: "Lindsay Fünke") }
       it "has changes" do
-        user.should be_changed
+        expect(user).to be_changed
       end
       it "tracks dirty attributes" do
         user.fullname = "Tobias Fünke"
-        user.fullname_changed?.should be_truthy
-        user.should be_changed
+        expect(user.fullname_changed?).to be_truthy
+        expect(user).to be_changed
         user.save
-        user.should_not be_changed
+        expect(user).not_to be_changed
       end
     end
   end
 end
+#

data/spec/model/http_spec.rb

@@ -3,13 +3,13 @@ require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 
 describe Her::Model::HTTP do
   context "binding a model with an API" do
-    let(:api1) { Her::API.new :url => "https://api1.example.com" }
-    let(:api2) { Her::API.new :url => "https://api2.example.com" }
+    let(:api1) { Her::API.new url: "https://api1.example.com" }
+    let(:api2) { Her::API.new url: "https://api2.example.com" }
 
     before do
       spawn_model("Foo::User")
       spawn_model("Foo::Comment")
-      Her::API.setup :url => "https://api.example.com"
+      Her::API.setup url: "https://api.example.com"
     end
 
     context "when binding a model to its superclass' her_api" do
@@ -19,7 +19,7 @@ describe Her::Model::HTTP do
         Foo::Subclass = Class.new(Foo::Superclass)
       end
 
-      specify { Foo::Subclass.her_api.should == Foo::Superclass.her_api }
+      specify { expect(Foo::Subclass.her_api).to eq(Foo::Superclass.her_api) }
     end
 
     context "when changing her_api without changing the parent class' her_api" do
@@ -30,23 +30,23 @@ describe Her::Model::HTTP do
         Foo::Subclass.uses_api api2
       end
 
-      specify { Foo::Subclass.her_api.should_not == Foo::Superclass.her_api }
+      specify { expect(Foo::Subclass.her_api).not_to eq(Foo::Superclass.her_api) }
     end
   end
 
   context "making HTTP requests" 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") { |env| [200, {}, [{ :id => 1 }].to_json] }
-          stub.get("/users/1") { |env| [200, {}, { :id => 1 }.to_json] }
+          stub.get("/users") { [200, {}, [{ id: 1 }].to_json] }
+          stub.get("/users/1") { [200, {}, { id: 1 }.to_json] }
           stub.get("/users/popular") do |env|
             if env[:params]["page"] == "2"
-              [200, {}, [{ :id => 3 }, { :id => 4 }].to_json]
+              [200, {}, [{ id: 3 }, { id: 4 }].to_json]
             else
-              [200, {}, [{ :id => 1 }, { :id => 2 }].to_json]
+              [200, {}, [{ id: 1 }, { id: 2 }].to_json]
             end
           end
         end
@@ -57,61 +57,85 @@ describe Her::Model::HTTP do
 
     describe :get do
       subject { Foo::User.get(:popular) }
-      its(:length) { should == 2 }
-      specify { subject.first.id.should == 1 }
+
+      describe "#length" do
+        subject { super().length }
+        it { is_expected.to eq(2) }
+      end
+      specify { expect(subject.first.id).to eq(1) }
     end
 
     describe :get_raw do
       context "with a block" do
         specify do
-          Foo::User.get_raw("/users") do |parsed_data, response|
-            parsed_data[:data].should == [{ :id => 1 }]
+          Foo::User.get_raw("/users") do |parsed_data, _response|
+            expect(parsed_data[:data]).to eq([{ id: 1 }])
           end
         end
       end
 
       context "with a return value" do
         subject { Foo::User.get_raw("/users") }
-        specify { subject[:parsed_data][:data].should == [{ :id => 1 }] }
+        specify { expect(subject[:parsed_data][:data]).to eq([{ id: 1 }]) }
       end
     end
 
     describe :get_collection do
       context "with a String path" do
         subject { Foo::User.get_collection("/users/popular") }
-        its(:length) { should == 2 }
-        specify { subject.first.id.should == 1 }
+
+        describe "#length" do
+          subject { super().length }
+          it { is_expected.to eq(2) }
+        end
+        specify { expect(subject.first.id).to eq(1) }
       end
 
       context "with a Symbol" do
         subject { Foo::User.get_collection(:popular) }
-        its(:length) { should == 2 }
-        specify { subject.first.id.should == 1 }
+
+        describe "#length" do
+          subject { super().length }
+          it { is_expected.to eq(2) }
+        end
+        specify { expect(subject.first.id).to eq(1) }
       end
 
       context "with extra parameters" do
-        subject { Foo::User.get_collection(:popular, :page => 2) }
-        its(:length) { should == 2 }
-        specify { subject.first.id.should == 3 }
+        subject { Foo::User.get_collection(:popular, page: 2) }
+
+        describe "#length" do
+          subject { super().length }
+          it { is_expected.to eq(2) }
+        end
+        specify { expect(subject.first.id).to eq(3) }
       end
     end
 
     describe :get_resource do
       context "with a String path" do
         subject { Foo::User.get_resource("/users/1") }
-        its(:id) { should == 1 }
+
+        describe "#id" do
+          subject { super().id }
+          it { is_expected.to eq(1) }
+        end
       end
 
       context "with a Symbol" do
         subject { Foo::User.get_resource(:"1") }
-        its(:id) { should == 1 }
+
+        describe "#id" do
+          subject { super().id }
+          it { is_expected.to eq(1) }
+        end
       end
     end
 
     describe :get_raw do
       specify do
-        Foo::User.get_raw(:popular) do |parsed_data, response|
-          parsed_data[:data].should == [{ :id => 1 }, { :id => 2 }]
+        Foo::User.get_raw(:popular) do |parsed_data, _response|
+          expect(parsed_data[:data]).to eq([{ id: 1 }, { id: 2 }])
         end
       end
     end
@@ -119,11 +143,11 @@ describe Her::Model::HTTP do
 
   context "setting custom HTTP requests" do
     before do
-      Her::API.setup :url => "https://api.example.com" do |connection|
+      Her::API.setup url: "https://api.example.com" do |connection|
         connection.use Her::Middleware::FirstLevelParseJSON
         connection.adapter :test do |stub|
-          stub.get("/users/popular") { |env| [200, {}, [{ :id => 1 }, { :id => 2 }].to_json] }
-          stub.post("/users/from_default") { |env| [200, {}, { :id => 4 }.to_json] }
+          stub.get("/users/popular") { [200, {}, [{ id: 1 }, { id: 2 }].to_json] }
+          stub.post("/users/from_default") { [200, {}, { id: 4 }.to_json] }
         end
       end
 
@@ -135,23 +159,31 @@ describe Her::Model::HTTP do
     describe :custom_get do
       context "without cache" do
         before { Foo::User.custom_get :popular, :recent }
-        it { should respond_to(:popular) }
-        it { should respond_to(:recent) }
+        it { is_expected.to respond_to(:popular) }
+        it { is_expected.to respond_to(:recent) }
 
         context "making the HTTP request" do
           subject { Foo::User.popular }
-          its(:length) { should == 2 }
+
+          describe "#length" do
+            subject { super().length }
+            it { is_expected.to eq(2) }
+          end
         end
       end
     end
 
     describe :custom_post do
       before { Foo::User.custom_post :from_default }
-      it { should respond_to(:from_default) }
+      it { is_expected.to respond_to(:from_default) }
 
       context "making the HTTP request" do
-        subject { Foo::User.from_default(:name => "Tobias Fünke") }
-        its(:id) { should == 4 }
+        subject { Foo::User.from_default(name: "Tobias Fünke") }
+
+        describe "#id" do
+          subject { super().id }
+          it { is_expected.to eq(4) }
+        end
       end
     end
   end