laserlemon-search_party 0.3.2 → 0.3.3

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('search_party', '0.3.2') do |g|
+Echoe.new('search_party', '0.3.3') do |g|
   g.description = %(Parse your query parameters into more meaningful values)
   g.url = 'http://github.com/laserlemon/search_party'
   g.author = 'Steve Richert'

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 3
-:patch: 2
+:patch: 3

data/lib/search_party.rb

@@ -14,25 +14,31 @@ module LaserLemon
       end
       
       def search_parameters
-        @search_parameters ||= begin
-          query_parameters.symbolize_keys.inject({}) do |new_parameters, (key, value)|
-            parsed_value = parse_search_parameter(value)
-            if model_name = self.class.search_parameter_models[key]
-              model = model_name.to_s.classify.constantize
-              finder = self.class.search_parameter_finders[key]
-              new_values = [*parsed_value].map{|v| model.send(finder, v) }
-              new_value = (parsed_value.is_a?(Array) ? new_values.dup : new_values.first)
-            else
-              new_value = parsed_value
-            end
-            new_parameters.update(key => new_value)
-          end
-        end.with_indifferent_access
+        @search_parameters ||= parse_hash(query_parameters)
       end
       
       private
       
-      def parse_search_parameter(value)
+      def parse_hash(hash)
+        hash.symbolize_keys.inject({}) do |new_hash, (key, value)|
+          parsed_value = case value
+          when Hash then parse_hash(value)
+          when Array then value.map{|v| parse_value(v) }
+          else parse_value(v)
+          end
+          new_value = if model_name = self.class.search_parameter_models[key]
+            model = model_name.to_s.classify.constantize
+            finder = self.class.search_parameter_finders[key]
+            new_values = [*parsed_value].map{|v| model.send(finder, v) }
+            parsed_value.is_a?(Array) ? new_values.dup : new_values.first
+          else
+            parsed_value
+          end
+          new_hash.update(key => new_value)
+        end.with_indifferent_access
+      end
+      
+      def parse_value(value)
         if p = self.class.search_parameter_patterns.detect{|r,v| r.match(value) }
           (v = p.last).respond_to?(:call) ? v.call($~) : v
         else

data/search_party.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{search_party}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve Richert"]
-  s.date = %q{2009-06-24}
+  s.date = %q{2009-07-30}
   s.description = %q{Parse your query parameters into more meaningful values}
   s.email = %q{steve@laserlemon.com}
   s.extra_rdoc_files = ["lib/search_party.rb", "README.rdoc"]
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Search_party", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{search_party}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Parse your query parameters into more meaningful values}
   s.test_files = ["test/search_party_test.rb", "test/test_helper.rb"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: laserlemon-search_party
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Steve Richert
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-24 00:00:00 -07:00
+date: 2009-07-30 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - search_party.gemspec
 has_rdoc: false
 homepage: http://github.com/laserlemon/search_party
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -60,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: search_party
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Parse your query parameters into more meaningful values