sinatra-snap 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/sinatra/named_path_support.rb

@@ -7,7 +7,7 @@ module Sinatra
     end
 
     def paths(paths)
-      paths.keys.each { | k | verify_type_of(k) }
+      paths.keys.each { | key | verify_type_of(key) }
       named_paths.merge!(paths)
     end
 
@@ -26,40 +26,40 @@ module Sinatra
   end 
 
   module UrlBuilder
+    SPLAT = %r{(\*)}
+    NAMED_PARAMETER = %r{/?(:\S+?)(?:/|$)}
+    REGEXP_GROUP = %r{\(.+?\)}
+    
     def with(*values)
       if self.instance_of? Regexp
-        process_regex_replacement(values)
+        replace_regex_with(values)
       else
-        process_string_replacement(values)
+        replace_string_with(values)
       end
     end
   
-    def process_regex_replacement(values)
-      url = String.new(self.source)
-      url.scan(%r{\(.+?\)}).each_with_index do | placeholder, index |
-        url.sub!(Regexp.new(Regexp.escape(placeholder)), values[index].to_s)
-      end
-      url
+    def replace_regex_with(values)
+      perform_substitution_using(self.source, REGEXP_GROUP, values)
     end
   
-    def process_string_replacement(values)
-      if %r{/(\*)}.match self
-        replacement_pattern = %r{/(\*)}
-      else
-        replacement_pattern = %r{/?(:\S+?)(?:/|$)}
+    def perform_substitution_using(url, replacement_pattern, values) 
+      string = String.new(url)
+      string.scan(replacement_pattern).each_with_index do | placeholder, index |
+        string.sub!(Regexp.new(Regexp.escape(placeholder.first)), values[index].to_s)
       end
-      build_url_from(replacement_pattern, values)
+      string
     end
-  
-    def build_url_from(replacement_pattern, values)
-      url = String.new(self)
-      scan(replacement_pattern).each_with_index do | placeholder, index |
-        url.sub!(Regexp.new(Regexp.escape(placeholder[0])), values[index].to_s)
-      end
-      url
+
+    def replace_string_with(values)
+      replacement_pattern = route_defined_using_splat? ? SPLAT : NAMED_PARAMETER
+      perform_substitution_using(self, replacement_pattern, values)
     end
   
-    private :process_regex_replacement, :process_string_replacement, :build_url_from
+    def route_defined_using_splat?
+      SPLAT.match self
+    end
+    
+    private :replace_regex_with, :replace_string_with, :route_defined_using_splat?, :perform_substitution_using
   end
 
   module PathBuilderSupport

data/sinatra-snap.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-snap}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["bcarlso"]
-  s.date = %q{2010-03-08}
+  s.date = %q{2010-03-13}
   s.email = %q{bcarlso@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/spec/snap_spec.rb

@@ -90,6 +90,11 @@ describe "Snap helper methods for building URLs" do
     @app.new.path_to(:say).with('hi', 'bob').should == '/say/hi/to/bob'
   end
   
+  it "should still support splat syntax" do
+    @app.path :say => '/download/*.*'
+    @app.new.path_to(:say).with('path/to/file', 'xml').should == '/download/path/to/file.xml'
+  end
+  
   it "should raise a friendly error when the path doesn't exist" do
     lambda { @app.new.path_to(:unknown) }.should raise_error(ArgumentError)
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - bcarlso
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -06:00
+date: 2010-03-13 00:00:00 -06:00
 default_executable: 
 dependencies: []