sinatra-trails 0.0.2 → 0.0.3

data/lib/sinatra/trails.rb

@@ -25,7 +25,8 @@ module Sinatra
         @to_route    = "/#{@components.join('/')}"
         namespace    = ancestors.reverse.find { |ancestor| ancestor.class == Scope && ancestor.name }
 
-        @to_regexp, @keys = Sinatra::Base.send(:compile, to_route)
+        @to_regexp, @keys = Sinatra::Base.send :compile, @to_route
+
         add_param 'resource', scope.name if [Resource, Resources].include?(scope.class)
         add_param 'namespace', namespace.name if namespace
         add_param 'action', name
@@ -55,26 +56,38 @@ module Sinatra
 
       private
       def add_param key, capture
-        unless keys.include? key
-          @keys << key
-          @captures << capture.to_s
-        end
+        @keys << key
+        @captures << capture.to_s
       end
     end
 
+    # This is hackish
     class ScopeMatcher
       def initialize scope, matchers
         @scope = scope
-        @names, @matchers = matchers.partition { |el| Symbol === el }
+        @names, @routes = matchers.partition { |el| Symbol === el }
       end
       
       def match str
-        if @matchers.empty? && @names.empty?
-          Regexp.union(@scope.routes).match str
-        else
-          Regexp.union(*@matchers, *@names.map{ |name| @scope[name] }).match str
-        end
+        Regexp.union(matchers).match str
+      end
+
+      def matchers
+        @matchers ||= 
+          if @routes.empty? && @names.empty?
+            @scope.routes 
+          else
+            @routes + @names.map { |name| @scope[name] }
+          end
       end
+
+      def actual_keys
+        @keys ||= matchers.map{ |m| m.keys }.flatten
+      end
+
+      def keys() self end
+      def any?() actual_keys.any? end
+      def zip(arr) actual_keys.zip(arr) end
     end
 
     class Scope

data/lib/sinatra/trails/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Trails
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/route_generation_spec.rb

@@ -490,6 +490,28 @@ describe 'trails' do
       end
     end
 
+    describe 'before filter costructing correct params' do
+      before :all do
+        app.instance_eval do
+          resources :users do
+            before(user) do
+              # puts params
+              @user = params[:id]
+            end
+
+            get user do
+              @user
+            end
+          end
+        end
+      end
+
+      it 'should set before filter for passed routes' do
+        get '/users/1'
+        last_response.body.should == '1'
+      end
+    end
+
     describe 'having access to resource name' do
       before :all do
         app.resources(:users => :posts) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-trails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-01 00:00:00.000000000Z
+date: 2011-10-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2162183940 !ruby/object:Gem::Requirement
+  requirement: &2158241920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162183940
+  version_requirements: *2158241920
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2162207320 !ruby/object:Gem::Requirement
+  requirement: &2158241500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162207320
+  version_requirements: *2158241500
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2162206820 !ruby/object:Gem::Requirement
+  requirement: &2158241000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162206820
+  version_requirements: *2158241000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2162206400 !ruby/object:Gem::Requirement
+  requirement: &2158240580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162206400
+  version_requirements: *2158240580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2162205940 !ruby/object:Gem::Requirement
+  requirement: &2158263920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162205940
+  version_requirements: *2158263920
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2162205520 !ruby/object:Gem::Requirement
+  requirement: &2158263500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162205520
+  version_requirements: *2158263500
 description: A named routes Sinatra DSL inspired by Rails routing
 email:
 - macarui@gmail.com