homeostasis 0.0.17 → 0.0.18

data/README.md

@@ -182,6 +182,7 @@ slashes to URLs.
 TODO
 ====
 
+* override `render` to handle multi rendering
 * make each plugin optional
 * setup homeostasis website
 

data/lib/homeostasis.rb

@@ -26,7 +26,7 @@ module Homeostasis
     end
 
     def h(html)
-      CGI::escapeHTML(html)
+      CGI::escapeHTML(html.to_s)
     end
 
     def render_multi(path, body = nil, context = nil, locals = {})
@@ -230,10 +230,10 @@ module Homeostasis
         if !ignore?(path)
           relative = path[(@stasis.root.length+1)..-1]
           ext = Tilt.mappings.keys.find { |ext| File.extname(path)[1..-1] == ext }
-          dest = trailify((ext && File.extname(relative) == ".#{ext}") ?
+          dest = (ext && File.extname(relative) == ".#{ext}") ?
             relative[0..-1*ext.length-2] :
-            relative)
-          yaml[:path] = dest
+            relative
+          yaml[:path] = trailify(Multi.drop_tilt_exts(dest))
         end
         @@front_site[front_key(path)] = yaml
       end
@@ -272,6 +272,10 @@ module Homeostasis
       @@front_site
     end
 
+    def self._front_key(stasis, filename) # for other plugins
+      filename.sub(stasis.root, '')[1..-1]
+    end
+
     def self.config(options)
       @@matcher = options[:matcher] if options[:matcher]
     end
@@ -285,7 +289,7 @@ module Homeostasis
 
     private
     def front_key(filename)
-      filename.sub(@stasis.root, '')[1..-1]
+      self.class._front_key(@stasis, filename)
     end
 
     def trailify(filename)
@@ -322,7 +326,7 @@ module Homeostasis
         body ||= Helpers.read(@stasis.path)
 
         @tmpfile = Tempfile.new(["temp", ".txt"])
-        @tmpfile.puts(render_multi(@stasis.path, body))
+        @tmpfile.puts(render_multi(@stasis.path, body, @stasis.action))
         @tmpfile.close
         Helpers.set_stasis_path(@stasis, @stasis.path)
         @stasis.path = @tmpfile.path
@@ -340,15 +344,20 @@ module Homeostasis
 
     def after_write
       return if @stasis.path.nil? || ignore?(@stasis.path)
-      dirname = File.dirname(@stasis.dest)
-      basename = File.basename(@stasis.dest)
+      dest = self.class.drop_tilt_exts(@stasis.dest)
+      File.rename(@stasis.dest, dest) if dest != @stasis.dest
+    end
+
+    def self.drop_tilt_exts(path)
+      dirname = File.dirname(path)
+      basename = File.basename(path)
       exts = basename.split('.')[2..-1]
+      return path if exts.nil? || exts.length < 1
 
-      return if exts.nil? || exts.length < 1
       exts.each do |ext|
         basename = basename.sub(/\.#{ext}/, '')
       end
-      File.rename(@stasis.dest, File.join(dirname, basename))
+      File.join(dirname, basename)
     end
   end
 
@@ -421,6 +430,7 @@ module Homeostasis
     include Helpers
     DATE_REGEX = /^(\d{4}-\d{2}-\d{2})-/
     before_all    :before_all
+    before_render :before_render
     after_all     :after_all
     action_method :blog_posts
     priority      3
@@ -451,16 +461,27 @@ module Homeostasis
         next if File.basename(filename) !~ DATE_REGEX
         date = $1
         post = front_site[filename.sub(@stasis.root, '')[1..-1]] || {}
+        post[:blog] = true
         post[:date] = Date.parse(date)
         post[:path] = post[:path].sub(
           "/#{@@directory}/#{date}-",
           File.join('/', @@path, '/'))
-        post[:body] = render_multi(filename, Helpers.read(filename))
         @@posts << post
       end
       @@posts = @@posts.sort_by { |post| post[:date] }.reverse
     end
 
+    def before_render
+      path = Helpers.stasis_path || @stasis.path
+      return if path.nil?
+
+      post = Homeostasis::Front._front_site[Homeostasis::Front._front_key(@stasis, path)]
+      if post && post[:blog] && post[:date] && post[:path]
+        yaml, body = Front.preamble_load(path)
+        post[:body] = render_multi(path, body, @stasis.action)
+      end
+    end
+
     def after_all
       return if @@directory.nil?
       blog_dest = File.join(@stasis.destination, @@path)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Homeostasis
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homeostasis
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stasis
@@ -59,38 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bluecloth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Provides asset stamping using git revisions, environments, and a few
   view helpers.
 email: