tvdbr 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tvdbr (0.1.0)
+    tvdbr (0.2.0)
       hashie
       httparty (>= 0.8.0)
 
@@ -10,7 +10,7 @@ GEM
   specs:
     activesupport (3.0.0)
     hashie (1.2.0)
-    httparty (0.8.1)
+    httparty (0.9.0)
       multi_json (~> 1.0)
       multi_xml
     i18n (0.6.1)

data/examples/demo2.rb

@@ -5,6 +5,10 @@ require 'active_support/all'
 # Updated APIs circa 10/05/2012
 tvdb = Tvdbr::Client.new('5FEC454623154441')
 
+# Find episode by id
+episode = tvdb.find_episode_by_id(326177)
+puts episode.inspect
+
 # Find episode with airdate
 episode = tvdb.find_episode_by_airdate(80348, '2007-09-24')
 puts episode.inspect

data/lib/tvdbr/data_set.rb

@@ -7,10 +7,10 @@ module Tvdbr
     ## INSTANCE METHODS ##
 
     # Tvdb::DataSet.new(self, { :foo => "bar" })
-    def initialize(parent, *args)
+    def initialize(parent, source_hash = nil, default = nil, &block)
       @parent = parent
-      args[0] = normalize_keys(args[0]) if args[0].is_a?(Hash)
-      super(*args)
+      source_hash = normalize_keys(source_hash) if source_hash.is_a?(Hash)
+      super(source_hash, default, &block)
     end
 
     # Outputs: <#Tvdb::Series actors="..." added=nil added_by=nil>
@@ -61,11 +61,17 @@ module Tvdbr
       # => [:foo => "bar", ...]
       def normalize_keys(hash)
         hash.inject({}) do |options, (key, value)|
-          options[(underscore(key) rescue key) || key] = value
+          options[(underscore(key) rescue key) || key] = normalize_value(value)
           options
         end
       end
 
+      # Normalizes a value for the formatted hash
+      # Sometimes TVDB returns a hash with a "__content__" key which needs to be removed
+      def normalize_value(val)
+        val.respond_to?(:has_key?) && val.has_key?("__content__") ? val["__content__"] : val
+      end
+
       def underscore(camel_cased_word)
         word = camel_cased_word.to_s.dup
         word.gsub!(/::/, '/')

data/lib/tvdbr/version.rb

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

metadata

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