bluemark-smallcage 0.1.3 → 0.1.4

data/History.txt

@@ -1,5 +1,17 @@
+== 0.1.4 2009-07-27
+
+* add cache control filter and rake task (for CDN, etag, etc.). 
+* move rake tasks into *.rake files.
+* switch 'smc import' default answer to 'Yes'.
+* add the most primitive project template: tutorial.
+* add project template to explain smc object and template: tutorial2.
+* added 'body' to default smc object keys.
+* avoid error when helper directory doesn't exist.
+* show smc filename when template error occurs. 
+ 
 == 0.1.3 2009-05-01
 
+* moved to github.
 * stop using newgem and generate Rakefile using cutagem.
 * fix svnignore_reset bug.
 

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2007 FIXME full name
+Copyright (c) 2007-2009 Bluemark Inc. <http://www.bluemark.co.jp>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.txt

@@ -1 +1,61 @@
-README
+
+SmallCage - Lightweigt CMS Package.
+
+
+INSTALL
+
+$ sudo gem install smallcage
+
+
+USAGE
+
+$ smc help
+
+Usage: smc <subcommand> [options]
+SmallCage 0.1.3 - Lightweight CMS Package.
+Subcommands are:
+    update [path]                    Build smc contents.
+    clean  [path]                    Remove files generated from *.smc source.
+    server [path] [port]             Start HTTP server.
+    auto   [path] [port]             Start auto update daemon.
+    import [name|uri]                Import project.
+    export [path] [outputpath]       Export project.
+    manifest [path]                  Generate Manifest.html file.
+
+Options are:
+
+    -h, --help                       Show this help message.
+    -v, --version                    Show version info.
+
+$ mkdir htdocs
+$ cd htdocs
+$ smc import
+Import: base
+Create:
+  /_smc
+  /_smc/helpers
+  /_smc/helpers/base_helper.rb
+  /_smc/helpers/site_helper.rb
+  /_smc/templates
+  /_smc/templates/default.rhtml
+  /_smc/templates/footer.rhtml
+  /_smc/templates/header.rhtml
+
+Import these files?[yN]: y
+A /_smc
+A /_smc/helpers
+A /_smc/helpers/base_helper.rb
+:
+
+$ smc update
+A /index.html
+A /sample/index.html
+A /sample/redirect.html
+A /sample/sub/contents.html
+A /sample/sub/index.html
+
+$ smc server . 8080
+:
+...and access
+http://localhost:8080/
+

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
-require 'rake/testtask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
@@ -9,6 +8,9 @@ require 'rake/contrib/rubyforgepublisher'
 require 'rake/contrib/sshpublisher'
 require 'fileutils'
 require 'lib/smallcage'
+require 'spec'
+require 'spec/rake/spectask'
+
 include FileUtils
 
 NAME              = "smallcage"
@@ -23,118 +25,120 @@ VERS              = SmallCage::VERSION::STRING
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 RDOC_OPTS = [
-	'--title', "#{NAME} documentation",
-	"--charset", "utf-8",
-	"--opname", "index.html",
-	"--line-numbers",
-	"--main", "README.txt",
-	"--inline-source",
+  '--title', "#{NAME} documentation",
+  "--charset", "utf-8",
+  "--opname", "index.html",
+  "--line-numbers",
+  "--main", "README.txt",
+  "--inline-source",
 ]
 
-task :default => [:test]
-task :package => [:clean]
-
-Rake::TestTask.new("test") do |t|
-	t.libs   << "test"
-	t.pattern = "test/**/*_test.rb"
-	t.verbose = true
-end
+SRC_FILES = FileList.new(%w{Rakefile README.txt History.txt License.txt})
+SRC_FILES.include("{bin,doc,lib,test,project,spec}/**/*")
+SRC_FILES.exclude(/~$/)
 
 spec = Gem::Specification.new do |s|
-	s.name              = NAME
-	s.version           = VERS
-	s.platform          = Gem::Platform::RUBY
-	s.has_rdoc          = true
-	s.extra_rdoc_files  = ["README.txt", "History.txt"]
-	s.rdoc_options     += RDOC_OPTS + ['--exclude', '^(examples|extras)/']
-	s.summary           = DESCRIPTION
-	s.description       = DESCRIPTION
-	s.authors           = AUTHORS
-	s.email             = EMAIL
-	s.homepage          = HOMEPATH
-	s.executables       = BIN_FILES
-	s.rubyforge_project = RUBYFORGE_PROJECT
-	s.bindir            = "bin"
-	s.require_path      = "lib"
-	#s.autorequire       = ""
-	s.test_files        = Dir["test/*_test.rb"]
-
-	#s.add_dependency('activesupport', '>=1.3.1')
-	#s.required_ruby_version = '>= 1.8.2'
-
-	s.files = %w(Rakefile README.txt History.txt License.txt) +
-		Dir.glob("{bin,doc,lib,test,project,spec}/**/*")
-
-	s.extensions = FileList["ext/**/extconf.rb"].to_a
+  s.name              = NAME
+  s.version           = VERS
+  s.platform          = Gem::Platform::RUBY
+  s.has_rdoc          = true
+  s.extra_rdoc_files  = ["README.txt", "History.txt"]
+  s.rdoc_options     += RDOC_OPTS + ['--exclude', '^(examples|extras)/']
+  s.summary           = DESCRIPTION
+  s.description       = DESCRIPTION
+  s.authors           = AUTHORS
+  s.email             = EMAIL
+  s.homepage          = HOMEPATH
+  s.executables       = BIN_FILES
+  s.rubyforge_project = RUBYFORGE_PROJECT
+  s.bindir            = "bin"
+  s.require_path      = "lib"
+  s.test_files        = Dir["spec/*_spec.rb"]
+  s.files             = SRC_FILES
+
+  #s.autorequire       = ""
+  #s.add_dependency('activesupport', '>=1.3.1')
+  #s.required_ruby_version = '>= 1.8.2'
+  #s.extensions = FileList["ext/**/extconf.rb"].to_a
 end
 
+task :default => [:spec]
+task :package => [:clean]
+
 Rake::GemPackageTask.new(spec) do |p|
-	p.need_tar = true
-	p.gem_spec = spec
+  p.need_tar = true
+  p.gem_spec = spec
 end
 
 task :install do
-	name = "#{NAME}-#{VERS}.gem"
-	sh %{rake package}
-	sh %{sudo gem install pkg/#{name}}
+  name = "#{NAME}-#{VERS}.gem"
+  sh %{rake package}
+  sh %{sudo gem install pkg/#{name}}
 end
 
 task :uninstall => [:clean] do
-	sh %{sudo gem uninstall #{NAME}}
+  sh %{sudo gem uninstall #{NAME}}
 end
 
 
 Rake::RDocTask.new do |rdoc|
-	rdoc.rdoc_dir = 'html'
-	rdoc.options += RDOC_OPTS
-	rdoc.template = "resh"
-	#rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-	if ENV['DOC_FILES']
-		rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
-	else
-		rdoc.rdoc_files.include('README.txt', 'History.txt')
-		rdoc.rdoc_files.include('lib/**/*.rb')
-		rdoc.rdoc_files.include('ext/**/*.c')
-	end
+  rdoc.rdoc_dir = 'html'
+  rdoc.options += RDOC_OPTS
+  rdoc.template = "resh"
+  #rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+  if ENV['DOC_FILES']
+    rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
+  else
+    rdoc.rdoc_files.include('README.txt', 'History.txt')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+    rdoc.rdoc_files.include('ext/**/*.c')
+  end
 end
 
 desc "Publish to RubyForge"
 task :rubyforge => [:rdoc, :package] do
-	require 'rubyforge'
-	Rake::RubyForgePublisher.new(RUBYFORGE_PROJECT, 'bluemark').upload
+  require 'rubyforge'
+  Rake::RubyForgePublisher.new(RUBYFORGE_PROJECT, 'bluemark').upload
 end
 
 desc 'Package and upload the release to rubyforge.'
 task :release => [:clean, :package] do |t|
-	v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
-	abort "Versions don't match #{v} vs #{VERS}" unless v == VERS
-	pkg = "pkg/#{NAME}-#{VERS}"
-
-	require 'rubyforge'
-	rf = RubyForge.new.configure
-	puts "Logging in"
-	rf.login
-
-	c = rf.userconfig
-#	c["release_notes"] = description if description
-#	c["release_changes"] = changes if changes
-	c["preformatted"] = true
-
-	files = [
-		"#{pkg}.tgz",
-		"#{pkg}.gem"
-	].compact
-
-	puts "Releasing #{NAME} v. #{VERS}"
-	rf.add_release RUBYFORGE_PROJECT, NAME, VERS, *files
+  v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
+  abort "Versions don't match #{v} vs #{VERS}" unless v == VERS
+  pkg = "pkg/#{NAME}-#{VERS}"
+
+  require 'rubyforge'
+  rf = RubyForge.new.configure
+  puts "Logging in"
+  rf.login
+
+  c = rf.userconfig
+#  c["release_notes"] = description if description
+#  c["release_changes"] = changes if changes
+  c["preformatted"] = true
+
+  files = [
+    "#{pkg}.tgz",
+    "#{pkg}.gem"
+  ].compact
+
+  puts "Releasing #{NAME} v. #{VERS}"
+  rf.add_release RUBYFORGE_PROJECT, NAME, VERS, *files
 end
 
 desc 'Show information about the gem.'
 task :debug_gem do
-	puts spec.to_ruby
+  puts spec.to_ruby
 end
 
 desc 'Update gem spec'
 task :gemspec do
   open("#{NAME}.gemspec", 'w').write spec.to_ruby
 end
+
+desc "Run the specs under ./spec/"
+Spec::Rake::SpecTask.new do |t|
+  t.libs << "lib"
+  t.spec_opts = ['--options', "spec/spec.opts"]
+  t.spec_files = FileList['spec/*_spec.rb']
+end

data/lib/smallcage/commands/import.rb

@@ -148,7 +148,7 @@ module SmallCage::Commands
         qps
       end
       
-      return y_or_n("Import these files?[yN]: ", false)
+      return y_or_n("Import these files?[Yn]: ", true)
     end
     private :confirm_entries
     

data/lib/smallcage/erb_base.rb

@@ -8,7 +8,6 @@ class SmallCage::ErbBase
     n = name.to_s
     
     return @obj[n] unless @obj[n].nil?
-    return @obj["strings"][0] if n == "body" && ! @obj["strings"][0].nil?
 
     # render if template file exists. or return nil.
     return @renderer.render(name, @obj)

data/lib/smallcage/loader.rb

@@ -87,6 +87,7 @@ module SmallCage
       result["uri"]      = uri_out
       result["arrays"]   = []
       result["strings"]  = []
+      result["body"]     = nil
 
       # target is directory and _dir.smc is not exist.
       return result unless source_path.exist?
@@ -110,6 +111,8 @@ module SmallCage
           result["strings"] << o.to_s
         end
       end
+      
+      result["body"] = result["strings"][0] if result["body"].nil?
 
       return result
     end
@@ -205,8 +208,11 @@ module SmallCage
     
     def load_anonymous(dir, rex)
       module_names = []
-      
       mod = Module.new
+      result = { :module => mod, :names => module_names }
+      
+      return result unless File.exist?(dir)
+
       Dir.entries(dir).sort.each do |h|
         next unless h =~ rex
         
@@ -217,14 +223,14 @@ module SmallCage
         begin
           mod.module_eval(src, "#{dir}/#{h}")
         rescue => ex
-          puts ex.to_s # TODO show error
+          STDERR << ex.to_s # TODO show error
           load("#{dir}/#{h}", true) # try to know error line number.
           raise "Can't load #{dir}/#{h} / line# unknown"
         end
         module_names << module_name
       end
       
-      return { :module => mod, :names => module_names }
+      return result
     end
     private :load_anonymous
 

data/lib/smallcage/renderer.rb

@@ -11,8 +11,13 @@ class SmallCage::Renderer
   end
     
   def render_string(str, obj)
-    erb_class = ERB.new(str, nil, '-').def_class(@loader.erb_base, "erb")
-    result = erb_class.new(@loader, self, obj).erb
+    begin
+      erb_class = ERB.new(str, nil, '-').def_class(@loader.erb_base, "erb")
+      result = erb_class.new(@loader, self, obj).erb
+    rescue => e
+      STDERR.puts "Can't render: #{obj["uri"]}"
+      raise e
+    end
     return result
   end
 

data/lib/smallcage/version.rb

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

data/project/cache/_smc/filters/cache_filter.rb

@@ -0,0 +1,35 @@
+module SmallCage
+  class CacheFilter
+
+    def initialize(opts)
+    end
+
+    def after_rendering_filter(obj, str)
+      str.gsub %r{(\s(?:src|href)=["'])(?!https?://)([^"']+--latest\.(?:css|js|png|gif|jpg))(["'])} do
+        pre  = $1
+        path = $2
+        pro  = $3
+        dir  = obj["dirs"][path[0] == ?/ ? 0 : -1]["path"]
+        pre + find_latest(dir, path) + pro
+      end
+    end
+
+    def find_latest(dir, path)
+      relpath = path[0] == ?/ ? path[1..-1] : path
+      return path unless (dir + relpath).exist?
+      
+      rex = /^(.+)--latest(\.[^.]+)$/
+      pattern    = relpath.to_s.sub(rex, '\1-*\2')
+      
+      entry = nil
+      Dir.chdir(dir) do
+        entry = Dir.glob(pattern).reject {|f| f == relpath }.sort.last
+      end
+      return path unless entry
+      
+      entry = "/" + entry if path[0] == ?/ 
+      return entry
+    end
+    private :find_latest
+  end
+end

data/project/cache/_smc/filters/filters.yml

@@ -0,0 +1,2 @@
+after_rendering_filters:
+  - name: cache_filter

data/project/cache/_smc/rakelib/cache.rake

@@ -0,0 +1,34 @@
+
+namespace :cache do
+
+  task :update do
+    require "rexml/document" 
+    list = FileList["**/*--latest.{css,js,png,gif,jpg}"]
+    
+    list.each do |path|
+      src = %x{svn info --xml #{path}}
+      begin
+        doc = REXML::Document.new(src)
+        revision = doc.elements['/info/entry/commit/@revision'].value
+      rescue
+        puts "Can't get revision number: #{path}"
+      end
+      to = path.pathmap("%{--latest$,-#{revision}}X%x")
+      if File.exist?(to)
+        puts "  SKIP(exists): #{path} -> #{to}"
+        next
+      else
+        puts "  COPY: #{path} -> #{to}"
+      end
+      unless ENV["DRYRUN"]
+        next if File.exist?(to)
+        begin
+          FileUtils.copy(path,to)
+        rescue => e
+          puts "  ERROR: #{e} #{path} -> #{to}"
+        end
+      end
+    end
+  end
+
+end

data/project/rake/_smc/Rakefile

@@ -4,65 +4,10 @@ require 'pathname'
 require 'rubygems'
 require 'smallcage'
 
+FileList["_smc/rakelib/*.rake"].each {|f| load f }
+
 task :default => :smcupdate
 
 task :smcupdate do
   system "smc update"
 end
-
-def load_svnignores(loader, path)
-  dirs = loader.load_dirs(Pathname.new(path) + "child_dummy") # TODO
-  ignores = []
-  dirs.reverse.each do |d|
-    data = d["svnignore"]
-    ignores << data unless data.to_s.empty?
-    break if d["svnignore_reset"]
-  end
-  data = dirs.last["svnignore_current"]
-  unless data.to_s.empty?
-    ignores << data
-  end
-  
-  ignores.flatten!
-  ignores.uniq!
-  ignores.sort!
-  return ignores
-end
-
-def set_svnignore(dryrun = false)
-  loader = SmallCage::Loader.new(".")
-  
-  exec_svn(loader, ".", dryrun)
-  Dir.glob("**/") do |f|
-    exec_svn(loader, f, dryrun)
-  end
-end
-
-def exec_svn(loader, f, dryrun)
-  return if f =~ %r{^_smc/}
-  svnignores = load_svnignores(loader, f).join("\n")
-  return if svnignores.empty?
-  cmd = "svn propset svn:ignore '#{svnignores}' #{f}"
-  puts cmd
-  return if dryrun
-  puts "FAILED: #{cmd}" unless system cmd
-end
-
-# _dir.smc 
-#   svnignore: *.html # set recursively.
-#   svnignore_current: .project # add only current dir. 
-#   svnignore_reset: true # ignore parent directory settings.
-#   
-# You can use list.
-#   svnignore:
-#     - *.html
-#     - *.xml
-desc "svn propset svn:ignore ..."
-task :svnignore do
-  set_svnignore
-end
-
-desc "confirm svn commands."
-task :svnignore_dryrun do
-  set_svnignore(true)
-end

data/project/rake/_smc/rakelib/csv.rake

@@ -0,0 +1,43 @@
+
+namespace :csv do
+
+  task :require do
+    require "csv"
+    require "yaml"
+  end
+
+  # csv_to_smc sample task.
+  task :sample_update => [:require] do
+    csv_to_smc("_smc/sample.csv") {|data,rownum| "path/to/contents/#{"%04d" % (rownum - 1)}_#{data["key"]}.smc" }
+  end
+
+end
+
+
+def csv_to_smc(csv_file, label_row = 0, skip_rows = 1)
+  labels = nil
+  rownum = -1
+  CSV.foreach(csv_file) do |row|
+    rownum += 1
+    labels = row if label_row == rownum
+    next if rownum < skip_rows
+
+    if labels
+      data = {}
+      labels.each_with_index do |label,i|
+        data[label] = row[i].to_s
+      end
+    else
+      data = row.map {|cell| cell.to_s }
+    end
+    if block_given?
+      fname = yield(data,rownum)
+    else
+      fname = data[0]
+    end
+    File.open(fname, "w") do |io|
+      io << data.to_yaml
+    end
+  end
+
+end

data/project/rake/_smc/rakelib/svn.rake

@@ -0,0 +1,64 @@
+
+namespace :svn do
+
+  # _dir.smc 
+  #   svnignore: *.html # set recursively.
+  #   svnignore_current: .project # add only current dir. 
+  #   svnignore_reset: true # ignore parent directory settings.
+  #   
+  # You can use list.
+  #   svnignore:
+  #     - *.html
+  #     - *.xml
+  desc "svn propset svn:ignore ..."
+  task :ignore do
+    set_svnignore
+  end
+
+  desc "confirm svn commands."
+  task :ignore_dryrun do
+    set_svnignore(true)
+  end
+
+end
+
+
+
+def load_svnignores(loader, path)
+  dirs = loader.load_dirs(Pathname.new(path) + "child_dummy") # XXX
+  ignores = []
+  dirs.reverse.each do |d|
+    data = d["svnignore"]
+    ignores << data unless data.to_s.empty?
+    break if d["svnignore_reset"]
+  end
+  data = dirs.last["svnignore_current"]
+  unless data.to_s.empty?
+    ignores << data
+  end
+  
+  ignores.flatten!
+  ignores.uniq!
+  ignores.sort!
+  return ignores
+end
+
+def set_svnignore(dryrun = false)
+  loader = SmallCage::Loader.new(".")
+  
+  exec_svn(loader, ".", dryrun)
+  Dir.glob("**/") do |f|
+    exec_svn(loader, f, dryrun)
+  end
+end
+
+def exec_svn(loader, f, dryrun)
+  return if f =~ %r{^_smc/}
+  svnignores = load_svnignores(loader, f).join("\n")
+  return if svnignores.empty?
+  cmd = "svn propset svn:ignore '#{svnignores}' #{f}"
+  puts cmd
+  return if dryrun
+  puts "FAILED: #{cmd}" unless system cmd
+end
+

data/project/tutorial/_smc/helpers/sample_helper.rb

@@ -0,0 +1,7 @@
+module SmallCage
+  module SampleHelper
+    def abc
+      return "XYZ"
+    end
+  end
+end

data/project/tutorial/_smc/templates/default.rhtml

@@ -0,0 +1,6 @@
+<%= include1 %>
+ foo ... <%= foo %>
+ bar ... <%= bar %>
+ abc ... <%= abc %>
+body ... <%= body %>
+<%= include2 %>

data/project/tutorial/_smc/templates/include1.rhtml

@@ -0,0 +1 @@
+----------------------------------------------------------------

data/project/tutorial/_smc/templates/include2.rhtml

@@ -0,0 +1 @@
+================================================================

data/project/tutorial/sample.txt.smc

@@ -0,0 +1,7 @@
+foo: abcd
+bar: efgh
+--- |
+BODY FIRST LINE.
+SECOND
+THIRD
+Here is end of body.

data/project/tutorial/sample2.txt.smc

@@ -0,0 +1 @@
+template: include2

data/project/tutorial2/_smc/helpers/priority_sample_helper.rb

@@ -0,0 +1,7 @@
+module SmallCage
+  module PrioritySampleHelper
+    def priority1
+      return "helper"
+    end
+  end
+end

data/project/tutorial2/_smc/templates/priorities.rhtml

@@ -0,0 +1,5 @@
+=== priority ===
+
+ * priority1	<%= priority1 %>
+ * priority2	<%= priority2 %>
+ * priority3	<%= priority3 %>

data/project/tutorial2/_smc/templates/priority1.rhtml

@@ -0,0 +1 @@
+template

data/project/tutorial2/_smc/templates/priority2.rhtml

@@ -0,0 +1 @@
+template

data/project/tutorial2/_smc/templates/priority3.rhtml

@@ -0,0 +1 @@
+template

data/project/tutorial2/_smc/templates/smc_variables.rhtml

@@ -0,0 +1,29 @@
+=== vars ===
+
+<%- (@obj.keys - %w{template uri path strings arrays body dirs}).sort.each do |key| -%>
+ * <%= key %>	<%= @obj[key].inspect %>
+<%- end -%>
+
+=== special variables ===
+
+ * template	<%= template.inspect %>
+ * uri		<%= uri.inspect %>
+ * uri.smc	<%= uri.smc.inspect %>
+ * path		<%= path.inspect %>
+ * path.smc	<%= path.smc.inspect %>
+ * strings      <%= strings.inspect %>
+ * arrays       <%= arrays.inspect %>
+ * body         <%= body.inspect %>
+
+=== directory info ===
+
+<%- dirs.each_with_index do |dir,i| -%>
+ * dirs[<%= i %>]
+ <%- dir.keys.sort.each do |k| -%>
+   * dirs[<%= i %>]["<%= k %>"]	<%= dir[k].inspect %>
+ <%- end %>
+<%- end -%>
+=== smc object ===
+
+ * @obj.class.name	<%= @obj.class.name %>
+ * @obj.keys.inspect	<%= @obj.keys.inspect %>

data/project/tutorial2/tutorial2/_dir.smc

@@ -0,0 +1,2 @@
+topic: Tutorial vol.2
+note: This file set directory info.

data/project/tutorial2/tutorial2/priorities.txt.smc

@@ -0,0 +1,4 @@
+template: priorities
+priority1: smc file
+priority2: smc file
+# priority3: smc file

data/project/tutorial2/tutorial2/vars.txt.smc

@@ -0,0 +1,26 @@
+template: smc_variables
+title: How smc file convert into smc object.
+array_sample:
+  - item1
+  - item2
+overwrite: OVER
+--- |
+text part 1.
+foo bar
+---
+- AAA
+- BBB
+- CCC
+---
+- 111
+- 222
+- 333
+--- |
+text part 2.
+baz baz
+---
+hash_sample:
+  key1: value-A
+  key2: value-B
+note: All YAML hash documents gather into one hash value.
+overwrite: WRITE

data/spec/data/htdocs1/_dir.smc

@@ -0,0 +1,3 @@
+var: xxx
+--- |
+BODYBODYBODY

data/spec/loader_spec.rb

@@ -7,7 +7,7 @@ describe SmallCage::Loader do
     @docroot = Pathname.new(File.dirname(__FILE__) + "/data/htdocs1")
   end
 
-  it "should load path value which returns Pathname object" do
+  it "should load path value which is instance of Pathname" do
     ldr = SmallCage::Loader.new(@docroot)
     obj = ldr.load(@docroot + "a/b/c/index.html.smc")
 
@@ -52,4 +52,38 @@ describe SmallCage::Loader do
     end
     objects[0]["strings"][0].should == "abc\ndef\n\nghi"
   end
+  
+  it "should load body value which equals strings[0]" do
+    ldr = SmallCage::Loader.new(@docroot)
+    obj = ldr.load(@docroot + "a/b/c/index.html.smc")
+    
+    obj["strings"][0].should == "abc\ndef\n\nghi"  
+    obj["body"].should == obj["strings"][0]
+    
+    # same String instance
+    obj["strings"][0].replace("XXX")
+    obj["body"].should == "XXX"
+
+    obj["strings"][0] = "ABC"
+    obj["body"].should == "XXX"
+  end
+  
+  it "should load dirs" do
+    ldr = SmallCage::Loader.new(@docroot)
+    obj = ldr.load(@docroot + "a/b/c/index.html.smc")
+    
+    dirs = obj["dirs"]
+    dirs.length.should == 4
+    
+    dirs[0]["uri"].should == "/"
+    dirs[1]["uri"].should == "/a/"
+    dirs[2]["uri"].should == "/a/b/"
+    dirs[3]["uri"].should == "/a/b/c/"
+    (dirs[3]["path"] + "index.html.smc").file?.should be_true
+    
+    dirs[0]["var"].should == "xxx"
+    dirs[0]["strings"][0].should == "BODYBODYBODY"
+    dirs[0]["body"].should == "BODYBODYBODY"
+  end
+  
 end

data/spec/manifest_spec.rb

@@ -1,8 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 require 'smallcage'
 
-
-
 describe "SmallCage::Commands::Manifest" do
 
   before do
@@ -17,18 +15,20 @@ describe "SmallCage::Commands::Manifest" do
     @manifest_file.file?.should be_true
 
     source = @manifest_file.read
-    source.include?(<<'EOT').should be_true
-<ul class="files">
+    source = source.match(%r{<ul class="files">\n(.+?)\n</ul>}m)[1].split(/\n/)
+
+    contents = <<'EOT'.split(/\n/)
+<li><a href="./_dir.smc">./_dir.smc</a></li>
+<li><a href="./_smc/">./_smc/</a></li>
 <li><a href="./a/">./a/</a></li>
 <li><a href="./a/b/">./a/b/</a></li>
 <li><a href="./a/b/c/">./a/b/c/</a></li>
 <li><a href="./a/b/c/index.html.smc">./a/b/c/index.html.smc</a></li>
-<li><a href="./_dir.smc">./_dir.smc</a></li>
-<li><a href="./_smc/">./_smc/</a></li>
-<li><a href="./_smc/helpers/">./_smc/helpers/</a></li>
-<li><a href="./_smc/templates/">./_smc/templates/</a></li>
-</ul>
 EOT
+
+    source.each do |line|
+      contents.should include(line)
+    end
   end
   
   after do

data/spec/spec_helper.rb

@@ -1,9 +1,4 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
-end
+require 'rubygems'
+require 'spec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bluemark-smallcage
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - SAITO Toshihiro
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-01 00:00:00 -07:00
+date: 2009-07-27 00:00:00 -07:00
 default_executable: smc
 dependencies: []
 
@@ -53,8 +53,6 @@ files:
 - lib/smallcage/runner.rb
 - lib/smallcage/version.rb
 - lib/smallcage.rb
-- test/test_helper.rb
-- test/test_smallcage.rb
 - project/base
 - project/base/_smc
 - project/base/_smc/helpers
@@ -70,6 +68,13 @@ files:
 - project/bluecloth/_smc/helpers/blue_cloth_helper.rb
 - project/bluecloth/_smc/templates
 - project/bluecloth/_smc/templates/markdown.rhtml
+- project/cache
+- project/cache/_smc
+- project/cache/_smc/filters
+- project/cache/_smc/filters/cache_filter.rb
+- project/cache/_smc/filters/filters.yml
+- project/cache/_smc/rakelib
+- project/cache/_smc/rakelib/cache.rake
 - project/lang
 - project/lang/_smc
 - project/lang/_smc/helpers
@@ -88,6 +93,9 @@ files:
 - project/rake
 - project/rake/_smc
 - project/rake/_smc/Rakefile
+- project/rake/_smc/rakelib
+- project/rake/_smc/rakelib/csv.rake
+- project/rake/_smc/rakelib/svn.rake
 - project/redcloth
 - project/redcloth/_smc
 - project/redcloth/_smc/helpers
@@ -126,9 +134,34 @@ files:
 - project/standard/sample/sub/_dir.smc
 - project/standard/sample/sub/contents.html.smc
 - project/standard/sample/sub/index.html.smc
+- project/tutorial
+- project/tutorial/_smc
+- project/tutorial/_smc/helpers
+- project/tutorial/_smc/helpers/sample_helper.rb
+- project/tutorial/_smc/templates
+- 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
+- project/tutorial2/_smc
+- project/tutorial2/_smc/helpers
+- project/tutorial2/_smc/helpers/priority_sample_helper.rb
+- project/tutorial2/_smc/templates
+- 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
+- project/tutorial2/tutorial2/_dir.smc
+- project/tutorial2/tutorial2/priorities.txt.smc
+- project/tutorial2/tutorial2/vars.txt.smc
 - spec/data
 - spec/data/htdocs1
 - spec/data/htdocs1/_dir.smc
+- spec/data/htdocs1/_smc
 - spec/data/htdocs1/a
 - spec/data/htdocs1/a/b
 - spec/data/htdocs1/a/b/c
@@ -152,8 +185,9 @@ files:
 - spec/smallcage_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://www.smallcage.org
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --title
@@ -185,9 +219,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: smallcage
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Lightweight CMS package.
-test_files: []
-
+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

data/test/test_helper.rb

@@ -1,2 +0,0 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/smallcage'

data/test/test_smallcage.rb

@@ -1,11 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestSmallCage < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  def test_truth
-    assert true
-  end
-end