rack-lacquer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmIwZjQ3ZTZiM2RjZDIyNGU1ZjhhMDUzOTJmMGIwYjlmMmEyODE0Nw==
+    MmEzN2VhOThmMGQ0ZGQzNzY4ODE4ZTYwNmNhOWQ0NmZhMWM3OTQyNw==
   data.tar.gz: !binary |-
-    NjA3YWFjZDZjZDQ2NjZkMDg0YWQxZmFhYzBhMjVhZmY1NWVkYzQwNA==
+    Mzc2ZjIzOTY4NjhkMDc1M2UxNTVmODJjOWYzZTM5NThkZjBlOTQ2ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWNmYzVkMzNiNmM1NDRiMzhkZTRiODdmMGY3NGI2NjYxNTUwYThiNGFhZGE4
-    NTVkZWY4ZTdiYTdkY2IwY2Q3YWZjZGRjNGQ5MjY2YWJmZWQ2NjNmNWZiNzFj
-    YTAxMjFmMWE2YTQ1NmU5OWNlMjMzNmU0MjEwMTM3Y2JkZmQ5MmQ=
+    ZWIwYzE0YTg3ZmFmNTQ2ODA2ZjhiNjg2MTQzZTVjMjMwMjRkNjNkM2FhYTA4
+    ODVkYjUwY2JiMTBjOTQyM2ZmODBiY2U1ZWExODJlN2ZlN2M4MDFiODJkNWUx
+    ZDU4YWM0OWIyMzJjMzQ0ZjAwMDE3NDQ2MmJmOTAyY2VhZGFmYjU=
   data.tar.gz: !binary |-
-    YTQ3YWM3ZjA5NWE5Y2EwYmFkNzQ0NjAzOTI5ZTIwZTk2ZDRkMGVlNmRhNDFk
-    YzczMTk2YmEzYzQ5YjRmZmNhODIzM2E1Mzk1MjhlNjE2ZmVjMjliZTI2MDUw
-    ZGMyYzZhNDI1MmM1NzY5NGM0NTEwMGUyMDU3ZjhmYWRlOTA2ODM=
+    NTgzN2I0NzlhMDk2MzM0MDBkYjViOGEzYmE5NDhmMmIwYzhmYjU4NjEzOWY0
+    YTIzNTE5MWU1ZTEyNjUyYjg2ODZiYjAwNjYwNTVkMWJkMzFmMGY4MTBlMmRi
+    N2FjYTU0ZGFkMDM3YTlhYTA1NWYxYmE5YTQ3MDU1YjBkZmVhYWQ=

data/README.md

@@ -18,11 +18,13 @@ Or install it yourself as:
 
 ## Usage
 
-In your rails environment file, add the following:
+In your rails development environment file, add the following:
 
 ``` ruby
 config.middleware.insert_before ActionDispatch::Static, Rack::Lacquer
+config.threadsafe!
 ```
+This inserts Rack::Lacquer as the first middleware in the stack. We run in threadsafe mode to prevent recursive locking from Rack::Lock
 
 ## Contributing
 

data/lib/rack/lacquer.rb

@@ -1,3 +1,5 @@
+require 'nokogiri'
+
 module Rack
   class Lacquer
     
@@ -6,20 +8,30 @@ module Rack
     end
 
     def call env
+      @env = env.deep_dup
       status, headers, response = @app.call env
-      response.map! { |part| process_includes part, env } if headers['Content-Type'] =~ /text\/html/ && response.respond_to?( :map! )
+      response.map! { |part| process_includes part } if headers['Content-Type'] =~ /text\/html/ && response.respond_to?( :map! )
       [status, headers, response]
     end
     
-    def process_includes part, env
+    def process_includes part
       document = Nokogiri::HTML part.to_s
       document.css('include').each do |esi|
-        include_status, include_headers, include_response = @app.call env.merge 'PATH_INFO' => esi['src'], 'REQUEST_URI' => esi['src']
-        esi.after include_response.join
+        status, headers, response = @app.call env_for(esi['src'])
+        esi.after response.join
         esi.remove
       end
       document.to_s
     end
     
+    def env_for path_with_query
+      path_info, query_string = path_with_query.split('?')
+      @env.deep_dup.merge({
+        'PATH_INFO' => path_info,
+        'REQUEST_URI' => path_with_query,
+        'QUERY_STRING' => query_string.to_s
+      })
+    end
+    
   end
 end

data/rack-lacquer.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rack-lacquer"
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.3'
   spec.authors       = ["Adam Ross Cohen"]
   spec.email         = ["a.ross.cohen@gmail.com"]
   spec.description   = %q{Ruby driven ESI for non-production environments}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-lacquer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Adam Ross Cohen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri