sinarey 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c8547363a6513e1929f8c835e306ea76be70e41
-  data.tar.gz: 5e53fcf63738709b08343cb80a64bea2869e54bd
+  metadata.gz: 52320fa050cf68249ee686d1d8a0e08ac28f1905
+  data.tar.gz: 66a2858bbde53da9b3b81137cf026575d7d073fe
 SHA512:
-  metadata.gz: 636e193c4b1feefc03c28e7aa41ae80ba3ea0e63ff9668fbca9b952568543aabdaac06b0746fe6d053ca995c2b8ea2d87088aed43223efa8f033cc1361f91aea
-  data.tar.gz: 90aa1a593c73faf5b5f6881f7263871b06409fac3b667818a1c784909eb9f2327029fbcfc138e12c884a174eadd1a466d2f0bc0063819b4448d7f99e29549f8d
+  metadata.gz: b29e990f9e64c1fce9b008ab756f8f6cca957e338e3c78e8b9017f1ec7a6ff171e01ddf15a0c7443ff8eae100e32df4474ad4f6c481f6b52fc04e7045ba40b59
+  data.tar.gz: b16ba1a755d2b37232017eb21b5cf3425605e4798a81bf602acc4061b0980b83f6764179ce5f46043a84dc68e97444e02ade5e2a4671d5e3c8e3806fc0c47b90

data/lib/sinarey/base.rb

@@ -95,7 +95,7 @@ module Sinatra
     # Run filters defined on the class and all superclasses.
     def filter!(type, base = settings)
       filter! type, base.superclass if base.superclass.respond_to?(:filters)
-      base.filters[type].each { |args| process_route(*args) }
+      base.filters[type].each { |args| process_filter(*args) }
     end
 
     # Run routes defined on the class and all superclasses.
@@ -170,15 +170,31 @@ module Sinatra
     #
     # Returns pass block.
 
+    def process_route(pattern, keys, conditions, block_id = nil, values = [])
+      route = @request.path_info
+      return unless match = pattern.match(route)
+      values += match.captures.map! { |v| force_encoding URI_INSTANCE.unescape(v) if v }
+
+      if values.any?
+        original, @params = params, params.merge('splat' => [], 'captures' => values)
+        keys.zip(values) { |k,v| Array === @params[k] ? @params[k] << v : @params[k] = v if v }
+      end
+
+      catch(:pass) do
+        conditions.each { |c| throw :pass if c.bind(self).call == false }
+        (block_id && (block = settings.blocks[block_id])) ? block[self, values] : yield(self, values)
+      end
+    ensure
+      @params = original if original
+    end
+
     def process_turbo_route(block = nil)
       catch(:pass) do
         block ? block[self, []] : yield(self, [])
       end
     end
 
-    def process_route(pattern, keys, conditions, block_id = nil, values = [])
-      route = @request.path_info
-      return unless match = pattern.match(route)
+    def process_mount_route(match, keys, conditions, block_id = nil, values = [])
       values += match.captures.map! { |v| force_encoding URI_INSTANCE.unescape(v) if v }
 
       if values.any?
@@ -194,7 +210,10 @@ module Sinatra
       @params = original if original
     end
 
-    def process_mount_route(match, keys, conditions, block_id = nil, values = [])
+    def process_filter(pattern, keys, conditions, block = nil, values = [])
+      route = @request.path_info
+      route = '/' if route.empty? and not settings.empty_path_info?
+      return unless match = pattern.match(route)
       values += match.captures.map! { |v| force_encoding URI_INSTANCE.unescape(v) if v }
 
       if values.any?
@@ -204,7 +223,7 @@ module Sinatra
 
       catch(:pass) do
         conditions.each { |c| throw :pass if c.bind(self).call == false }
-        (block_id && (block = settings.blocks[block_id])) ? block[self, values] : yield(self, values)
+        block ? block[self, values] : yield(self, values)
       end
     ensure
       @params = original if original
@@ -535,7 +554,7 @@ module Sinatra
       # add a filter
       def add_filter(type, path = nil, options = {}, &block)
         path, options = //, path if path.respond_to?(:each_pair)
-        filters[type] << compile!(type, path || //, block, options)
+        filters[type] << compile_filter!(type, path || //, block, options)
       end
 
       # Add a route condition. The route is considered non-matching when the
@@ -833,6 +852,22 @@ module Sinatra
         [ pattern, keys, conditions, block_id ]
       end
 
+      def compile_filter!(verb, path, block, options = {})
+        options.each_pair { |option, args| send(option, *args) }
+        method_name             = "#{verb} #{path}"
+        unbound_method          = generate_method(method_name, &block)
+        pattern, keys           = compile path
+        conditions, @conditions = @conditions, []
+
+        wrapper                 = block.arity != 0 ?
+          proc { |a,p| unbound_method.bind(a).call(*p) } :
+          proc { |a,p| unbound_method.bind(a).call }
+        wrapper.instance_variable_set(:@route_name, method_name)
+
+        [ pattern, keys, conditions, wrapper ]
+      end
+
+
       def compile(path)
         if path.respond_to? :to_str
           keys = []

data/lib/sinarey/version.rb

@@ -1,3 +1,3 @@
 module Sinarey
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinarey
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jeffrey