stasis 0.1.4 → 0.1.5

data/README.md

@@ -209,7 +209,7 @@ Change the public (destination) directory:
    
 ### Ruby Library
 
-Instanciate a `Stasis` object:
+Instantiate a `Stasis` object:
 
     stasis = Stasis.new('/path/to/project/root')
 
@@ -282,6 +282,9 @@ Push to the server (in Ruby):
       # Return rendered templates (false by default)
       :return => false,
 
+      # Cache ttl for returned templates (nil by default)
+      :ttl => nil,
+
       # Block until templates generate (false by default)
       :wait => false,
 

data/config/gemspec.yml

@@ -1,5 +1,5 @@
 name: stasis
-version: 0.1.4
+version: 0.1.5
 authors:
   - Winton Welsh
 email: mail@wintoni.us

data/lib/stasis/server.rb

@@ -19,22 +19,39 @@ class Stasis
           request = redis.lpop('stasis:requests')
 
           if request
+            files = {}
             request = Yajl::Parser.parse(request)
 
-            params = request['paths'] + [
-              {
-                :collect => request['return'],
-                :write => request['write']
-              }
-            ]
-            files = stasis.render(*params)
+            paths = request['paths'].reject do |path|
+              files[path] = redis.get("stasis:caches:#{root}:#{path}")
+            end
+
+            if paths.empty? && !request['paths'].empty?
+              new_files = {}
+            else
+              params = request['paths'] + [
+                {
+                  :collect => request['return'],
+                  :write => request['write']
+                }
+              ]
+              new_files = stasis.render(*params)
+            end
+
+            if request['ttl']
+              new_files.each do |path, body|
+                key = "stasis:caches:#{root}:#{path}"
+                redis.set(key, body)
+                redis.expire(key, request['ttl'])
+              end
+            end
 
-            if request['return'] && request['paths'] && !request['paths'].empty?
+            if request['return']
               request['wait'] = true
             end
 
             if request['wait']
-              response = files
+              response = files.merge(new_files)
               redis.publish(self.class.response_key(request['id']), Yajl::Encoder.encode(response))
             end
           end

data/spec/stasis/server_spec.rb

@@ -26,4 +26,29 @@ describe Stasis::Server do
     new_time_from_file.should == new_time
     new_time_from_file.should_not == time
   end
+
+  it "should expire after ttl" do
+    time = Stasis::Server.push(
+      :paths => [ 'time.html.haml' ],
+      :redis => 'localhost:6379/0',
+      :return => true,
+      :ttl => 1,
+      :write => false
+    )['time.html.haml'].split("time")[1].strip
+    time2 = Stasis::Server.push(
+      :paths => [ 'time.html.haml' ],
+      :redis => 'localhost:6379/0',
+      :return => true,
+      :write => false
+    )['time.html.haml'].split("time")[1].strip
+    time.should == time2
+    sleep 2
+    time3 = Stasis::Server.push(
+      :paths => [ 'time.html.haml' ],
+      :redis => 'localhost:6379/0',
+      :return => true,
+      :write => false
+    )['time.html.haml'].split("time")[1].strip
+    time2.should_not == time3
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stasis
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000Z
+date: 2011-09-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: directory_watcher
-  requirement: &70320984055060 !ruby/object:Gem::Requirement
+  requirement: &70211207276660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70320984055060
+  version_requirements: *70211207276660
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70320984054600 !ruby/object:Gem::Requirement
+  requirement: &70211207276200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70320984054600
+  version_requirements: *70211207276200
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70320984054160 !ruby/object:Gem::Requirement
+  requirement: &70211207275760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70320984054160
+  version_requirements: *70211207275760
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70320984053720 !ruby/object:Gem::Requirement
+  requirement: &70211207275320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70320984053720
+  version_requirements: *70211207275320
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70320984053280 !ruby/object:Gem::Requirement
+  requirement: &70211207274880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *70320984053280
+  version_requirements: *70211207274880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70320984052700 !ruby/object:Gem::Requirement
+  requirement: &70211207274300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70320984052700
+  version_requirements: *70211207274300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70320984052260 !ruby/object:Gem::Requirement
+  requirement: &70211207273860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70320984052260
+  version_requirements: *70211207273860
 description: Stasis is a dynamic framework for static sites.
 email: mail@wintoni.us
 executables: