milksteak 0.0.11 → 0.0.12

data/lib/milksteak/version.rb

@@ -1,3 +1,3 @@
 module Milksteak
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/lib/milksteak.rb

@@ -65,12 +65,17 @@ module Milksteak
  
       unless session[:ms_user]
         flash[:error] = "You must be logged in to see this area."
-        redirect "/"
+        redirect "/ms-admin/login" unless request.path_info == "/ms-admin/login"
       end
     end    
 
     get "/ms-admin" do
       erb "admin", :layout => "admin"
     end
+    
+    get "/ms-admin/login" do
+      return "asdf"
+    end
+
   end
 end

data/lib/models/yml_content.rb

@@ -74,7 +74,13 @@ module Milksteak
       rendered = Liquid::Template.parse(self.content).render(self.data.merge("params" => params))
 
       if self.data["format"]
-        rendered = RDiscount.new(rendered, :smart).to_html if self.data["format"] == "markdown"
+        if self.data["format"] == "markdown"
+          if !self.data["allow_html"].nil? and self.data["allow_html"] == false
+            rendered = RDiscount.new(rendered, :filter_html, :smart).to_html 
+          else
+            rendered = RDiscount.new(rendered, :smart).to_html 
+          end
+        end
       end
 
       if self.data["layout"]

data/milksteak.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "liquid"
   s.add_runtime_dependency "rdiscount" # using RDiscount for more advanced Markdown 
   s.add_runtime_dependency "sinatra"
+  s.add_runtime_dependency "document_mapper"
 end

data/spec/fixtures/objs/sample_obj_no_html.yml

@@ -0,0 +1,7 @@
+---
+description: Test Object
+format: markdown
+allow_html: false
+---
+
+<strong>This is</strong> _a_ {{description}}

data/spec/lib/milksteak/cms_spec.rb

@@ -9,8 +9,14 @@ describe Milksteak do
     it "should redirect to / from /ms-admin" do
       get "/ms-admin"
       last_response.status.should == 302
+      (last_response.header["Location"] =~ /\/ms\-admin\/login/).should_not be_nil
       get "/ms-admin/"
       last_response.status.should == 302
+      (last_response.header["Location"] =~ /\/ms\-admin\/login/).should_not be_nil
+    end
+    it "should not redirect /ms-admin/login" do
+      get "/ms-admin/login"
+      last_response.status.should == 200
     end
   end
 

data/spec/models/yml_content_spec.rb

@@ -15,7 +15,7 @@ describe TestYmlObject do
   it "should get list of objs from milk_root/objs" do
     TestYmlObject.list.should be_an Array
   end
- 
+
   # this utility method is used by the read and write methods as a consistent
   # way to access yml obj documents.   
   it "should load a obj into params" do
@@ -59,6 +59,13 @@ describe TestYmlObject do
     obj.render.should == "<p>This is a Test Object</p>\n"
   end
 
+  it "should respect allow_html variable in yaml frontmatter" do
+    f = File.open(File.join(File.dirname(__FILE__), "../fixtures/objs/sample_obj_no_html.yml"), "r")
+    File.should_receive(:new).with("/tmp/milk_site/objs/home.yml", "r").and_return f
+    obj = TestYmlObject.load("home")
+    obj.render.should == "<p>&lt;strong>This is&lt;/strong> <em>a</em> Test Object</p>\n"
+  end
+
   it "should return empty string if trying to render a obj that doesn't exist" do
     FileUtils.stub(:mkdir).and_return true
     empty = TestYmlObject.render("home")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milksteak
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-16 00:00:00.000000000Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13670420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13670420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &13670000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13670000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &13669540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13669540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &13669080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13669080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &13668640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13668640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &13668140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13668140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &13667700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: document_mapper
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +133,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13667700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Super tiny and simple ruby-based cms that uses yml for content '
 email:
 - bryan.thompson@firespring.com
@@ -446,6 +497,7 @@ files:
 - spec/fixtures/fragments/sample_fragment.yml
 - spec/fixtures/layouts/primary.yml
 - spec/fixtures/objs/sample_obj.yml
+- spec/fixtures/objs/sample_obj_no_html.yml
 - spec/fixtures/objs/sample_obj_with_params.yml
 - spec/fixtures/pages/sample_page.yml
 - spec/lib/milksteak/cms_spec.rb
@@ -474,7 +526,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: milksteak
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Super tiny and simple ruby-based cms
@@ -482,6 +534,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_no_html.yml
 - spec/fixtures/objs/sample_obj_with_params.yml
 - spec/fixtures/pages/sample_page.yml
 - spec/lib/milksteak/cms_spec.rb