tvrage_api 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62f7f9d558b9cd8fe834e83c4349bcdf5665d4bf
-  data.tar.gz: 5c079055971ba0d4b341e3099c30c3d09e5d080b
+  metadata.gz: 9cc485fd0b5d0192d75bfd365bc26843cd60ef6b
+  data.tar.gz: 1d30a3840cf19545ab13c8aee5548e84db2115d2
 SHA512:
-  metadata.gz: 54736a76669139e2e0cb92c85d472d5a68978f2a86ab03359a3d6bd957e02c934a91d5d8e7c7c461e59d29c27c411c4575f093ca04af06919a9eb97f9ebeaf6b
-  data.tar.gz: 173775ab0e8a14ae56c73b18744dca37950ff84c632ff249c16b7842134daa90d21a7064a67512fc2ee800b463e1c75e76fee718be02eeff2fff66b36a0d162e
+  metadata.gz: cfbf9c7afdea409cce8bad1f8fb0fe3a7af818ab4ade2daf379baa20dc339d7d672bf2c1f5cf555fb121c1226eddb077b251cdb33713f9d4edd4f5f7f9d52c17
+  data.tar.gz: 06e72ebd87168457edbd8629273517495f6902fa23d267cfae7d544d0253792f355949c84df20fbd79dda2b3a67cbfd95578e55cacf8e7a0377173ce1ee8ea60

data/README.md

@@ -29,25 +29,25 @@ Search show by name:
 
 ```ruby
 client = TvrageApi::Client.new
-client.search.by_name('buffy') # return pure Hash
-client.search.full_by_name('buffy') # return pure Hash
+client.search.by_name('buffy')
+client.search.full_by_name('buffy')
 ```
 
 Search show by id:
 
 ```ruby
 client = TvrageApi::Client.new
-client.show.find('123') # return pure Hash
-client.show.find_full('123') # return pure Hash
-client.show.episodes('123') # return pure Hash, with all episodes
-client.show.episode('123', season, episode) # return pure Hash, with specific episode
+client.show.find('123')
+client.show.find_full('123')
+client.show.episodes('123') # show with all episodes
+client.show.episode('123', season, episode) # show with specific episode
 ```
 
 Search all show ids:
 
 ```ruby
 client = TvrageApi::Client.new
-client.update.all # return pure Hash
+client.update.all
 ```
 
 ## Contributing

data/lib/tvrage_api/base.rb

@@ -2,25 +2,5 @@ require 'httparty'
 
 class TvrageApi::Base
   include HTTParty
-
-  attr_reader :uri, :options
-
-  def get(uri, options = {})
-    @uri = uri
-    @options = options
-
-    self
-  end
-
-  def response
-    response = self.class.get(uri, request_options(options))
-    response.code == 200 ? response.parsed_response : nil
-  end
-
-  def request_options(options = {})
-    {
-      query: options,
-      base_uri: 'http://services.tvrage.com/feeds/'
-    }
-  end
-end
+  base_uri 'http://services.tvrage.com/feeds/'
+end

data/lib/tvrage_api/search.rb

@@ -1,9 +1,9 @@
 class TvrageApi::Search < TvrageApi::Base
   def by_name(name)
-    get('search.php', show: name).response
+    self.class.get('search.php', show: name)
   end
 
   def full_by_name(name)
-    get('full_search.php', show: name).response
+    self.class.get('full_search.php', show: name)
   end
 end

data/lib/tvrage_api/show.rb

@@ -1,17 +1,17 @@
 class TvrageApi::Show < TvrageApi::Base
   def find(id)
-    get('showinfo.php', sid: id).response
+    self.class.get('showinfo.php', sid: id)
   end
 
   def find_full(id)
-    get('full_show_info.php', sid: id).response
+    self.class.get('full_show_info.php', sid: id)
   end
 
   def episodes(show_id)
-    get('episode_list.php', sid: show_id).response
+    self.class.get('episode_list.php', sid: show_id)
   end
 
   def episode(series_id, season, episode)
-    get('episodeinfo.php', sid: series_id, ep: "#{season}x#{episode}").response
+    self.class.get('episodeinfo.php', sid: series_id, ep: "#{season}x#{episode}")
   end
 end

data/lib/tvrage_api/update.rb

@@ -1,5 +1,5 @@
 class TvrageApi::Update < TvrageApi::Base
   def all
-    get('show_list.php').response
+    self.class.get('show_list.php')
   end
 end

data/lib/tvrage_api/version.rb

@@ -1,3 +1,3 @@
 module TvrageApi
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/integrations/client_spec.rb

@@ -6,48 +6,48 @@ describe TvrageApi::Client do
   describe 'real request' do
     describe '.search' do
       describe '.by_name' do
-        it 'should return Hash class' do
-          client.search.by_name('buffy').class.should == Hash
+        it 'should return response class' do
+          client.search.by_name('buffy').class.should == HTTParty::Response
         end
       end
 
       describe '.full_by_name' do
-        it 'should return show class' do
-          client.search.full_by_name('buffy').class.should == Hash
+        it 'should return response class' do
+          client.search.full_by_name('buffy').class.should == HTTParty::Response
         end
       end
     end
 
     describe '.show' do
       describe '.find' do
-        it 'should return Hash class' do
-          client.show.find('2930').class.should == Hash
+        it 'should return response class' do
+          client.show.find('2930').class.should == HTTParty::Response
         end
       end
 
       describe '.find_full' do
-        it 'should return Hash class' do
-          client.show.find_full('2930').class.should == Hash
+        it 'should return response class' do
+          client.show.find_full('2930').class.should == HTTParty::Response
         end
       end
 
       describe '.episodes' do
-        it 'should return show class' do
-          client.show.episodes('2930').class.should == Hash
+        it 'should return response class' do
+          client.show.episodes('2930').class.should == HTTParty::Response
         end
       end
 
       describe '.episode' do
-        it 'should return show class' do
-          client.show.episode('2930', '2',  '4').class.should == Hash
+        it 'should return response class' do
+          client.show.episode('2930', '2',  '4').class.should == HTTParty::Response
         end
       end
     end
 
     describe '.update' do
       describe '.all' do
-        it 'should return Hash class' do
-          client.update.all.class.should == Hash
+        it 'should return response class' do
+          client.update.all.class.should == HTTParty::Response
         end
       end
     end

data/spec/integrations/search_spec.rb

@@ -5,14 +5,14 @@ describe TvrageApi::Search do
 
   describe 'real request' do
     describe '.by_name' do
-      it 'should return Hash class' do
-        model.by_name('buffy').class.should == Hash
+      it 'should return response class' do
+        model.by_name('buffy').class.should == HTTParty::Response
       end
     end
 
     describe '.full_by_name' do
-      it 'should return show class' do
-        model.full_by_name('buffy').class.should == Hash
+      it 'should return response class' do
+        model.full_by_name('buffy').class.should == HTTParty::Response
       end
     end
   end

data/spec/integrations/show_spec.rb

@@ -5,26 +5,26 @@ describe TvrageApi::Show do
 
   describe 'real request' do
     describe '.find' do
-      it 'should return Hash class' do
-        model.find('2930').class.should == Hash
+      it 'should return response class' do
+        model.find('2930').class.should == HTTParty::Response
       end
     end
 
     describe '.find_full' do
-      it 'should return Hash class' do
-        model.find_full('2930').class.should == Hash
+      it 'should return response class' do
+        model.find_full('2930').class.should == HTTParty::Response
       end
     end
 
     describe '.episodes' do
-      it 'should return show class' do
-        model.episodes('2930').class.should == Hash
+      it 'should return response class' do
+        model.episodes('2930').class.should == HTTParty::Response
       end
     end
 
     describe '.episode' do
-      it 'should return show class' do
-        model.episode('2930', '2',  '4').class.should == Hash
+      it 'should return response class' do
+        model.episode('2930', '2',  '4').class.should == HTTParty::Response
       end
     end
   end

data/spec/integrations/update_spec.rb

@@ -5,8 +5,8 @@ describe TvrageApi::Update do
 
   describe 'real request' do
     describe '.all' do
-      it 'should return Hash class' do
-        model.all.class.should == Hash
+      it 'should return response class' do
+        model.all.class.should == HTTParty::Response
       end
     end
   end

data/spec/tvrage_api/client_spec.rb

@@ -1,23 +1,23 @@
 require 'spec_helper'
 
 describe TvrageApi::Client do
-  let(:klass) { TvrageApi::Client }
+  let(:model) { TvrageApi::Client.new }
 
   describe '.search' do
     it 'should return search class' do
-      klass.new.search.class.should == TvrageApi::Search
+      model.search.class.should == TvrageApi::Search
     end
   end
 
   describe '.show' do
     it 'should return show class' do
-      klass.new.show.class.should == TvrageApi::Show
+      model.show.class.should == TvrageApi::Show
     end
   end
 
   describe '.update' do
     it 'should return update class' do
-      klass.new.update.class.should == TvrageApi::Update
+      model.update.class.should == TvrageApi::Update
     end
   end
 end

data/spec/tvrage_api/search_spec.rb

@@ -6,7 +6,7 @@ describe TvrageApi::Search do
 
   describe '#find' do
     it 'should call new with specific params' do
-      model.should_receive(:get).with('search.php', show: 'buffy').and_return(double(response: true))
+      klass.should_receive(:get).with('search.php', show: 'buffy')
 
       model.by_name('buffy')
     end
@@ -14,7 +14,7 @@ describe TvrageApi::Search do
 
   describe '#find_full' do
     it 'should call new with specific params' do
-      model.should_receive(:get).with('full_search.php', show: 'buffy').and_return(double(response: true))
+      klass.should_receive(:get).with('full_search.php', show: 'buffy')
 
       model.full_by_name('buffy')
     end

data/spec/tvrage_api/show_spec.rb

@@ -6,7 +6,7 @@ describe TvrageApi::Show do
 
   describe '#find' do
     it 'should call new with specific params' do
-      model.should_receive(:get).with('showinfo.php', sid: 123).and_return(double(response: true))
+      klass.should_receive(:get).with('showinfo.php', sid: 123)
 
       model.find(123)
     end
@@ -14,7 +14,7 @@ describe TvrageApi::Show do
 
   describe '#find_full' do
     it 'should call new with specific params' do
-      model.should_receive(:get).with('full_show_info.php', sid: 123).and_return(double(response: true))
+      klass.should_receive(:get).with('full_show_info.php', sid: 123)
 
       model.find_full(123)
     end
@@ -22,7 +22,7 @@ describe TvrageApi::Show do
 
   describe '#episodes' do
     it 'should call new with specific params' do
-      model.should_receive(:get).with('episode_list.php', sid: 123).and_return(double(response: true))
+      klass.should_receive(:get).with('episode_list.php', sid: 123)
 
       model.episodes(123)
     end
@@ -30,7 +30,7 @@ describe TvrageApi::Show do
 
   describe '#episode' do
     it 'should call new with specific params' do
-      model.should_receive(:get).with('episodeinfo.php', sid: 123, ep: '1x2').and_return(double(response: true))
+      klass.should_receive(:get).with('episodeinfo.php', sid: 123, ep: '1x2')
 
       model.episode(123, 1, 2)
     end

data/spec/tvrage_api/update_spec.rb

@@ -6,7 +6,7 @@ describe TvrageApi::Update do
 
   describe '#all' do
     it 'should call new with specific params' do
-      model.should_receive(:get).with('show_list.php').and_return(double(response: true))
+      klass.should_receive(:get).with('show_list.php')
 
       model.all
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tvrage_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Krzysztof Wawer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -105,7 +105,6 @@ files:
 - spec/integrations/show_spec.rb
 - spec/integrations/update_spec.rb
 - spec/spec_helper.rb
-- spec/tvrage_api/base_spec.rb
 - spec/tvrage_api/client_spec.rb
 - spec/tvrage_api/search_spec.rb
 - spec/tvrage_api/show_spec.rb
@@ -141,7 +140,6 @@ test_files:
 - spec/integrations/show_spec.rb
 - spec/integrations/update_spec.rb
 - spec/spec_helper.rb
-- spec/tvrage_api/base_spec.rb
 - spec/tvrage_api/client_spec.rb
 - spec/tvrage_api/search_spec.rb
 - spec/tvrage_api/show_spec.rb

data/spec/tvrage_api/base_spec.rb

@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-class ExampleRequestClass < TvrageApi::Base
-end
-
-describe TvrageApi::Base do
-  let(:klass) { ExampleRequestClass }
-  let(:model) { klass.new }
-
-  describe '.get' do
-    it 'should set uri' do
-      model.get('http://example.com')
-
-      model.uri.should == 'http://example.com'
-    end
-
-    it 'should set options' do
-      model.get('http://example.com', sample_options: true)
-
-      model.options.should == { sample_options: true }
-    end
-
-    it 'should return self' do
-      model.get('http://example.com').should == model
-    end
-  end
-
-  describe '.response' do
-    it 'should call get klass method' do
-      klass.should_receive(:get).and_return(double(code: 200, parsed_response: {}))
-      model.stub(:request_options).and_return({})
-
-      model.response
-    end
-
-    it 'should return Hash' do
-      klass.should_receive(:get).and_return(double(code: 200, parsed_response: {}))
-      model.stub(:request_options).and_return({})
-
-      model.response.class.should == Hash
-    end
-
-    it 'should return nil' do
-      klass.should_receive(:get).and_return(double(code: 400))
-      model.stub(:request_options).and_return({})
-
-      model.response.should be_nil
-    end
-  end
-
-  describe '.request_options' do
-    it 'should return correct keys' do
-      model.request_options.keys.sort.should == [:query, :base_uri].sort
-    end
-  end
-end