kippt 3.0.1 → 3.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDBhNjllZmQzYTU0ZTc2NzBhYjU5NWFiYzE0MTczYTBkZTM2MjM3Zg==
-  data.tar.gz: !binary |-
-    Y2JmNmVjOTc5MTNmNTg2Y2U4NGEzNGFmY2Y5MjQxNWU0MjAzNDc2YQ==
+SHA1:
+  metadata.gz: 80e2fac4be245de12f3fee8ded602b664f8835c6
+  data.tar.gz: 45c5189f649696dfc64549e52f0814e613808923
 SHA512:
-  metadata.gz: !binary |-
-    NTI0MGU2YzFlOGFhNDAxNzFiYjc1YTE2OWQ2MDljMDJlOTNkNmNiNDYyNjc5
-    OGY4ZTYxOTYwYjE4OTk5MDRkYTA0M2E5ZjhmYTdjZWZjN2EzODdlZTgwYzY5
-    NzdhYWM2ZDJlMDI2YjQzYzJhOGI3NDc2MWE5M2Y5ZDQ0Yjg0OWI=
-  data.tar.gz: !binary |-
-    MGYzMTJjZTVkNDk3NjE5ZTlkZTQxMmJkOTU3M2I2NzlmNTM0MTJkOTIzZmNj
-    ZGY1MmViMTQ2MGE3ZGIxM2VmOGZlMjI5MzA4ZGY0OWZkNjdiYWYwYjhjYzIw
-    Mjg1N2YzZTU3NzZlZGM3MmMwMmQ5NDk0YTY5Y2ExOGIzNmI4YTM=
+  metadata.gz: 4ad46f521ca0a8d113d48cbd58126e236035f0487001e1c8635ad24f253fac6a77156af82c3b9dd8ac0deadc15d7066be76cb9f36e4e78de489bb60d74776f1c
+  data.tar.gz: aca191768fb9801d485f101ea781ceb84c85cff81cc5ec45a2510c3d32884cce984ac4afadcfd9c25139c31bc5d351609f737383fa3d7a465746568a8a706dab

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.1 / July 31, 2015
+
+Fixes bug with fetching next & previous page of clips.
+
+Updates RSpec to >= 3.0 and updates the test syntax to use the `expect`-style.
+
 ## 3.0 / December 23, 2013
 
 Changes all fetching to paginated HTTP endpoints to return a proxy so that you can control

data/kippt.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "faraday_middleware", "~> 0.8"
   gem.add_dependency "multi_json", "~> 1.3"
 
-  gem.add_development_dependency "rspec", "~> 2.9"
+  gem.add_development_dependency "rspec", "~> 3.0"
   gem.add_development_dependency "webmock", "~> 1.11"
   gem.add_development_dependency "simplecov", "~> 0.7"
 end

data/lib/kippt/collection.rb

@@ -37,7 +37,7 @@ module Kippt::Collection
   def next_page
     raise Kippt::APIError.new("There is no next page") if @next.nil? || @next == ""
 
-    collection_resource.collection_from_url(@next)
+    collection_resource_from_url(@next).fetch
   end
 
   def previous_page?
@@ -48,14 +48,14 @@ module Kippt::Collection
   def previous_page
     raise Kippt::APIError.new("There is no previous page") if @previous.nil? || @previous == ""
 
-    collection_resource.collection_from_url(@previous)
+    collection_resource_from_url(@previous).fetch
   end
   alias_method :prev_page, :previous_page
 
   private
 
-  def collection_resource
-    @collection_resource ||= client.collection_resource_for(collection_resource_class)
+  def collection_resource_from_url(url)
+    client.collection_resource_for(collection_resource_class, url)
   end
 
   def client

data/lib/kippt/read_collection_resource.rb

@@ -24,12 +24,6 @@ module Kippt::ReadCollectionResource
 
   alias find []
 
-  def collection_from_url(url)
-    raise ArgumentError.new("The parameter URL can't be blank") if url.nil? || url == ""
-
-    collection_class.new(client.get(url).body, client)
-  end
-
   private
 
   def validate_collection_options(options)

data/lib/kippt/version.rb

@@ -1,3 +1,3 @@
 module Kippt
-  VERSION = "3.0.1"
+  VERSION = "3.1.0"
 end

data/spec/kippt/client_spec.rb

@@ -30,7 +30,7 @@ describe Kippt::Client do
     context "when debug is set to true" do
       it "sets client to debug mode" do
         client = Kippt::Client.new(:unauthenticated => true, :debug => true)
-        client.debug?.should be_true
+        expect(client.debug?).to be_truthy
       end
     end
   end
@@ -38,9 +38,9 @@ describe Kippt::Client do
   context "#debug" do
     it "can be set and read" do
       client = Kippt::Client.new(:unauthenticated => true)
-      client.debug?.should be_false
+      expect(client.debug?).to be_falsey
       client.debug = true
-      client.debug?.should be_true
+      expect(client.debug?).to be_truthy
     end
   end
 
@@ -84,17 +84,17 @@ describe Kippt::Client do
     subject { Kippt::Client.new(:username => "bob", :password => "secret") }
 
     it "returns a Kippt::User instance" do
-      subject.should_receive(:get).with("account").and_return(
-        stub :body => {}
+      expect(subject).to receive(:get).with("account").and_return(
+        double :body => {}
       )
       account = subject.account
-      account.should be_a(Kippt::User)
+      expect(account).to be_a(Kippt::User)
     end
 
     context "when asked for api token" do
       it "asks for the token from the server" do
-        subject.should_receive(:get).with("account?include_data=api_token").and_return(
-          stub :body => {}
+        expect(subject).to receive(:get).with("account?include_data=api_token").and_return(
+          double :body => {}
         )
         account = subject.account(true)
       end
@@ -106,7 +106,7 @@ describe Kippt::Client do
 
     it "returns a Kippt::Lists instance" do
       lists = subject.lists
-      lists.should be_a(Kippt::Lists)
+      expect(lists).to be_a(Kippt::Lists)
     end
   end
 
@@ -115,7 +115,7 @@ describe Kippt::Client do
 
     it "returns a Kippt::RootClips instance" do
       clips = subject.clips
-      clips.should be_a(Kippt::RootClips)
+      expect(clips).to be_a(Kippt::RootClips)
     end
   end
 
@@ -124,7 +124,7 @@ describe Kippt::Client do
 
     it "returns a Kippt::Users instance" do
       users = subject.users
-      users.should be_a(Kippt::Users)
+      expect(users).to be_a(Kippt::Users)
     end
   end
 
@@ -132,12 +132,12 @@ describe Kippt::Client do
     subject { Kippt::Client.new(valid_user_credentials) }
 
     it "returns instance of the resource class" do
-      subject.collection_resource_for(Kippt::Users).should be_a(Kippt::Users)
+      expect(subject.collection_resource_for(Kippt::Users)).to be_a(Kippt::Users)
     end
 
     it "passes itself and the passed arguments as parameters" do
       resource_class = double :resource
-      resource_class.should_receive(:new).with(subject, :option1, :option2)
+      expect(resource_class).to receive(:new).with(subject, :option1, :option2)
       subject.collection_resource_for(resource_class, :option1, :option2)
     end
   end
@@ -149,16 +149,16 @@ describe Kippt::Client do
       stub_get("/users/10").
         to_return(:status => 200, :body => fixture("user.json"))
       resource = subject.resource_from_url(Kippt::User, "/api/users/10")
-      resource.should be_a(Kippt::User)
+      expect(resource).to be_a(Kippt::User)
     end
 
     context "when passed URL is blank" do
       it "raises ArgumentError" do
         expect {
-          subject.resource_from_url(stub, "")
+          subject.resource_from_url(double, "")
         }.to raise_error(ArgumentError, "The parameter URL can't be blank")
         expect {
-          subject.resource_from_url(stub, nil)
+          subject.resource_from_url(double, nil)
         }.to raise_error(ArgumentError, "The parameter URL can't be blank")
       end
     end

data/spec/kippt/clip_collection_spec.rb

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

data/spec/kippt/clip_spec.rb

@@ -23,7 +23,7 @@ describe Kippt::Clip do
       let(:data) { {"list" => "/api/lists/44525/"} }
 
       it "returns the URI" do
-        subject.list_uri.should eq "/api/lists/44525/"
+        expect(subject.list_uri).to eq "/api/lists/44525/"
       end
     end
 
@@ -31,7 +31,7 @@ describe Kippt::Clip do
       let(:data) { {"list" => {"resource_uri" => "/api/lists/44525/"}} }
 
       it "returns the uri of the embedded list" do
-        subject.list_uri.should eq "/api/lists/44525/"
+        expect(subject.list_uri).to eq "/api/lists/44525/"
       end
     end
   end
@@ -44,7 +44,7 @@ describe Kippt::Clip do
         stub_get("/lists/44525/").
           to_return(:status => 200, :body => fixture("list.json"))
 
-        subject.list.should be_a Kippt::List
+        expect(subject.list).to be_a Kippt::List
       end
     end
 
@@ -52,7 +52,7 @@ describe Kippt::Clip do
       let(:data) { {"list" => {"resource_uri" => "/api/lists/44525/"}} }
 
       it "returns an instance using the embedded list" do
-        subject.list.should be_a Kippt::List
+        expect(subject.list).to be_a Kippt::List
       end
     end
 
@@ -61,18 +61,18 @@ describe Kippt::Clip do
       let(:data) { {"list" => list} }
 
       it "returns the passed list" do
-        subject.list.should eq list
+        expect(subject.list).to eq list
       end
     end
   end
 
   describe "#comments" do
     it "returns Kippt::Comments" do
-      subject.comments.should be_a Kippt::Comments
+      expect(subject.comments).to be_a Kippt::Comments
     end
 
     it "returns object where clip is set" do
-      subject.comments.clip.should eq subject
+      expect(subject.comments.clip).to eq subject
     end
   end
 
@@ -83,7 +83,7 @@ describe Kippt::Clip do
       }} }
 
       it "returns true" do
-        subject.all_comments_embedded?.should be_true
+        expect(subject.all_comments_embedded?).to be_truthy
       end
     end
 
@@ -93,18 +93,18 @@ describe Kippt::Clip do
       }} }
 
       it "returns false" do
-        subject.all_comments_embedded?.should be_false
+        expect(subject.all_comments_embedded?).to be_falsey
       end
     end
   end
 
   describe "#likes" do
     it "returns Kippt::ClipLikes" do
-      subject.likes.should be_a Kippt::ClipLikes
+      expect(subject.likes).to be_a Kippt::ClipLikes
     end
 
     it "returns object where clip is set" do
-      subject.likes.clip.should eq subject
+      expect(subject.likes.clip).to eq subject
     end
   end
 
@@ -115,7 +115,7 @@ describe Kippt::Clip do
       }} }
 
       it "returns true" do
-        subject.all_likes_embedded?.should be_true
+        expect(subject.all_likes_embedded?).to be_truthy
       end
     end
 
@@ -125,81 +125,81 @@ describe Kippt::Clip do
       }} }
 
       it "returns false" do
-        subject.all_likes_embedded?.should be_false
+        expect(subject.all_likes_embedded?).to be_falsey
       end
     end
   end
 
   describe "#likes_count" do
     it "returns the likes count from the response" do
-      subject.likes_count.should eq 0
+      expect(subject.likes_count).to eq 0
     end
   end
 
   describe "#likes_data" do
     it "returns the likes data from the response" do
-      subject.likes_data.should eq []
+      expect(subject.likes_data).to eq []
     end
   end
 
   describe "#saves" do
     it "returns Kippt::Saves" do
-      subject.saves.should be_a Kippt::Saves
+      expect(subject.saves).to be_a Kippt::Saves
     end
 
     it "returns object where clip is set" do
-      subject.saves.clip.should eq subject
+      expect(subject.saves.clip).to eq subject
     end
   end
 
   describe "#saves_count" do
     it "returns the saves count from the response" do
-      subject.saves_count.should eq 0
+      expect(subject.saves_count).to eq 0
     end
   end
 
   describe "#saves_data" do
     it "returns the saves data from the response" do
-      subject.saves_data.should eq []
+      expect(subject.saves_data).to eq []
     end
   end
 
   describe "#like" do
-    let(:like) { stub :like }
+    let(:like) { double :like }
 
     it "instantiates a Kippt::Like and saves it" do
-      Kippt::Like.should_receive(:new).with(subject, client).and_return(like)
-      like.should_receive(:save)
+      expect(Kippt::Like).to receive(:new).with(subject, client).and_return(like)
+      expect(like).to receive(:save)
       subject.like
     end
   end
 
   describe "#unlike" do
-    let(:like) { stub :like }
+    let(:like) { double :like }
 
     it "instantiates a Kippt::Like and destroys it" do
-      Kippt::Like.should_receive(:new).with(subject, client).and_return(like)
-      like.should_receive(:destroy)
+      expect(Kippt::Like).to receive(:new).with(subject, client).and_return(like)
+      expect(like).to receive(:destroy)
       subject.unlike
     end
   end
 
   describe "#favorite" do
-    let(:favorite) { stub :favorite }
+    let(:favorite) { double :favorite }
 
     it "instantiates a Kippt::Favorite and saves it" do
-      Kippt::Favorite.should_receive(:new).with(subject, client).and_return(favorite)
-      favorite.should_receive(:save)
+      expect(Kippt::Favorite).to receive(:new).with(subject, client).and_return(favorite)
+      expect(favorite).to receive(:save)
       subject.favorite
     end
   end
 
   describe "#unlike" do
-    let(:favorite) { stub :favorite }
+    let(:favorite) { double :favorite }
 
     it "instantiates a Kippt::Favorite and destroys it" do
-      Kippt::Favorite.should_receive(:new).with(subject, client).and_return(favorite)
-      favorite.should_receive(:destroy)
+      expect(Kippt::Favorite).to receive(:new).with(subject, client).and_return(favorite)
+      expect(favorite).to receive(:destroy)
       subject.unfavorite
     end
   end

data/spec/kippt/clips_spec.rb

@@ -14,11 +14,11 @@ describe Kippt::Clips 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
@@ -28,8 +28,8 @@ describe Kippt::Clips do
 
     it "returns Clips" do
       feed = subject.feed
-      feed.should be_a Kippt::Clips
-      feed.base_uri.should eq "clips/feed"
+      expect(feed).to be_a Kippt::Clips
+      expect(feed.base_uri).to eq "clips/feed"
     end
   end
 
@@ -38,8 +38,8 @@ describe Kippt::Clips do
 
     it "returns Clips" do
       feed = subject.favorites
-      feed.should be_a Kippt::Clips
-      feed.base_uri.should eq "clips/favorites"
+      expect(feed).to be_a Kippt::Clips
+      expect(feed.base_uri).to eq "clips/favorites"
     end
   end
 
@@ -66,9 +66,9 @@ describe Kippt::Clips 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
@@ -78,7 +78,7 @@ describe Kippt::Clips do
       stub_get("/search/clips?q=bunny").
         to_return(:status => 200, :body => fixture("clips.json"))
       clips = subject.search("bunny")
-      clips.should be_a Kippt::ClipCollection
+      expect(clips).to be_a Kippt::ClipCollection
     end
   end
 
@@ -93,7 +93,7 @@ describe Kippt::Clips do
 
         clip = Kippt::Clip.new(:url => "http://kiskolabs.com")
         response = subject.save_resource(clip)
-        response[:success].should be_true
+        expect(response[:success]).to be_truthy
       end
     end
 
@@ -105,8 +105,8 @@ describe Kippt::Clips do
 
         clip = Kippt::Clip.new(:url => "http://kiskolabs.com")
         response = subject.save_resource(clip)
-        response.success?.should be_false
-        response[:error_message].should eq "No good."
+        expect(response.success?).to be_falsey
+        expect(response[:error_message]).to eq "No good."
       end
     end
 
@@ -142,7 +142,7 @@ describe Kippt::Clips do
          to_return(:status => 200, :headers => {})
 
         clip = Kippt::Clip.new(:id => 100)
-        subject.destroy_resource(clip).should be_true
+        expect(subject.destroy_resource(clip)).to be_truthy
       end
     end
   end