accelerator 0.1.0 → 0.1.1

data/README.md

@@ -10,21 +10,23 @@ Drop-in page caching using nginx, lua, and memcached.
 
 ##Requirements
 
-Nginx build with the following modules:
+You'll need an nginx build with the following modules:
 
 * [LuaJIT](http://wiki.nginx.org/HttpLuaModule)
 * [MemcNginxModule](http://wiki.nginx.org/HttpMemcModule)
 * [LuaRestyMemcachedLibrary](https://github.com/agentzh/lua-resty-memcached)
 
-See the [Building OpenResty](#building-openresty) section below for instructions.
+##Configure nginx
 
-##Install
+###Install luarock
 
-    luarocks install nginx-accelerator
+	git clone git://github.com/winton/nginx-accelerator.git
+	cd nginx-accelerator
+	luarocks make
 
-##Nginx config
+###nginx.conf
 
-Drop the following line in any `location` directive within `nginx.conf`:
+Drop the following line in any `location` directive:
 
     access_by_lua "require('accelerator').access()";
 
@@ -57,7 +59,7 @@ To configure your memcached connection information:
 	cache = Accelerator.new("localhost:11211")
 	cache.get("/test")
 	cache.set("/test", "body")
-	cache.delete("/test")
+	cache.delete("/test")	
 	cache.expire("/test", 10)
 
 ## Running specs

data/{nginx-accelerator-1.0-1.rockspec → accelerator-1.0-1.rockspec}

@@ -1,4 +1,4 @@
-package = "nginx-accelerator"
+package = "accelerator"
 version = "1.0-1"
 source = {
    url = "http://github.com/winton/nginx-accelerator"

data/{nginx-accelerator.gemspec → accelerator.gemspec}

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "accelerator"
-  s.version     = '0.1.0'
+  s.version     = '0.1.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ "Winton Welsh" ]
   s.email       = [ "mail@wintoni.us" ]

data/lib/accelerator.lua

@@ -38,7 +38,7 @@ access = function(opts)
   local fn
   fn = function()
     local memc = memclient(opts)
-    local cache, flags, err = memc:get(ngx.var.request_uri)
+    local cache, flags, err = memc:get(ngx.var.uri)
     if err then
       error(err)
     end
@@ -56,8 +56,8 @@ access = function(opts)
       local co = coroutine.create(function()
         cache = cache or { }
         cache.time = os.time()
-        memc:set(ngx.var.request_uri, json.encode(cache))
-        local res = ngx.location.capture(ngx.var.request_uri)
+        memc:set(ngx.var.uri, json.encode(cache))
+        local res = ngx.location.capture(ngx.var.uri)
         if not res then
           return 
         end
@@ -76,7 +76,7 @@ access = function(opts)
         end
         res.time = os.time()
         res.ttl = ttl or opts.ttl or 10
-        memc:set(ngx.var.request_uri, json.encode(res))
+        memc:set(ngx.var.uri, json.encode(res))
         return debug("write cache")
       end)
       coroutine.resume(co)

data/lib/accelerator.rb

@@ -15,8 +15,8 @@ class Accelerator
 
   def expire(uri, ttl=nil)
     if data = get_and_set_time(uri)
-      data[:ttl] = ttl if ttl
-      data[:time] -= data[:ttl] || 10
+      data[:ttl]   = ttl if ttl
+      data[:time] -= data[:ttl]
       @memc.set(key(uri), data.to_json, 604800, false)
     end
   end
@@ -27,8 +27,9 @@ class Accelerator
     end
   end
 
-  def set(uri, body)
-    data = get_and_set_time(uri) || { :time => Time.now.to_i }
+  def set(uri, body, ttl=nil)
+    data   = get_and_set_time(uri)
+    data ||= { :time => Time.now.to_i, :ttl => ttl || 10 }
     data[:body] = body
     @memc.set(key(uri), data.to_json, 604800, false)
   end

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ require "#{$root}/lib/accelerator"
 
 def request(wait=nil)
   sleep(wait) if wait
-  `curl -s http://localhost:8080/test`.strip.to_i
+  `curl -s http://localhost:8080/test#{"?blah" if Random.rand(2) == 0}`.strip.to_i
 end
 
 def response_tests(time)

data/src/accelerator.moon

@@ -40,7 +40,7 @@ access = (opts) ->
   fn = ->
     memc = memclient(opts)
 
-    cache, flags, err = memc\get(ngx.var.request_uri)
+    cache, flags, err = memc\get(ngx.var.uri)
     error(err) if err
 
     if cache
@@ -60,10 +60,10 @@ access = (opts) ->
         -- Immediately update the time to prevent multiple writes
         cache = cache or {}
         cache.time = os.time()
-        memc\set(ngx.var.request_uri, json.encode(cache))
+        memc\set(ngx.var.uri, json.encode(cache))
 
         -- Make subrequest
-        res = ngx.location.capture(ngx.var.request_uri)
+        res = ngx.location.capture(ngx.var.uri)
         return if not res
 
         -- Parse TTL
@@ -81,7 +81,7 @@ access = (opts) ->
         res.ttl  = ttl or opts.ttl or 10
 
         -- Write cache
-        memc\set(ngx.var.request_uri, json.encode(res))
+        memc\set(ngx.var.uri, json.encode(res))
         debug("write cache")
 
       coroutine.resume(co)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: accelerator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -56,12 +56,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- accelerator-1.0-1.rockspec
+- accelerator.gemspec
 - bin/accelerator
 - build
 - lib/accelerator.lua
 - lib/accelerator.rb
-- nginx-accelerator-1.0-1.rockspec
-- nginx-accelerator.gemspec
 - nginx/nginx.conf
 - nginx/start
 - spec/accelerator_spec.rb