thetvdb_api 0.1.2 → 0.2.0

data/lib/thetvdb_api/mappers/update.rb

@@ -0,0 +1,14 @@
+require 'happymapper'
+require 'update/banner'
+require 'update/episode'
+require 'update/series'
+
+class ThetvdbApi::Mappers::Update
+  include HappyMapper
+
+  tag 'Data'
+
+  has_many :series, ThetvdbApi::Mappers::Update::Series, tag: 'Series'
+  has_many :episodes, ThetvdbApi::Mappers::Update::Episode, tag: 'Episode'
+  has_many :banners, ThetvdbApi::Mappers::Update::Banner, tag: 'Banner'
+end

data/lib/thetvdb_api/mappers/update/banner.rb

@@ -0,0 +1,19 @@
+require 'happymapper'
+
+class ThetvdbApi::Mappers::Update
+  class Banner
+    include HappyMapper
+
+    tag 'Banner'
+    element :type, String
+    element :format, String
+    element :series_id, String, tag: 'Series'
+    element :season_num, String, tag: 'SeasonNum'
+    element :language, String
+    element :path, String
+
+    def url
+      path ? "http://thetvdb.com/banners/#{path}" : nil
+    end
+  end
+end

data/lib/thetvdb_api/mappers/update/element.rb

@@ -0,0 +1,10 @@
+require 'happymapper'
+
+class ThetvdbApi::Mappers::Update
+  class Element
+    include HappyMapper
+
+    element :id, Integer
+    element :timestamp, Integer, tag: 'time'
+  end
+end

data/lib/thetvdb_api/mappers/update/episode.rb

@@ -0,0 +1,8 @@
+require 'happymapper'
+require 'thetvdb_api/mappers/update/element'
+
+class ThetvdbApi::Mappers::Update
+  class Episode < ThetvdbApi::Mappers::Update::Element
+    tag 'Episode'
+  end
+end

data/lib/thetvdb_api/mappers/update/series.rb

@@ -0,0 +1,8 @@
+require 'happymapper'
+require 'thetvdb_api/mappers/update/element'
+
+class ThetvdbApi::Mappers::Update
+  class Series < ThetvdbApi::Mappers::Update::Element
+    tag 'Series'
+  end
+end

data/lib/thetvdb_api/response.rb

@@ -0,0 +1,30 @@
+class ThetvdbApi::Response
+  def initialize(faraday_response, mapper = nil)
+    @faraday_response = faraday_response
+    @mapper = mapper
+  end
+
+  def mapper
+    @mapper
+  end
+
+  def env
+    @faraday_response.env
+  end
+
+  def status
+    @faraday_response.status
+  end
+
+  def headers
+    @faraday_response.headers
+  end
+
+  def body
+    @body ||= @mapper ? @mapper.parse(@faraday_response.body) : @faraday_response.body
+  end
+
+  def inspect
+    "<ThetvdbApi::Response body=#{body.inspect}, mapper=#{mapper.inspect}>"
+  end
+end

data/lib/thetvdb_api/search.rb

@@ -1,17 +1,17 @@
 class ThetvdbApi::Search < ThetvdbApi::Base
-  def get_series(name, language = self.language)
-    get('GetSeries.php').params(seriesname: name, language: language).response
+  def get_series(name, options = {})
+    get('GetSeries.php').params({ seriesname: name }.merge(options)).response
   end
 
-  def get_series_by_imdb_id(id, language = self.language)
-    get('GetSeriesByRemoteID.php').params(imdbid: id, language: language).response
+  def get_series_by_imdb_id(id, options = {})
+    get('GetSeriesByRemoteID.php').params({ imdbid: id }.merge(options)).response
   end
 
-  def get_series_by_zap2it_id(id, language = self.language)
-    get('GetSeriesByRemoteID.php').params(zap2it: id, language: language).response
+  def get_series_by_zap2it_id(id, options = {})
+    get('GetSeriesByRemoteID.php').params({ zap2it: id }.merge(options)).response
   end
 
-  def get_episode_by_air_date(series_id, air_date, language = self.language)
-    get('GetEpisodeByAirDate.php').params(seriesid: series_id, airdate: air_date, language: language).response
+  def get_episode(series_id, air_date, options = {})
+    get('GetEpisodeByAirDate.php').params({ seriesid: series_id, airdate: air_date }.merge(options)).response
   end
 end

data/lib/thetvdb_api/series.rb

@@ -1,9 +1,9 @@
 class ThetvdbApi::Series < ThetvdbApi::Base
-  def find(series_id, language = self.language)
-    get("#{series_uri}/{language}.xml").params(series_id: series_id, language: language).response
+  def find(series_id, options = {})
+    get("#{series_uri}/{language}.xml").params({ series_id: series_id }.merge(options)).response
   end
 
-  def find_full(series_id, language = self.language)
-    get("#{series_uri}/all/{language}.xml").params(series_id: series_id, language: language).response
+  def find_full(series_id, options = {})
+    get("#{series_uri}/all/{language}.xml").params({ series_id: series_id }.merge(options)).response
   end
 end

data/lib/thetvdb_api/update.rb

@@ -1,17 +1,51 @@
 class ThetvdbApi::Update < ThetvdbApi::Base
-  def day
-    get('{api_key}/updates/updates_day.xml').response
+  def day(options = {})
+    get(day_path).params(options).response
   end
 
-  def week
-    get('{api_key}/updates/updates_week.xml').response
+  def day_url
+    get(day_path).url
   end
 
-  def month
-    get('{api_key}/updates/updates_month.xml').response
+  def week(options = {})
+    get(week_path).params(options).response
   end
 
-  def all
-    get('{api_key}/updates/updates_all.xml').response
+  def week_url
+    get(week_path).url
+  end
+
+  def month(options = {})
+    get(month_path).params(options).response
+  end
+
+  def month_url
+    get(month_path).url
+  end
+
+  def all(options = {})
+    get(all_path).params(options).response
+  end
+
+  def all_url
+    get(all_path).url
+  end
+
+  private
+
+  def day_path
+    '{api_key}/updates/updates_day.xml'
+  end
+
+  def week_path
+    '{api_key}/updates/updates_week.xml'
+  end
+
+  def month_path
+    '{api_key}/updates/updates_month.xml'
+  end
+
+  def all_path
+    '{api_key}/updates/updates_all.xml'
   end
 end

data/lib/thetvdb_api/version.rb

@@ -1,3 +1,3 @@
 module ThetvdbApi
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/spec/integrations/actor_spec.rb

@@ -6,7 +6,7 @@ describe ThetvdbApi::Actor do
   describe 'real request' do
     describe '.find' do
       it 'should return response class' do
-        model.find('70327').class.should == HTTParty::Response
+        model.find('70327').class.should == ThetvdbApi::Response
       end
     end
   end

data/spec/integrations/banner_spec.rb

@@ -6,7 +6,7 @@ describe ThetvdbApi::Banner do
   describe 'real request' do
     describe '.find' do
       it 'should return response class' do
-        model.find('72449').class.should == HTTParty::Response
+        model.find('72449').class.should == ThetvdbApi::Response
       end
     end
   end

data/spec/integrations/client_spec.rb

@@ -7,25 +7,25 @@ describe ThetvdbApi::Client do
     describe '.search' do
       describe '.get_series' do
         it 'should return response class' do
-          client.search.get_series('buffy').class.should == HTTParty::Response
+          client.search.get_series('buffy').class.should == ThetvdbApi::Response
         end
       end
 
       describe '.get_series_by_imdb_id' do
         it 'should return response class' do
-          client.search.get_series_by_imdb_id('tt0118276').class.should == HTTParty::Response
+          client.search.get_series_by_imdb_id('tt0118276').class.should == ThetvdbApi::Response
         end
       end
 
       describe '.get_series_by_zap2it_id' do
         it 'should return response class' do
-          client.search.get_series_by_zap2it_id('EP00213110').class.should == HTTParty::Response
+          client.search.get_series_by_zap2it_id('EP00213110').class.should == ThetvdbApi::Response
         end
       end
 
-      describe '.get_episode_by_air_date' do
+      describe '.get_episode' do
         it 'should return response class' do
-          client.search.get_episode_by_air_date('70327','1997-03-10').class.should == HTTParty::Response
+          client.search.get_episode('70327','1997-03-10').class.should == ThetvdbApi::Response
         end
       end
     end
@@ -33,13 +33,13 @@ describe ThetvdbApi::Client do
     describe '.series' do
       describe '.find' do
         it 'should return response class' do
-          client.series.find('70327').class.should == HTTParty::Response
+          client.series.find('70327').class.should == ThetvdbApi::Response
         end
       end
 
       describe '.find_full' do
         it 'should return response class' do
-          client.series.find_full('70327').class.should == HTTParty::Response
+          client.series.find_full('70327').class.should == ThetvdbApi::Response
         end
       end
     end
@@ -47,7 +47,7 @@ describe ThetvdbApi::Client do
     describe '.actor' do
       describe '.find' do
         it 'should return response class' do
-          client.actor.find('70327').class.should == HTTParty::Response
+          client.actor.find('70327').class.should == ThetvdbApi::Response
         end
       end
     end
@@ -55,7 +55,7 @@ describe ThetvdbApi::Client do
     describe '.banner' do
       describe '.find' do
         it 'should return response class' do
-          client.banner.find('70327').class.should == HTTParty::Response
+          client.banner.find('70327').class.should == ThetvdbApi::Response
         end
       end
     end
@@ -63,25 +63,25 @@ describe ThetvdbApi::Client do
     describe '.episode' do
       describe '.find_by_default_order' do
         it 'should return response class' do
-          client.episode.find_by_default_order('70327', '1', '1').class.should == HTTParty::Response
+          client.episode.find_by_default_order('70327', '1', '1').class.should == ThetvdbApi::Response
         end
       end
 
       describe '.find_by_dvd_order' do
         it 'should return response class' do
-          client.episode.find_by_dvd_order('70327', '1', '1').class.should == HTTParty::Response
+          client.episode.find_by_dvd_order('70327', '1', '1').class.should == ThetvdbApi::Response
         end
       end
 
       describe '.find_by_absolute_order' do
         it 'should return response class' do
-          client.episode.find_by_absolute_order('70327', '1').class.should == HTTParty::Response
+          client.episode.find_by_absolute_order('70327', '1').class.should == ThetvdbApi::Response
         end
       end
 
       describe '.find' do
         it 'should return response class' do
-          client.episode.find('533011').class.should == HTTParty::Response
+          client.episode.find('533011').class.should == ThetvdbApi::Response
         end
       end
     end
@@ -89,19 +89,19 @@ describe ThetvdbApi::Client do
     describe '.update' do
       describe '.day' do
         it 'should return response class' do
-          client.update.day.class.should == HTTParty::Response
+          client.update.day.class.should == ThetvdbApi::Response
         end
       end
 
       describe '.week' do
         it 'should return response class' do
-          client.update.week.class.should == HTTParty::Response
+          client.update.week.class.should == ThetvdbApi::Response
         end
       end
 
       describe '.month' do
         it 'should return response class' do
-          client.update.month.class.should == HTTParty::Response
+          client.update.month.class.should == ThetvdbApi::Response
         end
       end
     end

data/spec/integrations/episode_spec.rb

@@ -6,25 +6,25 @@ describe ThetvdbApi::Episode do
   describe 'real request' do
     describe '.find_by_default_order' do
       it 'should return response class' do
-        model.find_by_default_order('70327', '1', '1').class.should == HTTParty::Response
+        model.find_by_default_order('70327', '1', '1').class.should == ThetvdbApi::Response
       end
     end
 
     describe '.find_by_dvd_order' do
       it 'should return response class' do
-        model.find_by_dvd_order('70327', '1', '1').class.should == HTTParty::Response
+        model.find_by_dvd_order('70327', '1', '1').class.should == ThetvdbApi::Response
       end
     end
 
     describe '.find_by_absolute_order' do
       it 'should return response class' do
-        model.find_by_absolute_order('70327', '1').class.should == HTTParty::Response
+        model.find_by_absolute_order('70327', '1').class.should == ThetvdbApi::Response
       end
     end
 
     describe '.find' do
       it 'should return response class' do
-        model.find('533011').class.should == HTTParty::Response
+        model.find('533011').class.should == ThetvdbApi::Response
       end
     end
   end

data/spec/integrations/search_spec.rb

@@ -6,25 +6,25 @@ describe ThetvdbApi::Search do
   describe 'real request' do
     describe '.get_series' do
       it 'should return response class' do
-        model.get_series('buffy').class.should == HTTParty::Response
+        model.get_series('buffy').class.should == ThetvdbApi::Response
       end
     end
 
     describe '.get_series_by_imdb_id' do
       it 'should return response class' do
-        model.get_series_by_imdb_id('tt0118276').class.should == HTTParty::Response
+        model.get_series_by_imdb_id('tt0118276').class.should == ThetvdbApi::Response
       end
     end
 
     describe '.get_series_by_zap2it_id' do
       it 'should return response class' do
-        model.get_series_by_zap2it_id('EP00213110').class.should == HTTParty::Response
+        model.get_series_by_zap2it_id('EP00213110').class.should == ThetvdbApi::Response
       end
     end
 
-    describe '.get_episode_by_air_date' do
+    describe '.get_episode' do
       it 'should return response class' do
-        model.get_episode_by_air_date('70327','1997-03-10').class.should == HTTParty::Response
+        model.get_episode('70327', '1997-03-10').class.should == ThetvdbApi::Response
       end
     end
   end

data/spec/integrations/series_spec.rb

@@ -6,13 +6,13 @@ describe ThetvdbApi::Series do
   describe 'real request' do
     describe '.find' do
       it 'should return response class' do
-        model.find('70327').class.should == HTTParty::Response
+        model.find('70327').class.should == ThetvdbApi::Response
       end
     end
 
     describe '.find_full' do
       it 'should return response class' do
-        model.find_full('70327').class.should == HTTParty::Response
+        model.find_full('70327').class.should == ThetvdbApi::Response
       end
     end
   end

data/spec/integrations/update_spec.rb

@@ -6,20 +6,26 @@ describe ThetvdbApi::Update do
   describe 'real request' do
     describe '.day' do
       it 'should return response class' do
-        model.day.class.should == HTTParty::Response
+        model.day.class.should == ThetvdbApi::Response
       end
     end
 
     describe '.week' do
       it 'should return response class' do
-        model.week.class.should == HTTParty::Response
+        model.week.class.should == ThetvdbApi::Response
       end
     end
 
     describe '.month' do
       it 'should return response class' do
-        model.month.class.should == HTTParty::Response
+        model.month.class.should == ThetvdbApi::Response
+      end
+    end
+
+    describe '.all' do
+      it 'should return response class' do
+        model.all.class.should == ThetvdbApi::Response
       end
     end
   end
-end
+end