smallcage 0.1.7 → 0.1.8

data/lib/smallcage/commands/update.rb

@@ -1,5 +1,7 @@
 module SmallCage::Commands
   class Update
+    include SmallCage
+
     def self.execute(opts)
       self.new(opts).execute
     end
@@ -15,73 +17,80 @@ module SmallCage::Commands
         raise "target directory or file does not exist.: " + target.to_s
       end
       
-      @loader = SmallCage::Loader.new(target)
-      @renderer = SmallCage::Renderer.new(@loader)
+      @loader   = Loader.new(target)
+      @renderer = Renderer.new(@loader)
+      @list     = UpdateList.create(@loader.root, target)
+      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]
+    end
 
-      urilist = render_smc_files
-      rendered = urilist.length
-      if list_file.exist?
-        urilist = delete_expired_files(urilist)
+    def expire_old_files(uris)
+      root = @loader.root
+      uris.each do |uri|
+        file = root + uri[1..-1]
+        if file.exist?
+          puts "D #{uri}" unless @opts[:quiet]
+          file.delete
+        end
       end
-      save_list(urilist)
-      elapsed = Time.now - start
-      
-      puts "-- #{rendered} files.  #{"%.3f" % elapsed} sec.  #{"%.3f" % (elapsed/rendered)} sec/file." unless @opts[:quiet]
     end
+    private :expire_old_files
 
     def render_smc_files
-      urilist = []
       @loader.each_smc_obj do |obj|
-        urilist << obj["uri"].smc
-        mark = obj["path"].exist? ? "U " : "A "
         render_smc_obj(obj)
-        puts mark + obj["uri"] unless @opts[:quiet]
       end
-      return urilist
     end
     private :render_smc_files
 
     def render_smc_obj(obj)
-      result = @renderer.render(obj["template"], obj)
-      result = after_rendering_filters(obj, result)
-      output_result(obj, result)
+      uris = @renderer.render(obj["template"] + ".uri", obj)
+      if uris
+        render_multi(obj, uris.split(/\r\n|\r|\n/))
+      else
+        render_single(obj)
+      end
     end
     private :render_smc_obj
 
-    def delete_expired_files(urilist)
-      old_urilist = load_list
-      root = @loader.root
-      target     = SmallCage::DocumentPath.new(root, @loader.target)
-      target_uri = target.uri
-      target_uri += "/" if target.path.directory? and target_uri[-1] != ?/
-      if @loader.target.file?
-        old_urilist << target_uri unless old_urilist.include?(target_uri)
-        return old_urilist
-      end
-      
-      target_uris = []
-      not_target_uris = []
-      old_urilist.each do |uri|
-        if uri.index(target_uri) == 0
-          target_uris << uri
-        else
-          not_target_uris << uri
-        end
-      end
+    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)
+      result = after_rendering_filters(obj, result)
+      output_result(obj, result)
+      puts mark + obj["uri"] unless @opts[:quiet]
 
-      deletelist = target_uris - urilist
+      # create new uri String to remove smc instance-specific method.
+      @list.update(obj["uri"].smc, mtime, String.new(obj["uri"]))
+    end
+    private :render_single
 
-      deletelist.each do |uri|
-        delfile = SmallCage::DocumentPath.new(root, root + ("." + uri)).outfile
-        next unless delfile.path.file?
-        
-        File.delete(delfile.path)
-        puts "D #{delfile.uri}" unless @opts[:quiet]
+    def render_multi(obj, uris)
+      obj['uris'] ||= uris
+      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)
+        next if docpath.path.directory?
+        FileUtils.mkpath(docpath.path.parent)
+        obj['uri']    = DocumentPath.add_smc_method(docpath.uri, smcuri)
+        obj['path']   = DocumentPath.add_smc_method(docpath.path, smcpath)
+        obj['cursor'] = index
+        render_single(obj, mtime)
       end
-      
-      return (not_target_uris + urilist).sort
     end
-    private :delete_expired_files
+    private :render_multi
     
     def after_rendering_filters(obj, result)
       filters = @loader.filters("after_rendering_filters")
@@ -92,36 +101,12 @@ module SmallCage::Commands
     end
     private :after_rendering_filters
 
-    def save_list(urilist)
-      f = list_file
-      FileUtils.makedirs(f.parent)
-      open(f, "w") do |io|
-        io << "version: " + SmallCage::VERSION::STRING + "\n"
-        urilist.each do |u|
-          io << u + "\n"
-        end
-      end
-    end
-    private :save_list
-    
-    def load_list
-      txt = File.read(list_file)
-      result = txt.split(/\n/)
-      result.shift
-      return result
-    end
-    private :load_list
-
-    def list_file
-      @loader.root + "./_smc/tmp/list.txt"
-    end
-    private :list_file
-
     def output_result(obj, str)
       open(obj["path"], "w") do |io|
         io << str
       end
     end
     private :output_result
+
   end
 end

data/lib/smallcage/document_path.rb

@@ -4,7 +4,7 @@ module SmallCage
     attr_reader :root, :uri, :path
     
     def initialize(root, path)
-      @root = Pathname.new(root).realpath;
+      @root = Pathname.new(root).realpath
 
       @path = Pathname.new(path)
       if @path.exist?
@@ -42,5 +42,29 @@ module SmallCage
       return self.new(root,path).uri
     end
 
+    def self.create_with_uri(root, uri, base = nil)
+      base ||= root
+      if uri[0] == ?/
+        path = root + uri[1..-1] # absolute URI
+      else
+        path = base + uri # relative URI
+      end
+      return self.new(root, path)
+    end
+
+    def self.add_smc_method(obj, value)
+      obj.instance_eval do
+        @__smallcage ||= {}
+        @__smallcage[:smc] = value
+      end
+
+      def obj.smc
+        return @__smallcage.nil? ? nil : @__smallcage[:smc]
+      end
+
+      return obj
+    end
+
+
   end
-end
+end

data/lib/smallcage/loader.rb

@@ -36,7 +36,7 @@ module SmallCage
     def load(path)
       raise "Not found: #{path}" unless path.exist?
 
-      docpath = SmallCage::DocumentPath.new(@root, path)
+      docpath = DocumentPath.new(@root, path)
 
       if path.file?
         return load_smc_file(docpath)
@@ -68,7 +68,7 @@ module SmallCage
       local_prop_file = docpath.path + LOCAL_PROP_FILE
       if dir_prop_file.file?
         path_smc = dir_prop_file
-        uri_smc  = SmallCage::DocumentPath.to_uri(@root, dir_prop_file)
+        uri_smc  = DocumentPath.to_uri(@root, dir_prop_file)
       end
 
       result = create_base_smc_object(docpath.path, path_smc,
@@ -86,8 +86,8 @@ module SmallCage
       result["arrays"]   = []
       result["strings"]  = []
       result["body"]     = nil
-      result["path"]     = add_smc_method(path_out, path_smc)
-      result["uri"]      = add_smc_method(uri_out,  uri_smc )
+      result["path"]     = DocumentPath.add_smc_method(path_out, path_smc)
+      result["uri"]      = DocumentPath.add_smc_method(uri_out,  uri_smc )
       return result
     end
     private :create_base_smc_object
@@ -170,13 +170,13 @@ module SmallCage
             next if f.directory?
             next if f.to_s =~ %r{/_smc/}
             next if f.to_s =~ %r{\.smc$}
-            yield SmallCage::DocumentPath.new(@root, p + f)
+            yield DocumentPath.new(@root, p + f)
           end
         end
       else
         return if @target.to_s =~ %r{/_smc/}
         return if @target.to_s =~ %r{\.smc$}
-        yield SmallCage::DocumentPath.new(@root, @target)
+        yield DocumentPath.new(@root, @target)
       end
     end
     
@@ -193,7 +193,7 @@ module SmallCage
     
     
     def load_erb_base
-      result = Class.new(SmallCage::ErbBase)
+      result = Class.new(ErbBase)
       class << result
         def include_helpers(anon_module, mod_names)
           smc_module = anon_module.const_get("SmallCage")
@@ -272,19 +272,5 @@ module SmallCage
     end
     private :load_filters_config
     
-    def add_smc_method(obj, value)
-      obj.instance_eval do
-        @__smallcage ||= {}
-        @__smallcage[:smc] = value
-      end
-
-      def obj.smc
-        return @__smallcage.nil? ? nil : @__smallcage[:smc]
-      end
-
-      return obj
-    end
-    private :add_smc_method
-
   end
 end

data/lib/smallcage/update_list.rb

@@ -0,0 +1,143 @@
+module SmallCage
+
+  # Updated files list model. 
+  # Do not access File system exept list.yml.
+  class UpdateList
+    attr_reader :update_count
+
+    def self.create(root_path, target_path)
+      docpath = DocumentPath.new(root_path, target_path)
+      uri = docpath.uri
+      uri += "/" if docpath.path.directory? && uri[-1] != ?/
+      return self.new(root_path + "_smc/tmp/list.yml", uri)
+    end
+
+    # target_uri must be ends with / when target is directory.
+    def initialize(list_file, target_uri)
+      @list_file = list_file
+      @target_uri = target_uri
+      @expired_src = {}
+      @expired_dst = {}
+      @update_count = 0
+      load
+    end
+
+    def load
+      if @list_file.exist?
+        @data = YAML.load_file(@list_file)
+      else
+        @data = {}
+      end
+      @data["version"] ||= VERSION::STRING
+      @data["list"] ||= []
+
+      @map = {}
+      @data["list"].each do |item|
+        src = item["src"]
+        @map[src] = item
+        if target?(src)
+          @expired_src[src] = true
+          item["dst"].each do |d|
+            @expired_dst[d] = [true, src]
+          end
+        end
+      end
+    end
+    private :load
+
+    def target?(uri)
+      return uri[0...@target_uri.length] == @target_uri
+    end
+    private :target?
+
+    def save
+      FileUtils.mkpath(@list_file.parent)
+      @data["version"] = VERSION::STRING
+      open(@list_file, "w") do |io|
+        io << to_yaml
+      end
+    end
+
+    def to_yaml
+      return @data.to_yaml
+    end
+
+    def mtime(srcuri)
+      item = @map[srcuri]
+      return -1 unless item
+      return item["mtime"].to_i
+    end
+
+    def update(srcuri, mtime, dsturi)
+      update_list(srcuri, mtime, dsturi)
+      stop_expiration(srcuri, dsturi)
+      @update_count += 1
+    end
+
+    def update_list(srcuri, mtime, dsturi)
+      unless update_list_item(srcuri, mtime, dsturi)
+        add_list_item(srcuri, mtime, dsturi)
+      end
+    end
+    private :update_list
+
+    def update_list_item(srcuri, mtime, dsturi)
+      return false unless @map[srcuri]
+      item = @map[srcuri]
+      item["mtime"] = mtime.to_i
+      item["dst"] << dsturi unless item["dst"].include?(dsturi)
+      return true
+    end
+    private :update_list_item
+
+    def add_list_item(srcuri, mtime, dsturi)
+      item = {"src" => srcuri, "dst" => [dsturi], "mtime" => mtime.to_i}
+      @map[srcuri] = item
+      @data["list"] << item
+    end
+    private :add_list_item
+      
+    def stop_expiration(srcuri, dsturi)
+      @expired_src.delete(srcuri)
+      @expired_dst[dsturi] = [false, srcuri]
+    end
+    private :stop_expiration
+
+    def expire
+      expire_src
+      result = expire_dst
+      return result
+    end
+
+    def expire_src
+      @expired_src.each do |srcuri,v|
+        mark_expired_src(srcuri)
+      end
+      @data["list"] = @data["list"].select {|item| ! item["expired"] }
+    end
+    private :expire_src
+
+    def mark_expired_src(srcuri)
+      @map[srcuri]["expired"] = true
+      @map[srcuri]["dst"].each do |dsturi|
+        next if @expired_dst[dsturi] && ! @expired_dst[dsturi][0]
+        @expired_dst[dsturi] = [true, srcuri]
+      end
+    end
+    private :mark_expired_src
+
+    def expire_dst
+      result = []
+      @expired_dst.each do |dsturi, stat|
+        next unless stat[0]
+        srcuri = stat[1]
+        item = @map[srcuri]
+        item["dst"].delete(dsturi)
+        result << dsturi
+      end
+      return result
+    end
+    private :expire_dst
+    
+  end
+end

data/lib/smallcage/version.rb

@@ -2,7 +2,7 @@ module SmallCage #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 7
+    TINY  = 8
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/smallcage.gemspec

@@ -0,0 +1,172 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{smallcage}
+  s.version = "0.1.8"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["SAITO Toshihiro", "gommmmmm", "KOSEKI Kengo"]
+  s.date = %q{2009-11-05}
+  s.default_executable = %q{smc}
+  s.description = %q{Lightweight CMS package.}
+  s.email = %q{smallcage@googlegroups.com}
+  s.executables = ["smc"]
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "License.txt",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/smc",
+     "lib/smallcage.rb",
+     "lib/smallcage/application.rb",
+     "lib/smallcage/commands/auto.rb",
+     "lib/smallcage/commands/base.rb",
+     "lib/smallcage/commands/clean.rb",
+     "lib/smallcage/commands/export.rb",
+     "lib/smallcage/commands/import.rb",
+     "lib/smallcage/commands/manifest.rb",
+     "lib/smallcage/commands/server.rb",
+     "lib/smallcage/commands/update.rb",
+     "lib/smallcage/document_path.rb",
+     "lib/smallcage/erb_base.rb",
+     "lib/smallcage/http_server.rb",
+     "lib/smallcage/loader.rb",
+     "lib/smallcage/misc.rb",
+     "lib/smallcage/renderer.rb",
+     "lib/smallcage/resources/Manifest.erb",
+     "lib/smallcage/resources/auto.html",
+     "lib/smallcage/runner.rb",
+     "lib/smallcage/update_list.rb",
+     "lib/smallcage/version.rb",
+     "project/base/_smc/helpers/base_helper.rb",
+     "project/base/_smc/helpers/site_helper.rb",
+     "project/base/_smc/templates/default.rhtml",
+     "project/base/_smc/templates/footer.rhtml",
+     "project/base/_smc/templates/header.rhtml",
+     "project/bluecloth/_smc/helpers/blue_cloth_helper.rb",
+     "project/bluecloth/_smc/templates/markdown.rhtml",
+     "project/cache/_smc/filters/cache_filter.rb",
+     "project/cache/_smc/filters/filters.yml",
+     "project/cache/_smc/rakelib/cache.rake",
+     "project/lang/_smc/helpers/lang_helper.rb",
+     "project/lang/_smc/templates/other_lang.rhtml",
+     "project/news/_smc/helpers/news_helper.rb",
+     "project/nkf/_smc/filters/filters.yml",
+     "project/nkf/_smc/filters/nkf_filter.rb",
+     "project/nkf/_smc/helpers/nkf_helper.rb",
+     "project/rake/_smc/Rakefile",
+     "project/rake/_smc/rakelib/csv.rake",
+     "project/rake/_smc/rakelib/svn.rake",
+     "project/redcloth/_smc/helpers/red_cloth_helper.rb",
+     "project/redcloth/_smc/templates/textile.rhtml",
+     "project/relpath/_smc/filters/filters.yml",
+     "project/relpath/_smc/filters/relpath_filter.rb",
+     "project/standard/_dir.smc",
+     "project/standard/_smc/helpers/menu_helper.rb",
+     "project/standard/_smc/templates/default.rhtml",
+     "project/standard/_smc/templates/footer.rhtml",
+     "project/standard/_smc/templates/header.rhtml",
+     "project/standard/_smc/templates/menu.rhtml",
+     "project/standard/_smc/templates/redirect.rhtml",
+     "project/standard/_smc/templates/sidebar.rhtml",
+     "project/standard/_smc/templates/topic_path.rhtml",
+     "project/standard/common/css/default.css",
+     "project/standard/common/css/print.css",
+     "project/standard/index.html.smc",
+     "project/standard/sample/_dir.smc",
+     "project/standard/sample/index.html.smc",
+     "project/standard/sample/redirect.html.smc",
+     "project/standard/sample/sub/_dir.smc",
+     "project/standard/sample/sub/contents.html.smc",
+     "project/standard/sample/sub/index.html.smc",
+     "project/tutorial/_smc/helpers/sample_helper.rb",
+     "project/tutorial/_smc/templates/default.rhtml",
+     "project/tutorial/_smc/templates/include1.rhtml",
+     "project/tutorial/_smc/templates/include2.rhtml",
+     "project/tutorial/sample.txt.smc",
+     "project/tutorial/sample2.txt.smc",
+     "project/tutorial2/_smc/helpers/priority_sample_helper.rb",
+     "project/tutorial2/_smc/templates/priorities.rhtml",
+     "project/tutorial2/_smc/templates/priority1.rhtml",
+     "project/tutorial2/_smc/templates/priority2.rhtml",
+     "project/tutorial2/_smc/templates/priority3.rhtml",
+     "project/tutorial2/_smc/templates/smc_variables.rhtml",
+     "project/tutorial2/tutorial2/_dir.smc",
+     "project/tutorial2/tutorial2/priorities.txt.smc",
+     "project/tutorial2/tutorial2/vars.txt.smc",
+     "smallcage.gemspec",
+     "spec/data/htdocs1/_dir.smc",
+     "spec/data/htdocs1/_smc/.gitignore",
+     "spec/data/htdocs1/_smc/filters/filters.yml",
+     "spec/data/htdocs1/a/b/c/index.html.smc",
+     "spec/data/htdocs2/_smc/filters/filters.yml",
+     "spec/data/htdocs2/_smc/templates/dummy.rhtml",
+     "spec/data/htdocs2/a/b/c/test.html",
+     "spec/data/htdocs2/a/b/test.html",
+     "spec/data/htdocs2/a/test.html.smc",
+     "spec/data/htdocs3/_dir.smc",
+     "spec/data/htdocs3/_local.smc",
+     "spec/data/htdocs3/_smc/.gitignore",
+     "spec/data/htdocs3/a/b/_dir.smc",
+     "spec/data/htdocs3/a/b/_local.smc",
+     "spec/data/htdocs3/a/b/c/_local.smc",
+     "spec/data/htdocs3/a/b/c/index.html.smc",
+     "spec/data/htdocs3/a/index.html.smc",
+     "spec/data/htdocs3/ab/index.html.smc",
+     "spec/data/htdocs3/abc/index.html.smc",
+     "spec/data/multifiles/_dir.smc",
+     "spec/data/multifiles/_smc/templates/default.rhtml",
+     "spec/data/multifiles/_smc/templates/items.rhtml",
+     "spec/data/multifiles/_smc/templates/items.uri.rhtml",
+     "spec/data/multifiles/items/index.html.smc",
+     "spec/data/updatelists/list1.yml",
+     "spec/document_path_spec.rb",
+     "spec/export_spec.rb",
+     "spec/import_spec.rb",
+     "spec/loader_spec.rb",
+     "spec/manifest_spec.rb",
+     "spec/misc_spec.rb",
+     "spec/smallcage_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "spec/update_list_spec.rb",
+     "spec/update_spec.rb"
+  ]
+  s.homepage = %q{http://www.smallcage.org}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{smallcage}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Lightweight CMS package.}
+  s.test_files = [
+    "spec/document_path_spec.rb",
+     "spec/export_spec.rb",
+     "spec/import_spec.rb",
+     "spec/loader_spec.rb",
+     "spec/manifest_spec.rb",
+     "spec/misc_spec.rb",
+     "spec/smallcage_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/update_list_spec.rb",
+     "spec/update_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+