tvdb 0.0.2 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/lib/tvdb/element.rb

@@ -22,18 +22,26 @@ module TVdb
     protected
     
     def attributes_from_xml(xml)
-      return {} if xml.nil? || xml.empty?
-      doc = Hpricot(xml)
-      
       attributes = {}
+      return attributes if xml.nil? || xml.is_a?(String) && xml.empty?
+      
+      element_root = if xml.is_a?(Hpricot::Elem)
+        xml
+      else
+        doc = xml.is_a?(Hpricot::Doc) ? xml : Hpricot(xml)
+        
+        # doc.children.nil? is true for Hpricot('')
+        doc.children.nil? ? doc : (@root_name.nil? ? doc.root : doc.search(@root_name).first)
+      end
       
-      element_root = @root_name.nil? ? doc.root : doc.search(@root_name).first
-      
-      element_root.children.map do |child|
-        unless child.is_a?(Hpricot::Text)
-          attributes[child.name] = child.inner_text
+      if element_root.children
+        element_root.children.map do |child|
+          unless child.is_a?(Hpricot::Text)
+            attributes[child.name] = child.inner_text
+          end
         end
       end
+      
       attributes
     end
   end

data/lib/tvdb/serie.rb

@@ -1,7 +1,11 @@
 module TVdb
   class Serie < Element
+    attr_accessor :episodes
+    
     def initialize(xml)
-      super(xml, 'series') do |atts|
+      doc = Hpricot(xml)
+      
+      super(doc, 'series') do |atts|
         # Turn into arrays
         atts["actors"] = atts["actors"].split('|').select{|a| !a.nil? && !a.empty?} if atts["actors"] && atts["actors"].is_a?(String) && !atts["actors"].empty?
         genres = atts.delete("genre")
@@ -9,6 +13,8 @@ module TVdb
 
         atts["poster"] = BANNER_URL % atts["poster"] unless atts["poster"].nil?
       end
+      
+      @episodes = doc.search('episode').map{|exml| Element.new(exml)}
     end
   end
   

data/spec/spec_helper.rb

@@ -11,5 +11,7 @@ def load_example_data
   @serie2_xml = File.read(File.dirname(__FILE__) + "/data/serie2.xml")
   @series_xml = @serie1_xml + @serie2_xml
   @serie1_zip = File.open(File.dirname(__FILE__) + "/data/serie1.zip")
+  @serie1_full_xml = Zip::ZipFile.new(@serie1_zip.path).find_entry("en.xml").get_input_stream.read
   @serie2_zip = File.open(File.dirname(__FILE__) + "/data/serie2.zip")
+  @serie2_full_xml = Zip::ZipFile.new(@serie2_zip.path).find_entry("en.xml").get_input_stream.read
 end

data/spec/tvdb/element_spec.rb

@@ -42,8 +42,28 @@ module TVdb
     
     it "should behave with empty xml" do
       element = Element.new("")
-      
       element.wadus.should be_nil
     end
+    
+    it "should accept already parsed Hpricot documents" do
+      element = Element.new(Hpricot('<Element><attribute1>The one</attribute1><second>2</second><last>inphinity</last></Element>'))
+      element.attribute1.should == "The one"
+      element.second.should == "2"
+      element.last.should == "inphinity"
+    end
+    
+    it "should accept already parsed Hpricot elements" do
+      doc = Hpricot('<Doc><Element><attribute1>The one</attribute1><second>2</second><last>inphinity</last></Element></Doc>')
+      element = Element.new(doc.search('element').first)
+      element.attribute1.should == "The one"
+      element.second.should == "2"
+      element.last.should == "inphinity"
+    end
+    
+    it "should behave with empty Hpricot::Doc objects" do
+      element = Element.new(Hpricot(''))
+      element.wadus.should be_nil
+    end
+    
   end
 end

data/spec/tvdb/serie_spec.rb

@@ -35,5 +35,21 @@ module TVdb
       serie.poster.should == TVdb::BANNER_URL % "posters/80379-1.jpg"
     end
     
+    it "should parse episodes and return them as an array of Element objects" do
+      serie = Serie.new(@serie1_full_xml)
+      
+      serie.episodes.size.should == 55 # There are 55 <Episode> tags in the zip file
+      
+      serie.episodes.first.tvdb_id.should == '1102131'
+      serie.episodes.first.episodename.should == 'Physicist To The Stars'
+      serie.episodes.first.seriesid.should == serie.tvdb_id
+      
+      serie.episodes[1].tvdb_id.should == '1088021'
+      serie.episodes[1].episodename.should == 'Season 2 Gag Reel'
+      
+      serie.episodes.last.tvdb_id.should == '1309961'
+      serie.episodes.last.episodename.should == 'The Maternal Congruence'
+    end
+    
   end
 end

data/tvdb.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tvdb}
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["\303\201lvaro Bautista"]
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/alvarobp/tvdb}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby wrapper for TheTVDB}
   s.test_files = [
     "spec/spec_helper.rb",
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0.8.1"])
       s.add_runtime_dependency(%q<rubyzip>, [">= 0.9.1"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tvdb
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - "\xC3\x81lvaro Bautista"
@@ -21,9 +22,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -35,9 +38,11 @@ dependencies:
   name: hpricot
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 61
         segments: 
         - 0
         - 8
@@ -49,9 +54,11 @@ dependencies:
   name: rubyzip
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 0
         - 9
@@ -100,23 +107,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for TheTVDB