milksteak 0.0.9 → 0.0.10

data/lib/milksteak.rb

@@ -8,7 +8,7 @@ require "models/yml_content"
 require "models/layout"
 require "models/page"
 require "models/fragment"
-require "bluecloth"
+require "rdiscount"
 
 module Milksteak
   class Admin < Sinatra::Base

data/lib/milksteak/liquid_helpers.rb

@@ -2,6 +2,20 @@ 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.9"
+  VERSION = "0.0.10"
 end

data/lib/models/yml_content.rb

@@ -74,7 +74,7 @@ module Milksteak
       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"
+        rendered = RDiscount.new(rendered).to_html if self.data["format"] == "markdown"
       end
 
       if self.data["layout"]

data/milksteak.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |s|
   #s.add_runtime_dependency "tonic-cms"
  
   s.add_runtime_dependency "liquid"
-  s.add_runtime_dependency "BlueCloth"
+  s.add_runtime_dependency "rdiscount" # using RDiscount for more advanced Markdown 
   s.add_runtime_dependency "sinatra"
 end

data/spec/models/yml_content_spec.rb

@@ -56,7 +56,7 @@ describe TestYmlObject do
     File.should_receive(:new).with("/tmp/milk_site/objs/home.yml", "r").and_return f
     obj = TestYmlObject.load("home")
     obj.data["format"] = "markdown"
-    obj.render.should == "<p>This is a Test Object</p>"
+    obj.render.should == "<p>This is a Test Object</p>\n"
   end
 
   it "should return empty string if trying to render a obj that doesn't exist" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milksteak
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000Z
+date: 2012-06-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11705100 !ruby/object:Gem::Requirement
+  requirement: &25257560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11705100
+  version_requirements: *25257560
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &11704680 !ruby/object:Gem::Requirement
+  requirement: &25256940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11704680
+  version_requirements: *25256940
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &11704200 !ruby/object:Gem::Requirement
+  requirement: &25256520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11704200
+  version_requirements: *25256520
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &11703740 !ruby/object:Gem::Requirement
+  requirement: &25256100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11703740
+  version_requirements: *25256100
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &11703260 !ruby/object:Gem::Requirement
+  requirement: &25255680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11703260
+  version_requirements: *25255680
 - !ruby/object:Gem::Dependency
-  name: BlueCloth
-  requirement: &11702820 !ruby/object:Gem::Requirement
+  name: rdiscount
+  requirement: &25247280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11702820
+  version_requirements: *25247280
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &11702360 !ruby/object:Gem::Requirement
+  requirement: &25244860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11702360
+  version_requirements: *25244860
 description: ! 'Super tiny and simple ruby-based cms that uses yml for content '
 email:
 - bryan.thompson@firespring.com
@@ -102,7 +102,6 @@ files:
 - Rakefile
 - Readme.md
 - lib/helpers.rb
-- lib/liquid_helpers.rb
 - lib/milksteak.rb
 - lib/milksteak/cms.rb
 - lib/milksteak/liquid_helpers.rb

data/lib/liquid_helpers.rb

@@ -1,27 +0,0 @@
-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]
-    elsif hash.keys.include?(name.to_sym)
-      return hash[name.to_sym]
-    else
-      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)