rtopia 0.1.1 → 0.2.0

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+/doc

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/rtopia.rb

@@ -1,14 +1,13 @@
+require 'uri'
+require 'cgi'
+
 module Rtopia
   def self.R(*args)
     @rtopia ||= Object.new.extend(self)
-
     @rtopia.R(*args)
   end
 
-  # Pass any collection of objects
-  # R will use it's :to_param, then :id (if ruby19), then :to_s
-  #
-  # Examples:
+  # Usage:
   #
   #    R(:items) # => /items
   #    
@@ -17,15 +16,55 @@ module Rtopia
   #    R(@person, :posts) # => '/john-doe/posts'
   #    R(@person, :posts, :replied) # => '/john-doe/posts/replied'
   #
-  #    @entry = Entry.create # has an id of 1001 for example
+  #    @entry = Entry.create # has an id of 1001 for example and Ruby1.9
   #    R(@entry) # => '/1001'
   #    R(:entry, @entry) # => '/entry/1001'
   #   
+  #    R(:search, :q => 'Ruby', :page => 1) => '/search?q=Ruby&page=1'
+  #    R(:q => 'Ruby', :page => 1) => '?q=Ruby&page=1'
+  #    R(:q => ['first, 'second']) => '?q[]=first&q[]=second'
+  #    R(:user => { :lname => 'Doe', :fname => 'John' })
+  #    => '?user[lname]=Doe&user[fname]=John'
+  #
   def R(*args)
-    args.unshift('/').map { |arg| to_param(arg) }.join('/').squeeze('/')
+    hash = args.last.is_a?(Hash) ? args.pop : {}
+
+    # No args, so we opt to make ?q=Ruby&page=1 style URIs
+    if hash.any? and args.empty?
+      '?' + query_string(hash)
+    else
+      r = args.unshift('/').map { |arg| to_param(arg) }.join('/').squeeze('/')
+      if hash.any?
+        r << '?'
+        r << query_string(hash)
+      end
+      r
+    end
   end
 
 private
+  def query_string(hash)
+    hash.inject([]) { |arr, (key, value)|
+      if value.is_a?(Array)
+        value.each do |e|
+          arr << to_query("#{key}[]", e)
+        end
+        arr
+      elsif value.is_a?(Hash)
+        value.each do |namespace, deeper|
+          arr << to_query("#{key}[#{namespace}]", deeper)
+        end
+        arr
+      else
+        arr << to_query(key, value)
+      end
+    }.join('&')
+  end
+
+  def to_query(k, v)
+    '%s=%s' % [CGI.escape(k.to_s), URI.escape(to_param(v))]
+  end
+
   # Primary difference of this method is that it checks if
   # the passed object has an :id method
   # after checking for a :to_param

data/rtopia.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rtopia}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sinefunc"]
-  s.date = %q{2010-04-21}
+  s.date = %q{2010-04-25}
   s.description = %q{For use anywhere you have objects with to_params, ids, or just to_s's}
   s.email = %q{sinefunc@gmail.com}
   s.extra_rdoc_files = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/sinefunc/rtopia}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{A cute helper for route generation}
   s.test_files = [
     "test/helper.rb",

data/test/helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'test/unit'
+require 'mocha'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

data/test/test_rtopia.rb

@@ -60,4 +60,22 @@ class TestRtopia < Test::Unit::TestCase
   def test_Rtopia_R_is_calleable_directly
     assert_equal '/items/yeah/boi', Rtopia.R(:items, :yeah, :boi)
   end
+
+  def test_Rtopia_R_with_just_hash_returns_query_string
+    assert_equal '?q=Ruby&page=1', Rtopia.R(:q => 'Ruby', :page => 1)
+  end
+
+  def test_Rtopia_R_with_search_then_hash_returns_search_with_query_string
+    assert_equal '/search?q=Ruby&page=1', R(:search, :q => 'Ruby', :page => 1)
+  end
+
+  def test_Rtopia_R_of_array_produces_empty_brackets
+    assert_equal '/search?q%5B%5D=first&q%5B%5D=second', 
+      R(:search, :q => ['first', 'second'])
+  end
+
+  def test_Rtopia_R_of_nested_hash_produces_namespaced_hash
+    assert_equal '/users?user%5Blname%5D=Doe&user%5Bfname%5D=John', 
+      R(:users, :user => { :lname => 'Doe', :fname => 'John' })
+  end
 end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rtopia
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sinefunc
@@ -14,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +08:00
+date: 2010-04-25 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -51,20 +46,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A cute helper for route generation