valdemaximus-xx 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/extensions/hash.rb

@@ -1,20 +1,37 @@
 require 'cgi'
+require 'pp'
 
 class Hash
   def to_url_params
     elements = []
-    keys.size.times do |i|
-      elements << "#{CGI::escape(keys[i])}=#{CGI::escape(values[i])}"
+    self.each_pair do |key, value|
+      url_node(key, value, elements)
     end
     elements.join('&')
   end
-
-  def self.from_url_params(url_params)
-    result = {}.with_indifferent_access
-    url_params.split('&').each do |element|
-      element = element.split('=')
-      result[element[0]] = element[1]
+  
+  private
+    def url_node(key, value, elements, curr_path=nil)
+      if value.class != Hash && value.class != Array && curr_path.nil?
+        elements << "#{CGI::escape(key.to_s)}=#{CGI::escape(value.to_s)}"
+      elsif value.class != Hash && value.class != Array
+        elements << curr_path + CGI::escape("[#{key.to_s}]"+ '=' + CGI::escape(value.to_s))
+      elsif value.class == Hash
+        value.each_pair do |k, v|
+          if curr_path.nil?
+            url_node(k,v, elements, CGI::escape(key.to_s))
+          else
+            url_node(k,v, elements, curr_path + "[#{CGI::escape(key.to_s)}]")
+          end
+        end
+      elsif value.class == Array
+        value.each do |v|
+          if curr_path.nil?
+            url_node('',v, elements, CGI::escape(key.to_s))
+          else
+            url_node('',v, elements, curr_path + "[#{CGI::escape(key.to_s)}]")
+          end
+        end
+      end
     end
-    result
-  end
 end

data/lib/extensions/string.rb

@@ -1,7 +1,22 @@
+require 'rubygems'
+require 'activesupport'
+
 class String
   def not_empty?
     not empty?
   end
   
   alias :not_blank? :not_empty?
+  
+  
+
+  def from_url_params
+    puts self
+    result = {}.with_indifferent_access
+    self.split('&').each do |element|
+      element = element.split('=')
+      result[element[0]] = element[1]
+    end
+    result
+  end
 end

data/test/tc_hash.rb

@@ -0,0 +1,32 @@
+require "test/unit"
+
+require "extensions/array"
+require "extensions/hash"
+require "extensions/string"
+
+class TestToAndFromUrl < Test::Unit::TestCase
+  def test_simple_hash
+    params = {:hello => 'joe', :fun => 'trips', :trip => 'Florida'}
+    assert_equal("trip=Florida&hello=joe&fun=trips", CGI::unescape(params.to_url_params))
+  end
+  
+  def test_simple_hash_with_symbols_instead_of_strings
+    params = {:hello => :joe, :fun => :trips, :trip => :Florida}
+    assert_equal("trip=Florida&hello=joe&fun=trips", CGI::unescape(params.to_url_params))
+  end
+  
+  def test_only_hash_of_hashes
+    params = {:hello => 'joe', :fun => {:stuff => {:basketball => :sports, :football => 'sports'}, :trip => 'Florida'}}
+    assert_equal("hello=joe&fun[trip]=Florida&fun[stuff][football]=sports&fun[stuff][basketball]=sports", CGI::unescape(params.to_url_params))
+  end
+  
+  def test_hash_of_hashes_and_arrays
+    params = {:hello => 'joe', :fun => {:stuff => {:sports => ['basketball', 'football']}, :trip => 'Florida'}}
+    assert_equal("hello=joe&fun[trip]=Florida&fun[stuff][sports][]=basketball&fun[stuff][sports][]=football", CGI::unescape(params.to_url_params))
+  end
+  
+  def test_arrays_at_root
+    params = {:sports => ['basketball', 'football']}
+    assert_equal("sports[]=basketball&sports[]=football", CGI::unescape(params.to_url_params))
+  end
+end

data/xx.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xx}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Johnson"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "lib/extensions/string.rb",
      "lib/extensions/time.rb",
      "lib/xx.rb",
+     "test/tc_hash.rb",
      "test/tc_time.rb",
      "xx.gemspec"
   ]
@@ -41,7 +42,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Extensions of standard ruby objects}
   s.test_files = [
-    "test/tc_time.rb"
+    "test/tc_hash.rb",
+     "test/tc_time.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: valdemaximus-xx
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tom Johnson
@@ -38,6 +38,7 @@ files:
 - lib/extensions/string.rb
 - lib/extensions/time.rb
 - lib/xx.rb
+- test/tc_hash.rb
 - test/tc_time.rb
 - xx.gemspec
 has_rdoc: false
@@ -68,4 +69,5 @@ signing_key:
 specification_version: 3
 summary: Extensions of standard ruby objects
 test_files: 
+- test/tc_hash.rb
 - test/tc_time.rb