milksteak 0.0.8 → 0.0.9

data/lib/liquid_helpers.rb

@@ -2,7 +2,9 @@ module FragmentHelper
   def fragment(name)
     Milksteak::Fragment.render(name)
   end
-  
+end
+
+module HashHelper
   def hash_attribute(hash, name)
     if hash.keys.include?(name)
       return hash[name]
@@ -12,11 +14,14 @@ module FragmentHelper
       nil
     end
   end
+end
 
+module InspectionHelper
   def inspect(obj)
     return obj.inspect
   end
-
 end
 
 Liquid::Template.register_filter(FragmentHelper)
+Liquid::Template.register_filter(HashHelper)
+Liquid::Template.register_filter(InspectionHelper)

data/lib/milksteak/version.rb

@@ -1,3 +1,3 @@
 module Milksteak
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/models/yml_content.rb

@@ -72,16 +72,18 @@ module Milksteak
     # todo: test
     def render(params = {})
       rendered = Liquid::Template.parse(self.content).render(self.data.merge("params" => params))
+
+      if self.data["format"]
+        rendered = BlueCloth.new(rendered).to_html if self.data["format"] == "markdown"
+      end
+
       if self.data["layout"]
         layout = Milksteak::Layout.load(self.data["layout"])
         data = layout.data.merge("yield" => rendered, "params" => params)
         rendered = Liquid::Template.parse(layout.content).render(data)
       end
-      if self.data["format"]
-        BlueCloth.new(rendered).to_html if self.data["format"] == "markdown"
-      else
-        rendered
-      end
+
+      return rendered
     end
   end
 end

data/spec/models/fragment_spec.rb

@@ -12,4 +12,12 @@ describe Milksteak::Fragment do
     c = Milksteak::Fragment.load("section/sub-folder/fragment-name")
   end
   
+  it "should render a fragment with params" do
+    f = File.open(File.join(File.dirname(__FILE__), "../fixtures/objs/sample_obj_with_params.yml"), "r")
+    f.stub(:save).and_return true
+    File.should_receive(:new).with("/tmp/milk_site/fragments/section/sub-folder/fragment-name.yml", "r").and_return f
+    c = Milksteak::Fragment.render("section/sub-folder/fragment-name", {:foo => "Testing"})
+    c.should == "This is a Test Object.  Testing\n"
+  end 
+ 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milksteak
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23900640 !ruby/object:Gem::Requirement
+  requirement: &11705100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23900640
+  version_requirements: *11705100
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &23900220 !ruby/object:Gem::Requirement
+  requirement: &11704680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23900220
+  version_requirements: *11704680
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &23899800 !ruby/object:Gem::Requirement
+  requirement: &11704200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23899800
+  version_requirements: *11704200
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &23899380 !ruby/object:Gem::Requirement
+  requirement: &11703740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23899380
+  version_requirements: *11703740
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &23898960 !ruby/object:Gem::Requirement
+  requirement: &11703260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23898960
+  version_requirements: *11703260
 - !ruby/object:Gem::Dependency
   name: BlueCloth
-  requirement: &23898540 !ruby/object:Gem::Requirement
+  requirement: &11702820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23898540
+  version_requirements: *11702820
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &23927100 !ruby/object:Gem::Requirement
+  requirement: &11702360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23927100
+  version_requirements: *11702360
 description: ! 'Super tiny and simple ruby-based cms that uses yml for content '
 email:
 - bryan.thompson@firespring.com