kippt 3.0.1 → 3.1.0

data/spec/kippt/user_clips_spec.rb

@@ -14,11 +14,11 @@ describe Kippt::UserClips do
 
   describe "#build" do
     it "returns new resource" do
-      subject.build.should be_a(resource_class)
+      expect(subject.build).to be_a(resource_class)
     end
 
     it "accepts parameters" do
-      subject.object_class.should_receive(:new).with({:an => "attribute"}, client)
+      expect(subject.object_class).to receive(:new).with({:an => "attribute"}, client)
       subject.build(:an => "attribute")
     end
   end
@@ -27,7 +27,7 @@ describe Kippt::UserClips do
     it "returns ClipCollection" do
       stub_get("/#{base_uri}/favorites").
         to_return(:status => 200, :body => fixture("clips.json"))
-      subject.favorites.should be_a Kippt::Clips
+      expect(subject.favorites).to be_a Kippt::Clips
     end
   end
 
@@ -35,7 +35,7 @@ describe Kippt::UserClips do
     it "returns ClipCollection" do
       stub_get("/#{base_uri}/likes").
         to_return(:status => 200, :body => fixture("clips.json"))
-      subject.likes.should be_a Kippt::Clips
+      expect(subject.likes).to be_a Kippt::Clips
     end
   end
 end

data/spec/kippt/user_collection_spec.rb

@@ -6,9 +6,10 @@ describe Kippt::UserCollection do
   let(:data_with_multiple_pages) {
     MultiJson.load(fixture("users_with_multiple_pages.json").read)
   }
-  let(:client) { stub }
+  let(:client) { double(:client) }
   subject { Kippt::UserCollection.new(data, client) }
   let(:subject_with_multiple_pages) { Kippt::UserCollection.new(data_with_multiple_pages, client) }
+  let(:collection_resource_class) { Kippt::Users }
 
   it_behaves_like "collection"
 end

data/spec/kippt/user_lists_spec.rb

@@ -14,11 +14,11 @@ describe Kippt::UserLists do
 
   describe "#build" do
     it "returns new resource" do
-      subject.build.should be_a(resource_class)
+      expect(subject.build).to be_a(resource_class)
     end
 
     it "accepts parameters" do
-      subject.object_class.should_receive(:new).with({:an => "attribute"}, client)
+      expect(subject.object_class).to receive(:new).with({:an => "attribute"}, client)
       subject.build(:an => "attribute")
     end
   end

data/spec/kippt/user_spec.rb

@@ -21,7 +21,7 @@ describe Kippt::User do
   describe "#pro?" do
     it "gets data from is_pro" do
       user = Kippt::User.new({:is_pro => true}, nil)
-      user.pro?.should be_true
+      expect(user.pro?).to be_truthy
     end
   end
 
@@ -31,52 +31,52 @@ describe Kippt::User do
       user = Kippt::User.new(nil, client)
 
       likes = user.likes
-      likes.should be_a(Kippt::UserLikes)
-      likes.user.should eq user
+      expect(likes).to be_a(Kippt::UserLikes)
+      expect(likes.user).to eq user
     end
   end
 
   describe "#following?" do
     it "uses Kippt::FollowRelationship to get the information" do
-      follow_relationship = mock(:follow_relationship,
+      follow_relationship = double(:follow_relationship,
         :following? => true)
-      Kippt::FollowRelationship.stub(:new).and_return(follow_relationship)
+      allow(Kippt::FollowRelationship).to receive(:new).and_return(follow_relationship)
       user = Kippt::User.new({:is_pro => true}, nil)
-      user.following?.should be_true
+      expect(user.following?).to be_truthy
     end
   end
 
   describe "#follower_count" do
     it "returns the count from the fetched data" do
       user = Kippt::User.new({:counts => {"follows" => 11}})
-      user.follower_count.should eq 11
+      expect(user.follower_count).to eq 11
     end
   end
 
   describe "#following_count" do
     it "returns the count from the fetched data" do
       user = Kippt::User.new({:counts => {"followed_by" => 111}})
-      user.following_count.should eq 111
+      expect(user.following_count).to eq 111
     end
   end
 
   describe "#follow" do
     it "sets up a Kippt::FollowRelationship and calls it" do
-      follow_relationship = mock(:follow_relationship,
+      follow_relationship = double(:follow_relationship,
         :follow => true)
-      Kippt::FollowRelationship.stub(:new).and_return(follow_relationship)
+      allow(Kippt::FollowRelationship).to receive(:new).and_return(follow_relationship)
       user = Kippt::User.new
-      user.follow.should be_true
+      expect(user.follow).to be_truthy
     end
   end
 
   describe "#unfollow" do
     it "sets up a Kippt::FollowRelationship and calls it" do
-      follow_relationship = mock(:follow_relationship,
+      follow_relationship = double(:follow_relationship,
         :unfollow => true)
-      Kippt::FollowRelationship.stub(:new).and_return(follow_relationship)
+      allow(Kippt::FollowRelationship).to receive(:new).and_return(follow_relationship)
       user = Kippt::User.new
-      user.unfollow.should be_true
+      expect(user.unfollow).to be_truthy
     end
   end
 end

data/spec/kippt/users_spec.rb

@@ -35,9 +35,9 @@ describe Kippt::Users do
 
         context "with invalid keys" do
           it "raises ArgumentError" do
-            lambda {
+            expect {
               subject.search(:q => "bunny", :stuff => true)
-            }.should raise_error(ArgumentError, "'stuff' is not a valid search parameter")
+            }.to raise_error(ArgumentError, "'stuff' is not a valid search parameter")
           end
         end
       end
@@ -47,13 +47,13 @@ describe Kippt::Users do
       stub_get("/users/search?q=bunny").
         to_return(:status => 200, :body => fixture("users_with_multiple_pages.json"))
       users = subject.search("bunny")
-      users.should be_a Kippt::UserCollection
+      expect(users).to be_a Kippt::UserCollection
     end
 
     it "sets UserCollection client" do
       stub_get("/users/search?q=bunny").
         to_return(:status => 200, :body => fixture("users_with_multiple_pages.json"))
-      Kippt::UserCollection.should_receive(:new).with(kind_of(Hash), kind_of(Kippt::Client))
+      expect(Kippt::UserCollection).to receive(:new).with(kind_of(Hash), kind_of(Kippt::Client))
       users = subject.search("bunny")
     end
   end

data/spec/shared_examples/collection.rb

@@ -1,31 +1,31 @@
 shared_examples_for "collection" do
   it "is Enumberable" do
-    subject.should be_a(Enumerable)
+    expect(subject).to be_a(Enumerable)
   end
 
   describe "#offset" do
     it "returns offset of the results" do
-      subject.offset.should eq 0
+      expect(subject.offset).to eq 0
     end
   end
 
   describe "#limit" do
     it "returns limit of the results" do
-      subject.limit.should eq 20
+      expect(subject.limit).to eq 20
     end
   end
 
   describe "#objects" do
     it "returns the objects generated from the data" do
       subject.objects.each do |object|
-        object.should be_a(subject.object_class)
+        expect(object).to be_a(subject.object_class)
       end
     end
   end
 
   describe "#[]" do
     it "returns a object by index" do
-      subject[0].id.should eq data["objects"][0]["id"]
+      expect(subject[0].id).to eq data["objects"][0]["id"]
     end
   end
 
@@ -33,45 +33,44 @@ shared_examples_for "collection" do
     it "loops through the objects" do
       ids = []
       subject.each {|object| ids << object.id }
-      ids.should eq data["objects"].map { |node| node["id"] }
+      expect(ids).to eq data["objects"].map { |node| node["id"] }
     end
   end
 
   describe "#next_page?" do
     context "there is a next page" do
       it "returns url of the page" do
-        subject_with_multiple_pages.next_page?.should eq data_with_multiple_pages["meta"]["next"]
+        expect(subject_with_multiple_pages.next_page?).to eq data_with_multiple_pages["meta"]["next"]
       end
     end
 
     context "there is no next page" do
       it "returns nil" do
-        subject.next_page?.should eq nil
+        expect(subject.next_page?).to eq nil
       end
     end
   end
 
   describe "#next_page" do
     context "if there is a next page" do
-      let(:collection_resource) { stub }
+      let(:collection_resource) { double(:collection_resource) }
 
       it "gets the next page of results from the collection resource" do
-        client.stub(:collection_resource_for).and_return(collection_resource)
+        expect(client).to receive(:collection_resource_for).with(collection_resource_class, data_with_multiple_pages["meta"]["next"]).and_return(collection_resource)
 
-        results = stub
-        collection_resource.should_receive(:collection_from_url).
-          with(data_with_multiple_pages["meta"]["next"]).
+        results = double :results
+        expect(collection_resource).to receive(:fetch).
           and_return(results)
 
-        subject_with_multiple_pages.next_page.should eq results
+        expect(subject_with_multiple_pages.next_page).to eq results
       end
     end
 
     context "if there is no next page" do
       it "raises an error" do
-        lambda {
+        expect {
           subject.next_page
-        }.should raise_error(Kippt::APIError, "There is no next page")
+        }.to raise_error(Kippt::APIError, "There is no next page")
       end
     end
   end
@@ -79,38 +78,39 @@ shared_examples_for "collection" do
   describe "#previous_page?" do
     context "there is a previous page" do
       it "returns url of the page" do
-        subject_with_multiple_pages.previous_page?.should eq data_with_multiple_pages["meta"]["previous"]
+        expect(subject_with_multiple_pages.previous_page?).to eq data_with_multiple_pages["meta"]["previous"]
       end
     end
 
     context "there is no previous page" do
       it "returns nil" do
-        subject.previous_page?.should be_nil
+        expect(subject.previous_page?).to be_nil
       end
     end
   end
 
   describe "#previous_page" do
     context "if there is a previous page" do
-      let(:collection_resource) { stub }
+      let(:collection_resource) { double(:collection_resource) }
 
       it "gets the previous page of results from the collection resource" do
-        client.stub(:collection_resource_for).and_return(collection_resource)
+        expect(client).to receive(:collection_resource_for)
+          .with(collection_resource_class, data_with_multiple_pages["meta"]["previous"])
+          .and_return(collection_resource)
 
-        results = stub
-        collection_resource.should_receive(:collection_from_url).
-          with(data_with_multiple_pages["meta"]["previous"]).
+        results = double :results
+        expect(collection_resource).to receive(:fetch).
           and_return(results)
 
-        subject_with_multiple_pages.previous_page.should eq results
+        expect(subject_with_multiple_pages.previous_page).to eq results
       end
     end
 
     context "if there is no previous page" do
       it "raises an error" do
-        lambda {
+        expect {
           subject.previous_page
-        }.should raise_error(Kippt::APIError, "There is no previous page")
+        }.to raise_error(Kippt::APIError, "There is no previous page")
       end
     end
   end

data/spec/shared_examples/collection_resource.rb

@@ -5,8 +5,8 @@ shared_examples_for "collection resource" do
     let(:resource) { double :resource }
 
     it "builds and saves a resource" do
-      resource.should_receive :save
-      subject.should_receive(:build).with(:an => "attribute").and_return(resource)
+      expect(resource).to receive :save
+      expect(subject).to receive(:build).with(:an => "attribute").and_return(resource)
       subject.create(:an => "attribute")
     end
   end

data/spec/shared_examples/read_collection_resource.rb

@@ -16,9 +16,9 @@ shared_examples_for "read collection resource" do
 
     context "when passed unrecognized arguments" do
       it "raises error" do
-        lambda {
+        expect {
           subject.fetch(:foobar => true)
-        }.should raise_error(
+        }.to raise_error(
           ArgumentError, "Unrecognized argument: foobar")
       end
     end
@@ -28,22 +28,22 @@ shared_examples_for "read collection resource" do
     it "fetches single resource" do
       stub_get("/#{base_uri}/10").
         to_return(:status => 200, :body => fixture("#{singular_fixture}.json"))
-      subject[10].id.should eq 10
+      expect(subject[10].id).to eq 10
     end
 
     it "returns resource" do
       stub_get("/#{base_uri}/10").
         to_return(:status => 200, :body => fixture("#{singular_fixture}.json"))
-      subject[10].should be_a(resource_class)
+      expect(subject[10]).to be_a(resource_class)
     end
 
     context "when resource is not found" do
       it "raises exception" do
         stub_get("/#{base_uri}/10").
-          to_return(:status => 404, :body => {"message" => "Resource not found."})
-        lambda {
+          to_return(:status => 404, :body => {"message" => "Resource not found."}.to_json)
+        expect {
           subject[10]
-        }.should raise_error(
+        }.to raise_error(
           Kippt::APIError, "Resource could not be loaded: Resource not found.")
       end
     end
@@ -51,27 +51,7 @@ shared_examples_for "read collection resource" do
 
   describe "#find" do
     it "exists" do
-      subject.respond_to?(:find).should be_true
-    end
-  end
-
-  describe "#collection_from_url" do
-    it "returns a new collection" do
-      stub_get("/#{base_uri}/?limit=20&offset=20").
-        to_return(:status => 200, :body => fixture("#{collection_fixture}.json"))
-      collection = subject.collection_from_url("/api/#{base_uri}/?limit=20&offset=20")
-      collection.should be_a(collection_class)
-    end
-
-    context "when passed URL is blank" do
-      it "raises ArgumentError" do
-        lambda {
-          subject.collection_from_url("")
-        }.should raise_error(ArgumentError, "The parameter URL can't be blank")
-        lambda {
-          subject.collection_from_url(nil)
-        }.should raise_error(ArgumentError, "The parameter URL can't be blank")
-      end
+      expect(subject.respond_to?(:find)).to be_truthy
     end
   end
 end

data/spec/shared_examples/resource.rb

@@ -2,7 +2,7 @@ shared_examples_for "resource" do
   describe "attribute accessors" do
     it "delegates to attributes" do
       attributes.each do |attribute_name|
-        subject.send(attribute_name).should eq data[attribute_name.to_s]
+        expect(subject.send(attribute_name)).to eq data[attribute_name.to_s]
       end
     end
   end
@@ -10,70 +10,70 @@ shared_examples_for "resource" do
   describe "mapped attribute accessors" do
     it "delegates to attributes and wraps with to a object" do
       mapped_attributes.each do |attribute_name, attribute_class|
-        subject.send(attribute_name).class.to_s.should eq attribute_class
+        expect(subject.send(attribute_name).class.to_s).to eq attribute_class
       end
     end
   end
 
   describe "#destroy" do
-    let(:collection_resource)  { stub }
+    let(:collection_resource)  { double(:collection_resource) }
 
     it "sends delete request to the server" do
-      client.stub(:collection_resource_for).and_return(collection_resource)
-      collection_resource.should_receive(:destroy_resource).with(subject).and_return(true)
-      subject.destroy.should be_true
+      allow(client).to receive(:collection_resource_for).and_return(collection_resource)
+      expect(collection_resource).to receive(:destroy_resource).with(subject).and_return(true)
+      expect(subject.destroy).to be_truthy
     end
   end
 
   describe "#save" do
     context "with valid parameters" do
-      let(:collection_resource)  { stub }
+      let(:collection_resource)  { double(:collection_resource) }
 
       before do
-        client.stub(:collection_resource_for).and_return(collection_resource)
+        allow(client).to receive(:collection_resource_for).and_return(collection_resource)
       end
 
       it "sends POST request to server" do
-        collection_resource.should_receive(:save_resource).with(subject).and_return({})
+        expect(collection_resource).to receive(:save_resource).with(subject).and_return({})
         subject.save
       end
 
       it "returns true" do
-        collection_resource.stub(:save_resource).and_return(
+        allow(collection_resource).to receive(:save_resource).and_return(
           {:success => true})
-        subject.save.should be_true
+        expect(subject.save).to be_truthy
       end
 
       it "sets the updated attributes received from the server" do
-        collection_resource.stub(:save_resource).and_return(
+        allow(collection_resource).to receive(:save_resource).and_return(
           {:success => true, :resource => {:id => 9999}})
         subject.save
-        subject.id.should eq 9999
+        expect(subject.id).to eq 9999
       end
     end
 
     context "with invalid parameters" do
-      let(:collection_resource)  { stub }
+      let(:collection_resource)  { double(:collection_resource) }
 
       before do
-        client.stub(:collection_resource_for).and_return(collection_resource)
-        collection_resource.stub(:save_resource).and_return({:success => false, :error_message => "No url."})
+        allow(client).to receive(:collection_resource_for).and_return(collection_resource)
+        allow(collection_resource).to receive(:save_resource).and_return({:success => false, :error_message => "No url."})
       end
 
       it "sets an error messages" do
         subject.save
-        subject.errors.should eq ["No url."]
+        expect(subject.errors).to eq ["No url."]
       end
 
       it "returns false" do
-        subject.save.should be_false
+        expect(subject.save).to be_falsey
       end
 
       it "clears previous errors" do
         subject.save
-        subject.errors.should eq ["No url."]
+        expect(subject.errors).to eq ["No url."]
         subject.save
-        subject.errors.should eq ["No url."]
+        expect(subject.errors).to eq ["No url."]
       end
     end
   end