thetvdb_party 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cf3bf1a43c2e0027e04bf9434f8fb69c9178d66
-  data.tar.gz: 0265a264153e58967a68f17efeb828be92fdf904
+  metadata.gz: fe3a4f17f547c861e87303b8fa3be45e8c6e1a7b
+  data.tar.gz: ae9d09780aa198bf2733df4668e727996b147dab
 SHA512:
-  metadata.gz: fa90db343f77b61d7b28904797d2b32c0dd0e4431d6afaa84a21acbd08e2cea505667884c8fd14c45bdd6262f2017959d6e0fc062d70f9bf4954d5ac92351400
-  data.tar.gz: 69df7b8cdc293b60367a97d5ca98897f10eb7da5ad7c463665ca7c6baf338123537e83ccfcc4fd456db926caac4e95725f1b6e23f70d2dc51c09dbaaef9cb6cd
+  metadata.gz: 5e329d481bc61bd2b5387981f7036ff0b641018970cbb85a9f980ccec6dfad4b1f19060917f0e6c493cb4e0d499faf225434feaa6e0a0731f0840d5d22a4e518
+  data.tar.gz: 2279f2ac4c555f214384278e363b82ee310805208a16144d3b218bbf176c295628a85c26d86b3fd2c86e4a75249cf754431fe0ae4fc4a860749ce7ba3e5aa71c

data/lib/thetvdb_party/all.rb

@@ -12,32 +12,34 @@ module TheTvDbParty
 
     private
     def unzip_file(zip_buffer)
-      @actors = []
-      @banners = []
-
       zip_file = Zip::InputStream.open(StringIO.new(zip_buffer))
 
       while entry = zip_file.get_next_entry
         case entry.name
-          when "en.xml"
-            full_hash = MultiXml.parse(entry.get_input_stream.read)
-            @full_series_record = FullSeriesRecord.new(@client, full_hash["Data"])
           when "actors.xml"
             actors_hash = MultiXml.parse(entry.get_input_stream.read)
 
-            actors_hash["Actors"]["Actor"].each do |a|
-              actors << Actor.new(@client, a)
-            end if actors_hash["Actors"]
+            case actors_hash["Actors"]["Actor"]
+              when Array
+                @actors = actors_hash["Actors"]["Actor"].map { |a| Actor.new(self, a) }
+              when Hash
+                @actors = [Actor.new(self, actors_hash["Actors"]["Actor"])]
+              else
+                @actors = []
+            end if actors_hash && actors_hash["Actors"]
           when "banners.xml"
             banners_hash = MultiXml.parse(entry.get_input_stream.read)
             case banners_hash["Banners"]["Banner"]
               when Array
-                banners_hash["Banners"]["Banner"].map {|s|Banner.new(self, s)}
+                @banners = banners_hash["Banners"]["Banner"].map { |b| Banner.new(self, b) }
               when Hash
-                [Banner.new(self, banners_hash["Banners"]["Banner"])]
+                @banners = [Banner.new(self, banners_hash["Banners"]["Banner"])]
               else
-                []
-            end if banners_hash
+                @banners = []
+            end if banners_hash && banners_hash["Banners"]
+          else
+            full_hash = MultiXml.parse(entry.get_input_stream.read)
+            @full_series_record = FullSeriesRecord.new(@client, full_hash["Data"])
         end
       end
     end

data/lib/thetvdb_party/client.rb

@@ -112,7 +112,8 @@ module TheTvDbParty
     # See Also::    #get_series_season_episode, #get_series_absolute_episode, #get_base_episode_record
     def get_series_dvd_season_episode(seriesid, season_number, episode_number)
       unless @language
-        request_url = "#{@apikey}/series/#{seriesid}/dvd/#{season_number}/#{episode_number}"
+        # DVD requires you to specify language:
+        request_url = "#{@apikey}/series/#{seriesid}/dvd/#{season_number}/#{episode_number}/en.xml"
       else
         request_url = "#{@apikey}/series/#{seriesid}/dvd/#{season_number}/#{episode_number}/#{@language}.xml"
       end
@@ -129,7 +130,8 @@ module TheTvDbParty
     # See Also::    #get_series_season_episode, #get_series_dvd_season_episode, #get_base_episode_record
     def get_series_absolute_episode(seriesid, episode_number)
       unless @language
-        request_url = "#{@apikey}/series/#{seriesid}/absolute/#{episode_number}"
+        # Absolute requires you to specify language:
+        request_url = "#{@apikey}/series/#{seriesid}/absolute/#{episode_number}/en.xml"
       else
         request_url = "#{@apikey}/series/#{seriesid}/absolute/#{episode_number}/#{@language}.xml"
       end

data/lib/thetvdb_party/version.rb

@@ -1,4 +1,4 @@
 module TheTvDbParty
   # The current version of the *thetvdb_party* gem
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/thetvdb_party/update_spec.rb

@@ -0,0 +1,104 @@
+require 'rspec'
+require 'thetvdb_party'
+
+describe 'TheTvDbParty::Update' do
+  it 'should have a client associated with it' do
+    client = TheTvDbParty::Client.new(nil)
+    record = TheTvDbParty::Update.new(client, { },false)
+    expect(record.client).to be_an_instance_of(TheTvDbParty::Client)
+  end
+
+  it 'should have a nil client if constructed with nil' do
+    record = TheTvDbParty::Update.new(nil, { },false)
+    expect(record.client).to be_nil
+  end
+  
+  it 'should read timestamp when passed hashed XML with timestamp (last timestamp format)' do
+    record = TheTvDbParty::Update.new(nil,{"Items"=>{"Time"=>"1432052332"}},false)
+    expect(record.timestamp).to_not be_nil
+    expect(record.timestamp).to eq("1432052332")
+  end
+  it 'should read series when passed hashed XML with series data (last timestamp format)' do
+    record = TheTvDbParty::Update.new(nil,{"Items"=>{"Series"=>["123","234","345"]}},false)
+    expect(record.series).to_not be_nil
+    expect(record.series).to match_array([{:seriesid=>"123",:updatetime=>nil},{:seriesid=>"234",:updatetime=>nil},{:seriesid=>"345",:updatetime=>nil}])
+  end
+  it 'should read episodes when passed hashed XML with series data (last timestamp format)' do
+    record = TheTvDbParty::Update.new(nil,{"Items"=>{"Episode"=>["123","234","345"]}},false)
+    expect(record.episodes).to_not be_nil
+    expect(record.episodes).to match_array([{:episodeid=>"123",:seriesid=>nil,:updatetime=>nil},{:episodeid=>"234",:seriesid=>nil,:updatetime=>nil},{:episodeid=>"345",:seriesid=>nil,:updatetime=>nil}])
+  end
+  it 'should not have data not passed in (last timestamp format)' do
+    record = TheTvDbParty::Update.new(nil,{"Items"=>{"Episode"=>["123","234","345"]}},false)
+    expect(record.series).to be_nil
+    expect(record.timestamp).to be_nil
+    expect(record.banners).to be_nil
+    record = TheTvDbParty::Update.new(nil,{"Items"=>{"Series"=>["123","234","345"]}},false)
+    expect(record.episodes).to be_nil
+    expect(record.timestamp).to be_nil
+    expect(record.banners).to be_nil
+    record = TheTvDbParty::Update.new(nil,{"Items"=>{"Time"=>"1432052332"}},false)
+    expect(record.episodes).to be_nil
+    expect(record.series).to be_nil
+    expect(record.banners).to be_nil
+  end
+  it 'should read timestamp when passed hashed XML with timestamp (timeframe format)' do
+    data = {"Data"=>{"time"=>"1432053001"}}
+    record = TheTvDbParty::Update.new(nil,data,false)
+    expect(record.timestamp).to_not be_nil
+    expect(record.timestamp).to eq("1432053001")
+  end
+  it 'should read series when passed hashed XML with timestamp (timeframe format)' do
+    data = {"Data"=>{"Series"=>[{"id"=>"70328", "time"=>"1431972440"}, {"id"=>"70383", "time"=>"1431973145"}]}}
+    record = TheTvDbParty::Update.new(nil,data,false)
+    expect(record.series).to_not be_nil
+    expect(record.series).to match_array([{:seriesid=>"70328",:updatetime=>"1431972440"},{:seriesid=>"70383",:updatetime=>"1431973145"}])
+  end
+  it 'should read episodes when passed hashed XML with timestamp (timeframe format)' do
+    data = {"Data"=>{"Episode"=>[{"id"=>"5229051", "Series"=>"295317", "time"=>"1431966617"}, {"id"=>"5229389", "Series"=>"285520", "time"=>"1431966652"}]}}
+    record = TheTvDbParty::Update.new(nil,data,false)
+    expect(record.episodes).to_not be_nil
+    expect(record.episodes).to match_array([{:episodeid=>"5229051",:seriesid=>"295317",:updatetime=>"1431966617"},{:episodeid=>"5229389",:seriesid=>"285520",:updatetime=>"1431966652"}])
+  end
+  it 'should read banners when passed hashed XML with timestamp (timeframe format)' do
+    data = {"Data"=>{"Banner"=>[{"SeasonNum"=>"1", "Series"=>"253534", "format"=>"standard", "language"=>"nl", "path"=>"seasons/253534-1-3.jpg", "time"=>"1431987040", "type"=>"season"}, {"Series"=>"294169", "format"=>"1920x1080", "path"=>"fanart/original/294169-4.jpg", "time"=>"1431987428", "type"=>"fanart"}]}}
+    record = TheTvDbParty::Update.new(nil,data,false)
+    expect(record.banners).to_not be_nil
+    expect(record.banners).to match_array([{:path=>"seasons/253534-1-3.jpg",:format=>"standard",:type=>"season",:seriesid=>"253534",:seasonnum=>"1",:language=>"nl",:updatetime=>"1431987040"},
+      {:path=>"fanart/original/294169-4.jpg",:format=>"1920x1080",:type=>"fanart",:seriesid=>"294169",:seasonnum=>nil,:language=>nil,:updatetime=>"1431987428"}])
+  end
+  it 'should not have data not passed in (timeframe format)' do
+    data = {"Data"=>{"time"=>"1432053001"}}
+    record = TheTvDbParty::Update.new(nil,data,false)
+    expect(record.episodes).to be_nil
+    expect(record.series).to be_nil
+    expect(record.banners).to be_nil
+    data = {"Data"=>{"Series"=>[{"id"=>"70328", "time"=>"1431972440"}, {"id"=>"70383", "time"=>"1431973145"}]}}
+    record = TheTvDbParty::Update.new(nil,data,false)
+    expect(record.episodes).to be_nil
+    expect(record.timestamp).to be_nil
+    expect(record.banners).to be_nil
+    data = {"Data"=>{"Episode"=>[{"id"=>"5229051", "Series"=>"295317", "time"=>"1431966617"}, {"id"=>"5229389", "Series"=>"285520", "time"=>"1431966652"}]}}
+    record = TheTvDbParty::Update.new(nil,data,false)
+    expect(record.series).to be_nil
+    expect(record.timestamp).to be_nil
+    expect(record.banners).to be_nil
+    data = {"Data"=>{"Banner"=>[{"SeasonNum"=>"1", "Series"=>"253534", "format"=>"standard", "language"=>"nl", "path"=>"seasons/253534-1-3.jpg", "time"=>"1431987040", "type"=>"season"}, {"Series"=>"294169", "format"=>"1920x1080", "path"=>"fanart/original/294169-4.jpg", "time"=>"1431987428", "type"=>"fanart"}]}}
+    record = TheTvDbParty::Update.new(nil,data,false)
+    expect(record.series).to be_nil
+    expect(record.timestamp).to be_nil
+    expect(record.episodes).to be_nil
+  end
+  ### Unable to get Zipping to work in this test
+  #it 'should read zipped data' do
+  #  Zip::ZipOutputStream::open("my.zip") {
+  #  |io|
+  #
+  #  io.put_next_entry("first_entry.txt")
+  #  io.write "Hello world!"
+  #
+  #  io.put_next_entry("adir/first_entry.txt")
+  #  io.write "Hello again!"
+  #}
+  #end
+end

data/spec/thetvdb_party_spec.rb

@@ -1,6 +1,7 @@
 require 'rspec'
 require 'thetvdb_party'
 
+
 describe 'TheTvDbParty' do
   it 'should find search results' do
     client = TheTvDbParty::Client.new(ENV["TVDB_API_KEY"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thetvdb_party
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Fredrik Høisæther Rasch
@@ -137,6 +137,7 @@ files:
 - spec/thetvdb_party/client_spec.rb
 - spec/thetvdb_party/fullseriesrecord_spec.rb
 - spec/thetvdb_party/searchseriesrecord_spec.rb
+- spec/thetvdb_party/update_spec.rb
 - spec/thetvdb_party_spec.rb
 - thetvdb_party.gemspec
 homepage: https://github.com/couven92/thetvdb_party
@@ -178,5 +179,6 @@ test_files:
 - spec/thetvdb_party/client_spec.rb
 - spec/thetvdb_party/fullseriesrecord_spec.rb
 - spec/thetvdb_party/searchseriesrecord_spec.rb
+- spec/thetvdb_party/update_spec.rb
 - spec/thetvdb_party_spec.rb
 has_rdoc: