milksteak 0.0.6 → 0.0.7

data/lib/liquid_helpers.rb

@@ -0,0 +1,7 @@
+module FragmentHelper
+  def fragment(name)
+    Milksteak::Fragment.render(name)
+  end
+end
+
+Liquid::Template.register_filter(FragmentHelper)

data/lib/milksteak/cms.rb

@@ -1,7 +1,7 @@
 module Milksteak
   class Cms
     @@pages = []
-    @routes = nil
+    @@routes = nil
 
     def initialize(app)
       @app = app
@@ -12,6 +12,7 @@ module Milksteak
     end
     
     def load_pages
+      puts "LOADING PAGES"
       @@pages = []
       Milksteak::Page.list.each do |name|
         name = name.match(/^.+\/(.+)\.yml/)[1]
@@ -22,24 +23,90 @@ module Milksteak
   
     # todo: test
     def routes
-      return @routes if @routes
-      @routes = { :primary => [], :dynamic => [] }
+      return @@routes if @@routes
+      puts "LOADING ROUTES"
+      load_pages if @@pages.empty?
+      @@routes = { :primary => [], :dynamic => [] }
       @@pages.each do |page|
-        
+        r = Route.new(page)
+        r.primary ? (@@routes[:primary] << r) : (@@routes[:dynamic] << r)
       end
-      return @routes
+      return @@routes
     end  
 
     def route(url)
-      # TODO
+      # search primary first, then dynamic
+      routes[:dynamic].sort { |a,b| b.length <=> a.length }.each do |route|
+        if tmp = url.match(route.pattern)
+          keys = route.page.data["route"].split("/").reject{|x| x[0] != ":"}
+          params = {}
+          # our match data includes the original string, so compare against 
+          # its length minus that position
+          if keys.length == tmp.length-1
+            keys.each_with_index do |k,i| 
+              k = k.gsub(/^\:/, "")
+              # our arrays are off-by-one because of the case above
+              params[k] = tmp[i+1]
+            end
+          end
+          return { :page => route.page, :params => params }
+        end
+      end
+      routes[:primary].sort { |a,b| b.length <=> a.length }.each do |route|
+        if url.match(route.pattern)
+          if route.page.data["route"] == "/"
+            # do extra checking to see if they asked for /index, /, or /home
+            if %w(index home /).include? url
+              return { :page => route.page } 
+            else
+              return {:page => nil}
+            end
+          else
+            return { :page => route.page } 
+          end
+        end
+      end
+      return nil
     end
   
     def _call(env)
-      #puts "OK"
-      @status, @headers, @response = @app.call(env)
-      [@status, @headers, @response]
+      if match = route(env["PATH_INFO"]) and match[:page]
+puts match.inspect
+        @response = [match[:page].render]
+        [200, {"Content-Type" => "text/html", "Content-Length" => @response[0].bytesize.to_s}, @response]
+      else    
+        @status, @headers, @response = @app.call(env)
+        [@status, @headers, @response]
+      end
     end
   end
   
   # todo: test
+  class Route
+    attr_accessor :pattern
+    attr_accessor :page
+    attr_accessor :primary
+    attr_accessor :length
+
+    def initialize(page)
+      @primary = true
+      @length = page.data["route"].length
+      @page = page
+      @pattern = build_expression(page.data["route"])
+      super
+    end 
+    
+    private
+    
+    def build_expression(url_string)
+      parts = url_string.split("/")
+      parts.each_with_index do |part,x|
+        if part =~ /\:(.+)/
+          parts[x] = "(.+)"
+          @primary = false
+        end 
+      end 
+      Regexp.new(parts.join("\/"))
+    end 
+  end
 end

data/lib/milksteak/version.rb

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

data/lib/milksteak.rb

@@ -5,6 +5,7 @@ require "milksteak/liquid_helpers"
 require "sinatra/base"
 require "models/user"
 require "models/yml_content"
+require "models/layout"
 require "models/page"
 require "models/fragment"
 require "bluecloth"
@@ -54,7 +55,6 @@ module Milksteak
     end
   
     before '/ms-admin/?*' do
-
       # note: it is your responsibility to manage users and login processes. Any
       # reference milksteak uses to a user will be done through the value stored 
       # in session[:ms_user]. It is best to store a string or integer that you can
@@ -67,7 +67,6 @@ module Milksteak
         flash[:error] = "You must be logged in to see this area."
         redirect "/"
       end
-
     end    
 
     get "/ms-admin" do

data/lib/models/layout.rb

@@ -0,0 +1,5 @@
+module Milksteak
+  class Layout < YmlContent
+    def self.folder; "layouts"; end
+  end
+end

data/lib/models/yml_content.rb

@@ -40,8 +40,7 @@ module Milksteak
     def self.render(name)
       begin
         p = self.load(name, "r")
-        rendered = Liquid::Template.parse(p.content).render(p.data)
-        BlueCloth.new(rendered).to_html
+        p.render
       rescue Errno::ENOENT => e
         ""
       end
@@ -69,5 +68,20 @@ module Milksteak
       end
       self.data ||= {}
     end
+    
+    # todo: test
+    def render
+      rendered = Liquid::Template.parse(self.content).render(self.data)
+      if self.data["layout"]
+        layout = Milksteak::Layout.load(self.data["layout"])
+        data = layout.data.merge("yield" => rendered)
+        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
+    end
   end
 end

data/spec/fixtures/layouts/primary.yml

@@ -0,0 +1,9 @@
+---
+---
+
+HEADER
+
+{{ yield }}
+
+FOOTER
+

data/spec/models/layout_spec.rb

@@ -0,0 +1,4 @@
+require File.join(File.dirname(__FILE__), "../spec_helper.rb")
+
+describe Milksteak::Layout do
+end

data/spec/models/page_spec.rb

@@ -19,5 +19,25 @@ describe Milksteak::Page do
     page.content.should == "TEST CONTENT"
     File.unlink(File.join(File.dirname(__FILE__), "../fixtures/pages/scratch_page.yml"))
   end
+  
+  it "should render without a layout" do
+    f = File.open(File.join(File.dirname(__FILE__), "../fixtures/pages/sample_page.yml"), "r")
+    File.should_receive(:new).with("/tmp/milk_site/pages/home.yml", "r").and_return f
+    content = Milksteak::Page.render("home")
+    content.should == "This is some test content. This is just a test.\n"
+  end
+  
+  it "should render with a layout" do
+    f = File.open(File.join(File.dirname(__FILE__), "../fixtures/pages/sample_page.yml"), "r")
+    File.should_receive(:new).with("/tmp/milk_site/pages/home.yml", "r").and_return f
+    page = Milksteak::Page.load("home")
+    page.data["layout"] = "primary"
 
+    layout = File.open(File.join(File.dirname(__FILE__), "../fixtures/layouts/primary.yml"), "r")
+    File.should_receive(:new).with("/tmp/milk_site/layouts/primary.yml", "r").and_return layout
+
+    content = page.render
+    content.should == "HEADER\n\nThis is some test content. This is just a test.\n\n\nFOOTER\n\n"
+  end
+  
 end

data/spec/models/yml_content_spec.rb

@@ -37,11 +37,19 @@ describe TestYmlObject do
     File.unlink(File.join(File.dirname(__FILE__), "../fixtures/objs/scratch_obj.yml"))
   end
 
-  it "should render obj content" do
+  it "should render obj content plain by default" 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
     content = TestYmlObject.render("home")
-    content.should == "<p>This is a Test Object</p>"
+    content.should == "This is a Test Object\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
+    obj = TestYmlObject.load("home")
+    obj.data["format"] = "markdown"
+    obj.render.should == "<p>This is a Test Object</p>"
   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.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000Z
+date: 2012-05-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19445960 !ruby/object:Gem::Requirement
+  requirement: &21507120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19445960
+  version_requirements: *21507120
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &19444880 !ruby/object:Gem::Requirement
+  requirement: &21506660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19444880
+  version_requirements: *21506660
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &19444200 !ruby/object:Gem::Requirement
+  requirement: &21506200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19444200
+  version_requirements: *21506200
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &19443520 !ruby/object:Gem::Requirement
+  requirement: &21505780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19443520
+  version_requirements: *21505780
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &19442860 !ruby/object:Gem::Requirement
+  requirement: &21505340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19442860
+  version_requirements: *21505340
 - !ruby/object:Gem::Dependency
   name: BlueCloth
-  requirement: &19442200 !ruby/object:Gem::Requirement
+  requirement: &21504880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19442200
+  version_requirements: *21504880
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &19441540 !ruby/object:Gem::Requirement
+  requirement: &21504400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19441540
+  version_requirements: *21504400
 description: ! 'Super tiny and simple ruby-based cms that uses yml for content '
 email:
 - bryan.thompson@firespring.com
@@ -102,11 +102,13 @@ files:
 - Rakefile
 - Readme.md
 - lib/helpers.rb
+- lib/liquid_helpers.rb
 - lib/milksteak.rb
 - lib/milksteak/cms.rb
 - lib/milksteak/liquid_helpers.rb
 - lib/milksteak/version.rb
 - lib/models/fragment.rb
+- lib/models/layout.rb
 - lib/models/page.rb
 - lib/models/user.rb
 - lib/models/yml_content.rb
@@ -443,10 +445,12 @@ files:
 - lib/views/login.erb
 - milksteak.gemspec
 - spec/fixtures/fragments/sample_fragment.yml
+- spec/fixtures/layouts/primary.yml
 - spec/fixtures/objs/sample_obj.yml
 - spec/fixtures/pages/sample_page.yml
 - spec/lib/milksteak/cms_spec.rb
 - spec/models/fragment_spec.rb
+- spec/models/layout_spec.rb
 - spec/models/page_spec.rb
 - spec/models/yml_content_spec.rb
 - spec/spec_helper.rb
@@ -476,10 +480,12 @@ specification_version: 3
 summary: Super tiny and simple ruby-based cms
 test_files:
 - spec/fixtures/fragments/sample_fragment.yml
+- spec/fixtures/layouts/primary.yml
 - spec/fixtures/objs/sample_obj.yml
 - spec/fixtures/pages/sample_page.yml
 - spec/lib/milksteak/cms_spec.rb
 - spec/models/fragment_spec.rb
+- spec/models/layout_spec.rb
 - spec/models/page_spec.rb
 - spec/models/yml_content_spec.rb
 - spec/spec_helper.rb