milksteak 0.0.7 → 0.0.8

data/lib/liquid_helpers.rb

@@ -2,6 +2,21 @@ module FragmentHelper
   def fragment(name)
     Milksteak::Fragment.render(name)
   end
+  
+  def hash_attribute(hash, name)
+    if hash.keys.include?(name)
+      return hash[name]
+    elsif hash.keys.include?(name.to_sym)
+      return hash[name.to_sym]
+    else
+      nil
+    end
+  end
+
+  def inspect(obj)
+    return obj.inspect
+  end
+
 end
 
 Liquid::Template.register_filter(FragmentHelper)

data/lib/milksteak/version.rb

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

data/lib/models/yml_content.rb

@@ -37,10 +37,10 @@ module Milksteak
       p
     end  
   
-    def self.render(name)
+    def self.render(name, params = {})
       begin
         p = self.load(name, "r")
-        p.render
+        p.render(params)
       rescue Errno::ENOENT => e
         ""
       end
@@ -70,11 +70,11 @@ module Milksteak
     end
     
     # todo: test
-    def render
-      rendered = Liquid::Template.parse(self.content).render(self.data)
+    def render(params = {})
+      rendered = Liquid::Template.parse(self.content).render(self.data.merge("params" => params))
       if self.data["layout"]
         layout = Milksteak::Layout.load(self.data["layout"])
-        data = layout.data.merge("yield" => rendered)
+        data = layout.data.merge("yield" => rendered, "params" => params)
         rendered = Liquid::Template.parse(layout.content).render(data)
       end
       if self.data["format"]

data/spec/fixtures/objs/sample_obj_with_params.yml

@@ -0,0 +1 @@
+This is a Test Object.  {{ params | hash_attribute, "foo"  }}

data/spec/models/fragment_spec.rb

@@ -4,4 +4,12 @@ describe Milksteak::Fragment do
   it "should use the fragments/ folder" do
     Milksteak::Fragment.folder.should == "fragments"
   end
+  
+  it "should allow sub-dir fragments" do
+    f = File.open(File.join(File.dirname(__FILE__), "../fixtures/objs/sample_obj.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.load("section/sub-folder/fragment-name")
+  end
+  
 end

data/spec/models/yml_content_spec.rb

@@ -44,6 +44,13 @@ describe TestYmlObject do
     content.should == "This is a Test Object\n"
   end
 
+  it "should accept additional params for rendering" do
+    f = File.open(File.join(File.dirname(__FILE__), "../fixtures/objs/sample_obj_with_params.yml"), "r")
+    File.should_receive(:new).with("/tmp/milk_site/objs/home.yml", "r").and_return f
+    content = TestYmlObject.render("home", {:foo => "This is from params."})
+    content.should == "This is a Test Object.  This is from params.\n"
+  end
+
   it "should render obj as markdown when specified as format" do
     f = File.open(File.join(File.dirname(__FILE__), "../fixtures/objs/sample_obj.yml"), "r")
     File.should_receive(:new).with("/tmp/milk_site/objs/home.yml", "r").and_return f

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milksteak
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000Z
+date: 2012-06-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21507120 !ruby/object:Gem::Requirement
+  requirement: &23900640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21507120
+  version_requirements: *23900640
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &21506660 !ruby/object:Gem::Requirement
+  requirement: &23900220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21506660
+  version_requirements: *23900220
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &21506200 !ruby/object:Gem::Requirement
+  requirement: &23899800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21506200
+  version_requirements: *23899800
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &21505780 !ruby/object:Gem::Requirement
+  requirement: &23899380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21505780
+  version_requirements: *23899380
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &21505340 !ruby/object:Gem::Requirement
+  requirement: &23898960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21505340
+  version_requirements: *23898960
 - !ruby/object:Gem::Dependency
   name: BlueCloth
-  requirement: &21504880 !ruby/object:Gem::Requirement
+  requirement: &23898540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21504880
+  version_requirements: *23898540
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &21504400 !ruby/object:Gem::Requirement
+  requirement: &23927100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21504400
+  version_requirements: *23927100
 description: ! 'Super tiny and simple ruby-based cms that uses yml for content '
 email:
 - bryan.thompson@firespring.com
@@ -447,6 +447,7 @@ files:
 - spec/fixtures/fragments/sample_fragment.yml
 - spec/fixtures/layouts/primary.yml
 - spec/fixtures/objs/sample_obj.yml
+- spec/fixtures/objs/sample_obj_with_params.yml
 - spec/fixtures/pages/sample_page.yml
 - spec/lib/milksteak/cms_spec.rb
 - spec/models/fragment_spec.rb
@@ -482,6 +483,7 @@ test_files:
 - spec/fixtures/fragments/sample_fragment.yml
 - spec/fixtures/layouts/primary.yml
 - spec/fixtures/objs/sample_obj.yml
+- spec/fixtures/objs/sample_obj_with_params.yml
 - spec/fixtures/pages/sample_page.yml
 - spec/lib/milksteak/cms_spec.rb
 - spec/models/fragment_spec.rb