giphy 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87256e6a650cf0a1c13f060ed1f206ca47a37270
-  data.tar.gz: 90684779e03569a29694590f9945d355603b69f7
+  metadata.gz: 37034eeefabd1bbeb9bc706ed7d6ddf33b647ed3
+  data.tar.gz: 99a9d9fe92d92c545b1d584e6fd2c06c22e0782d
 SHA512:
-  metadata.gz: 3668a849fcf756b5118a7c6690b14f1e81007e49e4f68eb39c58cdb57d4a3ec9daacdb406dba493aa8b0dd91134cb804490185d544abe51f91659d65a2eda808
-  data.tar.gz: 89c38c5208b7383523ece82c87e5224c14014e7d4c14db67dee4024be2316b422dfbbc106deaa418d2fcb188aa7fa430b404eac9cff354b785d54d1511490863
+  metadata.gz: 53f9d90a4f775e8d8e9e846a11f179d86e94a8230206939f74daba6b3e7794c42031b6f1562bb6de767a39185c517b0fa9237f943dd21f034487a496ced9e5f2
+  data.tar.gz: 8cb649fad8848b1deccb9cc4d984f6581e8950c8271da61a2ced99341aadf428ce62ae8af4019cfa7810880a44f7d3fd6b07440b6913b74756502750b61c9113

data/README.md

@@ -71,7 +71,7 @@ Giphy.favorite('12HoHdqnDxz5NS')
 ````
 Read
 ````ruby
-Giphy.favorites
+Giphy.favorites('absurdnoise', {limit: 50, offset: 25})
 ````
 
 #### Screensaver

data/lib/giphy/client.rb

@@ -25,8 +25,9 @@ module Giphy
       post("/#{id}/favorites")
     end
 
-    def favorites
-      get('/favorites')
+    def favorites(username='', options={})
+      options_hash = {username: username}.merge(options)
+      get('/favorites', options_hash)
     end
 
     def screensaver(tag)

data/lib/giphy/random_gif.rb

@@ -0,0 +1,59 @@
+module Giphy
+  class RandomGif
+    def initialize(hash)
+      @hash = hash
+    end
+
+    def id
+      hash.fetch('id')
+    end
+
+    def url
+      URI(hash.fetch('url'))
+    end
+
+    def image_original_url
+      URI(hash.fetch('image_original_url'))
+    end
+
+    def image_url
+      URI(hash.fetch('image_url'))
+    end
+
+    def image_mp4_url
+      URI(hash.fetch('image_mp4_url'))
+    end
+
+    def image_frames
+      hash.fetch('image_frames')
+    end
+
+    def image_width
+      hash.fetch('image_width')
+    end
+
+    def image_height
+      hash.fetch('image_height')
+    end
+
+    def rating
+      hash.fetch('rating')
+    end
+
+    def username
+      hash.fetch('username')
+    end
+
+    def caption
+      hash.fetch('caption')
+    end
+
+    def tags
+      hash.fetch('tags')
+    end
+
+    private
+
+    attr_reader :hash
+  end
+end

data/lib/giphy/search.rb

@@ -42,7 +42,7 @@ module Giphy
 
     def random
       result = client.random
-      gif.new(result)
+      random_gif.new(result)
     end
 
     def artists
@@ -78,6 +78,10 @@ module Giphy
       Giphy::FavoriteGif
     end
 
+    def random_gif
+      Giphy::RandomGif
+    end
+
     def artist
       Giphy::Artist
     end

data/lib/giphy/version.rb

@@ -1,3 +1,3 @@
 module Giphy
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/spec/giphy/client_spec.rb

@@ -51,9 +51,19 @@ describe Giphy::Client do
   end
 
   describe "#favorites" do
-    it "does a GET on the 'favorites' endpoint" do
-      Giphy::Request.stub(:get).with('/favorites', {}).and_return(api_response)
-      expect(subject.favorites).to eq response
+    context "when no username is passed to it" do
+      it "does a GET on the 'favorites' endpoint with no username" do
+        Giphy::Request.stub(:get).with('/favorites', {username: ''}).and_return(api_response)
+        expect(subject.favorites).to eq response
+      end
+    end
+
+    context "when a username is passed as an argument" do
+      it "does a GET on the 'favorites' endpoint with the username" do
+        username = 'absurdnoise'
+        Giphy::Request.stub(:get).with('/favorites', {username: username}).and_return(api_response)
+        expect(subject.favorites(username)).to eq response
+      end
     end
   end
 

data/spec/giphy/random_gif_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe Giphy::RandomGif do
+  subject { Giphy::RandomGif.new(hash) }
+
+  context "when iniatialized with a valid hash" do
+    let(:hash) do
+      {
+        "type"               => "gif",
+        "id"                 => "SWx6sXuaPhUA0",
+        "url"                => "http://giphy.com/gifs/SWx6sXuaPhUA0",
+        "image_original_url" => "http://s3.amazonaws.com/giphymedia/media/SWx6sXuaPhUA0/giphy.gif",
+        "image_url"          => "http://s3.amazonaws.com/giphymedia/media/SWx6sXuaPhUA0/giphy.gif",
+        "image_mp4_url"      => "http://s3.amazonaws.com/giphymedia/media/SWx6sXuaPhUA0/giphy.mp4",
+        "image_frames"       => "32",
+        "image_width"        => "480",
+        "image_height"       => "200",
+        "rating"             => "g",
+        "username"           => "cheezburger",
+        "caption"            => "hello",
+        "tags"               => [
+                                  "cat",
+                                  "fall",
+                                  "puns",
+                                  "box",
+                                  "caturday"
+                                ]
+      }
+    end
+
+    its(:id)                   { should eq 'SWx6sXuaPhUA0' }
+    its(:url)                  { should eq URI('http://giphy.com/gifs/SWx6sXuaPhUA0') }
+    its(:image_original_url)   { should eq URI('http://s3.amazonaws.com/giphymedia/media/SWx6sXuaPhUA0/giphy.gif') }
+    its(:image_url)            { should eq URI('http://s3.amazonaws.com/giphymedia/media/SWx6sXuaPhUA0/giphy.gif') }
+    its(:image_mp4_url)        { should eq URI('http://s3.amazonaws.com/giphymedia/media/SWx6sXuaPhUA0/giphy.mp4') }
+    its(:image_frames)         { should eq '32' }
+    its(:image_width)          { should eq '480' }
+    its(:image_height)         { should eq '200' }
+    its(:rating)               { should eq 'g' }
+    its(:username)             { should eq 'cheezburger' }
+    its(:caption)              { should eq 'hello' }
+    its(:tags)                 { should eq ['cat', 'fall', 'puns', 'box', 'caturday'] }
+  end
+
+  context "when initialized with an empty/invalid hash" do
+    let(:hash) { {} }
+
+    it { expect{ subject.id }.to raise_error KeyError }
+    it { expect{ subject.url }.to raise_error KeyError }
+    it { expect{ subject.image_original_url }.to raise_error KeyError }
+    it { expect{ subject.image_url }.to raise_error KeyError }
+    it { expect{ subject.image_mp4_url }.to raise_error KeyError }
+    it { expect{ subject.image_frames }.to raise_error KeyError }
+    it { expect{ subject.image_width }.to raise_error KeyError }
+    it { expect{ subject.image_height }.to raise_error KeyError }
+    it { expect{ subject.rating }.to raise_error KeyError }
+    it { expect{ subject.username }.to raise_error KeyError }
+    it { expect{ subject.caption }.to raise_error KeyError }
+    it { expect{ subject.tags }.to raise_error KeyError }
+  end
+end

data/spec/giphy/search_spec.rb

@@ -79,7 +79,7 @@ describe Giphy::Search do
   describe "#random" do
     it "returns a new Gif from the client result" do
       client.stub(random: client_result)
-      Giphy::Gif.stub(:new).with(client_result).and_return(response)
+      Giphy::RandomGif.stub(:new).with(client_result).and_return(response)
       expect(subject.random).to eq response
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: giphy
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Sebastian Sogamoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,6 +124,7 @@ files:
 - lib/giphy/gif_by_id.rb
 - lib/giphy/image.rb
 - lib/giphy/null_image.rb
+- lib/giphy/random_gif.rb
 - lib/giphy/request.rb
 - lib/giphy/response.rb
 - lib/giphy/search.rb
@@ -140,6 +141,7 @@ files:
 - spec/giphy/gif_spec.rb
 - spec/giphy/image_spec.rb
 - spec/giphy/null_image_spec.rb
+- spec/giphy/random_gif_spec.rb
 - spec/giphy/request_spec.rb
 - spec/giphy/response_spec.rb
 - spec/giphy/search_spec.rb
@@ -182,9 +184,11 @@ test_files:
 - spec/giphy/gif_spec.rb
 - spec/giphy/image_spec.rb
 - spec/giphy/null_image_spec.rb
+- spec/giphy/random_gif_spec.rb
 - spec/giphy/request_spec.rb
 - spec/giphy/response_spec.rb
 - spec/giphy/search_spec.rb
 - spec/giphy/special_gif_spec.rb
 - spec/shared_examples/special_gif_contract_spec.rb
 - spec/spec_helper.rb
+has_rdoc: