iron-web 1.0.2 → 1.1.1

data/History.txt

@@ -1,3 +1,14 @@
+== 1.1.1 / 2013-03-13
+
+* Handle setting Url params with keys, accessing with keys using #get_param
+
+== 1.1.0 / 2013-03-12
+
+* Fix parsing of multi-value params to be keyed without the "[]" - NOTE: BREAKING CHANGE!
+* Fix rendering of multi-value params to enforce addition of "[]"
+* Add Url#set_params(hash) to allow setting multiple params at once
+* Add optional param to Url#make_absolute to allow explicitly setting the server
+
 == 1.0.2 / 2012-06-03
 
 * Add ability to access attributes on elements using []/[]=
@@ -9,9 +20,9 @@
 
 == 1.0.0 / 2012-03-02
 
-* Broke out extensions from older irongaze gem
+* Break out extensions from older irongaze gem
 * Updated Url and Color classes with misc fixes
 * Added Url and Color spec coverage
 * Major Html::Element spec work, basic Html spec coverage
 * Add html_safe support for non-Rails environments
-* Added to GitHub
+* Add to GitHub

data/README.rdoc

@@ -16,6 +16,8 @@ A set of classes useful in the generation of HTML content.
     >> url.params[:key] = 'some value'
     >> url.to_s
     => '/home?key=some+value'
+    >> url.make_absolute(false, 'google.com')
+    => 'http://google.com/home?key=some+value'
 
 * Color - an RGB/A color manipulation class, useful in generating CSS etc.
 
@@ -89,3 +91,7 @@ setting them during construction.
 To install, simply run:
 
     sudo gem install iron-web
+    
+RVM users can skip the sudo:
+
+    gem install iron-web

data/Version.txt

@@ -1 +1 @@
-1.0.2
+1.1.1

data/lib/iron/web/url.rb

@@ -63,10 +63,11 @@ class Url
       str += '?'
       str += params.collect do |k,v|
         if v.is_a?(Array)
+          k = k.gsub('[]','')
           v.collect do |vs|
             val = vs.respond_to?(:to_param) ? vs.to_param : vs
             val = val.to_s
-            CGI::escape(k.to_s) + '=' + CGI::escape(val)
+            CGI::escape(k.to_s) + '[]=' + CGI::escape(val)
           end
         else
           val = v.respond_to?(:to_param) ? v.to_param : v
@@ -103,7 +104,13 @@ class Url
     @params = {}
     params.split('&').each do |p|
       k, v = p.split('=')
-      add_param(CGI::unescape(k), CGI::unescape(v)) if k && v
+      if k && v
+        if k.ends_with?('[]')
+          add_param(CGI::unescape(k.gsub('[]','')), [CGI::unescape(v)])
+        else
+          add_param(CGI::unescape(k), CGI::unescape(v))
+        end
+      end
     end
   end
 
@@ -153,14 +160,22 @@ class Url
 
   # Override current param val or set if none
   def set_param(k, v)
-    @params[k] = v
+    @params[k.to_s] = v
+  end
+  
+  def set_params(hash)
+    hash.each_pair {|k,v|
+      set_param(k, v)
+    }
   end
 
   # Add a param value (can be called multiply for the same param key)
   def add_param(k, v)
+    k = k.to_s
     oldval = @params[k]
     if oldval
       @params[k] = oldval.is_a?(Array) ? oldval + [v] :  [oldval, v]
+      @params[k].flatten!
     else
       @params[k] = v
     end
@@ -172,10 +187,14 @@ class Url
       if key_or_regex.is_a?(Regexp)
         k.match(key_or_regex)
       else
-        k == key_or_regex
+        k == key_or_regex.to_s
       end
     end
   end
+  
+  def get_param(k)
+    @params[k.to_s]
+  end
 
   # Reset params
   def clear_params
@@ -200,10 +219,10 @@ class Url
   end
 
   # Ensure url contains a server + scheme section, eg converts '/foo' into 'http://example.com/foo'.
-  def make_absolute(secure = false)
+  def make_absolute(secure = false, server = nil)
     unless absolute? && secure? == secure
-      raise 'No default server in Url#make_absolute' unless @server || Url.default_server
-      @server = Url.default_server unless @server
+      raise 'No default server set for Url#make_absolute' unless server || @server || Url.default_server
+      @server ||= (server || Url.default_server)
       unless @scheme
         @scheme = Url.default_scheme 
         @port = nil

data/spec/web/url_spec.rb

@@ -30,7 +30,7 @@ describe Url do
     u.port.should == 819
     u.path.should == '/this/is-a-bunch.jpg'
     u.params['of'].should == 'crazy'
-    u.params['free[]'].should == '55'
+    u.params['free'].should == ['55']
     u.fragment.should == 'now'
   end
   
@@ -60,6 +60,7 @@ describe Url do
     u = Url.new('/scores')
     u.add_param('soccer', '123')
     u.add_param('soccer', '456')
+    u.to_s.should match(/soccer\[\]=/)
     u = Url.parse(u.to_s)
     val = u.params['soccer']
     val.should be_an(Array)
@@ -94,8 +95,22 @@ describe Url do
     u.make_absolute.should == 'http://irongaze.com/bar'
   end
   
+  it 'should allow explicit servers in make_absolute' do
+    u = Url.parse('/bob')
+    u.make_absolute(true, 'microsoft.com').should == 'https://microsoft.com/bob'
+  end
+  
   it 'should escape params correctly' do
     Url.build('/foo', 'one:two' => 'http://other.com').should == '/foo?one%3Atwo=http%3A%2F%2Fother.com'
   end
   
+  it 'should allow setting and getting using symbols or strings' do
+    u = Url.parse('/')
+    u.set_param(:bob, 4)
+    u.to_s.should == '/?bob=4'
+    u.set_param('bob', 5)
+    u.to_s.should == '/?bob=5'
+    u.get_param(:bob).should == 5
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron-web
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-03 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron-extensions