tvdbr 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tvdbr (0.2.0)
+    tvdbr (0.2.1)
       hashie
       httparty (>= 0.8.0)
 

data/examples/demo2.rb

@@ -8,6 +8,8 @@ tvdb = Tvdbr::Client.new('5FEC454623154441')
 # Find episode by id
 episode = tvdb.find_episode_by_id(326177)
 puts episode.inspect
+episode = tvdb.find_episode_by_id(174207)
+puts episode.inspect
 
 # Find episode with airdate
 episode = tvdb.find_episode_by_airdate(80348, '2007-09-24')

data/lib/tvdbr/data_set.rb

@@ -2,6 +2,8 @@ require 'hashie' unless defined?(Hashie)
 
 module Tvdbr
   class DataSet < Hashie::Mash
+    class InvalidFormat < StandardError; end
+
     attr_reader :parent
 
     ## INSTANCE METHODS ##
@@ -11,6 +13,8 @@ module Tvdbr
       @parent = parent
       source_hash = normalize_keys(source_hash) if source_hash.is_a?(Hash)
       super(source_hash, default, &block)
+    rescue ArgumentError => e # #<ArgumentError: wrong number of arguments (0 for 1)>
+      raise InvalidFormat, "#{self.class.name} parse failed with source #{source_hash.inspect}"
     end
 
     # Outputs: <#Tvdb::Series actors="..." added=nil added_by=nil>
@@ -66,10 +70,18 @@ module Tvdbr
         end
       end
 
-      # Normalizes a value for the formatted hash
-      # Sometimes TVDB returns a hash with a "__content__" key which needs to be removed
+      # Normalizes a value for the formatted hash values
+      # TVDB hashes should not contain more hashes
+      # Sometimes TVDB returns a hash with content inside which needs to be extracted
       def normalize_value(val)
-        val.respond_to?(:has_key?) && val.has_key?("__content__") ? val["__content__"] : val
+        if val.is_a?(Hash)
+          val = val["__content__"] if val.has_key?("__content__")
+          val = val.values.first if val.respond_to?(:values) && val.values.one?
+          val = val.join(" ") if val.respond_to?(:join)
+          val.to_s
+        else # any other value
+          val
+        end
       end
 
       def underscore(camel_cased_word)

data/lib/tvdbr/version.rb

@@ -1,3 +1,3 @@
 module Tvdbr
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tvdbr
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie