sinatra-snap 0.3.0 → 0.3.1

data/README.rdoc

@@ -7,13 +7,13 @@ build URLs and perform parameter substitution.
 
 Install the gem:
 
-  sudo gem install snap
+  sudo gem install sinatra-snap
 
 Then require it in your application and use away!
 
   require 'rubygems'
   require 'sinatra'
-  require 'snap'
+  require 'sinatra-snap'
 
   paths :add => '/add/:addend/:augend',
         :sum => '/sum/:addend/:augend',

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/sinatra/named_path_support.rb

@@ -25,45 +25,48 @@ module Sinatra
     private :verify_type_of
   end 
 
+  module UrlBuilder
+    def with(*values)
+      if self.instance_of? Regexp
+        process_regex_replacement(values)
+      else
+        process_string_replacement(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
+    end
+  
+    def process_string_replacement(values)
+      if %r{/(\*)}.match self
+        replacement_pattern = %r{/(\*)}
+      else
+        replacement_pattern = %r{/?(:\S+?)(?:/|$)}
+      end
+      build_url_from(replacement_pattern, values)
+    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
+    end
+  
+    private :process_regex_replacement, :process_string_replacement, :build_url_from
+  end
+
   module PathBuilderSupport
     def path_to path_name
       pattern = self.class.named_paths[path_name]
-      puts "----------> " + path_name.to_s
-      pattern.instance_eval do
-        def with(*values)
-          if self.instance_of? Regexp
-            process_regex_replacement(values)
-          else
-            process_string_replacement(values)
-          end
-        end
-        
-        def process_regex_replacement(values)
-          url = String.new(self.source)
-          self.source.scan(%r{\(.+?\)}).each_with_index do | placeholder, index |
-            url.sub!(Regexp.new(Regexp.escape(placeholder)), values[index].to_s)
-          end
-          url
-        end
-        
-        def process_string_replacement(values)
-          if %r{/(\*)}.match self
-            replacement_pattern = %r{/(\*)}
-          else
-            replacement_pattern = %r{/?(:\S+?)(?:/|$)}
-          end
-          build_url_from(replacement_pattern, values)
-        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
-        end
-      end
-      pattern
+      raise ArgumentError.new("Unknown path ':#{path_name.to_s}'") if pattern == nil
+      pattern.extend UrlBuilder
     end
   end
   

data/sinatra-snap.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-snap}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["bcarlso"]
-  s.date = %q{2010-03-06}
+  s.date = %q{2010-03-08}
   s.email = %q{bcarlso@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -20,16 +20,16 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "examples/named_route_example.rb",
-     "lib/sinatra/named_path_support.rb",
      "lib/sinatra-snap.rb",
+     "lib/sinatra/named_path_support.rb",
      "sinatra-snap.gemspec",
      "spec/snap_spec.rb",
      "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/bcarlso/sinatra-snap}
+  s.homepage = %q{http://github.com/bcarlso/snap}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Sinatra NAmed Path support}
   s.test_files = [
     "spec/snap_spec.rb",

data/spec/snap_spec.rb

@@ -89,4 +89,8 @@ describe "Snap helper methods for building URLs" do
     @app.path :say => '/say/*/to/*'
     @app.new.path_to(:say).with('hi', 'bob').should == '/say/hi/to/bob'
   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
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - bcarlso
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-06 00:00:00 -06:00
+date: 2010-03-08 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -35,13 +35,13 @@ files:
 - Rakefile
 - VERSION
 - examples/named_route_example.rb
-- lib/sinatra/named_path_support.rb
 - lib/sinatra-snap.rb
+- lib/sinatra/named_path_support.rb
 - sinatra-snap.gemspec
 - spec/snap_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/bcarlso/sinatra-snap
+homepage: http://github.com/bcarlso/snap
 licenses: []
 
 post_install_message: