tvdb_party 0.6.0 → 0.6.1

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'rake/dsl_definition'
 require 'rake'
 
 begin

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/tvdb_party/episode.rb

@@ -1,8 +1,10 @@
 module TvdbParty
   class Episode
+    attr_reader :client
     attr_accessor :id, :season_number, :number, :name, :overview, :air_date, :thumb, :guest_stars, :director, :writer
-
-    def initialize(options={})
+    
+    def initialize(client, options={})
+      @client = client
       @id = options["id"]
       @season_number = options["SeasonNumber"]
       @number = options["EpisodeNumber"]
@@ -11,7 +13,7 @@ module TvdbParty
       @thumb = "http://thetvdb.com/banners/" + options["filename"] if options["filename"].to_s != ""
       @director = options["Director"]
       @writer = options["Writer"]
-
+      @series_id = options["seriesid"]
       if options["GuestStars"]
         @guest_stars = options["GuestStars"][1..-1].split("|")
       else
@@ -24,5 +26,9 @@ module TvdbParty
         puts 'invalid date'
       end
     end
+    
+    def series
+      client.get_series_by_id(@series_id)
+    end
   end
 end

data/lib/tvdb_party/httparty_icebox.rb

@@ -207,11 +207,11 @@ module HTTParty #:nodoc:
         end
         def set(key, value)
           Cache.logger.info("Cache: set (#{key})")
-          File.open( @path.join(key), 'w' ) { |file| file << Marshal.dump(value)  }
+          File.open( @path.join(key), 'w' ) { |file| Marshal.dump(value, file) }
           true
         end
         def get(key)
-          data = Marshal.load(File.read( @path.join(key)))
+          data = Marshal.load(File.new(@path.join(key)))
           Cache.logger.info("Cache: #{data.nil? ? "miss" : "hit"} (#{key})")
           data
         end

data/lib/tvdb_party/search.rb

@@ -4,18 +4,18 @@ module TvdbParty
     include HTTParty::Icebox
     attr_accessor :language
     cache :store => 'file', :timeout => 120, :location => Dir.tmpdir
-    
+
     base_uri 'www.thetvdb.com/api'
 
     def initialize(the_api_key, language = 'en')
       @api_key = the_api_key
       @language = language
     end
-    
+
     def search(series_name)
       response = self.class.get("/GetSeries.php", {:query => {:seriesname => series_name, :language => @language}}).parsed_response
       return [] unless response["Data"]
-      
+
       case response["Data"]["Series"]
       when Array
         response["Data"]["Series"]
@@ -28,22 +28,45 @@ module TvdbParty
 
     def get_series_by_id(series_id, language = self.language)
       response = self.class.get("/#{@api_key}/series/#{series_id}/#{language}.xml").parsed_response
+
       if response["Data"] && response["Data"]["Series"]
         Series.new(self, response["Data"]["Series"])
       else
         nil
       end
     end
+
+    def get_episode_by_id(episode_id, language = self.language)
+      response = self.class.get("/#{@api_key}/episodes/#{episode_id}/#{language}.xml").parsed_response
+      if response["Data"] && response["Data"]["Episode"]
+        Episode.new(self, response["Data"]["Episode"])
+      else
+        nil
+      end
+    end
     
     def get_episode(series, season_number, episode_number, language = self.language)
       response = self.class.get("/#{@api_key}/series/#{series.id}/default/#{season_number}/#{episode_number}/#{language}.xml").parsed_response
       if response["Data"] && response["Data"]["Episode"]
-        Episode.new(response["Data"]["Episode"])
+        Episode.new(self, response["Data"]["Episode"])
       else
         nil
       end
     end
 
+    def get_all_episodes(series, language = self.language)
+      response = self.class.get("/#{@api_key}/series/#{series.id}/all/#{language}.xml").parsed_response
+      return [] unless response["Data"] && response["Data"]["Episode"]
+      case response["Data"]["Episode"]
+      when Array
+        response["Data"]["Episode"].map{|result| Episode.new(result)}
+      when Hash
+        [Episode.new(response["Data"]["Episode"])]
+      else
+        []
+      end
+    end
+
     def get_actors(series)
       response = self.class.get("/#{@api_key}/series/#{series.id}/actors.xml").parsed_response
       if response["Actors"] && response["Actors"]["Actor"]

data/lib/tvdb_party/series.rb

@@ -2,40 +2,40 @@ module TvdbParty
   class Series
     attr_reader :client
     attr_accessor :id, :name, :overview, :seasons, :first_aired, :genres, :network, :rating, :runtime,
-                  :actors, :banners
-    
+                  :actors, :banners, :air_time
+
     def initialize(client, options={})
       @client = client
-
       @id = options["id"]
       @name = options["SeriesName"]
       @overview = options["Overview"]
       @network = options["Network"]
       @runtime = options["Runtime"]
-            
+      @air_time = options['Airs_Time'] if options['Airs_Time']
+
       if options["Genre"]
         @genres = options["Genre"][1..-1].split("|")
       else
         @genres = []
       end
-      
+
       if options["Rating"] && options["Rating"].size > 0
         @rating = options["Rating"].to_f
       else
         @rating = 0
       end
-      
-      begin 
+
+      begin
         @first_aired = Date.parse(options["FirstAired"])
       rescue
         puts 'invalid date'
       end
     end
-    
+
     def get_episode(season_number, episode_number)
       client.get_episode(self, season_number, episode_number)
     end
-    
+
     def posters(language)
       banners.select{|b| b.banner_type == 'poster' && b.language == language}
     end
@@ -55,22 +55,26 @@ module TvdbParty
     def seasonwide_posters(season_number, language)
       banners.select{|b| b.banner_type == 'season' && b.banner_type2 == 'seasonwide' && b.season == season_number.to_s && b.language == language}
     end
-    
+
     def banners
-      @banners ||= client.get_banners(self) 
+      @banners ||= client.get_banners(self)
     end
 
     def seasons
-      @seasons ||= client.get_seasons(self) 
+      @seasons ||= client.get_seasons(self)
+    end
+
+    def episodes
+      @episodes ||= client.get_all_episodes(self)
     end
 
     def actors
-      @actors ||= client.get_actors(self) 
+      @actors ||= client.get_actors(self)
     end
-    
+
     def season(season_number)
       seasons.detect{|s| s.number == season_number}
     end
-    
+
   end
 end

data/tvdb_party.gemspec

@@ -1,48 +1,42 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{tvdb_party}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Maddox"]
-  s.date = %q{2010-11-19}
+  s.date = %q{2011-10-11}
   s.description = %q{Simple Ruby library to talk to thetvdb.com's api}
   s.email = %q{jon@mustacheinc.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.textile"
+    "README.textile"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.textile",
-     "Rakefile",
-     "VERSION",
-     "lib/tvdb_party.rb",
-     "lib/tvdb_party/actor.rb",
-     "lib/tvdb_party/banner.rb",
-     "lib/tvdb_party/episode.rb",
-     "lib/tvdb_party/httparty_icebox.rb",
-     "lib/tvdb_party/search.rb",
-     "lib/tvdb_party/series.rb",
-     "test/test_helper.rb",
-     "test/tvdb_party_test.rb",
-     "tvdb_party.gemspec"
+    "LICENSE",
+    "README.textile",
+    "Rakefile",
+    "VERSION",
+    "lib/tvdb_party.rb",
+    "lib/tvdb_party/actor.rb",
+    "lib/tvdb_party/banner.rb",
+    "lib/tvdb_party/episode.rb",
+    "lib/tvdb_party/httparty_icebox.rb",
+    "lib/tvdb_party/search.rb",
+    "lib/tvdb_party/series.rb",
+    "test/test_helper.rb",
+    "test/tvdb_party_test.rb",
+    "tvdb_party.gemspec"
   ]
   s.homepage = %q{http://github.com/maddox/tvdb_party}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Simple Ruby library to talk to thetvdb.com's api}
-  s.test_files = [
-    "test/test_helper.rb",
-     "test/tvdb_party_test.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -60,3 +54,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<httparty>, [">= 0.6.1"])
   end
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tvdb_party
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Jon Maddox
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -05:00
+date: 2011-10-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,7 +59,6 @@ extra_rdoc_files:
 - README.textile
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.textile
 - Rakefile
@@ -79,8 +78,8 @@ homepage: http://github.com/maddox/tvdb_party
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -108,6 +107,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple Ruby library to talk to thetvdb.com's api
-test_files: 
-- test/test_helper.rb
-- test/tvdb_party_test.rb
+test_files: []
+

data/.gitignore

@@ -1,5 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg