lego-haml 0.0.1 → 0.0.2

data/README.rdoc

@@ -1,6 +1,6 @@
 = lego-haml
 
-A lego plugin for rendering haml
+A lego[http://github.com/stjernstrom/lego-core] plugin for rendering haml
 
 == Usage
   From within an action use the haml method

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/example/config.ru

@@ -0,0 +1,38 @@
+require 'rubygems'
+require 'lego-core'
+require File.join(Dir.pwd, '..', 'lib', 'lego', 'haml')
+
+module ControllerPlugin
+
+  def self.register(lego)
+    lego.add_plugin :router, Matcher
+    lego.add_plugin :controller, Routes
+  end
+
+  module Routes
+    def get(path, &block)
+      add_route(:get, {:path => path, :action_block => block})
+    end
+  end
+
+  module Matcher
+    def self.match_route(route, env)
+      (route[:path] == env['PATH_INFO']) ? true : false
+    end
+  end
+end
+
+Lego.config do
+  set :views => File.join(Dir.pwd, 'views')
+  plugin ControllerPlugin
+  plugin Lego::Haml
+end
+
+class MyApp < Lego::Controller
+
+  get "/" do
+    haml :index
+  end
+end
+
+run MyApp

data/example/views/_partial.haml

@@ -0,0 +1 @@
+%p Partial loaded

data/example/views/index.haml

@@ -0,0 +1,2 @@
+%h1 Welcome to root
+= haml :_partial

data/lego-haml.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lego-haml}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrik Hedman"]
@@ -23,12 +23,19 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "example/config.ru",
+     "example/views/_partial.haml",
+     "example/views/index.haml",
      "lego-haml.gemspec",
      "lib/lego/haml.rb",
      "spec/lego-haml_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
+     "spec/views/_foo.haml",
+     "spec/views/explicit_partial.haml",
      "spec/views/file_with_locals.haml",
+     "spec/views/instance_vars.haml",
+     "spec/views/partial.haml",
      "spec/views/template.haml"
   ]
   s.homepage = %q{http://github.com/polly/lego-haml}

data/lib/lego/haml.rb

@@ -13,20 +13,19 @@ module Lego
     #
     # Method for rendering haml input as html.
     #   <template> can be either a string or a symbol
-    #     - String: Renders the string and returns html
+    #     - String: Path to the view file
     #     - Symbol: Looks for a <template>.haml file in
     #               the path specified by options(:views)
     #               and renders the contents of that file
     #
     #     Example:
-    #       haml "%h1 My Header" #=> "<h1>My Header</h1>\n"
-    #       haml :template       #=> Renders <view_path>/template.haml
+    #       haml "views/template.haml" #=> Renders views/template.haml
+    #       haml :template             #=> Renders <view_path>/template.haml
     #
-    #   <locals> is a hash of local variables to pass to 
-    #            the template
+    #   <locals> is a hash of local variables to pass to the template
     #
     #     Example:
-    #        haml "%h1 foo", :foo => "My Header" #=> "<h1>My Header</h1>\n"
+    #        haml :template, :foo => "My Header" #=> Passes the local variable foo to the view
     #
     # Instance variables are automatically made available to the view
     #
@@ -34,19 +33,32 @@ module Lego
     #     @foo = "My Template"
     #     haml "%h1 @foo" #=> "<h1>My Header</h1>\n"
     #
+    #
+    # The haml method can be used inside views to render partials
+    #
+    #   Example:
+    #     %h1 My Template
+    #     = haml :_foo               #=> Renders <view_path>/_foo.haml
+    #     = haml 'views/_foo.haml'   #=> Renders views/_foo.haml
+    #     = haml :foo, :foo => "foo" #=> Passes foo to the partial
+    #
+    #
     def haml(template, locals={})
       ::Haml::Engine.new(extract(template)).render(self, locals)
     end
 
-
     private
        
       def extract(template)
-        template.is_a?(Symbol) ? read(template) : template
+        template.is_a?(Symbol) ? read(template) : read_explicit(template)
       end
 
       def read(template)
-        File.read("#{options(:views)}/#{template}.haml")
+        read_explicit "#{options(:views)}/#{template}.haml"
+      end
+
+      def read_explicit(file_path)
+        File.read(file_path)
       end
   end
 end

data/spec/lego-haml_spec.rb

@@ -5,17 +5,13 @@ def app
     set :views => File.join(File.dirname(__FILE__), 'views')
 
     get "/string" do
-      haml "%h1 My Header"
+      haml "spec/views/template.haml"
     end
 
     get "/instance_variables" do
       @foo = "foo"
 
-      haml "%h1= @foo"
-    end
-
-    get "/string/with/locals" do
-      haml "%h1= foo", :foo => "foo"
+      haml :instance_vars
     end
 
     get "/file" do
@@ -25,11 +21,19 @@ def app
     get "/file/with/locals" do
       haml :file_with_locals, :foo => "foo"
     end
+
+    get '/partial' do
+      haml :partial
+    end
+
+    get '/partial/with/path' do
+      haml :explicit_partial
+    end
   end
 end
 
 describe "Lego Haml" do
-  it "should render a string of haml as html" do
+  it "should render the specified haml file when passed a string" do
     get '/string'
     last_response.body.should eql("<h1>My Header</h1>\n")
   end
@@ -46,15 +50,21 @@ describe "Lego Haml" do
     last_response.body.should eql("<h1>foo</h1>\n")
   end
 
-  it "should render a string template with locals passed in" do
-    get '/string/with/locals'
+  it "should render a file template with locals passed in" do
+    get '/file/with/locals'
 
     last_response.body.should eql("<h1>foo</h1>\n")
   end
 
-  it "should render a file template with locals passed in" do
-    get '/file/with/locals'
+  it "should render partials" do
+    get '/partial'
 
-    last_response.body.should eql("<h1>foo</h1>\n")
+    last_response.body.should eql("<h1>Partial</h1>\n<p>content loaded from partial</p>\n")
+  end
+
+  it "should render partials with explicit path" do
+    get '/partial/with/path'
+
+    last_response.body.should eql("<h1>Partial</h1>\n<p>content loaded from partial</p>\n")
   end
 end

data/spec/views/_foo.haml

@@ -0,0 +1 @@
+%p= foo

data/spec/views/explicit_partial.haml

@@ -0,0 +1,2 @@
+%h1 Partial
+= haml 'spec/views/_foo.haml', :foo => "content loaded from partial"

data/spec/views/instance_vars.haml

@@ -0,0 +1 @@
+%h1= @foo

data/spec/views/partial.haml

@@ -0,0 +1,2 @@
+%h1 Partial
+= haml :_foo, :foo => "content loaded from partial"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lego-haml
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Patrik Hedman
@@ -38,12 +38,19 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- example/config.ru
+- example/views/_partial.haml
+- example/views/index.haml
 - lego-haml.gemspec
 - lib/lego/haml.rb
 - spec/lego-haml_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/views/_foo.haml
+- spec/views/explicit_partial.haml
 - spec/views/file_with_locals.haml
+- spec/views/instance_vars.haml
+- spec/views/partial.haml
 - spec/views/template.haml
 has_rdoc: true
 homepage: http://github.com/polly/lego-haml