rotten-party 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/rotten-party/client.rb

@@ -25,15 +25,15 @@ module RottenParty
 
     # Find a specific film by it's identifier
     def find_film_by_id(id, options={})
-      options.merge!(@global_options)
+      options = options.recurse_merge(@global_options)
       response = self.class.get("/movies/#{id}.json", options).parsed_response
       Hashie::Mash.new(response)
     end
 
     # Find a film by it's title
     def find_film_by_title(title, options={})
-      options.merge!(@global_options)
-      options.merge!({:query => {:q => u(title)}})
+      options = options.recurse_merge(@global_options)
+      options = options.recurse_merge({:query => {:q => u(title)}})
       response = self.class.get("/movies.json", options).parsed_response
       Hashie::Mash.new(response["movies"].first)
     end
@@ -48,9 +48,15 @@ module RottenParty
     # => 'dvds'
     # => 'movies'
     def find_movies_in_list(list, directory, options={})
-      options.merge!(@global_options)
+      options = options.recurse_merge(@global_options)
       response = self.class.get("/lists/#{directory}/#{list}.json", options).parsed_response
       response["movies"].collect{ |movie| Hashie::Mash.new(movie) }
     end
   end
+
+  def recurse_merge(a,b)
+    a.merge(b) do |_,x,y|
+      (x.is_a?(Hash) && y.is_a?(Hash)) ? recurse_merge(x,y) : [*x,*y]
+    end
+  end
 end

data/rotten-party.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rotten-party}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Pellant"]

metadata

@@ -2,7 +2,7 @@
 name: rotten-party
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Nick Pellant
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1354565757689011251
+      hash: -1643533933040285390
       segments: 
       - 0
       version: "0"