smallcage 0.1.5 → 0.1.6

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.6 2009-09-07
+
+* use _local.smc for local machine settings. This file overwrite _dir.smc.
+* erase statistics line when quiet option is on.
+
 == 0.1.5 2009-08-15
 
 * use @erbout for ERB output buffer variable name.

data/lib/smallcage/commands/update.rb

@@ -26,7 +26,7 @@ module SmallCage::Commands
       save_list(urilist)
       elapsed = Time.now - start
       
-      puts "-- #{rendered} files.  #{"%.3f" % elapsed} sec.  #{"%.3f" % (elapsed/rendered)} sec/file."
+      puts "-- #{rendered} files.  #{"%.3f" % elapsed} sec.  #{"%.3f" % (elapsed/rendered)} sec/file." unless @opts[:quiet]
     end
 
     def render_smc_files

data/lib/smallcage/loader.rb

@@ -1,13 +1,14 @@
 module SmallCage
   class Loader
     DEFAULT_TEMPLATE = "default"
-    DIR_PROP_FILE = "_dir.smc"
+    DIR_PROP_FILE    = "_dir.smc"
+    LOCAL_PROP_FILE  = "_local.smc"
     MAX_DEPTH = 100
   
     attr_reader :root, :target, :erb_base
   
     def initialize(target)
-      target = Pathname.new(target.to_s.strip.gsub(%r{(.+)/$}, '\1'))
+      target = Pathname.new(target.to_s.strip.chomp('/'))
       target = real_target(target) 
 
       @target = target # absolute
@@ -21,101 +22,104 @@ module SmallCage
 
     # return root dir Pathname object.
     def self.find_root(path, depth = MAX_DEPTH)
-      unless path.exist?
-        raise "Not found: " + path.to_s 
-      end
+      raise "Not found: #{path}" unless path.exist?
       d = path.realpath
-      
-      if d.file?
-        d = d.parent
-      end
-      
-      i = 0
+      d = d.parent if d.file?
       loop do
-        if d.join("_smc").directory?
-          return d
-        end
-        break if d.root?
+        return d if d.join("_smc").directory?
+        break if d.root? || (depth -= 1) <= 0
         d = d.parent
-
-        i += 1
-        break if depth <= i
       end
-      
-      raise "Root not found: " + path
+      raise "Root not found: #{path}"
     end
   
     def load(path)
-      unless path.exist?
-        raise "Not found: " + path.to_s 
-      end
+      raise "Not found: #{path}" unless path.exist?
 
       docpath = SmallCage::DocumentPath.new(@root, path)
 
-      result = {}
       if path.file?
-        unless docpath.smc?
-          raise "Path is not smc file: " + docpath.to_s
-        end
+        return load_smc_file(docpath)
+      else 
+        return load_dir_prop(docpath)
+      end
+    end
 
-        path_smc = docpath.path
-        path_out = docpath.outfile.path
-        uri_smc  = docpath.uri
-        uri_out  = docpath.outuri
-        source_path = path_smc
+    def load_smc_file(docpath)
+      raise "Path is not smc file: #{docpath}" unless docpath.smc?
 
-        result["dirs"]     = load_dirs(path)
-        result["template"] = DEFAULT_TEMPLATE
-      else # directory
-        path_smc = nil
-        path_out = path
-        uri_smc  = nil
-        uri_out  = docpath.uri
-        uri_out += "/" unless uri_out =~ %r{/$}
-        source_path = path + DIR_PROP_FILE
-        
-        if source_path.file?
-          path_smc = source_path
-          uri_smc = SmallCage::DocumentPath.to_uri(@root, source_path)
-        end
-      end
+      result = create_base_smc_object(docpath.outfile.path, docpath.path,
+                                      docpath.outuri,       docpath.uri)
       
-      add_smc_method(path_out, path_smc)
-      add_smc_method(uri_out, uri_smc)
+      result["template"] = DEFAULT_TEMPLATE
+      result["dirs"]     = load_dirs(docpath.path)
+
+      return result.merge(load_yaml(docpath.path))
+    end
+    private :load_smc_file
+
+    def load_dir_prop(docpath)
+      path_smc = nil
+      uri_smc  = nil
+      uri_out  = docpath.uri
+      uri_out += "/" unless uri_out[-1] == ?/
+
+      dir_prop_file   = docpath.path + DIR_PROP_FILE
+      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)
+      end
+
+      result = create_base_smc_object(docpath.path, path_smc,
+                                      uri_out, uri_smc)
 
-      result["path"]     = path_out
-      result["uri"]      = uri_out
+      result.merge!(load_yaml(dir_prop_file))   if dir_prop_file.file?
+      result.merge!(load_yaml(local_prop_file)) if local_prop_file.file?
+
+      return result
+    end
+    private :load_dir_prop
+    
+    def create_base_smc_object(path_out, path_smc, uri_out, uri_smc)
+      result = {}
       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 )
+      return result
+    end
+    private :create_base_smc_object
 
-      # target is directory and _dir.smc is not exist.
-      return result unless source_path.exist?
+    def load_yaml(path)
+      result = {}
 
-      source = source_path.read
+      source = path.read
       return result if source.strip.empty?
-
       begin
         obj = YAML.load_stream(source)
         return result if obj.nil?
       rescue => e
-        raise "Can't load file: #{source_path} / #{e}"
+        raise "Can't load file: #{path} / #{e}"
       end
-      
       obj.documents.each do |o|
-        if o.is_a? Hash
-          result = result.merge(o)
-        elsif o.is_a? Array
+        case o
+        when Hash
+          result.merge!(o)
+        when Array
+          result["arrays"] ||= []
           result["arrays"]  << o
         else
+          result["strings"] ||= []
           result["strings"] << o.to_s
         end
       end
-      
-      result["body"] = result["strings"][0] if result["body"].nil?
+      result["body"] ||= result["strings"][0] if result["strings"]
 
       return result
     end
+    private :load_yaml
 
     def load_dirs(path)
       result = []
@@ -138,6 +142,7 @@ module SmallCage
       each_smc_file do |path|
         next if path.directory?
         next if path.basename.to_s == DIR_PROP_FILE
+        next if path.basename.to_s == LOCAL_PROP_FILE
         obj = load(path)
         yield obj
       end
@@ -276,8 +281,10 @@ module SmallCage
       def obj.smc
         return @__smallcage.nil? ? nil : @__smallcage[:smc]
       end
+
+      return obj
     end
     private :add_smc_method
 
   end
-end
+end

data/lib/smallcage/version.rb

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

data/spec/data/htdocs3/_dir.smc

@@ -0,0 +1,4 @@
+a: 123
+b: 345
+--- |
+dirsmc

data/spec/data/htdocs3/_local.smc

@@ -0,0 +1,3 @@
+b: 567
+--- |
+localsmc

data/spec/data/htdocs3/a/b/_dir.smc

@@ -0,0 +1,4 @@
+a: 123
+b: 345
+--- |
+dirsmc

data/spec/data/htdocs3/a/b/_local.smc

@@ -0,0 +1,2 @@
+z: 999
+no_string_test: true

data/spec/data/htdocs3/a/b/c/_local.smc

@@ -0,0 +1,8 @@
+only_local_smc: true
+---
+- only
+- local
+- smc
+- array
+--- |
+strings

data/spec/data/htdocs3/a/b/c/index.html.smc

@@ -0,0 +1,6 @@
+title: dummy
+--- |
+foo
+bar
+foo
+bar

data/spec/loader_spec.rb

@@ -5,6 +5,7 @@ describe SmallCage::Loader do
 
   before do
     @docroot = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
+    @docroot3 = Pathname.new(File.dirname(__FILE__) + "/data/htdocs3")
   end
 
   it "should load path value which is instance of Pathname" do
@@ -85,5 +86,26 @@ describe SmallCage::Loader do
     dirs[0]["strings"][0].should == "BODYBODYBODY"
     dirs[0]["body"].should == "BODYBODYBODY"
   end
+
+  it "should load _local.smc" do
+    ldr = SmallCage::Loader.new(@docroot3)
+    obj = ldr.load(@docroot3 + "a/b/c/index.html.smc")
+
+    dirs = obj["dirs"]
+    dirs[0]["a"].should == 123
+    dirs[0]["b"].should == 567
+    dirs[0]["body"].strip.should == "localsmc"
+    dirs[0]["strings"][0].strip.should == "localsmc"
+
+    dirs[2]["a"].should == 123
+    dirs[2]["b"].should == 345
+    dirs[2]["z"].should == 999
+    dirs[2]["body"].should == "dirsmc"
+
+    dirs[3]["only_local_smc"].should be_true
+    dirs[3]["arrays"][0][2].should == "smc"
+    dirs[3]["body"].should == "strings"
+
+  end
   
-end
+end

data/spec/smallcage_spec.rb

@@ -3,13 +3,12 @@ require 'smallcage'
 
 describe "smallcage" do
 
-  docroot = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
-
   it "show version" do
     # puts "------- version:" + SmallCage::VERSION::STRING
   end
   
   it "should update not docroot directory" do
+    docroot  = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
     path = docroot + "a/b/"
 
     opts = { :command => "update", :path => path.to_s, :quiet => true }
@@ -36,5 +35,24 @@ describe "smallcage" do
     end
       
   end
+  
+  it "should not publish _dir.smc and _local.smc" do
+    root = Pathname.new(File.dirname(__FILE__) + "/data/htdocs3")
+
+    opts = { :command => "update", :path => root.to_s, :quiet => true }
+    
+    begin
+      SmallCage::Runner.run(opts)
+    
+      out = root + "_dir"
+      out.file?.should be_false
+    
+      out = root + "_local"
+      out.file?.should be_false
+    ensure
+      SmallCage::Runner.run({:command => "clean", :path => root.to_s, :quiet => true })
+    end
+    
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smallcage
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - SAITO Toshihiro
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-15 00:00:00 +09:00
+date: 2009-09-07 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -115,6 +115,12 @@ files:
 - 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/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/document_path_spec.rb
 - spec/export_spec.rb
 - spec/import_spec.rb