runo 0.1.1 → 0.1.2

data/lib/_parser.rb

@@ -86,7 +86,7 @@ module Runo::Parser
     s = StringScanner.new html
     until s.eos?
       if s.scan /\$\((\w+)(?:\s+|\s*=\s*)([\w\-]+)\s*/m
-        out << block.call(s[1], {:klass => s[2]}.merge(scan_tokens s))
+        out << block.call(s[1], {:klass => s[2]}.merge(scan_tokens(s)))
       else
         out << s.scan(/.+?(?=\$|\w|<|\z)/m)
       end
@@ -180,7 +180,7 @@ module Runo::Parser
         'default' => item_meta,
       },
     }
-    (inner_html =~ /\A\s*<!--(.+?)-->/m) ? sd.merge(scan_tokens StringScanner.new($1)) : sd
+    (inner_html =~ /\A\s*<!--(.+?)-->/m) ? sd.merge(scan_tokens(StringScanner.new($1))) : sd
   end
 
   def parse_token(prefix, token, meta = {})

data/lib/_path.rb

@@ -19,9 +19,9 @@ module Runo::Path
   end
 
   def base_of(path)
-    base = Runo::Set::Static::Folder.root.item(steps_of path)
+    base = Runo::Set::Static::Folder.root.item steps_of(path)
     if base.is_a? Runo::Set::Static::Folder
-      base.item 'main'
+      base.item('main') || base.find {|item| item.is_a? Runo::Set::Dynamic } || base
     else
       base
     end

data/lib/_storage/file.rb

@@ -11,7 +11,7 @@ require 'fileutils'
 class Runo::Storage::File < Runo::Storage
 
   def self.traverse(dir = '/', root = Runo['storage']['File']['data_dir'], &block)
-    ::Dir.glob(::File.join root, dir, '*').sort.collect {|file|
+    ::Dir.glob(::File.join(root, dir, '*')).sort.collect {|file|
       ftype     = ::File.ftype file
       base_name = ::File.basename file
       id, ext    = base_name.split('.', 2)

data/lib/_storage/sequel.rb

@@ -76,7 +76,7 @@ class Runo::Storage::Sequel < Runo::Storage
   end
 
   def delete(id)
-    @dataset.filter(_conds id).delete &&
+    @dataset.filter(_conds(id)).delete &&
     @dataset.grep(:full_name, _full_name("#{id}-%")).and(~:ext => 'yaml').delete &&
     id
   end
@@ -88,7 +88,7 @@ class Runo::Storage::Sequel < Runo::Storage
   private
 
   def _select_by_id(conds)
-    @dataset.filter(_conds conds[:id]).collect {|v| _id v[:full_name] }
+    @dataset.filter(_conds(conds[:id])).collect {|v| _id v[:full_name] }
   end
 
   def _select_by_d(conds)

data/lib/_widget/submit.rb

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

data/lib/meta/id.rb

@@ -16,7 +16,7 @@ class Runo::Meta::Id < Runo::Field
     if (my[:max].to_i > 0) && (val.size > my[:max])
       [_('too long: %{max} characters maximum') % {:max => my[:max]}]
     elsif (my[:min].to_i == 1) && val.empty?
-      [_ 'mandatory']
+      [_('mandatory')]
     elsif (my[:min].to_i > 0) && (val.size < my[:min])
       [_('too short: %{min} characters minimum') % {:min => my[:min]}]
     elsif val !~ /\A#{Runo::REX::ID_SHORT}\z/

data/lib/meta/timestamp.rb

@@ -48,7 +48,7 @@ class Runo::Meta::Timestamp < Runo::Field
   end
 
   def _date(time)
-    time.is_a?(::Time) ? time.strftime(_ '%Y-%m-%dT%H:%M:%S') : 'n/a'
+    time.is_a?(::Time) ? time.strftime(_('%Y-%m-%dT%H:%M:%S')) : 'n/a'
   end
 
   def _g_create(arg)

data/lib/runo.rb

@@ -110,7 +110,7 @@ class Runo
     Runo.current[:session] = env['rack.session']
 
     if Runo.transaction[tid].is_a? Runo::Field
-      base = Runo.transaction[tid].item(Runo::Path.steps_of path.sub(/\A.*#{Runo::REX::TID}/, ''))
+      base = Runo.transaction[tid].item Runo::Path.steps_of(path.sub(/\A.*#{Runo::REX::TID}/, ''))
     else
       base = Runo::Path.base_of path
     end
@@ -271,10 +271,10 @@ class Runo
       :action     => Runo::Path.action_of(req.path_info),
       :sub_action => Runo::Path.sub_action_of(req.path_info),
     }
-    params.merge!(rebuild_params req.params)
+    params.merge! rebuild_params(req.params)
 
     params[:conds] ||= {}
-    params[:conds].merge!(Runo::Path.conds_of req.path_info)
+    params[:conds].merge! Runo::Path.conds_of(req.path_info)
 
     params
   end

data/lib/scalar/checkbox.rb

@@ -19,9 +19,9 @@ class Runo::Checkbox < Runo::Field
 
   def errors
     if val.empty?
-      my[:mandatory] ? [_ 'mandatory'] : []
+      my[:mandatory] ? [_('mandatory')] : []
     else
-      (val - my[:options]).empty? ? [] : [_ 'no such option']
+      (val - my[:options]).empty? ? [] : [_('no such option')]
     end
   end
 

data/lib/scalar/file.rb

@@ -54,7 +54,7 @@ class Runo::File < Runo::Field
     elsif (my[:max].to_i > 0) && (val['size'].to_i > my[:max])
       [_('too large: %{max} bytes maximum') % {:max => my[:max]}]
     elsif (my[:min].to_i == 1) && val['size'].to_i < 1
-      [_ 'mandatory']
+      [_('mandatory')]
     elsif (my[:min].to_i > 0) && (val['size'].to_i < my[:min])
       [_('too small: %{min} bytes minimum') % {:min => my[:min]}]
     else

data/lib/scalar/img.rb

@@ -82,7 +82,7 @@ _html
   end
 
   def _g_thumbnail(arg = {})
-    _g_default(arg.merge :sub_action => :without_link)
+    _g_default arg.merge(:sub_action => :without_link)
   end
 
   def _thumbnail(tempfile)

data/lib/scalar/password.rb

@@ -16,7 +16,7 @@ class Runo::Password < Runo::Field
     elsif (my[:max].to_i > 0) && (@size > my[:max])
       [_('too long: %{max} characters maximum') % {:max => my[:max]}]
     elsif (my[:min].to_i == 1) && (@size == 0)
-      [_ 'mandatory']
+      [_('mandatory')]
     elsif (my[:min].to_i > 0) && (@size < my[:min])
       [_('too short: %{min} characters minimum') % {:min => my[:min]}]
     else
@@ -44,7 +44,7 @@ _html
         @val = v
       when :create, :update
         if v.is_a?(::String) && !v.empty?
-          salt = ('a'..'z').to_a[rand 26] + ('a'..'z').to_a[rand 26]
+          salt = ('a'..'z').to_a[rand(26)] + ('a'..'z').to_a[rand(26)]
           @size = v.size
           @val = v.crypt salt
         elsif @val.nil?

data/lib/scalar/radio.rb

@@ -13,9 +13,9 @@ class Runo::Radio < Runo::Field
 
   def errors
     if val.empty?
-      my[:mandatory] ? [_ 'mandatory'] : []
+      my[:mandatory] ? [_('mandatory')] : []
     else
-      my[:options].include?(val) ? [] : [_ 'no such option']
+      my[:options].include?(val) ? [] : [_('no such option')]
     end
   end
 

data/lib/scalar/select.rb

@@ -13,11 +13,11 @@ class Runo::Select < Runo::Field
 
   def errors
     if my[:mandatory] && val.empty?
-      [_ 'mandatory']
+      [_('mandatory')]
     elsif my[:options].include?(val) || val.empty?
       []
     else
-      [_ 'no such option']
+      [_('no such option')]
     end
   end
 

data/lib/scalar/text.rb

@@ -14,7 +14,7 @@ class Runo::Text < Runo::Field
     if (my[:max].to_i > 0) && (val.size > my[:max])
       [_('too long: %{max} characters maximum') % {:max => my[:max]}]
     elsif (my[:min].to_i == 1) && val.empty?
-      [_ 'mandatory']
+      [_('mandatory')]
     elsif (my[:min].to_i > 0) && (val.size < my[:min])
       [_('too short: %{min} characters minimum') % {:min => my[:min]}]
     else

data/lib/scalar/textarea.rb

@@ -9,7 +9,7 @@ class Runo::Textarea < Runo::Field
     if (my[:max].to_i > 0) && (val.size > my[:max])
       [_('too long: %{max} characters maximum') % {:max => my[:max]}]
     elsif (my[:min].to_i == 1) && val.empty?
-      [_ 'mandatory']
+      [_('mandatory')]
     elsif (my[:min].to_i > 0) && (val.size < my[:min])
       [_('too short: %{min} characters minimum') % {:min => my[:min]}]
     else

data/lib/set/dynamic.rb

@@ -168,7 +168,7 @@ _html
       if id[Runo::REX::ID_NEW]
         @item_object[id].load_default
       else
-        @item_object[id].load(@storage.val id)
+        @item_object[id].load @storage.val(id)
       end
     end
     @item_object[id]

data/lib/set/static.rb

@@ -11,7 +11,7 @@ class Runo::Set::Static < Runo::Field
 
   def initialize(meta = {})
     @meta = meta
-    @meta.merge!(Runo::Parser.parse_html meta[:html]) if meta[:html]
+    @meta.merge!(Runo::Parser.parse_html(meta[:html])) if meta[:html]
     @meta[:item] ||= {}
     @item_object = {}
   end
@@ -87,7 +87,7 @@ _html
   def collect_item(conds = {}, &block)
     items = my[:item].keys
     items &= conds[:id].to_a if conds[:id] # select item(s) by id
-    items.collect {|id|
+    items.sort.collect {|id|
       item = @item_object[id] ||= Runo::Field.instance(
         my[:item][id].merge(:id => id, :parent => self)
       )

data/lib/set/static_folder.rb

@@ -14,11 +14,11 @@ class Runo::Set::Static::Folder < Runo::Set::Static
     meta[:html] = load_html(meta[:dir], meta[:parent])
     super
 
-    ::Dir.glob(::File.join Runo['skin_dir'], my[:html_dir].to_s, '*.html').each {|f|
+    ::Dir.glob(::File.join(Runo['skin_dir'], my[:html_dir].to_s, '*.html')).each {|f|
       action = ::File.basename(f, '.*').intern
       merge_tmpl(@meta, Runo::Parser.parse_html(::File.read(f), action)) if action != :index
     }
-    ::Dir.glob(::File.join Runo['skin_dir'], my[:html_dir].to_s, '*.xml').each {|f|
+    ::Dir.glob(::File.join(Runo['skin_dir'], my[:html_dir].to_s, '*.xml')).each {|f|
       action = ::File.basename(f, '.*').intern
       merge_tmpl(@meta, Runo::Parser.parse_xml(::File.read(f), action)) if action != :index
     }
@@ -59,7 +59,7 @@ class Runo::Set::Static::Folder < Runo::Set::Static
       return sd.instance_eval { collect_item(conds, &block) }
     elsif (
       conds[:id] =~ /\A\w+\z/ &&
-      ::File.directory?(::File.join Runo['skin_dir'], my[:dir], conds[:id])
+      ::File.directory?(::File.join(Runo['skin_dir'], my[:dir], conds[:id]))
     )
       my[:item][conds[:id]] = {:klass  => 'set-static-folder'}
     end

data/skel/skin/examples/index.html

@@ -61,8 +61,6 @@
             Everybody who logged in can create a new post, or reply to a existing post.
           </dd>
         </dl>
-        <div id="main" class="app-blog"></div>
-        <!-- $(main.action_create) -->
       </div>
 
       <div id="right" class="column">

data/skel/skin/index.html

@@ -27,8 +27,6 @@
           This is your homepage of the Runo app.<br />
           You can play with <a href="./examples/">the examples</a> before making your first Runo app.
         </p>
-        <div id="main" class="app-blog"></div>
-        <!-- $(main.action_create) -->
       </div>
 
       <div id="right" class="column">

data/t/skin/foo/qux/index.html

@@ -0,0 +1,8 @@
+<html>
+  <head><title>@(label)</title></head>
+  <body>
+    <h1>@(label)</h1>
+    <ul id="abc" class="app-blog"><li></li></ul>
+    <ul id="sub" class="app-blog"><li></li></ul>
+  </body>
+</html>

data/t/skin/foo/qux/moo/index.html

@@ -0,0 +1,6 @@
+<html>
+  <head><title>@(label)</title></head>
+  <body>
+    <p>moo!</p>
+  </body>
+</html>

data/t/test_runo.rb

@@ -350,6 +350,18 @@ class TC_Runo < Test::Unit::TestCase
       "Runo::Path.base_of should return the item('main') if the given steps point at a folder"
     )
 
+    sd = Runo::Path.base_of '/foo/qux/index.html'
+    assert_instance_of(
+      Runo::Set::Dynamic,
+      sd,
+      "Runo::Path.base_of should return an available set_dynamic if there is no 'main' in the folder"
+    )
+    assert_equal(
+      '-foo-qux-abc',
+      sd[:full_name],
+      "Runo::Path.base_of should return the first set_dynamic if there is no 'main' in the folder"
+    )
+
     sd = Runo::Path.base_of '/foo/bar/20091120_0001/comment/index.html'
     assert_instance_of(
       Runo::Text,
@@ -376,6 +388,20 @@ class TC_Runo < Test::Unit::TestCase
     )
   end
 
+  def test_base_of_empty_folder
+    f = Runo::Path.base_of '/foo/qux/moo/index.html'
+    assert_instance_of(
+      Runo::Set::Static::Folder,
+      f,
+      'Runo::Path.base_of should return an folder if there is no SD in it'
+    )
+    assert_equal(
+      '-foo-qux-moo',
+      f[:full_name],
+      'Runo::Path.base_of should return an folder if there is no SD in it'
+    )
+  end
+
   def test_path_of
     assert_equal(
       '20091224/123/',

data/t/test_runo_call.rb

@@ -1136,29 +1136,24 @@ _html
       'Runo#call should return both the base path and tid at :done'
     )
 
-    tid    = res.headers['Location'][Runo::REX::TID]
-    new_id = res.headers['Location'][Runo::REX::PATH_ID]
+    location = res.headers['Location']
+    location =~ Runo::REX::PATH_ID
+    new_id = sprintf('%.8d_%.4d', $1, $2)
 
-    res = Rack::MockRequest.new(@runo).get(
-      res.headers['Location']
-    )
+    res = Rack::MockRequest.new(@runo).get location
     assert_match(
       /created 1 entry\./,
       res.body,
       'Runo#call should include the current message'
     )
 
-    res = Rack::MockRequest.new(@runo).get(
-      "http://example.com/#{tid}/#{new_id}index.html"
-    )
+    res = Rack::MockRequest.new(@runo).get location
     assert_no_match(
       /created 1 entry\./,
       res.body,
       'Runo#call should not include the message twice'
     )
 
-    res.headers['Location'] =~ Runo::REX::PATH_ID
-    new_id = sprintf('%.8d_%.4d', $1, $2)
     res = Rack::MockRequest.new(@runo).post(
       'http://example.com/t_store/main/update.html',
       {

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Akira FUNAI
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 +09:00
+date: 2010-07-10 00:00:00 +09:00
 default_executable: runo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -247,6 +247,8 @@ files:
 - t/skin/foo/index.html
 - t/skin/foo/index.yaml
 - t/skin/foo/not_css/foo.css
+- t/skin/foo/qux/index.html
+- t/skin/foo/qux/moo/index.html
 - t/skin/foo/sub-20100306_0001.yaml
 - t/skin/index.yaml
 - t/skin/t_attachment/index.html