sinatra-trails 0.0.3 → 0.0.4

data/lib/sinatra/trails.rb

@@ -65,27 +65,34 @@ module Sinatra
     class ScopeMatcher
       def initialize scope, matchers
         @scope = scope
-        @names, @routes = matchers.partition { |el| Symbol === el }
+        @names, @matchers = matchers.partition { |el| Symbol === el }
       end
       
       def match str
-        Regexp.union(matchers).match str
+        to_regexp.match str
       end
 
-      def matchers
-        @matchers ||= 
-          if @routes.empty? && @names.empty?
+      def to_regexp
+        @to_regexp ||= Regexp.union(routes)
+      end
+
+      def routes
+        @routes ||= 
+          if @matchers.empty? && @names.empty?
             @scope.routes 
           else
-            @routes + @names.map { |name| @scope[name] }
+            @matchers + @names.map { |name| @scope[name] }
           end
       end
 
       def actual_keys
-        @keys ||= matchers.map{ |m| m.keys }.flatten
+        @actual_keys ||= routes.map{ |m| m.keys }.flatten
+      end
+
+      def keys
+        self
       end
 
-      def keys() self end
       def any?() actual_keys.any? end
       def zip(arr) actual_keys.zip(arr) end
     end

data/lib/sinatra/trails/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-trails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2158241920 !ruby/object:Gem::Requirement
+  requirement: &2166677580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158241920
+  version_requirements: *2166677580
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2158241500 !ruby/object:Gem::Requirement
+  requirement: &2166677160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158241500
+  version_requirements: *2166677160
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2158241000 !ruby/object:Gem::Requirement
+  requirement: &2166676660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158241000
+  version_requirements: *2166676660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2158240580 !ruby/object:Gem::Requirement
+  requirement: &2166676240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158240580
+  version_requirements: *2166676240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158263920 !ruby/object:Gem::Requirement
+  requirement: &2166675780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158263920
+  version_requirements: *2166675780
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2158263500 !ruby/object:Gem::Requirement
+  requirement: &2166675360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158263500
+  version_requirements: *2166675360
 description: A named routes Sinatra DSL inspired by Rails routing
 email:
 - macarui@gmail.com