starapor-slippers 0.0.3 → 0.0.5

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 3
 :major: 0
 :minor: 0
+:patch: 5

data/examples/blog/controller/main.rb

@@ -1,6 +1,7 @@
 class MainController < Ramaze::Controller
   layout '/layout'
-
+  engine :Slippers
+  
   def index
     @entries = Entry.order(:created.desc).all
   end

data/examples/blog/model/entry.rb

@@ -1,4 +1,5 @@
 require 'sequel'
+Sequel::Model.plugin(:schema)
 
 DB = Sequel.connect("sqlite:///#{__DIR__}/../blog.db")
 

data/examples/blog/view/edit.st

@@ -1,6 +1,7 @@
 <h2>Editing entry</h2>
 <div id="entries">
   <div class="entry">
+	$entry:{
     <form method="post" action="/save">
       <input name="id" type="hidden" value="$id$"/>
       <div class="header">
@@ -13,5 +14,6 @@
       </div>
       <input type="submit" value="Update Entry"/>
     </form>
+	}$
   </div>
 </div>

data/examples/blog/view/entry.st

@@ -3,8 +3,8 @@
     <div class="title">$title$</div>
     <div class="created">Created: $created$</div>
     <ul>
-      <li><a href='/edit/$id$'>edit</li>
-      <li><a href='/delete/$id$'>delete</li>
+      <li><a href='/edit/$id$'>edit</a></li>
+      <li><a href='/delete/$id$'>delete</a></li>
     </ul>
   </div>
   <div class="content">$content$</div>

data/examples/forms/controller/registration.rb

@@ -19,6 +19,6 @@ class RegistrationController < Controller
     
     @registrationRepository.save(form)
     flash[:message] = "Saved!"
-    redirect R('/registration', :index, :key=>form[:key])
+    redirect route('/registration', :index, :key=>form[:key])
   end
 end

data/examples/todolist/{src/controller → controller}/main.rb

@@ -20,7 +20,6 @@ class MainController < Ramaze::Controller
         status = 'not done'
         toggle = 'close'
       end
-      delete = A('Delete', :href => Rs(:delete, title))
       @tasks << {:title => title, :status => status, :resource => title, :toggle => toggle}
     end
     @heading = "TodoList"
@@ -35,6 +34,7 @@ class MainController < Ramaze::Controller
         redirect '/new'
       end
       TodoList[title] = {:done => false}
+      redirect route('/', :title => title)
     end
   end
 
@@ -51,7 +51,7 @@ class MainController < Ramaze::Controller
   end
 
   helper :aspect
-  after(:create, :open, :close, :delete){ redirect(Rs()) unless redirected? }
+  after(:create, :open, :close, :delete){ redirect_referrer }
 
   private
 

data/examples/todolist/start.rb

@@ -4,8 +4,8 @@
 require 'rubygems'
 require 'ramaze'
 
-require 'src/controller/main'
-require 'src/element/page'
-require 'src/model'
+require 'controller/main'
+#require 'layout/page'
+require 'model/tasks'
 
 Ramaze.start :port => 3000

data/examples/todolist/todolist.db

@@ -1,7 +1,11 @@
 --- 
-Wash dishes: 
-  :done: false
 Watch the tv: 
   :done: false
+Wash dishes: 
+  :done: true
+Clean the shower: 
+  :done: false
 Laundry: 
   :done: false
+Vacuum the room: 
+  :done: false

data/lib/engine/binding_wrapper.rb

@@ -6,5 +6,9 @@ module Slippers
     def [](method)
       eval('@'+ method.to_s, @bindings)
     end
+    
+    def to_s
+      "BindingWrapper with #{@bindings}"
+    end
   end
 end

data/lib/engine/slippers.treetop

@@ -58,7 +58,7 @@ grammar Slippers
       end
     }
   end
-  
+    
   rule anything_except_keywords
     not_keyword* {
  	    def eval(*args)
@@ -108,7 +108,7 @@ grammar Slippers
       end
    }
   end
-  
+    
   rule brackets
    '()' {
       def to_s

data/lib/engine/template_group.rb

@@ -11,6 +11,10 @@ module Slippers
       find_in_super_group(subtemplate)
     end
     
+    def to_s
+      "TemplateGroup#Templates:[#{@templates}]&SuperGroup:[#{@super_group}] "
+    end
+    
     private
       def find_in_super_group(subtemplate)
         return nil unless @super_group 

data/lib/ramazeTemplates/slippers.rb

@@ -1,25 +1,22 @@
 require 'slippers'
 
 module Ramaze
-  module Template
-    class Slippers < Template
-
-      ENGINES[self] = %w[ st ]
-      class << self
-        def transform(action)
-          slippers = wrap_compile(action)
-          object_to_render = ::Slippers::BindingWrapper.new(action.binding)
-          slippers.render(object_to_render)
-        end
-
-        def compile(action, template)
-          subtemplates = action.controller.trait[:slippers_options] || {}
-         
-          template_group_directory = ::Slippers::TemplateGroupDirectory.new(Global.view_root)
+  module View
+    module Slippers
+      def self.call(action, string)
+        slippers = View.compile(string){|s| ::Slippers::Engine.new(s, :template_group => template_group(action)) }
+        object_to_render = ::Slippers::BindingWrapper.new(action.instance.binding)
+        html = slippers.render(object_to_render)
+        return html, 'text/html'
+      end
+      
+      private
+        def self.template_group(action)
+          subtemplates = action.instance.ancestral_trait[:slippers_options] || {}
+          view_root = "#{action.instance.options[:roots]}/#{action.instance.options[:views]}"
+          template_group_directory = ::Slippers::TemplateGroupDirectory.new(view_root)
           template_group = ::Slippers::TemplateGroup.new(:super_group => template_group_directory, :templates => subtemplates)
-          ::Slippers::Engine.new(template, :template_group => template_group)
         end
-      end
     end
   end
 end

data/spec/parser.rb

@@ -57,6 +57,12 @@ describe SlippersParser do
     @parser.parse('${template for this $name$}$').eval(:name => 'fred').should eql('template for this fred')
   end
   
+  it 'should parse an anonymous subtemplate within an anonymous subtemplate' do
+    stuff = @parser.parse('$cars:{I really like $types:{toyota}$ }$')
+    stuff.eval(:cars => {:types => 'toyota'}) if stuff
+    #.should eql('template for this')
+  end
+  
   it 'should apply the attribute to a subtemplate when parsing it' do
     subtemplate = Slippers::Engine.new('Hello $first$ $last$')
     template_group = Slippers::TemplateGroup.new(:templates => {:person => subtemplate})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: starapor-slippers
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors: 
 - Sarah Taraporewalla
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-30 00:00:00 -07:00
+date: 2009-09-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,7 +55,6 @@ files:
 - lib/engine/template_group.rb
 - lib/engine/template_group_directory.rb
 - lib/ramazeTemplates
-- lib/ramazeTemplates/0001-SarahTaraporewalla-adding-new-template-file-for-sli.patch
 - lib/ramazeTemplates/slippers.rb
 - lib/slippers.rb
 - spec/binding_wrapper.rb
@@ -146,28 +145,26 @@ files:
 - examples/main_controller.rb
 - examples/start.rb
 - examples/todolist
+- examples/todolist/controller
+- examples/todolist/controller/main.rb
+- examples/todolist/layout
+- examples/todolist/layout/page.rb
+- examples/todolist/model
+- examples/todolist/model/tasks.rb
 - examples/todolist/public
 - examples/todolist/public/favicon.ico
 - examples/todolist/public/js
 - examples/todolist/public/js/jquery.js
 - examples/todolist/public/ramaze.png
 - examples/todolist/README
-- examples/todolist/spec
-- examples/todolist/spec/todolist.rb
-- examples/todolist/src
-- examples/todolist/src/controller
-- examples/todolist/src/controller/main.rb
-- examples/todolist/src/element
-- examples/todolist/src/element/page.rb
-- examples/todolist/src/model.rb
 - examples/todolist/start.rb
-- examples/todolist/template
-- examples/todolist/template/index.st
-- examples/todolist/template/index.xhtml
-- examples/todolist/template/new.st
-- examples/todolist/template/new.xhtml
-- examples/todolist/template/tasks.st
 - examples/todolist/todolist.db
+- examples/todolist/view
+- examples/todolist/view/index.st
+- examples/todolist/view/index.xhtml
+- examples/todolist/view/new.st
+- examples/todolist/view/new.xhtml
+- examples/todolist/view/tasks.st
 - examples/todolist.db
 - examples/view
 - examples/view/index.st
@@ -175,8 +172,9 @@ files:
 - examples/view/person/age.st
 - examples/view/person/index.st
 - examples/view/person/name.st
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/starapor/slippers
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --inline-source
@@ -198,9 +196,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A strict templating library for Ruby
 test_files: []
 

data/examples/todolist/spec/todolist.rb

@@ -1,133 +0,0 @@
-require 'rubygems'
-require 'ramaze'
-require 'ramaze/spec/helper'
-
-spec_require 'hpricot'
-
-$LOAD_PATH.unshift base = __DIR__('..')
-require 'start'
-
-describe 'todolist' do
-  behaves_like 'http'
-
-  def h_get(*args)
-    Hpricot(get(*args).body)
-  end
-
-  def task_titles
-    doc = h_get('/')
-    doc.search("td[@class='title']").
-      map{|t| t.inner_html.strip}.sort
-  end
-
-  def tasks
-    (h_get('/')/:tr)
-  end
-
-  def task(name)
-    tasks.find do |task|
-      (task/:td).find do |td|
-        td['class'] == 'title' and
-        td.inner_html.strip == name
-      end
-    end
-  end
-
-  def spectask
-    task('spectask')
-  end
-
-  def spectask_status
-    spectask.search("td[@class='status']").inner_html.strip
-  end
-
-  def error_on_page(url, response)
-    doc = h_get(url, :cookie => response.headers['Set-Cookie'])
-
-    error = doc.search("div[@class='error']")
-    error.inner_html.strip
-  end
-
-  it 'should start' do
-    ramaze :public_root => base/:public,
-           :view_root   => base/:template
-    get('/').status.should == 200
-  end
-
-  it 'should have no empty mainpage' do
-    get('/').body.should.not == nil
-  end
-
-  it 'should have two preset tasks' do
-    task_titles.should == %w[Laundry Wash\ dishes]
-  end
-
-  it 'should have a link to new tasks' do
-    doc = h_get('/')
-    link = (doc/:a).find{|a| a.inner_html == 'New Task'}
-    link['href'].should == '/new'
-  end
-
-  it 'should have a page to create new tasks' do
-    get('/new').body.should.not == nil
-  end
-
-  it 'should have a form to create a tasks on the /new page' do
-    doc = h_get('/new')
-    form = doc.at :form
-    form.should.not == nil
-    input = form.at(:input)
-    input['type'].should == 'text'
-    input['name'].should == 'title'
-  end
-
-  it 'should POST new task and redirect to /' do
-    result = post('/create', 'title' => 'spectask')
-    result.status.should == 302
-  end
-
-  it 'should show have the new task' do
-    task_titles.should.include('spectask')
-  end
-
-  it 'should toggle the spectask' do
-    get('/close/spectask').status.should == 302
-    spectask.should.not == nil
-    spectask_status.should == 'done'
-    get('/open/spectask').status.should == 302
-    spectask.should.not == nil
-    spectask_status.should == 'not done'
-  end
-
-  it 'should raise on modifying a not existing task' do
-    %w[open close].each do |action|
-      response = get("/#{action}/nothere", :referrer => "/")
-      response.status.should == 302
-      response.original_headers['Location'].should == '/'
-      error_on_page('/', response).should == "No such Task: `nothere'"
-    end
-  end
-
-  it 'should delete the new task' do
-    get('/delete/spectask').status.should == 302
-    task_titles.should.not.include('spectask')
-  end
-
-  it 'should not create empty tasks but show a subtle error message' do
-    response = post('/create', 'title' => '', :referrer => "/new")
-
-    response.status.should == 302
-    response.original_headers['Location'].should == '/new'
-
-    error_on_page('/new', response).should == 'Please enter a title'
-  end
-
-  it 'should escape harmful titles' do
-    response = post('/create', 'title' => '#{puts "gotcha"}')
-
-    task('#{puts "gotcha"}').should.be.nil
-    task('#{puts "gotcha"}').should.not.be.nil
-  end
-
-  FileUtils.rm('todolist.db') rescue nil
-end

data/lib/ramazeTemplates/0001-SarahTaraporewalla-adding-new-template-file-for-sli.patch

@@ -1,58 +0,0 @@
-From 5a6c869d4709ce84d7c07b5dd33cf06e39c0111e Mon Sep 17 00:00:00 2001
-From: Sarah Taraporewalla <sarah.tarap@gmail.com>
-Date: Mon, 16 Feb 2009 20:44:08 +0000
-Subject: [PATCH 1] SarahTaraporewalla: adding new template file for slippers template engine
-
----
- lib/ramaze/template.rb |    2 +-
- 2 files changed, 26 insertions(+), 1 deletions(-)
-
-diff --git a/lib/ramaze/template.rb b/lib/ramaze/template.rb
-index 096816b..99f1f94 100644
---- a/lib/ramaze/template.rb
-+++ b/lib/ramaze/template.rb
-@@ -18,7 +18,7 @@ module Ramaze
- 
-     AVAILABLE_ENGINES = %w[
-       Amrita2 Builder Erubis Haml Liquid Markaby Maruku Nagoro None RedCloth
--      Remarkably Sass Tagz Tenjin XSLT
-+      Remarkably Sass Slippers Tagz Tenjin XSLT
-     ]
- 
-     AVAILABLE_ENGINES.each do |const|
--- 
-
-diff --git a/lib/ramaze/template/slippers.rb b/lib/ramaze/template/slippers.rb
-new file mode 100755
-index 0000000..e9981b4
---- /dev/null
-+++ b/lib/ramaze/template/slippers.rb
-@@ -0,0 +1,25 @@
-+require 'slippers'
-+
-+module Ramaze
-+  module Template
-+    class Slippers < Template
-+
-+      ENGINES[self] = %w[ st ]
-+      class << self
-+        def transform(action)
-+          slippers = wrap_compile(action)
-+          object_to_render = ::Slippers::BindingWrapper.new(action.binding)
-+          slippers.render(object_to_render)
-+        end
-+
-+        def compile(action, template)
-+          subtemplates = action.controller.trait[:slippers_options] || {}
-+         
-+          template_group_directory = ::Slippers::TemplateGroupDirectory.new(Global.view_root)
-+          template_group = ::Slippers::TemplateGroup.new(:super_group => template_group_directory, :templates => subtemplates)
-+          ::Slippers::Engine.new(template, :template_group => template_group)
-+        end
-+      end
-+    end
-+  end
-+end
--- 
-1.6.1
-