sinarey 1.0.4 → 1.0.5

data/lib/sinarey/router.rb

@@ -1,125 +1,120 @@
-module Sinarey
-  class Router
-    def initialize(*args, &block)
-      @notfound_app = lambda { |env| [404, {}, ['404']] }
-      @apps         = {}
-      @turbo_routes = {}
-      @routes       = {}
-      instance_eval(&block) if block
-      build_routing_table
-    end
-
-    def call(env)
-      route = env["PATH_INFO"]
-      route.chop! if (char=route[-1]) and char=='/' # ignore last '/' char
-
-      #pjax request support
-      if route.chomp!('.pjax')
-        env["IS_PJAX_REQUEST"] = true
-      end
-      
-      if response = apps_route(env["REQUEST_METHOD"], route, env)
-        response
-      else
-        @notfound_app.call(env)
-      end
-    end
-
-    def mount(app)
-      app_id = @apps.size + 1
-      @apps[app_id] = app
-    end
-
-    def notfound(app)
-      @notfound_app = app
-    end
-
-    private
-
-    def build_routing_table
-      @apps.each do |app_id, app|
-        regedit_turbo_routes(app_id, app)
-        regedit_basic_routes(app_id, app)
-      end
-    end
-
-    def regedit_turbo_routes(app_id, app)
-      return unless app.respond_to?(:turbo_routes)
-      app.turbo_routes.each do |verb, routes|
-        routes.each do |path, route|
-          route.tap do |block_id|
-            tmp = @turbo_routes[verb] ||= {}
-            tmp[path] = [block_id, app_id] unless tmp[path]
-          end
-        end
-      end
-    end
-
-    def regedit_basic_routes(app_id, app)
-      return unless app.respond_to?(:routes)
-      app.routes.each do |verb, routes|
-        routes.each do |pattern, keys, conditions, block_id|
-          (@routes[verb] ||= []) << [pattern, keys, conditions, block_id, app_id]
-        end
-      end
-    end
-
-    case ENV["RACK_ENV"]
-    when 'development'
-      
-      #development need support sinarey reloader.so here use dev logic.
-      def apps_route(verb, path, env)
-
-        #auto reload modified code
-        @apps.each do |index,app|
-          app.auto_reload if app.respond_to?(:auto_reload)
-        end
-
-        #rebuild route table
-        @turbo_routes = {}
-        @routes       = {}
-        build_routing_table
-
-        if turbo_route = (turbo_routes = @turbo_routes[verb]) && turbo_routes[path]
-          turbo_route.tap do |block_id,app_id|
-            env['sinarey.router'] = {type: :turbo, block_id: block_id}
-            status, headers, response = @apps[app_id].call(env)
-            return status, headers, response
-          end
-        elsif routes = @routes[verb]
-          routes.each do |pattern, keys, conditions, block_id, app_id|
-            if match = pattern.match(path)
-              env['sinarey.router'] = {type: :normal, match: match, keys: keys, conditions: conditions, block_id: block_id}
-              status, headers, response = @apps[app_id].call(env)
-              return status, headers, response
-            end
-          end
-        end
-        nil
-      end
-
-    else
-
-      def apps_route(verb, path, env)
-        if turbo_route = (turbo_routes = @turbo_routes[verb]) && turbo_routes[path]
-          turbo_route.tap do |block_id,app_id|
-            env['sinarey.router'] = {type: :turbo, block_id: block_id}
-            status, headers, response = @apps[app_id].call(env)
-            return status, headers, response
-          end
-        elsif routes = @routes[verb]
-          routes.each do |pattern, keys, conditions, block_id, app_id|
-            if match = pattern.match(path)
-              env['sinarey.router'] = {type: :normal, match: match, keys: keys, conditions: conditions, block_id: block_id}
-              status, headers, response = @apps[app_id].call(env)
-              return status, headers, response
-            end
-          end
-        end
-        nil
-      end
-
-    end
-
-  end
-end
+module Sinarey
+  class Router
+    def initialize(*args, &block)
+      @notfound_app = lambda { |env| [404, {}, ['404']] }
+      @apps         = {}
+      @turbo_routes = {}
+      @routes       = {}
+      instance_eval(&block) if block
+      build_routing_table
+    end
+
+    def call(env)
+      route = env["PATH_INFO"]
+      route.chop! if (char=route[-1]) and char=='/' # ignore last '/' char
+      
+      if response = apps_route(env["REQUEST_METHOD"], route, env)
+        response
+      else
+        @notfound_app.call(env)
+      end
+    end
+
+    def mount(app)
+      app_id = @apps.size + 1
+      @apps[app_id] = app
+    end
+
+    def notfound(app)
+      @notfound_app = app
+    end
+
+    private
+
+    def build_routing_table
+      @apps.each do |app_id, app|
+        regedit_turbo_routes(app_id, app)
+        regedit_basic_routes(app_id, app)
+      end
+    end
+
+    def regedit_turbo_routes(app_id, app)
+      return unless app.respond_to?(:turbo_routes)
+      app.turbo_routes.each do |verb, routes|
+        routes.each do |path, route|
+          route.tap do |block_id|
+            tmp = @turbo_routes[verb] ||= {}
+            tmp[path] = [block_id, app_id] unless tmp[path]
+          end
+        end
+      end
+    end
+
+    def regedit_basic_routes(app_id, app)
+      return unless app.respond_to?(:routes)
+      app.routes.each do |verb, routes|
+        routes.each do |pattern, keys, conditions, block_id|
+          (@routes[verb] ||= []) << [pattern, keys, conditions, block_id, app_id]
+        end
+      end
+    end
+
+    case ENV["RACK_ENV"]
+    when 'development'
+      
+      #development need support sinarey reloader.so here use dev logic.
+      def apps_route(verb, path, env)
+
+        #auto reload modified code
+        @apps.each do |index,app|
+          app.auto_reload if app.respond_to?(:auto_reload)
+        end
+
+        #rebuild route table
+        @turbo_routes = {}
+        @routes       = {}
+        build_routing_table
+
+        if turbo_route = (turbo_routes = @turbo_routes[verb]) && turbo_routes[path]
+          turbo_route.tap do |block_id,app_id|
+            env['sinarey.router'] = {type: :turbo, block_id: block_id}
+            status, headers, response = @apps[app_id].call(env)
+            return status, headers, response
+          end
+        elsif routes = @routes[verb]
+          routes.each do |pattern, keys, conditions, block_id, app_id|
+            if match = pattern.match(path)
+              env['sinarey.router'] = {type: :normal, match: match, keys: keys, conditions: conditions, block_id: block_id}
+              status, headers, response = @apps[app_id].call(env)
+              return status, headers, response
+            end
+          end
+        end
+        nil
+      end
+
+    else
+
+      def apps_route(verb, path, env)
+        if turbo_route = (turbo_routes = @turbo_routes[verb]) && turbo_routes[path]
+          turbo_route.tap do |block_id,app_id|
+            env['sinarey.router'] = {type: :turbo, block_id: block_id}
+            status, headers, response = @apps[app_id].call(env)
+            return status, headers, response
+          end
+        elsif routes = @routes[verb]
+          routes.each do |pattern, keys, conditions, block_id, app_id|
+            if match = pattern.match(path)
+              env['sinarey.router'] = {type: :normal, match: match, keys: keys, conditions: conditions, block_id: block_id}
+              status, headers, response = @apps[app_id].call(env)
+              return status, headers, response
+            end
+          end
+        end
+        nil
+      end
+
+    end
+
+  end
+end

data/lib/sinarey/version.rb

@@ -1,3 +1,3 @@
-module Sinarey
-  VERSION = '1.0.4'
-end
+module Sinarey
+  VERSION = '1.0.5'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinarey
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Jeffrey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -31,17 +31,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/sinatra/sinarey_reloader.rb
-- lib/sinarey/version.rb
-- lib/sinarey/base.rb
-- lib/sinarey/router.rb
-- lib/sinarey.rb
+- README.md
 - demo/app.rb
 - demo/app2.rb
-- demo/notfound.rb
 - demo/config.ru
+- demo/notfound.rb
+- lib/sinarey.rb
+- lib/sinarey/base.rb
+- lib/sinarey/router.rb
+- lib/sinarey/version.rb
+- lib/sinatra/sinarey_reloader.rb
 - sinarey.gemspec
-- README.md
 homepage: https://github.com/maymay25/sinarey
 licenses:
 - MIT
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Sinarey, use for large rack project.