tmdb_party 0.8.0 → 0.9.0

data/README.rdoc

@@ -33,13 +33,30 @@ Simple ruby wrapper to themoviedb.org (http://api.themoviedb.org/2.0/docs/) usin
   transformers.genres.collect{|cat| cat.name}.include?("Adventure")
     # => true
 
+= recent additions:
+
+  # Support for browsing movies http://api.themoviedb.org/2.1/methods/Movie.browse
+  @tmdb.browse({:query => 'Transformers')
+
+  # Support for looking up Media info based on the file hash
+  # http://api.themoviedb.org/2.1/methods/Media.getInfo
+  @tmdb.get_file_info(file)
+
+  # Support for Language Tags http://api.themoviedb.org/2.1/language-tags
+  # All methods support an optional locale as the final method parameter
+  @tmdb.search('transformers', 'fr')
+
 = what is themoviedb.org?
-It's a movie database, kind of like IMDB except it's more of a community wiki. They also have an api that they're cool with people using. More on the api here: http://api.themoviedb.org/2.0/docs/
+It's a movie database, kind of like IMDB except it's more of a community wiki. They also have an api that they're cool with people using. More on the api here: http://api.themoviedb.org/2.1
 
 == Contributors
+
 Jon Maddox (http://github.com/maddox)
+
 Magnus Bergmark (http://github.com/Mange)
+
 Brian Lopez (https://github.com/brianmario)
+
 Federico Ravasio (https://github.com/razielgn)
 
 == Copyright

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 8
+:minor: 9
 :patch: 0
 :build: 

data/lib/tmdb_party.rb

@@ -1,6 +1,6 @@
 require 'httparty'
 
-%w[core_extensions httparty_icebox attributes video genre person image country studio cast_member movie].each do |class_name|
+%w[extras/httparty_icebox extras/attributes video genre person image country studio cast_member movie extras/movie_hasher].each do |class_name|
   require "tmdb_party/#{class_name}"
 end
 
@@ -19,25 +19,27 @@ module TMDBParty
     end
     
     def search(query, lang = @default_lang)
-      data = self.class.get(method_url('Movie.search', query, lang)).parsed_response
-      if data.class != Array || data.first == "Nothing found."
-        []
-      else
-        data.collect { |movie| Movie.new(movie, self) }
-      end
+      data = self.class.get(method_url('Movie.search', lang, query))
+      
+      result_or_empty_array(data, Movie)
+    end
+
+    # Read more about the parameters that can be passed to this method here:
+    # http://api.themoviedb.org/2.1/methods/Movie.browse
+    def browse(params = {}, lang = @default_lang)
+      data = self.class.get(method_url('Movie.browse', lang), :query => {:order => "asc", :order_by => "title"}.merge(params))
+      
+      result_or_empty_array(data, Movie)
     end
     
     def search_person(query, lang = @default_lang)
-      data = self.class.get(method_url('Person.search', query, lang)).parsed_response
-      if data.class != Array || data.first == "Nothing found."
-        []
-      else
-        data.collect { |person| Person.new(person, self) }
-      end
+      data = self.class.get(method_url('Person.search', lang, query))
+      
+      result_or_empty_array(data, Person)
     end
     
     def imdb_lookup(imdb_id, lang = @default_lang)
-      data = self.class.get(method_url('Movie.imdbLookup', imdb_id, lang)).parsed_response
+      data = self.class.get(method_url('Movie.imdbLookup', lang, imdb_id)).parsed_response
       if data.class != Array || data.first == "Nothing found."
         nil
       else
@@ -46,29 +48,43 @@ module TMDBParty
     end
     
     def get_info(id, lang = @default_lang)
-      data = self.class.get(method_url('Movie.getInfo', id, lang)).parsed_response
+      data = self.class.get(method_url('Movie.getInfo', lang, id)).parsed_response
       Movie.new(data.first, self)
     end
-    
+
+    def get_file_info(file, lang=@default_lang)
+      hash = TMDBParty::MovieHasher.compute_hash(file)
+      bytesize = file.size
+      data = self.class.get(method_url('Media.getInfo', lang, hash, bytesize))
+
+      result_or_empty_array(data, Movie)
+    end
+
     def get_person(id, lang = @default_lang)
-      data = self.class.get(method_url('Person.getInfo', id, lang)).parsed_response
+      data = self.class.get(method_url('Person.getInfo', lang, id)).parsed_response
       Person.new(data.first, self)
     end
     
     def get_genres(lang = @default_lang)
-      data = self.class.get(method_url('Genres.getList', nil, lang)).parsed_response
+      data = self.class.get(method_url('Genres.getList', lang)).parsed_response
       data[1..-1].collect { |genre| Genre.new(genre) } # Skips the first, see spec/fixtures/genres_results.json
     end
     
     private
-      def default_path_items
-        ['json', @api_key]
-      end
-      
-      def method_url(method, value, lang)
-        url = [method, lang, default_path_items]
-        url << URI.escape(value.to_s) if value
-        '/' + url.join('/')
+
+    def result_or_empty_array(data, klass)
+      data = data.parsed_response
+      if data.class != Array || data.first == "Nothing found."
+        []
+      else
+        data.collect { |object| klass.new(object, self) }
       end
+    end
+
+    def method_url(method, lang, *args)
+      url = [method, lang, self.class.format, @api_key]
+      url += args.collect{ |a| URI.escape(a.to_s) }
+      '/' + url.join('/')
+    end
   end
 end

data/lib/tmdb_party/{attributes.rb → extras/attributes.rb}

@@ -12,7 +12,7 @@ module TMDBParty
 
     module ClassMethods
       def attributes(*names)
-        options = names.extract_options!
+        options = names.last.is_a?(::Hash) ? names.pop : {}
 
         names.each do |name|
           attribute name, options unless name.blank?
@@ -60,9 +60,18 @@ module TMDBParty
         
         def decode_raw_attribute(value, type)
           return nil unless value
-          type.respond_to?(:parse) ? type.parse(value) : value
+
+          if type.respond_to?(:parse)
+            type.parse(value)
+          elsif type == Integer
+            Integer(value)
+          elsif type == Float
+            Float(value)
+          else
+            value
+          end
         end
         
     end
   end
-end
+end

data/lib/tmdb_party/extras/movie_hasher.rb

@@ -0,0 +1,32 @@
+# MovieHasher based on the one found here:
+# http://trac.opensubtitles.org/projects/opensubtitles/wiki/HashSourceCodes
+#
+# This will compute a unique hash for the movie that can be used for lookups on TMDB
+# The algorithm calculates size + 64bit chksum of the first and last 64k (even if they overlap because the file is smaller than 128k).
+# Make sure to uncomment and run the tests for this before making any changes
+module TMDBParty
+  module MovieHasher
+    CHUNK_SIZE = 64 * 1024 # in bytes
+
+    def self.compute_hash(file)
+      filesize = file.size
+      hash = filesize
+
+      # Read 64 kbytes, divide up into 64 bits and add each
+      # to hash. Do for beginning and end of file.
+      # Q = unsigned long long = 64 bit
+      file.read(CHUNK_SIZE).unpack("Q*").each do |n|
+        hash = hash + n & 0xffffffffffffffff # to remain as 64 bit number
+      end
+
+      file.seek([0, filesize - CHUNK_SIZE].max, IO::SEEK_SET)
+
+      # And again for the end of the file
+      file.read(CHUNK_SIZE).unpack("Q*").each do |n|
+        hash = hash + n & 0xffffffffffffffff
+      end
+
+      sprintf("%016x", hash)
+    end
+  end
+end

data/spec/fixtures/browse.json

@@ -0,0 +1,891 @@
+[{
+    "score": 4.9083095,
+    "popularity": 3,
+    "translated": true,
+    "adult": false,
+    "language": "en",
+    "original_name": "Beast Wars: Transformers",
+    "name": "Beast Wars: Transformers",
+    "alternative_name": null,
+    "movie_type": "movie",
+    "id": 42311,
+    "imdb_id": "tt0115108",
+    "url": "http://www.themoviedb.org/movie/42311",
+    "votes": 0,
+    "rating": 0.0,
+    "runtime": 290,
+    "certification": "",
+    "overview": "The Predacons and Maximals are fighting through space and crash on an unknown planet.  The planet is rich in energon and powerful enough to fuel galactic conquest, and so the battle for the planet begins!",
+    "released": "",
+    "posters": [],
+    "backdrops": [],
+    "version": 53,
+    "last_modified_at": "2011-01-28 15:12:49"
+},
+{
+    "score": 2.7063267,
+    "popularity": 3,
+    "translated": true,
+    "adult": false,
+    "language": "en",
+    "original_name": "Powaqqatsi",
+    "name": "Powaqqatsi",
+    "alternative_name": "Powwaqatsi: Life in Transformation",
+    "movie_type": "movie",
+    "id": 24348,
+    "imdb_id": "tt0095895",
+    "url": "http://www.themoviedb.org/movie/24348",
+    "votes": 2,
+    "rating": 7.8,
+    "runtime": 99,
+    "certification": "",
+    "overview": "An exploration of technologically developing nations and the effect the transition to Western-style modernization has had on them.",
+    "released": "1988-04-29",
+    "posters": [{
+        "image": {
+            "type": "poster",
+            "size": "original",
+            "height": 2173,
+            "width": 1524,
+            "url": "http://cf1.themoviedb.org/posters/2d1/4bc96143017a3c57fe02c2d1/powaqqatsi-original.jpg",
+            "id": "4bc96143017a3c57fe02c2d1"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "mid",
+            "height": 713,
+            "width": 500,
+            "url": "http://cf1.themoviedb.org/posters/2d1/4bc96143017a3c57fe02c2d1/powaqqatsi-mid.jpg",
+            "id": "4bc96143017a3c57fe02c2d1"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "cover",
+            "height": 264,
+            "width": 185,
+            "url": "http://cf1.themoviedb.org/posters/2d1/4bc96143017a3c57fe02c2d1/powaqqatsi-cover.jpg",
+            "id": "4bc96143017a3c57fe02c2d1"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "thumb",
+            "height": 131,
+            "width": 92,
+            "url": "http://cf1.themoviedb.org/posters/2d1/4bc96143017a3c57fe02c2d1/powaqqatsi-thumb.jpg",
+            "id": "4bc96143017a3c57fe02c2d1"
+        }
+    }],
+    "backdrops": [{
+        "image": {
+            "type": "backdrop",
+            "size": "original",
+            "height": 2091,
+            "width": 3096,
+            "url": "http://cf1.themoviedb.org/backdrops/2cd/4bc96142017a3c57fe02c2cd/powaqqatsi-original.jpg",
+            "id": "4bc96142017a3c57fe02c2cd"
+        }
+    },
+    {
+        "image": {
+            "type": "backdrop",
+            "size": "poster",
+            "height": 527,
+            "width": 780,
+            "url": "http://cf1.themoviedb.org/backdrops/2cd/4bc96142017a3c57fe02c2cd/powaqqatsi-poster.jpg",
+            "id": "4bc96142017a3c57fe02c2cd"
+        }
+    },
+    {
+        "image": {
+            "type": "backdrop",
+            "size": "thumb",
+            "height": 203,
+            "width": 300,
+            "url": "http://cf1.themoviedb.org/backdrops/2cd/4bc96142017a3c57fe02c2cd/powaqqatsi-thumb.jpg",
+            "id": "4bc96142017a3c57fe02c2cd"
+        }
+    }],
+    "version": 30,
+    "last_modified_at": "2011-01-28 17:40:32"
+},
+{
+    "score": 3.8661811,
+    "popularity": 3,
+    "translated": true,
+    "adult": false,
+    "language": "en",
+    "original_name": "Resiklo",
+    "name": "Resiklo",
+    "alternative_name": "Recyclo Transformers",
+    "movie_type": "movie",
+    "id": 50136,
+    "imdb_id": "tt1047877",
+    "url": "http://www.themoviedb.org/movie/50136",
+    "votes": 0,
+    "rating": 0.0,
+    "runtime": 110,
+    "certification": null,
+    "overview": "Set in December 2021, Resiklo is the story of Crisval Sarmiento, an ex-military Colonel who leads a rag-tag group of survivors in the Philippines against the insect-like alien invaders known as the Balangs. Because of the enormous expenditures in resources during the invasion (hinted in the movie's opening credits), the humans are forced to scavenge the destroyed landscape for anything that could be recycled and put to use at their secret sanctuary, called Paraiso (Paradise in English).\r\nHowever, they are in a race against time, as in addition to the resource gathering, the survivors are fighting to eliminate the Balangs and their human collaborators, the Mutanos (mutated humans), while keeping Paraiso's location secret and along the way, uncovering the truth behind the invasion as well.",
+    "released": "2009-06-12",
+    "posters": [{
+        "image": {
+            "type": "poster",
+            "size": "original",
+            "height": 898,
+            "width": 690,
+            "url": "http://cf1.themoviedb.org/posters/47b/4ce92a267b9aa17c8e00047b/resiklo-original.jpg",
+            "id": "4ce92a267b9aa17c8e00047b"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "mid",
+            "height": 651,
+            "width": 500,
+            "url": "http://cf1.themoviedb.org/posters/47b/4ce92a267b9aa17c8e00047b/resiklo-mid.jpg",
+            "id": "4ce92a267b9aa17c8e00047b"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "cover",
+            "height": 241,
+            "width": 185,
+            "url": "http://cf1.themoviedb.org/posters/47b/4ce92a267b9aa17c8e00047b/resiklo-cover.jpg",
+            "id": "4ce92a267b9aa17c8e00047b"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "thumb",
+            "height": 120,
+            "width": 92,
+            "url": "http://cf1.themoviedb.org/posters/47b/4ce92a267b9aa17c8e00047b/resiklo-thumb.jpg",
+            "id": "4ce92a267b9aa17c8e00047b"
+        }
+    }],
+    "backdrops": [],
+    "version": 51,
+    "last_modified_at": "2011-01-28 14:57:18"
+},
+{
+    "score": 3.681232,
+    "popularity": 3,
+    "translated": true,
+    "adult": false,
+    "language": "en",
+    "original_name": "Riffrax: Transformers: Revenge of the Fallen",
+    "name": "Riffrax: Transformers: Revenge of the Fallen",
+    "alternative_name": null,
+    "movie_type": "movie",
+    "id": 48027,
+    "imdb_id": "",
+    "url": "http://www.themoviedb.org/movie/48027",
+    "votes": 0,
+    "rating": 0.0,
+    "runtime": null,
+    "certification": "",
+    "overview": "At its heart, Transformers: Revenge of the Fallen is a love story. A love story between two dogs, Mojo and Frankie, who are shown humping several times in the first fifteen minutes of the movie*. Stunningly, this remains a highlight over the next two hours of movie. We don't see much of the dogs after their owner, Shia LaBeouf, leaves for college, but we found our thoughts frequently drifting back to them as the human characters dropped their pants, ran into things, and stammered incoherently. Who was feeding the dogs? Were they getting along with the other dogs at the dog park? How was Frankie adapting to the new diet the vet had put him on back in June?",
+    "released": "",
+    "posters": [{
+        "image": {
+            "type": "poster",
+            "size": "original",
+            "height": 888,
+            "width": 666,
+            "url": "http://cf1.themoviedb.org/posters/318/4cc464ed7b9aa138d5002318/riffrax-transformers-revenge-of-the-fallen-original.jpg",
+            "id": "4cc464ed7b9aa138d5002318"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "mid",
+            "height": 667,
+            "width": 500,
+            "url": "http://cf1.themoviedb.org/posters/318/4cc464ed7b9aa138d5002318/riffrax-transformers-revenge-of-the-fallen-mid.jpg",
+            "id": "4cc464ed7b9aa138d5002318"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "cover",
+            "height": 247,
+            "width": 185,
+            "url": "http://cf1.themoviedb.org/posters/318/4cc464ed7b9aa138d5002318/riffrax-transformers-revenge-of-the-fallen-cover.jpg",
+            "id": "4cc464ed7b9aa138d5002318"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "thumb",
+            "height": 123,
+            "width": 92,
+            "url": "http://cf1.themoviedb.org/posters/318/4cc464ed7b9aa138d5002318/riffrax-transformers-revenge-of-the-fallen-thumb.jpg",
+            "id": "4cc464ed7b9aa138d5002318"
+        }
+    }],
+    "backdrops": [],
+    "version": 9,
+    "last_modified_at": "2011-01-25 21:10:37"
+},
+{
+    "score": 4.9083095,
+    "popularity": 3,
+    "translated": true,
+    "adult": false,
+    "language": "en",
+    "original_name": "The Transformers: The Movie",
+    "name": "The Transformers: The Movie",
+    "alternative_name": "The Transformers - The Movie",
+    "movie_type": "movie",
+    "id": 1857,
+    "imdb_id": "tt0092106",
+    "url": "http://www.themoviedb.org/movie/1857",
+    "votes": 4,
+    "rating": 6.8,
+    "runtime": 84,
+    "certification": "PG",
+    "overview": "The heroic Autobots must battle the evil Decepticons as well as a colossal planet-consuming robot named Unicron in order to safeguard the Autobot's Matrix of Leadership.",
+    "released": "1986-08-08",
+    "posters": [{
+        "image": {
+            "type": "poster",
+            "size": "original",
+            "height": 1000,
+            "width": 699,
+            "url": "http://cf1.themoviedb.org/posters/3bd/4ce860b25e73d6258f0003bd/the-transformers-the-movie-original.jpg",
+            "id": "4ce860b25e73d6258f0003bd"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "mid",
+            "height": 715,
+            "width": 500,
+            "url": "http://cf1.themoviedb.org/posters/3bd/4ce860b25e73d6258f0003bd/the-transformers-the-movie-mid.jpg",
+            "id": "4ce860b25e73d6258f0003bd"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "cover",
+            "height": 265,
+            "width": 185,
+            "url": "http://cf1.themoviedb.org/posters/3bd/4ce860b25e73d6258f0003bd/the-transformers-the-movie-cover.jpg",
+            "id": "4ce860b25e73d6258f0003bd"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "thumb",
+            "height": 132,
+            "width": 92,
+            "url": "http://cf1.themoviedb.org/posters/3bd/4ce860b25e73d6258f0003bd/the-transformers-the-movie-thumb.jpg",
+            "id": "4ce860b25e73d6258f0003bd"
+        }
+    }],
+    "backdrops": [{
+        "image": {
+            "type": "backdrop",
+            "size": "original",
+            "height": 1080,
+            "width": 1920,
+            "url": "http://cf1.themoviedb.org/backdrops/2b8/4bc91334017a3c57fe0072b8/the-transformers-the-movie-original.png",
+            "id": "4bc91334017a3c57fe0072b8"
+        }
+    },
+    {
+        "image": {
+            "type": "backdrop",
+            "size": "poster",
+            "height": 439,
+            "width": 780,
+            "url": "http://cf1.themoviedb.org/backdrops/2b8/4bc91334017a3c57fe0072b8/the-transformers-the-movie-poster.png",
+            "id": "4bc91334017a3c57fe0072b8"
+        }
+    },
+    {
+        "image": {
+            "type": "backdrop",
+            "size": "thumb",
+            "height": 169,
+            "width": 300,
+            "url": "http://cf1.themoviedb.org/backdrops/2b8/4bc91334017a3c57fe0072b8/the-transformers-the-movie-thumb.png",
+            "id": "4bc91334017a3c57fe0072b8"
+        }
+    }],
+    "version": 50,
+    "last_modified_at": "2011-01-28 17:28:46"
+},
+{
+    "score": 9.816619,
+    "popularity": 3,
+    "translated": true,
+    "adult": false,
+    "language": "en",
+    "original_name": "Transformations",
+    "name": "Transformations",
+    "alternative_name": null,
+    "movie_type": "movie",
+    "id": 28800,
+    "imdb_id": "tt0094632",
+    "url": "http://www.themoviedb.org/movie/28800",
+    "votes": 1,
+    "rating": 5.5,
+    "runtime": 84,
+    "certification": "",
+    "overview": "No overview found.",
+    "released": "1988-09-02",
+    "posters": [{
+        "image": {
+            "type": "poster",
+            "size": "original",
+            "height": 529,
+            "width": 326,
+            "url": "http://cf1.themoviedb.org/posters/b32/4bc97113017a3c57fe033b32/transformations-original.jpg",
+            "id": "4bc97113017a3c57fe033b32"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "mid",
+            "height": 811,
+            "width": 500,
+            "url": "http://cf1.themoviedb.org/posters/b32/4bc97113017a3c57fe033b32/transformations-mid.jpg",
+            "id": "4bc97113017a3c57fe033b32"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "cover",
+            "height": 300,
+            "width": 185,
+            "url": "http://cf1.themoviedb.org/posters/b32/4bc97113017a3c57fe033b32/transformations-cover.jpg",
+            "id": "4bc97113017a3c57fe033b32"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "thumb",
+            "height": 149,
+            "width": 92,
+            "url": "http://cf1.themoviedb.org/posters/b32/4bc97113017a3c57fe033b32/transformations-thumb.jpg",
+            "id": "4bc97113017a3c57fe033b32"
+        }
+    }],
+    "backdrops": [],
+    "version": 43,
+    "last_modified_at": "2011-01-28 17:15:41"
+},
+{
+    "score": 9.816619,
+    "popularity": 3,
+    "translated": true,
+    "adult": false,
+    "language": "en",
+    "original_name": "Transformers",
+    "name": "Transformers",
+    "alternative_name": "The Transformers",
+    "movie_type": "movie",
+    "id": 1858,
+    "imdb_id": "tt0418279",
+    "url": "http://www.themoviedb.org/movie/1858",
+    "votes": 63,
+    "rating": 7.4,
+    "runtime": 132,
+    "certification": "PG-13",
+    "overview": "Young teenager Sam Witwicky becomes involved in the ancient struggle between two extraterrestrial factions of transforming robots, the heroic Autobots and the evil Decepticons.  Sam holds the clue to unimaginable power and the Decepticons will stop at nothing to retrieve it.",
+    "released": "2007-07-04",
+    "posters": [{
+        "image": {
+            "type": "poster",
+            "size": "original",
+            "height": 1500,
+            "width": 1000,
+            "url": "http://cf1.themoviedb.org/posters/233/4c9ea5cf5e73d67049000233/transformers-original.jpg",
+            "id": "4c9ea5cf5e73d67049000233"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "mid",
+            "height": 750,
+            "width": 500,
+            "url": "http://cf1.themoviedb.org/posters/233/4c9ea5cf5e73d67049000233/transformers-mid.jpg",
+            "id": "4c9ea5cf5e73d67049000233"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "cover",
+            "height": 278,
+            "width": 185,
+            "url": "http://cf1.themoviedb.org/posters/233/4c9ea5cf5e73d67049000233/transformers-cover.jpg",
+            "id": "4c9ea5cf5e73d67049000233"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "thumb",
+            "height": 138,
+            "width": 92,
+            "url": "http://cf1.themoviedb.org/posters/233/4c9ea5cf5e73d67049000233/transformers-thumb.jpg",
+            "id": "4c9ea5cf5e73d67049000233"
+        }
+    }],
+    "backdrops": [{
+        "image": {
+            "type": "backdrop",
+            "size": "original",
+            "height": 1080,
+            "width": 1920,
+            "url": "http://cf1.themoviedb.org/backdrops/2ce/4bc91339017a3c57fe0072ce/transformers-original.jpg",
+            "id": "4bc91339017a3c57fe0072ce"
+        }
+    },
+    {
+        "image": {
+            "type": "backdrop",
+            "size": "poster",
+            "height": 439,
+            "width": 780,
+            "url": "http://cf1.themoviedb.org/backdrops/2ce/4bc91339017a3c57fe0072ce/transformers-poster.jpg",
+            "id": "4bc91339017a3c57fe0072ce"
+        }
+    },
+    {
+        "image": {
+            "type": "backdrop",
+            "size": "thumb",
+            "height": 169,
+            "width": 300,
+            "url": "http://cf1.themoviedb.org/backdrops/2ce/4bc91339017a3c57fe0072ce/transformers-thumb.jpg",
+            "id": "4bc91339017a3c57fe0072ce"
+        }
+    }],
+    "version": 187,
+    "last_modified_at": "2011-01-28 17:28:33"
+},
+{
+    "score": 4.9083095,
+    "popularity": 3,
+    "translated": true,
+    "adult": false,
+    "language": "en",
+    "original_name": "Transformers: Beginnings",
+    "name": "Transformers: Beginnings",
+    "alternative_name": null,
+    "movie_type": "movie",
+    "id": 25565,
+    "imdb_id": "tt1236486",
+    "url": "http://www.themoviedb.org/movie/25565",
+    "votes": 1,
+    "rating": 7.0,
+    "runtime": 22,
+    "certification": "",
+    "overview": "On their home planet of Cybertron, the Autobots and Decepticons are involved in an explosive battle over the coveted AllSpark. With the fate of the universe at stake, the Autobots send it far from the reach of the ruthless Megatron, leader of the Decepticons. But there are even more surprises in store when it crash-lands on Earth.",
+    "released": "1900-01-01",
+    "posters": [{
+        "image": {
+            "type": "poster",
+            "size": "original",
+            "height": 1500,
+            "width": 1000,
+            "url": "http://cf1.themoviedb.org/posters/4b0/4bc964ff017a3c57fe02e4b0/transformers-beginnings-original.jpg",
+            "id": "4bc964ff017a3c57fe02e4b0"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "mid",
+            "height": 750,
+            "width": 500,
+            "url": "http://cf1.themoviedb.org/posters/4b0/4bc964ff017a3c57fe02e4b0/transformers-beginnings-mid.jpg",
+            "id": "4bc964ff017a3c57fe02e4b0"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "cover",
+            "height": 278,
+            "width": 185,
+            "url": "http://cf1.themoviedb.org/posters/4b0/4bc964ff017a3c57fe02e4b0/transformers-beginnings-cover.jpg",
+            "id": "4bc964ff017a3c57fe02e4b0"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "thumb",
+            "height": 138,
+            "width": 92,
+            "url": "http://cf1.themoviedb.org/posters/4b0/4bc964ff017a3c57fe02e4b0/transformers-beginnings-thumb.jpg",
+            "id": "4bc964ff017a3c57fe02e4b0"
+        }
+    }],
+    "backdrops": [{
+        "image": {
+            "type": "backdrop",
+            "size": "original",
+            "height": 720,
+            "width": 1280,
+            "url": "http://cf1.themoviedb.org/backdrops/4a4/4bc964fe017a3c57fe02e4a4/transformers-beginnings-original.jpg",
+            "id": "4bc964fe017a3c57fe02e4a4"
+        }
+    },
+    {
+        "image": {
+            "type": "backdrop",
+            "size": "poster",
+            "height": 439,
+            "width": 780,
+            "url": "http://cf1.themoviedb.org/backdrops/4a4/4bc964fe017a3c57fe02e4a4/transformers-beginnings-poster.jpg",
+            "id": "4bc964fe017a3c57fe02e4a4"
+        }
+    },
+    {
+        "image": {
+            "type": "backdrop",
+            "size": "thumb",
+            "height": 169,
+            "width": 300,
+            "url": "http://cf1.themoviedb.org/backdrops/4a4/4bc964fe017a3c57fe02e4a4/transformers-beginnings-thumb.jpg",
+            "id": "4bc964fe017a3c57fe02e4a4"
+        }
+    }],
+    "version": 13,
+    "last_modified_at": "2011-01-28 16:35:20"
+},
+{
+    "score": 4.6044497,
+    "popularity": 3,
+    "translated": true,
+    "adult": false,
+    "language": "ru",
+    "original_name": "Transformers: Dark of the Moon",
+    "name": "Transformers: Dark of the Moon",
+    "alternative_name": null,
+    "movie_type": "movie",
+    "id": 38356,
+    "imdb_id": "tt1399103",
+    "url": "http://www.themoviedb.org/movie/38356",
+    "votes": 0,
+    "rating": 0.0,
+    "runtime": null,
+    "certification": "",
+    "overview": "Transformers 3 is the working title for the third and final film in the live action Transformers series, directed by Michael Bay and produced by Steven Spielberg. It is the sequel to Transformers and Transformers: Revenge of the Fallen and is scheduled for release on July 1, 2011 in Real D 3D And IMAX 3D. Shia LaBeouf, Josh Duhamel, Tyrese Gibson, John Turturro and Ram\u00f3n Rodr\u00edguez are set to reprise their starring roles, with Peter Cullen returning as the voice of Optimus Prime, and Hugo Weaving also returning the voice of Megatron. Despite having initially been confirmed for the film, with the film already into principal photography, Megan Fox will not reprise her role. With Fox's character Mikaela being dropped, Sam is now set to be assigned a new love interest, who will be played by English model Rosie Huntington-Whiteley.",
+    "released": "2011-07-01",
+    "posters": [{
+        "image": {
+            "type": "poster",
+            "size": "original",
+            "height": 1441,
+            "width": 988,
+            "url": "http://cf1.themoviedb.org/posters/280/4d0153bf7b9aa11bc2000280/transformers-dark-of-the-moon-original.jpg",
+            "id": "4d0153bf7b9aa11bc2000280"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "mid",
+            "height": 729,
+            "width": 500,
+            "url": "http://cf1.themoviedb.org/posters/280/4d0153bf7b9aa11bc2000280/transformers-dark-of-the-moon-mid.jpg",
+            "id": "4d0153bf7b9aa11bc2000280"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "cover",
+            "height": 270,
+            "width": 185,
+            "url": "http://cf1.themoviedb.org/posters/280/4d0153bf7b9aa11bc2000280/transformers-dark-of-the-moon-cover.jpg",
+            "id": "4d0153bf7b9aa11bc2000280"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "thumb",
+            "height": 134,
+            "width": 92,
+            "url": "http://cf1.themoviedb.org/posters/280/4d0153bf7b9aa11bc2000280/transformers-dark-of-the-moon-thumb.jpg",
+            "id": "4d0153bf7b9aa11bc2000280"
+        }
+    }],
+    "backdrops": [{
+        "image": {
+            "type": "backdrop",
+            "size": "original",
+            "height": 720,
+            "width": 1280,
+            "url": "http://cf1.themoviedb.org/backdrops/291/4d0156907b9aa11bc3000291/transformers-dark-of-the-moon-original.jpg",
+            "id": "4d0156907b9aa11bc3000291"
+        }
+    },
+    {
+        "image": {
+            "type": "backdrop",
+            "size": "poster",
+            "height": 439,
+            "width": 780,
+            "url": "http://cf1.themoviedb.org/backdrops/291/4d0156907b9aa11bc3000291/transformers-dark-of-the-moon-poster.jpg",
+            "id": "4d0156907b9aa11bc3000291"
+        }
+    },
+    {
+        "image": {
+            "type": "backdrop",
+            "size": "thumb",
+            "height": 169,
+            "width": 300,
+            "url": "http://cf1.themoviedb.org/backdrops/291/4d0156907b9aa11bc3000291/transformers-dark-of-the-moon-thumb.jpg",
+            "id": "4d0156907b9aa11bc3000291"
+        }
+    }],
+    "version": 58,
+    "last_modified_at": "2011-01-28 17:34:15"
+},
+{
+    "score": 4.9083095,
+    "popularity": 3,
+    "translated": true,
+    "adult": false,
+    "language": "en",
+    "original_name": "Transformers: Resparked",
+    "name": "Transformers: Resparked",
+    "alternative_name": null,
+    "movie_type": "movie",
+    "id": 18907,
+    "imdb_id": "",
+    "url": "http://www.themoviedb.org/movie/18907",
+    "votes": 0,
+    "rating": 0.0,
+    "runtime": 122,
+    "certification": "",
+    "overview": "No overview found.",
+    "released": "2008-03-09",
+    "posters": [{
+        "image": {
+            "type": "poster",
+            "size": "original",
+            "height": 1446,
+            "width": 1000,
+            "url": "http://cf1.themoviedb.org/posters/d0e/4bc954f9017a3c57fe025d0e/transformers-resparked-original.jpg",
+            "id": "4bc954f9017a3c57fe025d0e"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "mid",
+            "height": 723,
+            "width": 500,
+            "url": "http://cf1.themoviedb.org/posters/d0e/4bc954f9017a3c57fe025d0e/transformers-resparked-mid.jpg",
+            "id": "4bc954f9017a3c57fe025d0e"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "cover",
+            "height": 268,
+            "width": 185,
+            "url": "http://cf1.themoviedb.org/posters/d0e/4bc954f9017a3c57fe025d0e/transformers-resparked-cover.jpg",
+            "id": "4bc954f9017a3c57fe025d0e"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "thumb",
+            "height": 133,
+            "width": 92,
+            "url": "http://cf1.themoviedb.org/posters/d0e/4bc954f9017a3c57fe025d0e/transformers-resparked-thumb.jpg",
+            "id": "4bc954f9017a3c57fe025d0e"
+        }
+    }],
+    "backdrops": [],
+    "version": 8,
+    "last_modified_at": "2011-01-25 19:36:45"
+},
+{
+    "score": 4.2947707,
+    "popularity": 3,
+    "translated": true,
+    "adult": false,
+    "language": "en",
+    "original_name": "Transformers: Revenge of the Fallen",
+    "name": "Transformers: Revenge of the Fallen",
+    "alternative_name": "Transformers 2",
+    "movie_type": "movie",
+    "id": 8373,
+    "imdb_id": "tt1055369",
+    "url": "http://www.themoviedb.org/movie/8373",
+    "votes": 46,
+    "rating": 6.8,
+    "runtime": 147,
+    "certification": "PG-13",
+    "overview": "Sam Witwicky leaves the Autobots behind for a normal life. But when his mind is filled with cryptic symbols, the Decepticons target him and he is dragged back into the Transformers' war.",
+    "released": "2009-06-24",
+    "posters": [{
+        "image": {
+            "type": "poster",
+            "size": "original",
+            "height": 1500,
+            "width": 1000,
+            "url": "http://cf1.themoviedb.org/posters/511/4c9fa2365e73d6704b000511/transformers-revenge-of-the-fallen-original.jpg",
+            "id": "4c9fa2365e73d6704b000511"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "mid",
+            "height": 750,
+            "width": 500,
+            "url": "http://cf1.themoviedb.org/posters/511/4c9fa2365e73d6704b000511/transformers-revenge-of-the-fallen-mid.jpg",
+            "id": "4c9fa2365e73d6704b000511"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "cover",
+            "height": 278,
+            "width": 185,
+            "url": "http://cf1.themoviedb.org/posters/511/4c9fa2365e73d6704b000511/transformers-revenge-of-the-fallen-cover.jpg",
+            "id": "4c9fa2365e73d6704b000511"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "thumb",
+            "height": 138,
+            "width": 92,
+            "url": "http://cf1.themoviedb.org/posters/511/4c9fa2365e73d6704b000511/transformers-revenge-of-the-fallen-thumb.jpg",
+            "id": "4c9fa2365e73d6704b000511"
+        }
+    }],
+    "backdrops": [{
+        "image": {
+            "type": "backdrop",
+            "size": "original",
+            "height": 1080,
+            "width": 1920,
+            "url": "http://cf1.themoviedb.org/backdrops/350/4bc92149017a3c57fe00d350/transformers-revenge-of-the-fallen-original.jpg",
+            "id": "4bc92149017a3c57fe00d350"
+        }
+    },
+    {
+        "image": {
+            "type": "backdrop",
+            "size": "poster",
+            "height": 439,
+            "width": 780,
+            "url": "http://cf1.themoviedb.org/backdrops/350/4bc92149017a3c57fe00d350/transformers-revenge-of-the-fallen-poster.jpg",
+            "id": "4bc92149017a3c57fe00d350"
+        }
+    },
+    {
+        "image": {
+            "type": "backdrop",
+            "size": "thumb",
+            "height": 169,
+            "width": 300,
+            "url": "http://cf1.themoviedb.org/backdrops/350/4bc92149017a3c57fe00d350/transformers-revenge-of-the-fallen-thumb.jpg",
+            "id": "4bc92149017a3c57fe00d350"
+        }
+    }],
+    "version": 241,
+    "last_modified_at": "2011-01-28 15:20:21"
+},
+{
+    "score": 4.9083095,
+    "popularity": 3,
+    "translated": true,
+    "adult": false,
+    "language": "en",
+    "original_name": "Transformers: Scramble City",
+    "name": "Transformers: Scramble City",
+    "alternative_name": null,
+    "movie_type": "movie",
+    "id": 20368,
+    "imdb_id": "tt0147625",
+    "url": "http://www.themoviedb.org/movie/20368",
+    "votes": 0,
+    "rating": 0.0,
+    "runtime": 0,
+    "certification": "",
+    "overview": "Taking place after the 2nd Season of Transformers (Generation 1) Scramble City gets its original story underway, as the Autobots are shown to be in the midst of constructing the powerful \"Scramble City,\" overseen by their newest arrival, Ultra Magnus. When the Decepticons learn of this, their combiner robots are deployed to attack, and a battle between them and their Autobot counterparts ensues.",
+    "released": "1900-01-01",
+    "posters": [{
+        "image": {
+            "type": "poster",
+            "size": "original",
+            "height": 227,
+            "width": 300,
+            "url": "http://cf1.themoviedb.org/posters/3a5/4bc9596a017a3c57fe0283a5/transformers-scramble-city-original.jpg",
+            "id": "4bc9596a017a3c57fe0283a5"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "mid",
+            "height": 378,
+            "width": 500,
+            "url": "http://cf1.themoviedb.org/posters/3a5/4bc9596a017a3c57fe0283a5/transformers-scramble-city-mid.jpg",
+            "id": "4bc9596a017a3c57fe0283a5"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "cover",
+            "height": 140,
+            "width": 185,
+            "url": "http://cf1.themoviedb.org/posters/3a5/4bc9596a017a3c57fe0283a5/transformers-scramble-city-cover.jpg",
+            "id": "4bc9596a017a3c57fe0283a5"
+        }
+    },
+    {
+        "image": {
+            "type": "poster",
+            "size": "thumb",
+            "height": 70,
+            "width": 92,
+            "url": "http://cf1.themoviedb.org/posters/3a5/4bc9596a017a3c57fe0283a5/transformers-scramble-city-thumb.jpg",
+            "id": "4bc9596a017a3c57fe0283a5"
+        }
+    }],
+    "backdrops": [],
+    "version": 15,
+    "last_modified_at": "2011-01-28 16:13:24"
+}]

data/spec/lib/tmdb_party/extras/movie_hasher_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+# Download the sample files from here:
+# http://trac.opensubtitles.org/projects/opensubtitles/wiki/HashSourceCodes
+# and uncomment these tests before making any changes
+describe TMDBParty::MovieHasher do
+  # Not sure the best way to have tests for this without having real files to work with.
+  it "should compute hash" do
+    pending
+    File.open('breakdance.avi') do |file|
+      TMDBParty::MovieHasher.compute_hash(file).should == "8e245d9679d31e12"
+    end
+  end
+
+  it "should compute hash on large file" do
+    pending
+    File.open('dummy.bin') do |file|
+      TMDBParty::MovieHasher.compute_hash(file).should == "61f7751fc2a72bfb"
+    end
+  end
+end

data/spec/lib/tmdb_party/movie_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'httparty'
 
 describe TMDBParty::Movie do
   before(:each) do

data/spec/lib/tmdb_party_spec.rb

@@ -65,6 +65,24 @@ describe TMDBParty::Base do
       tmdb.get_info(1858, 'sv').should_not be_nil
     end
   end
+
+  describe "#get_info with file" do
+    it "should return a movie instance" do
+      file = mock("file")
+      file.should_receive(:size).and_return(742086656)
+      TMDBParty::MovieHasher.should_receive(:compute_hash).with(file).and_return("907172e7fe51ba57")
+      stub_get('/Media.getInfo/en/json/key/907172e7fe51ba57/742086656', 'transformers.json')
+      tmdb.get_file_info(file).should have(1).movies
+    end
+
+    it "should return empty array when no movie found" do
+      file = mock("file")
+      file.should_receive(:size).and_return("fake")
+      TMDBParty::MovieHasher.should_receive(:compute_hash).with(file).and_return("fake")
+      stub_get('/Media.getInfo/en/json/key/fake/fake', 'nothing_found.json')
+      tmdb.get_file_info(file).should == []
+    end
+  end
   
   describe "#search_person" do
     it "should return empty array when no people was found" do
@@ -114,4 +132,27 @@ describe TMDBParty::Base do
       tmdb.get_genres('sv').first.name.should == 'Action'
     end
   end
-end
+
+
+  describe "#browse" do
+    it "should return an empty array when no matches was found" do
+      stub_get('/Movie.browse/en/json/key?order=asc&order_by=title&query=NothingFound', 'nothing_found.json')
+
+      tmdb.browse(:query => 'NothingFound').should == []
+    end
+
+    it "should return an array of movies" do
+      stub_get('/Movie.browse/en/json/key?order=asc&order_by=title&query=Transformers', 'browse.json')
+
+      tmdb.browse(:query => 'Transformers').should have(12).movies
+      tmdb.browse(:query => 'Transformers').first.should be_instance_of(TMDBParty::Movie)
+    end
+
+    it "should use the preferred language" do
+      stub_get('/Movie.browse/en/json/key?order=asc&order_by=title&query=Transformers', 'shitty_shit_result.json')
+      stub_get('/Movie.browse/sv/json/key?order=asc&order_by=title&query=Transformers', 'browse.json')
+
+      tmdb.browse({:query => 'Transformers'}, 'sv').should have(12).movies
+    end
+  end
+end

data/tmdb_party.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tmdb_party}
-  s.version = "0.8.0"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Duff", "Jon Maddox"]
-  s.date = %q{2011-01-29}
+  s.date = %q{2011-03-12}
   s.email = %q{duff.john@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -22,18 +22,19 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION.yml",
     "lib/tmdb_party.rb",
-    "lib/tmdb_party/attributes.rb",
     "lib/tmdb_party/cast_member.rb",
     "lib/tmdb_party/category.rb",
-    "lib/tmdb_party/core_extensions.rb",
     "lib/tmdb_party/country.rb",
+    "lib/tmdb_party/extras/attributes.rb",
+    "lib/tmdb_party/extras/httparty_icebox.rb",
+    "lib/tmdb_party/extras/movie_hasher.rb",
     "lib/tmdb_party/genre.rb",
-    "lib/tmdb_party/httparty_icebox.rb",
     "lib/tmdb_party/image.rb",
     "lib/tmdb_party/movie.rb",
     "lib/tmdb_party/person.rb",
     "lib/tmdb_party/studio.rb",
     "lib/tmdb_party/video.rb",
+    "spec/fixtures/browse.json",
     "spec/fixtures/genres_results.json",
     "spec/fixtures/imdb_no_results.json",
     "spec/fixtures/imdb_search.json",
@@ -48,6 +49,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/transformers.json",
     "spec/lib/tmdb_party/cast_member_spec.rb",
     "spec/lib/tmdb_party/country_spec.rb",
+    "spec/lib/tmdb_party/extras/movie_hasher_spec.rb",
     "spec/lib/tmdb_party/genre_spec.rb",
     "spec/lib/tmdb_party/image_spec.rb",
     "spec/lib/tmdb_party/movie_spec.rb",
@@ -66,6 +68,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/lib/tmdb_party/cast_member_spec.rb",
     "spec/lib/tmdb_party/country_spec.rb",
+    "spec/lib/tmdb_party/extras/movie_hasher_spec.rb",
     "spec/lib/tmdb_party/genre_spec.rb",
     "spec/lib/tmdb_party/image_spec.rb",
     "spec/lib/tmdb_party/movie_spec.rb",

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - John Duff
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 -05:00
+date: 2011-03-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,18 +75,19 @@ files:
 - Rakefile
 - VERSION.yml
 - lib/tmdb_party.rb
-- lib/tmdb_party/attributes.rb
 - lib/tmdb_party/cast_member.rb
 - lib/tmdb_party/category.rb
-- lib/tmdb_party/core_extensions.rb
 - lib/tmdb_party/country.rb
+- lib/tmdb_party/extras/attributes.rb
+- lib/tmdb_party/extras/httparty_icebox.rb
+- lib/tmdb_party/extras/movie_hasher.rb
 - lib/tmdb_party/genre.rb
-- lib/tmdb_party/httparty_icebox.rb
 - lib/tmdb_party/image.rb
 - lib/tmdb_party/movie.rb
 - lib/tmdb_party/person.rb
 - lib/tmdb_party/studio.rb
 - lib/tmdb_party/video.rb
+- spec/fixtures/browse.json
 - spec/fixtures/genres_results.json
 - spec/fixtures/imdb_no_results.json
 - spec/fixtures/imdb_search.json
@@ -101,6 +102,7 @@ files:
 - spec/fixtures/transformers.json
 - spec/lib/tmdb_party/cast_member_spec.rb
 - spec/lib/tmdb_party/country_spec.rb
+- spec/lib/tmdb_party/extras/movie_hasher_spec.rb
 - spec/lib/tmdb_party/genre_spec.rb
 - spec/lib/tmdb_party/image_spec.rb
 - spec/lib/tmdb_party/movie_spec.rb
@@ -146,6 +148,7 @@ summary: Simple ruby wrapper to themoviedb.org (http://api.themoviedb.org/2.0/do
 test_files: 
 - spec/lib/tmdb_party/cast_member_spec.rb
 - spec/lib/tmdb_party/country_spec.rb
+- spec/lib/tmdb_party/extras/movie_hasher_spec.rb
 - spec/lib/tmdb_party/genre_spec.rb
 - spec/lib/tmdb_party/image_spec.rb
 - spec/lib/tmdb_party/movie_spec.rb

data/lib/tmdb_party/core_extensions.rb

@@ -1,18 +0,0 @@
-class Array
-  def extract_options!
-    last.is_a?(::Hash) ? pop : {}
-  end
-  
-end
-
-class Float
-  def self.parse(val)
-    Float(val)
-  end
-end
-
-class Integer
-  def self.parse(val)
-    Integer(val)
-  end
-end