runo 0.1.2 → 0.2.0

data/README.rdoc

@@ -107,7 +107,7 @@ See the URL:
   http://localhost:9292/fab/
 
 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. More detailed documents are on the way.
+When you need more complicated tricks, HTMLs under skin/examples/ will be your help. Also, you should check out the wiki: http://wiki.github.com/afunai/runo/
 
 == Note on Patches/Pull Requests
  

data/lib/_field.rb

@@ -1,12 +1,12 @@
 # encoding: UTF-8
 
 # Author::    Akira FUNAI
-# Copyright:: Copyright (c) 2009 Akira FUNAI
+# Copyright:: Copyright (c) 2009-2010 Akira FUNAI
 
 require 'rubygems'
 require 'rack/utils'
 
-$KCODE = 'UTF8'
+$KCODE = 'UTF8' if RUBY_VERSION < '1.9.0'
 
 class Runo::Field
 
@@ -91,11 +91,11 @@ class Runo::Field
   end
 
   def meta_owners
-    (my[:parent] ? my[:parent][:owners] : ['root']) | @meta[:owner].to_a
+    (my[:parent] ? my[:parent][:owners] : ['root']) | Array(@meta[:owner])
   end
 
   def meta_admins
-    (my[:parent] ? my[:parent][:admins] : ['root']) | @meta[:admin].to_a
+    (my[:parent] ? my[:parent][:admins] : ['root']) | Array(@meta[:admin])
   end
 
   def meta_group
@@ -186,7 +186,7 @@ class Runo::Field
   end
 
   def empty?
-    val.to_s == ''
+    val.respond_to?(:empty?) ? val.empty? : (val.to_s == '')
   end
 
   def errors

data/lib/_i18n.rb

@@ -10,6 +10,7 @@ module Runo::I18n
       if args.first.is_a? ::Hash
         self.gsub(/%\{(\w+)\}/) { args.first[$1.intern].to_s }
       else
+        args = args.first if args.first.is_a? ::Array
         ::String.new(self.gsub(/%\{(\w+)\}/, '%s')) % args
       end
     end
@@ -83,7 +84,9 @@ module Runo::I18n
         range.sub(/-.*/, ''),
       ].uniq.each {|r|
         po_file = ::File.join(self.po_dir, r, "#{self.domain}.po")
-        return open(po_file) {|f| self.parse_msg f } if ::File.readable? po_file
+        return ::File.open(po_file, ((RUBY_VERSION < '1.9') ? 'r' : 'r:utf-8')) {|f|
+          self.parse_msg f
+        } if ::File.readable? po_file
         return {} if r == 'en' # default
       }
     }
@@ -123,7 +126,7 @@ module Runo::I18n
   module_function
 
   def _(msgid)
-    Runo::I18n::Msgstr.new(Runo::I18n.msg[msgid].to_a.first || msgid)
+    Runo::I18n::Msgstr.new(Array(Runo::I18n.msg[msgid]).first || msgid)
   end
 
   def n_(msgid, msgid_plural, n)

data/lib/_storage/_storage.rb

@@ -102,6 +102,7 @@ class Runo::Storage
     ([:d, :id, :p] & conds.keys).each {|cid|
       case cid
         when :d
+          conds[:d] = conds[:d].first if conds[:d].is_a? ::Array
           conds[:d] = conds[:d].to_s
           conds[:d] = last(:d, conds) if conds[:d] =~ /9999(99)?(99)?/
           conds[:d] = nil unless conds[:d] =~ Runo::REX::COND_D
@@ -117,6 +118,7 @@ class Runo::Storage
             end
           }.uniq.compact
         when :p
+          conds[:p] = conds[:p].first if conds[:p].is_a? ::Array
           conds[:p] = conds[:p].to_s
           conds[:p] = last(:p, conds) if conds[:p] == 'last'
           conds[:p] = nil unless conds[:p] =~ /^\d+$/
@@ -127,7 +129,7 @@ class Runo::Storage
 
   def _select(conds)
     if conds[:id]
-      _select_by_id(conds) | (@sd.instance_variable_get(:@item_object).keys & conds[:id].to_a)
+      _select_by_id(conds) | (@sd.instance_variable_get(:@item_object).keys & Array(conds[:id]))
     elsif cid = (conds.keys - [:order, :p]).first
       m = "_select_by_#{cid}"
       respond_to?(m, true) ? __send__(m, conds) : []
@@ -146,7 +148,7 @@ class Runo::Storage
 
     page = conds[:p].to_i
     page = 1 if page < 1
-    item_ids[(page - 1) * size, size].to_a
+    Array item_ids[(page - 1) * size, size]
   end
 
   def _sibs_id(conds)
@@ -174,7 +176,7 @@ class Runo::Storage
   end
 
   def cast_ids(ids)
-    ids.to_a.collect {|i|
+    Array(ids).collect {|i|
       id = (i =~ /^[a-z]/) ? "00000000_#{i}" : i
       id if id =~ Runo::REX::ID
     }.compact

data/lib/_storage/file.rb

@@ -106,7 +106,7 @@ class Runo::Storage::File < Runo::Storage
   private
 
   def _select_by_id(conds)
-    glob(conds[:id].to_a).collect {|f| f[/\d.*/][Runo::REX::ID] }.compact
+    glob(Array(conds[:id])).collect {|f| f[/\d.*/][Runo::REX::ID] }.compact
   end
 
   def _select_by_d(conds)
@@ -138,7 +138,7 @@ class Runo::Storage::File < Runo::Storage
 
   def load(id)
     v = nil
-    file = glob(id.to_a).sort.first
+    file = glob(Array(id)).sort.first
     ::File.open(::File.join(@dir, file), 'r') {|f|
       f.flock ::File::LOCK_SH
       f.binmode
@@ -165,6 +165,7 @@ class Runo::Storage::File < Runo::Storage
 
     file = "#{file_prefix}#{id}.#{ext}"
     if old_id && f = ::File.open(::File.join(@dir, file), 'a')
+      f.seek(0, IO::SEEK_END)
       return if f.pos != 0 # duplicate id
       move(old_id, id) unless old_id == :new_id
     end
@@ -180,7 +181,7 @@ class Runo::Storage::File < Runo::Storage
   end
 
   def remove_file(id)
-    glob_pattern = "#{file_prefix}#{pattern_for id.to_a}[.-]*"
+    glob_pattern = "#{file_prefix}#{pattern_for Array(id)}[.-]*"
     files = ::Dir.chdir(@dir) { ::Dir.glob glob_pattern } # may include child files
     files.each {|file|
       ::File.unlink ::File.join(@dir, file)
@@ -188,7 +189,7 @@ class Runo::Storage::File < Runo::Storage
   end
 
   def rename_file(old_id, new_id)
-    glob_pattern = "#{file_prefix}#{pattern_for old_id.to_a}*"
+    glob_pattern = "#{file_prefix}#{pattern_for Array(old_id)}*"
     files = ::Dir.chdir(@dir) { ::Dir.glob glob_pattern } # may include child files
     rex = /^\A#{file_prefix}#{old_id}/
     files.each {|file|

data/lib/_storage/sequel.rb

@@ -112,7 +112,7 @@ class Runo::Storage::Sequel < Runo::Storage
   end
 
   def _full_name(id)
-    "#{@dirname}-#{id}"
+    "#{@dirname}-#{id.is_a?(::Array) ? id.first : id}"
   end
 
   def _id(full_name)

data/lib/_storage/temp.rb

@@ -58,7 +58,7 @@ class Runo::Storage::Temp < Runo::Storage
   private
 
   def _select_by_id(conds)
-    val.keys & conds[:id].to_a
+    val.keys & Array(conds[:id])
   end
 
   def _select_by_d(conds)

data/lib/_widget/message.rb

@@ -40,10 +40,10 @@ class Runo::Set::Dynamic
     end
 
     message.keys.collect {|type|
-      lis = message[type].collect {|m| "  <li>#{Runo::Field.h m}</li>\n" }
+      lis = Array(message[type]).collect {|m| "  <li>#{Runo::Field.h m}</li>\n" }
       <<_html
 <ul class="message #{type}">
-#{lis}</ul>
+#{lis.join}</ul>
 _html
     }.join if message
   end

data/lib/_widget/navi.rb

@@ -66,7 +66,7 @@ class Runo::Set::Dynamic
       base_conds.delete :p
       conds = arg[:navi][:sibs].values.first
       if p = arg[:conds][:p]
-        range = ['1', conds.last] + ((p.to_i - 5)..(p.to_i + 5)).to_a.collect {|i| i.to_s }
+        range = ['1', conds.last] + Array((p.to_i - 5)..(p.to_i + 5)).collect {|i| i.to_s }
         conds = conds & range
       end
       conds.collect {|cond|

data/lib/_workflow/attachment.rb

@@ -37,7 +37,7 @@ _html
           item_tmpl = item[:tmpl][:index].sub(/[\w\W]*\$\(.*?\)/, "\\&#{button}")
           item.send(:_get_by_tmpl, item_arg, item_tmpl)
         }
-        tmpl = my[:tmpl][:index].gsub('$()', item_outs.join)
+        tmpl = my[:tmpl][:index].gsub('$()', item_outs)
         _get_by_tmpl({:p_action => arg[:p_action], :action => :update}, tmpl)
       end
     }

data/lib/meta/timestamp.rb

@@ -13,8 +13,8 @@ class Runo::Meta::Timestamp < Runo::Field
 
   def initialize(meta = {})
     meta[:size]       = $&.to_i if meta[:tokens] && meta[:tokens].find {|t| t =~ /^\d+$/ }
-    meta[:can_edit]   = true if meta[:tokens].to_a.include? 'can_edit'
-    meta[:can_update] = true if meta[:tokens].to_a.include? 'can_update'
+    meta[:can_edit]   = true if Array(meta[:tokens]).include? 'can_edit'
+    meta[:can_update] = true if Array(meta[:tokens]).include? 'can_update'
     super
   end
 

data/lib/runo.rb

@@ -326,7 +326,7 @@ class Runo
           'Content-Length' => body.size.to_s,
         }
       ),
-      body,
+      [body],
     ]
   end
 
@@ -349,7 +349,7 @@ _html
         'Content-Length' => body.size.to_s,
         'Location'       => result[:location],
       },
-      body
+      [body]
     ]
   end
 
@@ -361,7 +361,7 @@ _html
         'Content-Type'   => 'text/html',
         'Content-Length' => body.size.to_s,
       },
-      body,
+      [body],
     ]
   end
 
@@ -373,7 +373,7 @@ _html
         'Content-Type'   => 'text/html',
         'Content-Length' => body.size.to_s,
       },
-      body
+      [body]
     ]
   end
 
@@ -389,7 +389,7 @@ _html
           'Content-Length' => body.size.to_s,
         }
       ),
-      body,
+      [body],
     ]
   end
 

data/lib/scalar/file.rb

@@ -122,13 +122,13 @@ _html
   end
 
   def val_cast(v)
-    if v && v[:tempfile]
+    if v.is_a?(::Hash) && v[:tempfile]
       v[:tempfile].rewind
       @body = v[:tempfile].read
       {
         'basename' => File.basename(v[:filename]),
         'type'     => v[:type] || 'application/octet-stream',
-        'size'     => @body.size,
+        'size'     => @body.respond_to?(:bytesize) ? @body.bytesize : @body.size,
       }
     elsif v.is_a?(::Hash) && v['basename']
       {

data/lib/scalar/img.rb

@@ -105,7 +105,7 @@ _html
   end
 
   def val_cast(v)
-    @thumbnail = _thumbnail(v[:tempfile]) if v && v[:tempfile]
+    @thumbnail = _thumbnail(v[:tempfile]) if v.is_a?(::Hash) && v[:tempfile]
     super
   end
 

data/lib/scalar/password.rb

@@ -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 = Array('a'..'z')[rand(26)] + Array('a'..'z')[rand(26)]
           @size = v.size
           @val = v.crypt salt
         elsif @val.nil?

data/lib/scalar/textarea_wiki.rb

@@ -127,7 +127,7 @@ _html
 
     <<_html
 <#{ul_ol} class="wiki">
-#{items}</#{ul_ol}>
+#{items.join}</#{ul_ol}>
 _html
   end
 

data/lib/set/_set.rb

@@ -149,7 +149,7 @@ module Runo::Set
       item_arg = item_arg(arg, item[:id])
       next if item.empty? && ![:create, :update].include?(item_arg[:action])
       block ? block.call(item, item_arg) : item.get(item_arg)
-    }
+    }.join
   end
 
   def _g_errors(arg)
@@ -157,7 +157,7 @@ module Runo::Set
   end
 
   def item_arg(arg, steps)
-    steps.to_a.inject(arg) {|a, s|
+    Array(steps).inject(arg) {|a, s|
       i = a[s] || {}
       i[:p_action] = a[:action]
       unless i[:action]
@@ -179,7 +179,7 @@ module Runo::Set
       elsif id =~ Runo::REX::ID_NEW
         permit? :create
       else
-        item_action = v[:action] || :update
+        item_action = (v.is_a?(::Hash) && v[:action]) || :update
         item(id) && item(id).permit?(item_action)
       end
     }

data/lib/set/dynamic.rb

@@ -24,10 +24,10 @@ class Runo::Set::Dynamic < Runo::Field
     }
 
     my[:p_size] = meta[:max] if meta[:max]
-    my[:preview] = :optional if meta[:tokens].to_a.include?('may_preview')
-    my[:preview] = :mandatory if meta[:tokens].to_a.include?('should_preview')
-    my[:order] = 'id'  if meta[:tokens].to_a.include? 'asc'
-    my[:order] = '-id' if meta[:tokens].to_a.include? 'desc'
+    my[:preview] = :optional if Array(meta[:tokens]).include?('may_preview')
+    my[:preview] = :mandatory if Array(meta[:tokens]).include?('should_preview')
+    my[:order] = 'id'  if Array(meta[:tokens]).include? 'asc'
+    my[:order] = '-id' if Array(meta[:tokens]).include? 'desc'
   end
 
   def meta_href

data/lib/set/static.rb

@@ -86,7 +86,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 &= Array(conds[:id]) if conds[:id] # select item(s) by id
     items.sort.collect {|id|
       item = @item_object[id] ||= Runo::Field.instance(
         my[:item][id].merge(:id => id, :parent => self)

data/t/test_img.rb

@@ -211,7 +211,7 @@ _eos
       {
         :input           => input,
         'CONTENT_TYPE'   => 'multipart/form-data; boundary=-foobarbaz',
-        'CONTENT_LENGTH' => input.length,
+        'CONTENT_LENGTH' => input.respond_to?(:bytesize) ? input.bytesize : input.size,
       }
     )
     tid = res.headers['Location'][Runo::REX::TID]
@@ -236,8 +236,8 @@ _eos
       'Runo#call to a img item should return the mime type of the file'
     )
     assert_equal(
-      @img.size,
-      res.body.size,
+      @img.respond_to?(:bytesize) ? @img.bytesize : @img.size,
+      res.body.respond_to?(:bytesize) ? res.body.bytesize : res.body.size,
       'Runo#call to a img item should return the binary body of the file'
     )
 

data/t/test_runo_call.rb

@@ -682,7 +682,7 @@ _html
     res = Rack::MockRequest.new(@runo).post(
       "http://example.com/t_attachment/main/update.html",
       {
-        :input => "_012-comment=abc&.status-public=create"
+        :input => "_012-comment=abc&.status-public=create&_token=#{Runo.token}"
       }
     )
     res.headers['Location'] =~ Runo::REX::PATH_ID

data/t/test_runo_i18n.rb

@@ -302,6 +302,13 @@ _eos
       "Runo::I18n::Msgstr#% should regard %{...} as '%s' if given a scalar"
     )
 
+    s = n_('one foo', '%{n} foo %{bar}', 2)
+    assert_equal(
+      '2 foo selected',
+      s % [2, 'selected'],
+      "Runo::I18n::Msgstr#% should regard %{...} as '%s' if given an array"
+    )
+
     s = n_('one color', '%{n} colors', 1)
     assert_instance_of(
       Runo::I18n::Msgstr,

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Akira FUNAI
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-10 00:00:00 +09:00
+date: 2010-07-20 00:00:00 +09:00
 default_executable: runo
 dependencies: 
 - !ruby/object:Gem::Dependency