bike 0.2.2 → 0.2.3

data/README.rdoc

@@ -3,9 +3,11 @@
 Bike is the easiest web application framework ever.
 You can make various apps such like blog, forum, contact form by putting single (or several) HTML file with a bit of special markups. The view rules. There is no model definition, no server restart, and no coding at all.
 
-== Wiki
+== Sites
 
-http://github.com/afunai/bike/wiki
+* Home: http://github.com/afunai/bike
+* Docs: http://github.com/afunai/bike/wiki
+* Demo: http://runo.heroku.com/examples/index.html
 
 == Features
 
@@ -16,7 +18,7 @@ http://github.com/afunai/bike/wiki
 * You can make nested apps inside an app (e.g. blog comments inside a blog entry).
 * Authentication / Authorization / User admin are built in by default.
 * Storage can be plain YAML files (default), or any RDB via Sequel.
-* Bike itself is a Rack application.
+* Bike can be deployed anywhere as it is a simple Rack application.
 
 == Quick Start
 
@@ -28,9 +30,6 @@ Open a command line terminal. Type:
 
   gem install bike
 
-If you want to make thumbnails for submitted images, you have to install QuickMagick as well.
-http://rubyforge.org/projects/quickmagick/
-
 === Step 2 - Initialize a Bike Directory
 
 In a command line terminal, go to an empty directory where you want to build Bike projects.
@@ -46,7 +45,6 @@ This will create a "bike" directory, which includes:
 
 === Step 3 - Start a Test Server
 
-In the terminal, change to the newly created "bike" directory.
 Type:
 
   bike run
@@ -55,24 +53,20 @@ Type:
 
 Now open this URL with your browser.
 
-  http://localhost:9292/
+http://localhost:9292/
 
 You will see the default homepage of Bike.
-There is some links to examples such like Blog, Contact Form, Forum, etc. Just see what can be done by plain HTML files.
+There is some links to examples such like Blog, Contact Form, Forum, etc. See what can be done by plain HTML files.
 
 === Step 5 - Create Your Own App
 
-Let's call our app "fab".
-It is a web-based forum where logged in users can submit their own articles, and everybody can read them.
-We put links to signup / login at bottom of the app.
-
 Create a new directory under bike/skin/:
 
-  mkdir skin/fab/
+  mkdir skin/myapp/
 
 Then create a new HTML file with your favorite editor:
 
-  edit skin/fab/index.html
+  edit skin/myapp/index.html
 
 The content is: (You can just copy & paste, of course)
 
@@ -102,12 +96,9 @@ The content is: (You can just copy & paste, of course)
 
 === Step 6 - That's it!
 
-See the URL:
-
-  http://localhost:9292/fab/
+http://localhost:9292/myapp/index.html
 
-You have just created your first app. Open a bottle of your favorite drink and make yourself comfortable.
-When you need more complicated tricks, HTMLs under skin/examples/ will be your help. Also, you should check out the wiki: http://github.com/afunai/bike/wiki
+You have just created your first app. Log in with root/root to try it out. Have a nice ride!
 
 == Note on Patches/Pull Requests
  

data/lib/_widget/submit.rb

@@ -37,7 +37,7 @@ _html
   def _g_submit_preview_delete(arg)
     if (
       permit_get?(arg.merge(:action => :delete)) &&
-      collect_item(arg[:conds]).find {|item| item[:id] !~ Bike::REX::ID_NEW } &&
+      collect_item(arg[:conds]).any? {|item| item[:id] !~ Bike::REX::ID_NEW } &&
       arg[:orig_action] != :preview
     )
       <<_html

data/lib/set/_set.rb

@@ -92,17 +92,13 @@ module Bike::Set
   def _get(arg)
     if respond_to?("_g_#{arg[:action]}", true)
       _get_by_method arg
-    elsif summary?(arg) && action_tmpl = my[:tmpl][:summary]
-      _get_by_tmpl(arg, action_tmpl)
-    elsif action_tmpl = my[:tmpl][arg[:sub_action]] || my[:tmpl][arg[:action]]
-      _get_by_tmpl(arg, action_tmpl)
     else
-      _get_by_tmpl(arg, my[:tmpl][:index])
+      _get_by_tmpl(arg, action_tmpl(arg))
     end
   end
 
   def _get_by_tmpl(arg, tmpl = '')
-    tmpl.gsub(/@\((.+?)\)/) {
+    tmpl.to_s.gsub(/@\((.+?)\)/) {
       tag   = $&
       steps = $1.split '-'
       id    = steps.pop
@@ -169,6 +165,18 @@ module Bike::Set
     }
   end
 
+  def action_tmpl(arg)
+    if summary?(arg) && my[:tmpl][:summary]
+      my[:tmpl][:summary]
+    elsif action_tmpl = my[:tmpl][arg[:sub_action]] || my[:tmpl][arg[:action]]
+      action_tmpl
+    elsif [:create, :update, :delete, :login].include? arg[:action]
+      my[:tmpl][:form] || my[:tmpl][:index]
+    else
+      my[:tmpl][:read] || my[:tmpl][:index]
+    end
+  end
+
   def summary?(arg)
     [:read, nil].include?(arg[:action]) && !arg[:sub_action]
   end

data/lib/set/static_folder.rb

@@ -10,44 +10,25 @@ class Bike::Set::Static::Folder < Bike::Set::Static
   end
 
   def initialize(meta = {})
-    meta[:dir]  = meta[:parent] ? ::File.join(meta[:parent][:dir], meta[:id]) : meta[:id]
-    meta[:html] = load_html(meta[:dir], meta[:parent])
-    super
-
-    ::Dir.glob(::File.join(Bike['skin_dir'], my[:html_dir].to_s, '*.html')).each {|f|
-      action = ::File.basename(f, '.*').intern
-      merge_tmpl(@meta, Bike::Parser.parse_html(::File.read(f), action)) if action != :index
-    }
-    ::Dir.glob(::File.join(Bike['skin_dir'], my[:html_dir].to_s, '*.xml')).each {|f|
-      action = ::File.basename(f, '.*').intern
-      merge_tmpl(@meta, Bike::Parser.parse_xml(::File.read(f), action)) if action != :index
-    }
+    @meta = meta
+    @meta.merge! load_html
+    @meta.merge! load_yaml
 
     @meta[:tmpl].values.each {|tmpl|
-      tmpl.sub!(/<head>([\s\n]*)/i) {
-        "#{$&}<base href=\"@(href)\" />#{$1}"
-      }
-    } if @meta[:tmpl]
+      tmpl.sub!(/<head>([\s\n]*)/i) { "#{$&}<base href=\"@(href)\" />#{$1}" }
+    }
 
-    @meta.merge! load_yaml(my[:dir], my[:parent])
+    @item_object = {}
   end
 
   def meta_dir
-    @meta[:dir]
-  end
-
-  def meta_html_dir
-    if ::File.readable? ::File.join(Bike['skin_dir'], my[:dir], 'index.html')
-      my[:dir]
-    elsif my[:parent]
-      my[:parent][:html_dir]
-    end
+    my[:parent] ? ::File.join(my[:parent][:dir], my[:id]) : my[:id]
   end
 
   private
 
   def _get(arg)
-    if arg['main'] && action_tmpl = my[:tmpl][arg['main'][:action]]
+    if arg['main'] && action_tmpl = action_tmpl(arg['main'])
       _get_by_tmpl(arg, action_tmpl)
     else
       super
@@ -66,17 +47,42 @@ class Bike::Set::Static::Folder < Bike::Set::Static
     super
   end
 
-  def load_html(dir, parent, action = :index)
-    html_file = ::File.join Bike['skin_dir'], dir, "#{action}.html"
-    if ::File.exists? html_file
-      ::File.read html_file
-    elsif parent
-      parent[:html]
+  def load_html
+    files = ::Dir[::File.join Bike['skin_dir'], my[:dir], '*.{html,xml}'].sort
+
+    if model_file = files.find {|f| ['form', 'index'].include? ::File.basename(f, '.*') }
+      html   = ::File.read model_file
+      action = ::File.basename(model_file, '.*').intern
+      meta   = {:html => html}
+      meta.merge! Bike::Parser.parse_html(html, action, (::File.extname(model_file) == '.xml'))
+
+      files.delete model_file
+      files.each {|f|
+        html   = ::File.read f
+        action = ::File.basename(f, '.*').intern
+        merge_tmpl(
+          meta,
+          Bike::Parser.parse_html(html, action, (::File.extname(f) == '.xml'))
+        )
+      }
+
+      meta
+    elsif my[:parent]
+      {
+        :label => my[:parent][:label],
+        :item  => my[:parent][:item],
+        :tmpl  => my[:parent][:tmpl],
+      }
+    else
+      {
+        :item => {},
+        :tmpl => {},
+      }
     end
   end
 
-  def load_yaml(dir, parent)
-    yaml_file = ::File.join(Bike['skin_dir'], dir, 'index.yaml')
+  def load_yaml
+    yaml_file = ::File.join(Bike['skin_dir'], my[:dir], 'index.yaml')
     meta = ::File.exists?(yaml_file) ? YAML.load_file(yaml_file) : {}
     meta.keys.inject({}) {|m, k|
       m[k.intern] = meta[k]

data/t/skin/foo/boo/form.html

@@ -0,0 +1 @@
+<html><ul class="app-boo"></ul></html>

data/t/skin/foo/boo/rss.xml

@@ -0,0 +1 @@
+<xml class="dummy">boo</xml>

data/t/skin/t_tmpl_form/form.html

@@ -0,0 +1 @@
+<form>

data/t/skin/t_tmpl_form/index.html

@@ -0,0 +1 @@
+<index>

data/t/skin/t_tmpl_read/index.html

@@ -0,0 +1 @@
+<index>

data/t/skin/t_tmpl_read/read.html

@@ -0,0 +1 @@
+<read>

data/t/test_set_folder.rb

@@ -39,22 +39,6 @@ class TC_Set_Folder < Test::Unit::TestCase
     )
   end
 
-  def test_meta_html_dir
-    folder = Bike::Set::Static::Folder.root.item('foo')
-    assert_equal(
-      '/foo',
-      folder[:html_dir],
-      "Folder#meta_html_dir should return meta_dir if there is 'index.html'"
-    )
-
-    folder = Bike::Set::Static::Folder.root.item('foo', 'bar')
-    assert_equal(
-      '/foo',
-      folder[:html_dir],
-      "Folder#meta_html_dir should return parent[:html_dir] if there is no 'index.html' in [:dir]"
-    )
-  end
-
   def test_meta_href
     folder = Bike::Set::Static::Folder.root.item('t_summary')
 
@@ -73,6 +57,29 @@ class TC_Set_Folder < Test::Unit::TestCase
     )
   end
 
+  def test_load_html
+    folder = Bike::Set::Static::Folder.root.item('foo', 'boo')
+    assert_equal(
+      'boo',
+      folder[:item]['main'][:workflow],
+      'Folder#load_html should load [:item] from form.html if available'
+    )
+    assert_equal(
+      "<html>$(main.message)$(main)</html>\n",
+      folder[:tmpl][:form],
+      'Folder#load_html should load [:tmpl][:form] from form.html'
+    )
+    assert_nil(
+      folder[:tmpl][:index],
+      'Folder#load_html should leave [:tmpl][:index] empty if there is no index.html'
+    )
+    assert_equal(
+      "<xml>boo</xml>\n",
+      folder[:tmpl][:rss],
+      'Folder#load_html should load [:tmpl] from *.xml if available'
+    )
+  end
+
   def test_load_yaml
     folder = Bike::Set::Static::Folder.new(:id => 'foo', :parent => nil)
     assert_equal(
@@ -412,6 +419,42 @@ _html
     )
   end
 
+  def test_get_by_tmpl_with_form_action
+    folder = Bike::Set::Static::Folder.root.item('t_tmpl_form')
+
+    [:create, :update, :delete, :login].each {|action|
+      assert_equal(
+        "<form>\n",
+        folder.get('main' => {:action => action}),
+        "Folder#_get_by_tmpl should use tmpl[:form] if arg['main'][:action] is :#{action}"
+      )
+    }
+
+    assert_equal(
+      "<index>\n",
+      folder.get('main' => {:action => :read}),
+      'Folder#_get_by_tmpl should not use tmpl[:form] for read actions'
+    )
+  end
+
+  def test_get_by_tmpl_with_read_action
+    folder = Bike::Set::Static::Folder.root.item('t_tmpl_read')
+
+    [:read, :summary, :foo, nil].each {|action|
+      assert_equal(
+        "<read>\n",
+        folder.get('main' => {:action => action}),
+        "Folder#_get_by_tmpl should use tmpl[:read] if arg['main'][:action] is :#{action}"
+      )
+    }
+
+    assert_equal(
+      "<index>\n",
+      folder.get('main' => {:action => :create}),
+      'Folder#_get_by_tmpl should not use tmpl[:read] for form actions'
+    )
+  end
+
   def test_g_login
     folder = Bike::Set::Static::Folder.root.item('t_contact')
 

data/t/test_set_static.rb

@@ -242,7 +242,7 @@ _html
     )
   end
 
-  def test_get_tmpl_non_existing_meta
+  def test_get_by_tmpl_non_existing_meta
     ss = Bike::Set::Static.new(:html => '')
     assert_equal(
       'foo @(foo-bar) foo',
@@ -256,7 +256,7 @@ _html
     )
   end
 
-  def test_get_tmpl_non_existing_item
+  def test_get_by_tmpl_non_existing_item
     ss = Bike::Set::Static.new(:html => '')
     assert_equal(
       'foo $(foo) foo',
@@ -265,6 +265,72 @@ _html
     )
   end
 
+  def test_get_by_tmpl_with_form_action
+    ss = Bike::Set::Static.new(:html => 'index')
+    ss[:tmpl][:form] = 'form'
+    class << ss
+      undef_method :_g_login # test purpose only
+    end
+
+    [:create, :update, :delete, :login].each {|action|
+      assert_equal(
+        'form',
+        ss.get(:action => action),
+        "Set#_get_by_tmpl should use tmpl[:form] for :#{action}"
+      )
+    }
+
+    ss[:tmpl][:read] = nil
+    assert_equal(
+      'index',
+      ss.get(:action => :read),
+      'Set#_get_by_tmpl should not use tmpl[:form] for read actions'
+    )
+    ss[:tmpl][:read] = 'read'
+    assert_equal(
+      'read',
+      ss.get(:action => :read),
+      'Set#_get_by_tmpl should not use tmpl[:form] for read actions'
+    )
+  end
+
+  def test_get_by_tmpl_without_index_action
+    ss = Bike::Set::Static.new(:html => '')
+    ss[:tmpl] = {:form => 'form'}
+
+    assert_equal(
+      '',
+      ss.get(:action => :read),
+      'Set#_get_by_tmpl should not use tmpl[:form] for :read'
+    )
+  end
+
+  def test_get_by_tmpl_with_read_action
+    ss = Bike::Set::Static.new(:html => 'index')
+    ss[:tmpl][:read] = 'read'
+
+    [:read, :summary, :foo, nil].each {|action|
+      assert_equal(
+        'read',
+        ss.get(:action => action),
+        "Set#_get_by_tmpl should use tmpl[:read] when available"
+      )
+    }
+
+    ss[:tmpl][:form] = nil
+    assert_equal(
+      'index',
+      ss.get(:action => :create),
+      'Set#_get_by_tmpl should not use tmpl[:read] for form actions'
+    )
+    ss[:tmpl][:form] = 'form'
+    assert_equal(
+      'form',
+      ss.get(:action => :create),
+      'Set#_get_by_tmpl should not use tmpl[:read] for form actions'
+    )
+  end
+
   def test_recursive_tmpl
     ss = Bike::Set::Static.new(:html => <<'_html')
 <li>$()</li>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Akira FUNAI
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +09:00
+date: 2010-11-02 00:00:00 +09:00
 default_executable: bike
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -244,6 +244,8 @@ files:
 - t/skin/foo/bar/20091120_0001.yaml
 - t/skin/foo/bar/index.yaml
 - t/skin/foo/baz/css/baz.css
+- t/skin/foo/boo/form.html
+- t/skin/foo/boo/rss.xml
 - t/skin/foo/css/foo.css
 - t/skin/foo/index.html
 - t/skin/foo/index.yaml
@@ -264,6 +266,10 @@ files:
 - t/skin/t_summary/create.html
 - t/skin/t_summary/index.html
 - t/skin/t_summary/summary.html
+- t/skin/t_tmpl_form/form.html
+- t/skin/t_tmpl_form/index.html
+- t/skin/t_tmpl_read/index.html
+- t/skin/t_tmpl_read/read.html
 - t/t.rb
 - t/test_bike.rb
 - t/test_call.rb