viki 1.0.3 → 1.1.0

data/.gitignore

@@ -8,3 +8,4 @@ pkg/*
 .idea/
 fixtures/
 spec_config.rb
+bundler_stubs/

data/lib/viki/client.rb

@@ -7,11 +7,13 @@ require 'multi_json'
 module Viki
   class Client
     include Viki::Transport
+    HOST = "http://www.viki.com"
 
-    def initialize(client_id, client_secret)
+    def initialize(client_id, client_secret, host = nil)
+      @host = host || HOST
       @client_id = client_id
       @client_secret = client_secret
-      @access_token = auth_request(client_id, client_secret)
+      @access_token = auth_request(client_id, client_secret, @host)
     end
 
     attr_reader :access_token
@@ -21,7 +23,8 @@ module Viki
        raise NoMethodError if not URL_NAMESPACES.include? name
        Viki::Request.new({client_id: @client_id,
                           client_secret: @client_secret,
-                          access_token: @access_token}, name, *args)
+                          access_token: @access_token,
+                          host: @host}, name, *args)
     end
 
   end

data/lib/viki/request.rb

@@ -4,6 +4,7 @@ module Viki
       @access_token = auth_data[:access_token]
       @client_id = auth_data[:client_id]
       @client_secret = auth_data[:client_secret]
+      @host = auth_data[:host] 
 
       build_call_chain(name, *args)
     end
@@ -14,11 +15,11 @@ module Viki
 
     def get
       current_chain = @call_chain
-      request(current_chain)
+      request(current_chain, @host)
     end
 
     def reset_access_token
-      @access_token = auth_request(@client_id, @client_secret)
+      @access_token = auth_request(@client_id, @client_secret, @host)
     end
 
     def url

data/lib/viki/transport.rb

@@ -8,23 +8,23 @@ module Viki
     include Viki::Utilities
 
     private
-    HOST = "http://www.viki.com/api/v3/"
 
-    def auth_request(client_id, client_secret)
+    def auth_request(client_id, client_secret, host)
+      endpoint = host + '/oauth/token'
       params = {
         :grant_type => 'client_credentials',
         :client_id => client_id,
         :client_secret => client_secret
       }
-      response = HTTParty.post('http://viki.com/oauth/token', query: params)
+      response = HTTParty.post(endpoint, query: params)
       json = MultiJson.load(response.body)
       raise Viki::Error.new(response.header.code, json["error_description"]) if response.header.code != "200"
       json["access_token"]
     end
 
-    def request(call_chain)
+    def request(call_chain, host)
       path, params = build_url(call_chain)
-      request_url = HOST + path.chop + ".json"
+      request_url = host + "/api/v3/" + path.chop + ".json"
 
       response = HTTParty.get(request_url, :query => params)
 

data/lib/viki/version.rb

@@ -1,3 +1,3 @@
 module Viki
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/lib/viki.rb

@@ -9,8 +9,8 @@ module Viki
   # Alias for viki::Client.new
   #
   # @return {viki::Client})
-  def self.new(client_id, client_secret)
-    Viki::Client.new(client_id, client_secret)
+  def self.new(client_id, client_secret, host = nil)
+    Viki::Client.new(client_id, client_secret, host)
   end
 
 end

data/spec/lib/client_spec.rb

@@ -1,14 +1,13 @@
 require 'spec_helper'
 
 describe Viki::Client do
+  before { Viki::Client.any_instance.stub(:auth_request) }
 
-  describe "method delegation" do
-    before { Viki::Client.any_instance.stub(:auth_request) }
-
-    def client
-      Viki::Client.new('chickenrice', 'soronerychickenrice')
-    end
+  def client(domain = nil)
+    domain ? Viki::Client.new('foo', 'bar', host=domain) : Viki::Client.new('foo', 'bar')
+  end
 
+  describe "method delegation" do
     it "should raise NoMethodError error if part of the call chain is not part of the URL_NAMESPACES list" do
       expect { client.methodwrong.subtitles('en') }.to raise_error(NoMethodError)
     end
@@ -17,4 +16,14 @@ describe Viki::Client do
       client.movies(1234).should be_an_instance_of(Viki::Request)
     end
   end
+
+  describe "API host toggling" do
+    it "should set host to http://www.viki.com when no domain parameter is set" do
+      client.instance_variable_get(:@host).should == 'http://www.viki.com'
+    end
+
+    it "should set host to custom host if domain parameter is set" do
+      client(host = "http://test.com").instance_variable_get(:@host).should == 'http://test.com'
+    end
+  end
 end

data/spec/lib/request_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Viki::Request do
+  DEFAULT_HOST = "http://www.viki.com"
+
   before do
     Viki::Client.any_instance.stub(:auth_request)
   end
@@ -13,13 +15,13 @@ describe Viki::Request do
     it "should perform a request to the right url given a call chain" do
       req = client.movies(1234).subtitles('en')
       req.should_receive(:request).with([{ :name => :movies, :resource => 1234 },
-                                             { :name => :subtitles, :resource => "en" }])
+                                             { :name => :subtitles, :resource => "en" }], DEFAULT_HOST)
       req.get
     end
 
     it "should perform a request with the right params given a call chain" do
       req = client.movies(1234, { genre: 2 })
-      req.should_receive(:request).with([{ :name => :movies, :resource => 1234, :params => { genre: 2 } }])
+      req.should_receive(:request).with([{ :name => :movies, :resource => 1234, :params => { genre: 2 } }], DEFAULT_HOST)
       req.get
     end
 

data/spec/requests/request_integration_spec.rb

@@ -40,14 +40,6 @@ describe "Viki" do
             end
           end
         end
-
-        it "should raise an error when platform parameter is given without watchable_in" do
-          VCR.use_cassette "movie/platform_filter_error" do
-            query_options.merge!({ :platform => 'mobile' })
-            lambda { results }.should raise_error(Viki::Error,
-                                                  "Require watchable_in parameter when given platform parameter")
-          end
-        end
       end
 
       describe "/movies/:id" do
@@ -93,9 +85,13 @@ describe "Viki" do
         it "should return a list of video qualities with links to hardsubbed videos" do
           VCR.use_cassette "movies/hardsubs" do
             response = client.movies(64135).hardsubs.get
-            response.count.should == 1
+            response.count.should_not == 1
             hardsubs = response.content
-            hardsubs["res-240p"].should_not be_empty
+            hardsubs.each do |h|
+              h["language_code"].should_not be_empty
+              h["resolution"].should_not be_empty
+              h["url"].should_not be_empty
+            end
           end
         end
       end
@@ -122,7 +118,7 @@ describe "Viki" do
     end
 
     describe "when HTTP timeout" do
-      before { stub_request(:any, /www.viki.com/).to_return(:status => [408]) }
+      before { stub_request(:get, /www.viki.com/).to_return(:status => [408]) }
       it "should handle timeout gracefully" do
         expect { client.movies.get }.should raise_error(Viki::Error, "Timeout error")
       end
@@ -210,5 +206,31 @@ describe "Viki" do
         results.should be_instance_of(Viki::APIObject)
       end
     end
+
+    describe "Custom Domain" do
+      let(:vikiping_client_id) { "4bd5edd4ba26ac2f3ad9d204dc6359ea8a3ebe2c95b6bc1a9195c0ce5c57d392"} 
+      let(:vikiping_client_secret) { "f3b796a1eb6e06458a502a89171a494a9160775ed4f4e9e0008c638f7e7e7d38" }
+      let(:custom_client) do
+        VCR.use_cassette "custom_auth" do  
+          Viki.new(vikiping_client_id, vikiping_client_secret, 'http://www.vikiping.com')
+        end
+      end
+
+      context "when initialized with a domain parameter" do
+        it "should contact the custom domain" do
+          stub_request(:get, /www.vikiping.com/).to_return(:body => '{"success": "custom"}')
+          results = custom_client.movies.get
+          results.content['success'].should == 'custom'
+        end
+      end
+
+      context "when not initialized with a domain parameter" do
+        it "should contact the default domain" do
+          stub_request(:get, /www.viki.com/).to_return(:body => '{"success": "default"}')
+          results = client.movies.get
+          results.content['success'].should == 'default'
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: viki
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec