pendragon 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50f2cc54ef1c804fa05b8de3a47d6bf731e86f8f
-  data.tar.gz: 90c08c4129ae507b429d35487ff7824a37ad424e
+  metadata.gz: 4e7cbea66f8dd29316768cfb0fe023d1406a8b64
+  data.tar.gz: 0e01b51a0a24b2ee596bf4f01d228a9885b49269
 SHA512:
-  metadata.gz: cf8e88346a526a08c48e63db31f861d4b401754bcaea842e0ac0ce6446e241a0cf51b87d2c61ff6f1dcbf29c4e10d975a078fa31f9413881b578c60845a53a41
-  data.tar.gz: 070bc4ce928f628ba6f22260e42f05087ee96caccba81c0084a3ccf5fe7491cfa94aebaf7f695a539ef26c9a86944313e0674dd23c9240e255fa23b05bc5e922
+  metadata.gz: 2010774c84e8aa9c33c4190c69e068b9e1d318dada14316dcaa4a3550a7363544626a2d77a791269ec0ec86426bd9c7542f5013f96340c020afdba74027d8cbe
+  data.tar.gz: 62dd9579a534ded3447bc6de68503cfcd6e70e56db1df11802c3bcb1abc26ac5274e332b083b33b0c96033e434427cac2e9f38bd70ff114de4a2228811da14ee

data/Gemfile.lock

@@ -8,7 +8,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.4)
+    activesupport (4.1.5)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -31,39 +31,39 @@ GEM
       metaclass (~> 0.0.1)
     moneta (0.7.20)
     mustermann (0.2.0)
-    padrino (0.12.2)
-      padrino-admin (= 0.12.2)
-      padrino-cache (= 0.12.2)
-      padrino-core (= 0.12.2)
-      padrino-gen (= 0.12.2)
-      padrino-helpers (= 0.12.2)
-      padrino-mailer (= 0.12.2)
-      padrino-support (= 0.12.2)
-    padrino-admin (0.12.2)
-      padrino-core (= 0.12.2)
-      padrino-helpers (= 0.12.2)
-    padrino-cache (0.12.2)
+    padrino (0.12.3)
+      padrino-admin (= 0.12.3)
+      padrino-cache (= 0.12.3)
+      padrino-core (= 0.12.3)
+      padrino-gen (= 0.12.3)
+      padrino-helpers (= 0.12.3)
+      padrino-mailer (= 0.12.3)
+      padrino-support (= 0.12.3)
+    padrino-admin (0.12.3)
+      padrino-core (= 0.12.3)
+      padrino-helpers (= 0.12.3)
+    padrino-cache (0.12.3)
       moneta (~> 0.7.0)
-      padrino-core (= 0.12.2)
-      padrino-helpers (= 0.12.2)
-    padrino-core (0.12.2)
+      padrino-core (= 0.12.3)
+      padrino-helpers (= 0.12.3)
+    padrino-core (0.12.3)
       activesupport (>= 3.1)
       http_router (~> 0.11.0)
-      padrino-support (= 0.12.2)
+      padrino-support (= 0.12.3)
       rack-protection (>= 1.5.0)
       sinatra (~> 1.4.2)
-      thor (~> 0.18.0)
-    padrino-gen (0.12.2)
+      thor (~> 0.18)
+    padrino-gen (0.12.3)
       bundler (~> 1.0)
-      padrino-core (= 0.12.2)
-    padrino-helpers (0.12.2)
+      padrino-core (= 0.12.3)
+    padrino-helpers (0.12.3)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.2)
+      padrino-support (= 0.12.3)
       tilt (~> 1.4.1)
-    padrino-mailer (0.12.2)
+    padrino-mailer (0.12.3)
       mail (~> 2.5.3)
-      padrino-core (= 0.12.2)
-    padrino-support (0.12.2)
+      padrino-core (= 0.12.3)
+    padrino-support (0.12.3)
       activesupport (>= 3.1)
     polyglot (0.3.5)
     rack (1.5.2)
@@ -76,13 +76,13 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    thor (0.18.1)
+    thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     url_mount (0.2.1)
       rack

data/README.md

@@ -32,6 +32,7 @@ Depends on [rack](https://github.com/rack/rack) and [mustermann](https://github.
 |:---------------|:------|:------|:-------------------------|
 |enable_compiler |boolean|false|The performance will be improved. However, it will increase the first load time.|
 |auto_rack_format|boolean|true|If disable this param, the block of route should return the response of valid rack format.|
+|lock            |boolean|false|If you enable this option, all requests to synchronize on a mutex lock|
 
 #### `enable_compiler`
 
@@ -59,6 +60,16 @@ end
 pendragon.get("/"){ [200, {"Content-Type" => "text/html;charset=utf-8"}, ["hey"]] }
 ```
 
+#### `lock`
+
+```ruby
+pendragon = Pendragon.new do |config|
+  config.lock = true
+end
+```
+
+If you use pendragon in threaded environment, you should enable this option to avoid compiling all routes again and again.
+
 #### Deprecated
 
 ```ruby

data/lib/pendragon/configuration.rb

@@ -23,10 +23,15 @@ module Pendragon
     # @see Pendragon::Router#invoke
     attr_boolean_accessor :auto_rack_format
 
+    # Enables to lock for threaded environment.
+    # If you enable this option, all requests to synchronize on a mutex lock
+    attr_boolean_accessor :lock
+
     # Constructs an instance of Pendragon::Configuration
     def initialize
       @enable_compiler  = false
       @auto_rack_format = true
+      @lock             = false
     end
 
     # Returns an instance variable

data/lib/pendragon/engine/compiler.rb

@@ -17,7 +17,7 @@ module Pendragon
     #   @raise [Pendragon::BadRequest] raised if request is bad request
     #   @raise [Pendragon::NotFound] raised if cannot find routes that match with pattern
     #   @raise [Pendragon::MethodNotAllowed] raised if routes can be find and do not match with verb
-    #   @return [Array] The return value will be something like [Pendragon::Route, Hash]
+    #   @return [Array] The return value will be something like [[Pendragon::Route, Hash], ..]
     def call(request)
       compile! unless compiled?
       pattern, verb, params = parse_request(request)
@@ -39,6 +39,7 @@ module Pendragon
         /(?<_#{index}>#{regexp})/
       end
       @regexps = compile(@regexps)
+      @compiled = true
     end
 
     # @!visibility private
@@ -51,7 +52,7 @@ module Pendragon
 
     # @!visibility private
     def compiled?
-      !!@regexps
+      !!@compiled
     end
 
     # @!visibility private

data/lib/pendragon/engine/recognizer.rb

@@ -12,7 +12,7 @@ module Pendragon
       @routes = routes
     end
 
-    # Recognized routes, and returns them
+    # Recognizes routes, and returns them
     # @param [Rack::Request] request
     # @raise [Pendragon::BadRequest] raised if request is bad request
     # @raise [Pendragon::NotFound] raised if cannot find routes that match with pattern

data/lib/pendragon/padrino/ext/class_methods.rb

@@ -198,8 +198,8 @@ module Pendragon
           end
 
           # Now we need to parse our 'parent' params and parent scope.
-          if !absolute_map and parent_params = options.delete(:parent) || @_parents
-            parent_params = (Array(@_parents) + Array(parent_params)).uniq
+          if !absolute_map and parent_params = options.delete(:parent) || @_parent
+            parent_params = (Array(@_parent) + Array(parent_params)).uniq
             path = process_path_for_parent_params(path, parent_params)
           end
 

data/lib/pendragon/padrino/router.rb

@@ -21,7 +21,7 @@ module Pendragon
       end
 
       def path(name, *args)
-        extract_with_name(name, *args) do |route, params, matcher|
+        extract_with(name, *args) do |route, params, matcher|
           matcher.mustermann? ? matcher.expand(params) : route.path_for_generation
         end
       end

data/lib/pendragon/router.rb

@@ -21,6 +21,9 @@ module Pendragon
     # The accessors are useful to access from Pendragon::Route
     attr_accessor :current, :routes
 
+    # @see Pendragon::Configuration#lock?
+    @@mutex = Mutex.new
+
     # Constructs a new instance of Pendragon::Router
     # Possible to pass the block
     #
@@ -96,9 +99,9 @@ module Pendragon
     # Prepares the router for route's priority
     # This method is executed only once in the initial load
     def prepare!
-      @prepared = true
       @routes.sort_by!(&:order)
       @engine = (configuration.enable_compiler? ? Compiler : Recognizer).new(routes)
+      @prepared = true
     end
 
     # @return [Boolean] the router is already prepared?
@@ -116,7 +119,7 @@ module Pendragon
     # @return [Array]
     def recognize(request)
       prepare! unless prepared?
-      @engine.call(request)
+      synchronize { @engine.call(request) }
     end
 
     # Recognizes a given path
@@ -135,7 +138,7 @@ module Pendragon
     #   router.path(:index, :id => 1) #=> "/1"
     #   router.path(:index, :id => 2, :foo => "bar") #=> "/1?foo=bar"
     def path(name, *args)
-      extract_with_name(name, *args) do |route, params, matcher|
+      extract_with(name, *args) do |route, params, matcher|
         matcher.mustermann? ? matcher.expand(params) : route.path
       end
     end
@@ -148,10 +151,10 @@ module Pendragon
 
     # @!visibility private
     # @example
-    #   extract_with_name(:index) do |route, params|
+    #   extract_with(:index) do |route, params|
     #     route.matcher.mustermann? ? route.matcher.expand(params) : route.path
     #   end
-    def extract_with_name(name, *args)
+    def extract_with(name, *args)
       params = args.delete_at(args.last.is_a?(Hash) ? -1 : 0) || {}
       saved_args = args.dup
       @routes.each do |route|
@@ -171,6 +174,15 @@ module Pendragon
       raise InvalidRouteException
     end
 
-    private :extract_with_name
+    # @!visibility private
+    def synchronize(&block)
+      if configuration.lock?
+        @@mutex.synchronize(&block)
+      else
+        yield
+      end
+    end
+
+    private :extract_with, :synchronize
   end
 end

data/lib/pendragon/version.rb

@@ -1,4 +1,4 @@
 
 module Pendragon
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

data/test/padrino_test.rb

@@ -655,7 +655,7 @@ describe "Pendragon::Padrino" do
     assert_equal 'application/javascript;charset=utf-8', response["Content-Type"]
     get "/a.json"
     assert_equal "json", body
-    assert_equal 'application/json;charset=utf-8', response["Content-Type"]
+    assert_equal 'application/json', response["Content-Type"]
     get "/a.foo"
     assert_equal "foo", body
     assert_equal 'application/foo;charset=utf-8', response["Content-Type"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pendragon
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - namusyaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack