path-to 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.1 2009-04-18
+
+* Minor enhancements
+  * Use new Addressable API
+  * support app[params]
+  * more tests!
+
 == 0.2.0 2009-04-18
 
 * Major enhancement

data/lib/path-to/application.rb

@@ -1,6 +1,6 @@
 require "path-to/path"
 require "path-to/http_client"
-require "addressable/uri"
+require "addressable/template"
 
 module PathTo
   #
@@ -114,7 +114,7 @@ module PathTo
       # TODO it's a 1-line fix to Addressable to permit symbols (etc) as keys
       if (t = uri_template_for(method, params))
         string_keyed_params = params.keys.inject({}){|hash, key| hash[key.to_s] = params[key]; hash}
-        Addressable::URI.expand_template(t, string_keyed_params).to_s
+        Addressable::Template.new(t).expand(string_keyed_params).to_s
       end
     end
   end

data/lib/path-to/described_routes.rb

@@ -26,8 +26,7 @@ module PathTo
       
       def uri
         @uri ||= begin
-          string_keyed_params = params.keys.inject({}){|hash, key| hash[key.to_s] = params[key]; hash}
-          Addressable::URI.expand_template(uri_template, string_keyed_params).to_s
+          Addressable::Template.new(uri_template).expand(params).to_s
         end
       end
       
@@ -65,7 +64,7 @@ module PathTo
       #
       def method_missing(method, *args)
         child_resource_template = resource_template.resource_templates.detect{|t| t.rel == method.to_s}
-        if resource_template && (child_class = child_class_for(self, method, params, child_resource_template))
+        if child_resource_template && (child_class = child_class_for(self, method, params, child_resource_template))
           params = args.inject(Hash.new){|h, arg| h.merge(arg)}
           child(child_class, method, params, child_resource_template)
         else
@@ -89,9 +88,10 @@ module PathTo
       attr_reader :base
       
       def initialize(options)
+        super(options[:parent], options[:service], options[:params])
+
         @base = options[:base]
         @base.sub(/\/$/, '') if base
-        @params = options[:params] || {}
         @default_type = options[:default_type] || TemplatedPath
         @http_client = options[:http_client] || HTTPClient
         
@@ -106,9 +106,21 @@ module PathTo
           end
         end
         
-        super(nil, nil, params)
+        if parent
+          @base ||= parent.base
+          @default_type ||= parent.default_type
+          @http_client ||= parent.http_client
+          @resource_templates ||= parent.resource_templates
+        end
       end
       
+      #
+      # Creates a copy of self with additional params
+      #
+      def [](params = {})
+        self.class.new(:parent => self, :params => params)
+      end      
+      
       #
       # Tries to respond to a missing method.  We can do so if
       #

data/lib/path-to/with_params.rb

@@ -24,7 +24,7 @@ module PathTo
     # [params]  Value for the params attribute
     #
     def initialize(parent = nil, service = nil, params = {})
-      @parent, @service, @params = parent, service, params
+      @parent, @service, @params = parent, service, params || {}
     end
 
     #
@@ -37,7 +37,7 @@ module PathTo
     def child(child_class = nil, service = nil, params = {}, *other_args)
       child_class ||= child_class_for(instance, service, params)
       service ||= self.service
-      params = self.params.merge(params)
+      params = self.params.merge(params || {})
       child_class.new(self, service, params, *other_args)
     end
 

data/lib/path-to.rb

@@ -1,5 +1,5 @@
 module PathTo
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end
 
 $:.push File.dirname(__FILE__)

data/test/path-to/test_described_routes.rb

@@ -91,4 +91,32 @@ class TestDescribedRoutes < Test::Unit::TestCase
       app.users.users
     end
   end
+  
+  def test_uri_template_expansion
+    assert_equal(
+        "http://localhost:3000/users/dojo/articles/recent",
+        app.users["user_id" => "dojo"].articles.recent.uri)
+    assert_equal(
+        "http://localhost:3000/users/dojo/articles/recent.json",
+        app.users["user_id" => "dojo", "format" => "json"].articles.recent.uri)
+  end
+
+  def test_path_optional_params
+    users_json = app.users["format" => "json"]
+    user_json = app.users["user_id" => "dojo"]["format" => "json"]
+    
+    assert_equal("users", users_json.service)
+    assert_equal("user", user_json.service)
+    assert_equal("http://localhost:3000/users.json", users_json.uri)
+    assert_equal("http://localhost:3000/users/dojo.json", user_json.uri)
+  end
+
+  def test_app_params
+    app_json = app["format" => "json"]
+    users_json = app_json.users
+    
+    assert_kind_of(PathTo::DescribedRoutes::Application, app_json)
+    assert_equal(app, app_json.parent)
+    assert_equal("http://localhost:3000/users.json", users_json.uri)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: path-to
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Mike Burrows (asplake)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-29 00:00:00 +01:00
+date: 2009-04-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency