deas 0.21.0 → 0.22.0

data/lib/deas/cgi.rb

@@ -0,0 +1,31 @@
+module Deas
+
+  module Cgi
+    # taken from http://ruby-doc.org/stdlib/libdoc/cgi/rdoc/index.html
+    # => not requiring 'cgi' to save on memory usage
+
+    def self.escape(string)
+      string.gsub(/([^ a-zA-Z0-9_.-]+)/n) do
+        '%' + $1.unpack('H2' * $1.size).join('%').upcase
+      end.gsub(' ', '%20')
+    end
+
+    def self.http_query(value, key_ns = nil)
+      # optimized version taken from:
+      # http://github.com/kelredd/useful/blob/master/lib/useful/ruby_extensions/hash.rb
+      value.sort{|a,b| a[0].to_s <=> b[0].to_s}.collect do |key_val|
+        key, val = key_val
+        key_s = key_ns ? "#{key_ns}[#{key_val[0].to_s}]" : key_val[0].to_s
+        if key_val[1].kind_of?(::Array)
+          key_val[1].sort.collect{|i| "#{key_s}[]=#{Deas::Cgi.escape(i.to_s)}"}.join('&')
+        elsif key_val[1].kind_of?(::Hash)
+          Deas::Cgi.http_query(key_val[1], key_s)
+        else
+          "#{key_s}=#{Deas::Cgi.escape(key_val[1].to_s)}"
+        end
+      end.join('&')
+    end
+
+  end
+
+end

data/lib/deas/url.rb

@@ -1,3 +1,5 @@
+require 'deas/cgi'
+
 module Deas
   class Url
 
@@ -8,25 +10,43 @@ module Deas
     end
 
     def path_for(*args)
-      named, ordered = [
+      hashed, ordered = [
         args.last.kind_of?(::Hash) ? args.pop : {},
         args
       ]
-      apply_ordered_params(apply_named_params(@path, named), ordered)
+      apply_ordered(apply_hashed(@path, hashed), ordered)
     end
 
     private
 
-    def apply_named_params(path, params)
+    def apply_ordered(path, params)
+      params.inject(path){ |p, v| p.sub(/\*+|\:\w+/i, v.to_s) }.gsub(/\/\/+/, '/')
+    end
+
+    def apply_hashed(path, params)
       # ignore captures in applying params
-      captures   = params.delete(:captures) || params.delete('captures') || []
-      splat      = params.delete(:splat)    || params.delete('splat')    || []
-      splat_path = splat.inject(path){ |p, v| p.sub(/\*+/, v.to_s) }
-      params.inject(splat_path){ |p, (k, v)| p.gsub(":#{k}", v.to_s) }
+      captures = params.delete(:captures) || params.delete('captures') || []
+      splat    = params.delete(:splat)    || params.delete('splat')    || []
+      apply_extra(apply_named(apply_splat(@path, splat), params), params)
     end
 
-    def apply_ordered_params(path, params)
-      params.inject(path){ |p, v| p.sub(/\*+|\:\w+/i, v.to_s) }.gsub(/\/\/+/, '/')
+    def apply_splat(path, params)
+      params.inject(path){ |p, v| p.sub(/\*+/, v.to_s) }
+    end
+
+    def apply_named(path, params)
+      params.inject(path) do |p, (k, v)|
+        if p.include?(":#{k}")
+          params.delete(k)
+          p.gsub(":#{k}", v.to_s)
+        else
+          p
+        end
+      end
+    end
+
+    def apply_extra(path, params)
+      params.empty? ? path : "#{path}?#{Deas::Cgi.http_query(params)}"
     end
 
   end

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.21.0"
+  VERSION = "0.22.0"
 end

data/test/unit/cgi_tests.rb

@@ -0,0 +1,36 @@
+require 'assert'
+require 'deas/cgi'
+
+module Deas::Cgi
+
+  class UnitTests < Assert::Context
+    desc "Deas::Cgi"
+    subject{ Deas::Cgi }
+
+    should have_imeths :escape, :http_query
+
+    should "cgi-escape data values" do
+      exp = "Right%21%20%5BSaid%5D%20Fred.%0D%0A"
+      assert_equal exp, Deas::Cgi.escape("Right! [Said] Fred.\r\n")
+    end
+
+    should "create http query strings" do
+      exp = "name=thomas%20hardy%20%2F%20thomas%20handy"
+      assert_equal exp, Deas::Cgi.http_query(:name => 'thomas hardy / thomas handy')
+
+      exp = "id=23423&since=2009-10-14"
+      assert_equal exp, Deas::Cgi.http_query(:id => 23423, :since => "2009-10-14")
+
+      exp = "id[]=1&id[]=2"
+      assert_equal exp, Deas::Cgi.http_query(:id => [1,2])
+
+      exp = "poo[bar]=2&poo[foo]=1"
+      assert_equal exp, Deas::Cgi.http_query(:poo => {:foo => 1, :bar => 2})
+
+      exp = "poo[bar][bar1]=1&poo[bar][bar2]=nasty&poo[foo]=1"
+      assert_equal exp, Deas::Cgi.http_query(:poo => {:foo => 1, :bar => {:bar1 => 1, :bar2 => "nasty"}})
+    end
+
+  end
+
+end

data/test/unit/url_tests.rb

@@ -5,7 +5,7 @@ require 'test/support/view_handlers'
 
 class Deas::Url
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Deas::Url"
     setup do
       @url = Deas::Url.new(:get_info, '/info')
@@ -22,7 +22,7 @@ class Deas::Url
 
   end
 
-  class PathForTests < BaseTests
+  class PathForTests < UnitTests
     desc "when generating paths"
     setup do
       @url = Deas::Url.new(:some_thing, '/:some/:thing/*/*')
@@ -50,6 +50,17 @@ class Deas::Url
       })
     end
 
+    should "append other (additional) params as query params" do
+      exp_path = "/a/goose/cooked/well?aye=a%20a%20a&bee=b"
+      assert_equal exp_path, subject.path_for({
+        'some'  => 'a',
+        :thing  => 'goose',
+        'splat' => ['cooked', 'well'],
+        'bee'   => 'b',
+        :aye    => 'a a a'
+      })
+    end
+
     should "generate given ordered params only" do
       exp_path = "/a/:thing/*/*"
       assert_equal exp_path, subject.path_for('a')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 71
   prerelease: 
   segments: 
   - 0
-  - 21
+  - 22
   - 0
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-24 00:00:00 Z
+date: 2013-10-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ns-options
@@ -145,6 +145,7 @@ files:
 - Rakefile
 - deas.gemspec
 - lib/deas.rb
+- lib/deas/cgi.rb
 - lib/deas/error_handler.rb
 - lib/deas/exceptions.rb
 - lib/deas/logging.rb
@@ -184,6 +185,7 @@ files:
 - test/support/views/some_no_engine_extension
 - test/support/views/with_layout.erb
 - test/system/rack_tests.rb
+- test/unit/cgi_tests.rb
 - test/unit/error_handler_tests.rb
 - test/unit/exceptions_tests.rb
 - test/unit/logging_tests.rb
@@ -254,6 +256,7 @@ test_files:
 - test/support/views/some_no_engine_extension
 - test/support/views/with_layout.erb
 - test/system/rack_tests.rb
+- test/unit/cgi_tests.rb
 - test/unit/error_handler_tests.rb
 - test/unit/exceptions_tests.rb
 - test/unit/logging_tests.rb