the_tv_db 0.0.2 → 0.0.3

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+only:
+  - master
+rvm:
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Gem dependencies are specified in the_tv_db.gemspec
 gemspec
+
+group :test do
+  gem "rake", "~> 0.9.2.2"
+end

data/README.md

@@ -1,4 +1,4 @@
-# TheTvDB
+# TheTvDB [![Build Status](https://travis-ci.org/jassa/the_tv_db.png)](https://travis-ci.org/jassa/the_tv_db)
 
 Ruby API Client for TheTvDB.com
 

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new do |r|
+  r.verbose = false
+end
+
+task :default => :spec

data/lib/the_tv_db/connection.rb

@@ -1,6 +1,8 @@
 require "faraday"
 require "the_tv_db/response"
+require "the_tv_db/response/unzip"
 require "the_tv_db/response/xmlize"
+require "the_tv_db/response/raise_error"
 
 module TheTvDB
   module Connection
@@ -11,8 +13,10 @@ module TheTvDB
     def connection
       @connection ||= Faraday.new(:url => TheTvDB::ENDPOINT) do |faraday|
         faraday.response :logger if ENV['DEBUG'] # log requests to STDOUT
-        faraday.adapter  :typhoeus # make requests with Typhoeus
+        faraday.adapter  :net_http # make requests with NetHTTP
         faraday.use      TheTvDB::Response::Xmlize
+        faraday.use      TheTvDB::Response::Unzip
+        faraday.use      TheTvDB::Response::RaiseError
       end
     end
     

data/lib/the_tv_db/response/raise_error.rb

@@ -0,0 +1,10 @@
+module TheTvDB
+  class Response::RaiseError < Faraday::Response::Middleware
+
+    def on_complete(env)
+      status_code = env[:status].to_i
+      raise TheTvDB::RecordNotFound.new(env) if (400...600).include? status_code
+    end
+
+  end # Response::RaiseError
+end # TheTvDB

data/lib/the_tv_db/response/unzip.rb

@@ -0,0 +1,33 @@
+module TheTvDB
+  class Response::Unzip < Response
+    dependency 'zip/zip'
+    
+    define_parser do |body|
+      ::Zip::ZipFile.new body
+    end
+
+    def parse(body)
+      case body
+      when String
+        zip = Tempfile.new('unzip_me')
+        begin
+           zip.write(body)
+           unzipped = self.class.parser.call(zip)
+           files = {}
+           unzipped.each do |file|
+             files[file.name] = file.get_input_stream.read
+           end
+        ensure
+           zip.close
+           zip.unlink
+        end
+        files
+      else
+        body
+      end
+    rescue
+      body
+    end
+    
+  end # Response::Unzip
+end # TheTvDB

data/lib/the_tv_db/response/xmlize.rb

@@ -1,12 +1,10 @@
-require "multi_xml"
-
 module TheTvDB
   class Response::Xmlize < Response
     dependency 'multi_xml'
     
     define_parser do |body|
-      MultiXml.parser = :ox
-      MultiXml.parse body
+      ::MultiXml.parser = :ox
+      ::MultiXml.parse body
     end
 
     def parse(body)
@@ -17,6 +15,8 @@ module TheTvDB
         true
       when 'false'
         false
+      when Hash
+        body.each { |k, v| body[k] = self.class.parser.call(v) }
       else
         self.class.parser.call body
       end

data/lib/the_tv_db/response.rb

@@ -7,7 +7,7 @@ module TheTvDB
     class << self
       attr_accessor :parser
     end
-
+    
     def self.define_parser(&block)
       @parser = block
     end
@@ -19,6 +19,6 @@ module TheTvDB
     def parse_response?(env)
       env[:body].respond_to? :to_str
     end
-
+    
   end # Response
 end # TheTvDB

data/lib/the_tv_db/series.rb

@@ -19,13 +19,21 @@ module TheTvDB
         end
       end
       
-      def find(id)
-        data = request("/data/series/#{id}/all/")["Data"]
-        record = new(data["Series"])
-        record.episodes = data["Episode"]
+      def find(id, lang="en")
+        if TheTvDB.api_key
+          files = request("#{TheTvDB.api_key}/series/#{id}/all/#{lang}.zip")
+          data = files["#{lang}.xml"].fetch("Data")
+          record = new(data["Series"])
+          record.episodes = data["Episode"]
+          record.banners = files["banners.xml"]["Banners"]["Banner"]
+          record.actors = files["actors.xml"]["Actors"]["Actor"]
+        else
+          data = request("/data/series/#{id}/all/").fetch("Data")
+          record = new(data["Series"])
+          record.episodes = data["Episode"]
+        end
+        
         return record
-      rescue MultiXml::ParseError
-        raise RecordNotFound, "Couldn't find series with ID=#{id}"
       end
       alias :get :find
     end
@@ -58,7 +66,7 @@ module TheTvDB
       :zap2it_id        => "zap2it_id"
     }.freeze
     
-    attr_accessor *ATTRS_MAP.keys, :episodes
+    attr_accessor *ATTRS_MAP.keys, :episodes, :banners, :actors
     
     def episodes=(episodes)
       @episodes = case episodes

data/lib/the_tv_db/version.rb

@@ -1,3 +1,3 @@
 module TheTvDb
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/fixtures/series/en/actors.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Actors>
+<Actor>
+  <id>77049</id>
+  <Image>actors/77049.jpg</Image>
+  <Name>Anna Torv</Name>
+  <Role>Olivia Dunham</Role>
+  <SortOrder>0</SortOrder>
+</Actor>
+<Actor>
+  <id>77045</id>
+  <Image>actors/77045.jpg</Image>
+  <Name>Joshua Jackson</Name>
+  <Role>Peter Bishop</Role>
+  <SortOrder>0</SortOrder>
+</Actor>
+<Actor>
+  <id>77047</id>
+  <Image>actors/77047.jpg</Image>
+  <Name>John Noble</Name>
+  <Role>Dr. Walter Bishop</Role>
+  <SortOrder>1</SortOrder>
+</Actor>
+<Actor>
+  <id>77046</id>
+  <Image>actors/77046.jpg</Image>
+  <Name>Jasika Nicole</Name>
+  <Role>Astrid</Role>
+  <SortOrder>1</SortOrder>
+</Actor>
+<Actor>
+  <id>77044</id>
+  <Image>actors/77044.jpg</Image>
+  <Name>Blair Brown</Name>
+  <Role>Nina Sharp</Role>
+  <SortOrder>1</SortOrder>
+</Actor>
+<Actor>
+  <id>77050</id>
+  <Image>actors/77050.jpg</Image>
+  <Name>Mark Valley</Name>
+  <Role>John Scott</Role>
+  <SortOrder>2</SortOrder>
+</Actor>
+<Actor>
+  <id>77042</id>
+  <Image>actors/77042.jpg</Image>
+  <Name>Kirk Acevedo</Name>
+  <Role>Charlie Francis</Role>
+  <SortOrder>2</SortOrder>
+</Actor>
+<Actor>
+  <id>284298</id>
+  <Image>actors/284298.jpg</Image>
+  <Name>Seth Gabel</Name>
+  <Role>Lincoln Lee</Role>
+  <SortOrder>2</SortOrder>
+</Actor>
+<Actor>
+  <id>77048</id>
+  <Image>actors/77048.jpg</Image>
+  <Name>Lance Reddick</Name>
+  <Role>Phillip Broyles</Role>
+  <SortOrder>3</SortOrder>
+</Actor>
+<Actor>
+  <id>303768</id>
+  <Image>actors/303768.jpg</Image>
+  <Name>Georgina Haig</Name>
+  <Role>Etta</Role>
+  <SortOrder>3</SortOrder>
+</Actor>
+</Actors>