smallcage 0.2.6 → 0.2.7

data/lib/smallcage/commands/import.rb

@@ -1,22 +1,22 @@
 module SmallCage::Commands
   class Import
     def self.execute(opts)
-      self.new(opts).execute
+      new(opts).execute
     end
 
     def initialize(opts)
       @opts = opts
-      if @opts[:from] == "default"
-        @opts[:from] = "base,standard"
+      if @opts[:from] == 'default'
+        @opts[:from] = 'base,standard'
       end
-      @project_dir = Pathname.new(__FILE__) + "../../../../project"
+      @project_dir = Pathname.new(__FILE__) + '../../../../project'
     end
 
-    def qp(str = "")
+    def qp(str = '')
       print str unless @opts[:quiet]
     end
 
-    def qps(str = "")
+    def qps(str = '')
       puts str unless @opts[:quiet]
     end
 
@@ -61,27 +61,27 @@ module SmallCage::Commands
       failed = []
       @entries.each do |e|
         if e.overwrite?
-          qps "M /" + e.path
-        elsif ! e.exist?
-          qps "A /" + e.path
+          qps 'M /' + e.path
+        elsif !e.exist?
+          qps 'A /' + e.path
         elsif e.to.directory?
           # nothing
         else
-          qps "? /" + e.path
+          qps '? /' + e.path
         end
 
         begin
           e.import
         rescue
           failed << e
-          qps "F /" + e.path
+          qps 'F /' + e.path
         end
       end
 
       unless failed.empty?
-        qps "FAILED:"
+        qps 'FAILED:'
         failed.each do |e|
-          qps "  " + e.path
+          qps '  ' + e.path
         end
       end
     end
@@ -90,7 +90,7 @@ module SmallCage::Commands
     def local_entries(d)
       result = []
       Dir.chdir(d) do
-        Dir.glob("**/*") do |f|
+        Dir.glob('**/*') do |f|
           e = ImportEntry.new
           e.path = f
           e.from = d + f
@@ -98,20 +98,20 @@ module SmallCage::Commands
           result << e
         end
       end
-      return result
+      result
     end
     private :local_entries
 
     def external_entries(uri)
       if uri !~ %r{/$}
-        uri += "/"
+        uri += '/'
       end
-      mfuri = uri + "Manifest.html"
+      mfuri = uri + 'Manifest.html'
 
-      source = open(mfuri) {|io| io.read }
+      source = open(mfuri) { |io| io.read }
       result = []
 
-      files = source.scan(%r{<li><a href="(./[^"]+)">(./[^<]+)</a></li>}) #"
+      files = source.scan(%r{<li><a href="(./[^"]+)">(./[^<]+)</a></li>}) # "
       files.each do |f|
         raise "illegal path:#{f[0]},#{f[1]}" if f[0] != f[1]
         raise "illegal path:#{f[0]}" if f[0] =~ %r{/\.\.}
@@ -123,32 +123,32 @@ module SmallCage::Commands
         result << e
       end
 
-      return result
+      result
     end
     private :external_entries
 
     def confirm_entries
       overwrite = []
 
-      qps "Create:"
+      qps 'Create:'
       @entries.each do |e|
         if e.overwrite?
           overwrite << e
-        elsif ! e.exist?
-          qps "  /" + e.path
+        elsif !e.exist?
+          qps '  /' + e.path
         end
       end
       qps
 
       unless overwrite.empty?
-        qps "Overwrite:"
+        qps 'Overwrite:'
         overwrite.each do |e|
-          qps "  /" + e.path
+          qps '  /' + e.path
         end
         qps
       end
 
-      return y_or_n("Import these files?[Yn]: ", true)
+      y_or_n('Import these files?[Yn]: ', true)
     end
     private :confirm_entries
 
@@ -160,7 +160,7 @@ module SmallCage::Commands
           return true
         elsif yn =~ /^(n|no)$/i
           return false
-        elsif yn == ""
+        elsif yn == ''
           return default
         end
       end
@@ -205,8 +205,8 @@ module SmallCage::Commands
           FileUtils.makedirs(to)
         else
           FileUtils.makedirs(to.parent)
-          s = open(from) {|io| io.read }
-          open(to, "w") {|io| io << s }
+          s = open(from) { |io| io.read }
+          open(to, 'w') { |io| io << s }
         end
       end
       private :copy_external

data/lib/smallcage/commands/manifest.rb

@@ -1,7 +1,7 @@
 module SmallCage::Commands
   class Manifest
     def self.execute(opts)
-      self.new(opts).execute
+      new(opts).execute
     end
 
     def initialize(opts)
@@ -12,7 +12,7 @@ module SmallCage::Commands
       entries = []
       root = Pathname.new(@opts[:path])
       Dir.chdir(root) do
-        Dir.glob("**/*") do |f|
+        Dir.glob('**/*') do |f|
           entries << f
         end
       end
@@ -20,18 +20,16 @@ module SmallCage::Commands
       tmp = []
       entries.each do |f|
         path = root + f
-        f = "./" + f
-        if path.directory?
-          f = f + "/"
-        end
-        next if path.basename.to_s == "Manifest.html"
+        f = './' + f
+        f = f + '/' if path.directory?
+        next if path.basename.to_s == 'Manifest.html'
         tmp << f
       end
       entries = tmp
 
-      template = File.dirname(__FILE__) + "/../resources/Manifest.erb"
-      source = ERB.new(File.read(template), nil, "-").result(binding)
-      open(root + "Manifest.html", "w") do |io|
+      template = File.dirname(__FILE__) + '/../resources/Manifest.erb'
+      source = ERB.new(File.read(template), nil, '-').result(binding)
+      open(root + 'Manifest.html', 'w') do |io|
         io << source
       end
     end

data/lib/smallcage/commands/server.rb

@@ -6,8 +6,8 @@ module SmallCage::Commands
 
       server = SmallCage::HTTPServer.new(document_root, port)
 
-      sighandler = Proc.new {|signal| server.shutdown}
-      SmallCage::Application.add_signal_handler(["INT", "TERM"], sighandler)
+      sighandler = Proc.new { |signal| server.shutdown }
+      SmallCage::Application.add_signal_handler(%w{INT TERM}, sighandler)
 
       server.start
     end

data/lib/smallcage/commands/update.rb

@@ -1,9 +1,12 @@
 module SmallCage::Commands
+  #
+  # 'smc update' command
+  #
   class Update
     include SmallCage
 
     def self.execute(opts)
-      self.new(opts).execute
+      new(opts).execute
     end
 
     def initialize(opts)
@@ -13,21 +16,22 @@ module SmallCage::Commands
     def execute
       start = Time.now
       target = Pathname.new(@opts[:path])
-      unless target.exist?
-        raise "target directory or file does not exist.: " + target.to_s
-      end
+
+      fail 'target directory or file does not exist.: ' + target.to_s unless target.exist?
 
       @loader   = Loader.new(target)
       @renderer = Renderer.new(@loader)
       @list     = UpdateList.create(@loader.root, target)
+      STDERR.puts 'WARN: Can\'t load tmp/list.yml file.' if @list.load_error
+
       render_smc_files
       expire_old_files @list.expire
       @list.save
 
       count = @list.update_count
       elapsed  = Time.now - start
-      puts "-- #{count} files.  #{"%.3f" % elapsed} sec." +
-        "  #{"%.3f" % (count == 0 ? 0 : elapsed/count)} sec/file." unless @opts[:quiet]
+      puts "-- #{count} files.  #{sprintf('%.3f', elapsed)} sec." +
+        "  #{sprintf('%.3f', count == 0 ? 0 : elapsed / count)} sec/file." unless @opts[:quiet]
     end
 
     def expire_old_files(uris)
@@ -50,7 +54,7 @@ module SmallCage::Commands
     private :render_smc_files
 
     def render_smc_obj(obj)
-      uris = @renderer.render(obj["template"] + ".uri", obj)
+      uris = @renderer.render(obj['template'] + '.uri', obj)
       if uris
         render_multi(obj, uris.split(/\r\n|\r|\n/))
       else
@@ -60,28 +64,37 @@ module SmallCage::Commands
     private :render_smc_obj
 
     def render_single(obj, mtime = nil)
-      mark   = obj["path"].exist? ? "U " : "A "
-      mtime  ||= obj["path"].smc.stat.mtime.to_i
-      result = @renderer.render(obj["template"], obj)
+      mark = obj['path'].exist? ? 'U ' : 'A '
+      mtime ||= obj['path'].smc.stat.mtime.to_i
+
+      if @opts[:fast]
+        last_mtime = @list.mtime(obj['uri'].smc)
+        if mtime == last_mtime
+          @list.update(obj['uri'].smc, mtime, String.new(obj['uri']))
+          return
+        end
+      end
+
+      result = @renderer.render(obj['template'], obj)
       result = after_rendering_filters(obj, result)
       output_result(obj, result)
-      puts mark + obj["uri"] unless @opts[:quiet]
+      puts mark + obj['uri'] unless @opts[:quiet]
 
       # create new uri String to remove smc instance-specific method.
-      @list.update(obj["uri"].smc, mtime, String.new(obj["uri"]))
+      @list.update(obj['uri'].smc, mtime, String.new(obj['uri']))
     end
     private :render_single
 
     def render_multi(obj, uris)
       obj['uris'] ||= uris
-      uris    = uris.map {|uri| uri.strip }
+      uris    = uris.map { |uri| uri.strip }
       smcuri  = obj['uri'].smc
       smcpath = obj['path'].smc
       base    = obj['path'].parent
       mtime   = smcpath.stat.mtime.to_i
       uris.each_with_index do |uri, index|
         next if uri.empty?
-        docpath       = DocumentPath.create_with_uri(@loader.root, uri, base)
+        docpath = DocumentPath.create_with_uri(@loader.root, uri, base)
         next if docpath.path.directory?
         FileUtils.mkpath(docpath.path.parent)
         obj['uri']    = DocumentPath.add_smc_method(docpath.uri, smcuri)
@@ -93,16 +106,16 @@ module SmallCage::Commands
     private :render_multi
 
     def after_rendering_filters(obj, result)
-      filters = @loader.filters("after_rendering_filters")
+      filters = @loader.filters('after_rendering_filters')
       filters.each do |f|
         result = f.after_rendering_filter(obj, result)
       end
-      return result
+      result
     end
     private :after_rendering_filters
 
     def output_result(obj, str)
-      open(obj["path"], "w") do |io|
+      open(obj['path'], 'w') do |io|
         io << str
       end
     end

data/lib/smallcage/commands/uri.rb

@@ -1,8 +1,7 @@
 module SmallCage::Commands
   class Uri
-
     def self.execute(opts)
-      self.new(opts).execute
+      new(opts).execute
     end
 
     def initialize(opts)
@@ -11,9 +10,7 @@ module SmallCage::Commands
 
     def execute
       target = Pathname.new(@opts[:path])
-      unless target.exist?
-        raise "target directory or file does not exist.: " + target.to_s
-      end
+      fail 'target directory or file does not exist.: ' + target.to_s unless target.exist?
 
       @loader   = SmallCage::Loader.new(target)
       @renderer = SmallCage::Renderer.new(@loader)
@@ -28,21 +25,21 @@ module SmallCage::Commands
     private :print_uris
 
     def print_default_or_template_uris(obj)
-      uris = @renderer.render(obj["template"] + ".uri", obj)
+      uris = @renderer.render(obj['template'] + '.uri', obj)
       if uris
         print_uri_templates(obj, uris.split(/\r\n|\r|\n/))
       else
-        puts obj["uri"]
+        puts obj['uri']
       end
     end
     private :print_default_or_template_uris
 
     def print_uri_templates(obj, uris)
-      uris = uris.map {|uri| uri.strip }
+      uris = uris.map { |uri| uri.strip }
       base = obj['path'].parent
       uris.each_with_index do |uri, index|
         if uri.empty?
-          puts ""
+          puts ''
         else
           docpath = SmallCage::DocumentPath.create_with_uri(@loader.root, uri, base)
           puts docpath.uri

data/lib/smallcage/document_path.rb

@@ -12,43 +12,41 @@ module SmallCage
         @path = @path.cleanpath
       end
 
-      if @path.to_s[0...@root.to_s.length] != @root.to_s
-        raise "Illegal path: #{path.to_s}"
-      end
+      fail "Illegal path: #{ path.to_s }" if @path.to_s[0...@root.to_s.length] != @root.to_s
 
       if @path == @root
-        @uri = "/"
+        @uri = '/'
       else
         @uri = @path.to_s[@root.to_s.length .. -1]
       end
     end
 
     def smc?
-      return @path.extname == ".smc"
+      @path.extname == '.smc'
     end
 
     def outfile
       return nil unless smc?
-      return self.class.new(@root, @path.to_s[0 .. -5])
+      self.class.new(@root, @path.to_s[0 .. -5])
     end
 
     def outuri
       return nil unless smc?
-      return uri[0 .. -5]
+      uri[0 .. -5]
     end
 
     def self.to_uri(root, path)
-      return self.new(root,path).uri
+      new(root, path).uri
     end
 
     def self.create_with_uri(root, uri, base = nil)
       base ||= root
-      if uri[0] == ?/
+      if uri[0, 1] == '/'
         path = root + uri[1..-1] # absolute URI
       else
         path = base + uri # relative URI
       end
-      return self.new(root, path)
+      new(root, path)
     end
 
     def self.add_smc_method(obj, value)
@@ -58,10 +56,10 @@ module SmallCage
       end
 
       def obj.smc
-        return @__smallcage.nil? ? nil : @__smallcage[:smc]
+        @__smallcage.nil? ? nil : @__smallcage[:smc]
       end
 
-      return obj
+      obj
     end
   end
 end

data/lib/smallcage/erb_base.rb

@@ -1,4 +1,6 @@
-
+#
+# ERB Base class
+#
 class SmallCage::ErbBase
   def initialize(loader, renderer, obj)
     @loader, @renderer, @obj = loader, renderer, obj
@@ -6,13 +8,15 @@ class SmallCage::ErbBase
 
   def method_missing(*args)
     if 1 < args.length
-      raise NameError.new("method_missing called with more than one argument: #{@renderer.current_template} #{args.inspect}")
+      msg = 'method_missing called with more than one argument: ' +
+        "#{ @renderer.current_template } #{ args.inspect }"
+      fail NameError, msg
     end
 
     name = args[0].to_s
     return @obj[name] unless @obj[name].nil?
 
     # render if template file exists. or return nil.
-    return @renderer.render(name, @obj)
+    @renderer.render(name, @obj)
   end
 end

data/lib/smallcage/http_server.rb

@@ -11,11 +11,11 @@ module SmallCage
         :AccessLog => []
       })
 
-      WEBrick::HTTPServlet::FileHandler.remove_handler("cgi")
-      WEBrick::HTTPServlet::FileHandler.remove_handler("rhtml")
+      WEBrick::HTTPServlet::FileHandler.remove_handler('cgi')
+      WEBrick::HTTPServlet::FileHandler.remove_handler('rhtml')
 
-      @server.mount("/_smc/update_uri", UpdateUriServlet)
-      @server.mount("/_smc/auto", AutoServlet)
+      @server.mount('/_smc/update_uri', UpdateUriServlet)
+      @server.mount('/_smc/auto', AutoServlet)
     end
 
     def start
@@ -31,17 +31,17 @@ module SmallCage
     end
 
     def reload
-      UpdateUriServlet.uri = ":reload"
+      UpdateUriServlet.uri = ':reload'
     end
   end
 
 
   class UpdateUriServlet < WEBrick::HTTPServlet::AbstractServlet
-    @@uri = "/index.html"
-    @@update_time = ""
+    @@uri = '/index.html'
+    @@update_time = ''
 
     def do_GET(req, res)
-      res['content-type'] = "text/plain"
+      res['content-type'] = 'text/plain'
       res.body = @@uri + "\n" + @@update_time
     end
 
@@ -57,8 +57,8 @@ module SmallCage
 
   class AutoServlet < WEBrick::HTTPServlet::AbstractServlet
     def do_GET(req, res)
-      res['content-type'] = "text/html"
-      html = File.dirname(__FILE__) + "/resources/auto.html"
+      res['content-type'] = 'text/html'
+      html = File.dirname(__FILE__) + '/resources/auto.html'
       res.body = File.read(html)
     end
   end