smallcage 0.0.9 → 0.1.0

data/History.txt

@@ -1,9 +1,15 @@
+== 0.1.0 2008-05-26
+
+* to avoid namespace polution, the helpers and filters loaded into an anonymous module.
+* fix signal handler bug.
+* change base helper _glob method.
+* refine default project template.
+
 == 0.0.9 2008-04-21
 
 * fix smc auto command bug.
 * add RedCloth project template (redcloth).
 * add multi language project template (lang).
-
 * add auto navigation servlet to the HTTP server.
 * add export command.
 * delete output file when smc source file does not exist.

data/Manifest.txt

@@ -41,9 +41,11 @@ 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/base_helper.rb
 project/standard/_smc/helpers/menu_helper.rb
 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
@@ -52,12 +54,16 @@ project/standard/about/index.html.smc
 project/standard/common/css/default.css
 project/standard/common/css/print.css
 project/standard/index.html.smc
-project/standard/sample1/_dir.smc
-project/standard/sample1/index.html.smc
-project/standard/sample1/index2.html.smc
-project/standard/sample1/redirect.html.smc
-project/standard/sample2/_dir.smc
-project/standard/sample2/index.html.smc
+project/standard/menu1/_dir.smc
+project/standard/menu1/index.html.smc
+project/standard/menu1/index2.html.smc
+project/standard/menu2/1/_dir.smc
+project/standard/menu2/1/index.html.smc
+project/standard/menu2/2/_dir.smc
+project/standard/menu2/2/index.html.smc
+project/standard/menu2/_dir.smc
+project/standard/menu2/index.html.smc
+project/standard/menu2/redirect.html.smc
 script/destroy
 script/destroy.cmd
 script/generate

data/lib/smallcage/application.rb

@@ -5,21 +5,26 @@ OPTIONS[:original_argv] = ARGV.clone
 
 class SmallCage::Application
   require 'optparse'
-
-  @@signal_handlers = {
-    "INT" => [],
-    "TERM" => []
-  }
   
-  @@signal_handlers.keys.each do |signal|
-    Signal.trap(signal) do
-      @@signal_handlers[signal].each do |proc|
-        proc.call(signal)
+  @@signal_handlers = nil
+
+  def self.init_signal_handlers
+    @@signal_handlers = {
+      "INT" => [],
+      "TERM" => []
+    }
+
+    @@signal_handlers.keys.each do |signal|
+      Signal.trap(signal) do
+        @@signal_handlers[signal].each do |proc|
+          proc.call(signal)
+        end
       end
     end
   end
   
   def self.add_signal_handler(signal, handler)
+    init_signal_handlers if @@signal_handlers.nil?
     signal.to_a.each do |s|
       @@signal_handlers[s] << handler
     end

data/lib/smallcage/loader.rb

@@ -94,8 +94,12 @@ module SmallCage
       source = source_path.read
       return result if source.strip.empty?
 
-      obj = YAML.load_stream(source)
-      return result if obj.nil?
+      begin
+        obj = YAML.load_stream(source)
+        return result if obj.nil?
+      rescue => e
+        raise "Can't load file: #{source_path} / #{e}"
+      end
       
       obj.documents.each do |o|
         if o.is_a? Hash
@@ -182,24 +186,47 @@ module SmallCage
     
     def load_erb_base
       result = Class.new(SmallCage::ErbBase)
-      class_names = load_classes(@helpers_dir, %r{([^/]+_helper)\.rb$})
-      class_names.each do |class_name|
-        result.class_eval("include SmallCage::#{class_name}")
+      class << result
+        def include_helpers(anon_module, mod_names)
+          smc_module = anon_module.const_get("SmallCage")
+          mod_names.each do |name|
+            helper_module = smc_module.const_get(name)
+            include helper_module
+          end
+        end
       end
+      
+      helpers = load_anonymous(@helpers_dir, %r{([^/]+_helper)\.rb$})
+      result.include_helpers(helpers[:module], helpers[:names])
+
       return result
     end
     private :load_erb_base
     
-    def load_classes(dir, rex)
-      class_names = []
+    def load_anonymous(dir, rex)
+      module_names = []
+      
+      mod = Module.new
       Dir.entries(dir).sort.each do |h|
         next unless h =~ rex
-        require "#{dir}/#{h}"
-        class_names << $1.camelize
+        
+        # create anonymous module.
+        module_name = $1.camelize
+        
+        src = File.read("#{dir}/#{h}")
+        begin
+          mod.module_eval(src, "#{dir}/#{h}")
+        rescue => ex
+          puts 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 class_names
+      
+      return { :module => mod, :names => module_names }
     end
-    private :load_classes
+    private :load_anonymous
 
     def filters(name)
       if @filters[name].nil?
@@ -212,15 +239,16 @@ module SmallCage
       result = {}
       return {} unless @filters_dir.directory?
       
-      load_classes(@filters_dir, %r{([^/]+_filter)\.rb$})
+      filters = load_anonymous(@filters_dir, %r{([^/]+_filter)\.rb$})
       
       config = load_filters_config
       config.each do |filter_type,filter_list|
         result[filter_type] = []
+        smc_module = filters[:module].const_get("SmallCage")
         filter_list.each do |fc|
           fc = { "name" => fc } if fc.is_a? String
-          klass = SmallCage.const_get(fc["name"].camelize)
-          result[filter_type] << klass.new(fc)
+          filter_class = smc_module.const_get(fc["name"].camelize)
+          result[filter_type] << filter_class.new(fc)
         end
       end
       return result

data/lib/smallcage/version.rb

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

data/project/base/_smc/helpers/base_helper.rb

@@ -2,11 +2,18 @@ module SmallCage
   module BaseHelper
     include ERB::Util
 
-    def _glob(relpath, rex)
-      base_dir = Pathname.new(@obj["path"]).parent
-      base_dir = base_dir.join(relpath)
+    def _glob(path, rex)
+      base_dir = nil
+      if path.to_s[0] == ?/
+        base_dir = @obj["dirs"][0]["path"]
+        base_dir = base_dir.join(path[1..-1])
+      else
+        base_dir = @obj["dirs"].last["path"]
+        base_dir = base_dir.join(path)
+      end
 
       entries = Dir.glob("#{base_dir}/**/*")
+      
       result = []
       entries.each do |path|
         result << path if path.to_s =~ rex

data/project/standard/_smc/helpers/base_helper.rb

@@ -0,0 +1,34 @@
+module SmallCage
+  module BaseHelper
+    include ERB::Util
+
+    def _glob(relpath, rex)
+      base_dir = Pathname.new(@obj["path"]).parent
+      base_dir = base_dir.join(relpath)
+
+      entries = Dir.glob("#{base_dir}/**/*")
+      result = []
+      entries.each do |path|
+        result << path if path.to_s =~ rex
+      end
+      return result.sort
+    end
+
+    def _with(o)
+      tmpobj = @obj
+      @obj = o
+      yield
+      @obj = tmpobj
+    end
+    
+    def _load(path)
+      path = Pathname.new(path)
+      @loader.load(path)
+    end
+    
+    def _erb(body)
+      @renderer.render_string(body, @obj)
+    end
+    
+  end
+end

data/project/standard/_smc/templates/footer.rhtml

@@ -1,12 +1,11 @@
 </div>
+</div>
 
-<%= sidebar %>
 
+<div id="footer">
+  <div class="copyright">&copy;<%= Time.now.year %> Site Owner All rights reserved.</div>
 </div>
 
-<div class="footer">
-  <div class="copyright">&copy; 20XX-<%= Time.now.year %> Site Owner All rights reserved.</div>
 </div>
-
 </body>
 </html>

data/project/standard/_smc/templates/header.rhtml

@@ -18,18 +18,20 @@
 <title><% if uri !~ %r{^/index.html$} %><%=h title %> | <% end %>Standard Site Template</title>
 </head>
 <body>
+<div id="container">
+
+<div id="header">
+<h1><a href="/index.html">SmallCage</a></h1>
+<h2>Lightweight CMS Package.</h2>
+<%= menu %>
+</div>
 
-<div class="header">
-<h1><a href="/index.html">Standard Site Template</a></h1>
 
-<div class="topicpath">
+<div id="topicpath">
 <%= topic_path %>
 </div>
-</div>
 
 
-<div class="container">
-
+<div id="main">
 <div class="contents">
-
-<h2><%=h title %></h2>
+<h1><%=h title %></h1>

data/project/standard/_smc/templates/menu.rhtml

@@ -0,0 +1,7 @@
+<div id="menu">
+<ul>
+<li class="<%= menu_active_rex(%r{^/index.html$}) %>"><a href="/index.html">Home</a></li>
+<li class="<%= menu_active("menu1") %>"><a href="/menu1/index.html">Menu 1</a></li>
+<li class="<%= menu_active("menu2") %>"><a href="/menu2/index.html">Menu 2</a></li>
+</ul>
+</div>

data/project/standard/_smc/templates/sidebar.rhtml

@@ -1,9 +1,6 @@
-<div class="sidebar">
+<div id="sidebar">
 <ul>
-<li class="<%= menu_active_rex(%r{^/index.html$}) %>"><a href="/index.html">Home</a></li>
-<li class="<%= menu_active("sample1") %>"><a href="/sample1/index.html">Sample 1</a></li>
-<li class="<%= menu_active("sample2") %>"><a href="/sample2/index.html">Sample 2</a></li>
-<li class="<%= menu_active("dummy") %>"><a href="/dummy/index.html">Dummy</a></li>
-<li class="<%= menu_active("about") %>"><a href="/about/index.html">About</a></li>
+<li class="<%= menu_active("sample2/1") %>"><a href="/sample2/1">First page</a></li>
+<li class="<%= menu_active("sample2/2") %>"><a href="/sample2/2">Second page</a></li>
 </ul>
 </div>

data/project/standard/common/css/default.css

@@ -3,95 +3,131 @@
 * {
   margin: 0;
   padding: 0;
-  font-style: normal;
-  font-weight: normal;
-  text-decoration: none;  
 }
 
-li { 
-  list-style: none; 
+a:link { text-decoration: none; color:#03c; }
+a:visited { text-decoration: none; color:#03c; }
+a:hover { text-decoration: none; color:#fff; background: #03c}
+a:active { text-decoration: none; color:#03c; background: #fff}
+
+body{
+  line-height: 1.7em;
+ font-family:Helvetica, sans-serif;
 }
 
-.header {
-  background: black;
-  color: white;
+#container {
+  height: 100%;
+  min-width:760px;
 }
 
-.header h1 {
-  padding: 1em;
-  text-align: center;
+#header {
+  background: #03c;
+  color: #FFF;
+  overflow: hidden;
+  position: relative;
+  width: 100%;
 }
 
-.header h1 a {
-  color: white;
+#header a:link { text-decoration: none; color:#fff; }
+#header a:visited { text-decoration: none; color:#fff; }
+#header a:hover { text-decoration: none; color:#fff; background: none}
+#header a:active { text-decoration: none; color: none; background: none}
+
+#header h1{
+ font-weight: normal;
+ font-size: 2em;
+ margin: 0.9em 0.9em 0.6em 0.9em;
 }
 
-.header h2 {
-  padding: 0.2em;
+#header h2 {
+  font-size: 1em;
+  font-weight: normal;
+  margin: 0 1.8em 1.8em 1.8em;
 }
 
-.topicpath {
-  background: #EEE;
-  padding: 0.4em;
+#menu{
+  position: absolute;
+  left: 288px;
+  bottom: 1.8em;
 }
 
-.footer {
-  clear: both;
-  background: #EEE;
-  padding: 0.4em;
-  margin-top: 4em;
-  text-align: right;
-  color: #999;
+#menu li{
+  display: inline;
+  padding-right: 1.8em;
+}
+
+#menu a{
+  padding: .6em 1.2em .6em 1.2em;
+}
+
+#menu a:hover{
+  color:#fff; background: #36f
 }
 
-.topicpath .delimiter {
+#menu .active a,
+#menu .active a:active{
+  color:#03c;
+  background: #fff
+}
+
+#topicpath {
+  background: #eee;
+  padding: 0.3em 1.8em 0.3em 1.8em;
+}
+
+#topicpath .delimiter {
   color: black;
-  margin-left: 0.5em;
-  margin-right: 0.5em;
+  margin-left: 0.3em;
+  margin-right: 0.3em;
+  font-size: .8em;
 }
 
-.topicpath a:hover {
-	background: white;
-	color: #600;
+#topicpath a {
+  font-size: .8em;
 }
 
-.container {
-    width: 780px;
-    height: 100%;
+#main {
+  width:100%;
 }
 
-.sidebar {
-	float: left;
-	width: 160px;
-	line-height: 2em;
-	background: #CCC;
-	margin-top: 1px;
+#main .contents {
+  margin-left: 288px;
+  padding: 1.2em 1.8em 1.8em 0;
 }
 
-.sidebar li {
-    border-bottom: solid 1px white;
+#main h1{
+  margin-left: .9em;
+  position: absolute;
+  left: 0;
 }
 
-.sidebar li a {
-    padding: 0.5em;
-    display: block;
+#main h2{
+  font-size: 1.2em;
+  margin-bottom: .3em;
+  font-weight: bold;
 }
 
-.sidebar li a:hover {
-	background: #EEE;
-	color: #600;
+#main h3{
+  font-size: 1em;
+  font-weight: bold;
 }
 
-.sidebar .active {
-  background: yellow;
+#main p{
+  margin-bottom: 1.8em;
 }
 
-.sidebar .active a:hover {
-  background: #FFFFCC;
+#main ul{
+  margin-left: 1.2em;
+}
+
+
+#footer {
+  clear: both;
+  padding: 1.2em 0 1.2em 0;
+  margin-top: 12em;
 }
 
-.contents {
-	float: right;
-	width: 580px;
-	padding: 10px;
+#footer .copyright{
+  margin-left: 288px;
+  font-size: 85%;
 }

data/project/standard/index.html.smc

@@ -1,3 +1,13 @@
 title: Home
 --- |
-<p>Sample Body</p>
+<h2><a href="/menu1/">Menu1</a></h2>
+<p>Sample text.</p>
+
+
+<h2><a href="/menu2/">Menu2</a></h2>
+<p>Sample text. Sample text. Sample text. Sample text. Sample text. Sample text. Sample text. Sample text. Sample text. Sample text. Sample text. Sample text.</p>
+
+<ul>
+	<li><a href="/menu2/1/">Sample1</a></li>
+	<li><a href="/menu2/2/">Sample2</a></li>
+</ul>

data/project/standard/menu1/_dir.smc

@@ -0,0 +1 @@
+topic: Menu1

data/project/standard/menu1/index.html.smc

@@ -0,0 +1,4 @@
+title: Menu1
+--- |
+<h2>Menu1 index</h2>
+<p>Sample text. Sample text. Sample text. Sample text. Sample text. Sample text. Sample text. Sample text. Sample text. Sample text. Sample text. Sample text.</p>

data/project/standard/menu2/1/_dir.smc

@@ -0,0 +1 @@
+topic: 1

data/project/standard/menu2/1/index.html.smc

@@ -0,0 +1,4 @@
+title: Sample1
+--- |
+<p>Sample1</p>
+

data/project/standard/menu2/2/_dir.smc

@@ -0,0 +1 @@
+topic: 2

data/project/standard/{sample2 → menu2/2}/index.html.smc

@@ -1,3 +1,4 @@
 title: Sample2
 --- |
-<p>Sample2 index</p>
+<p>Sample2</p>
+

data/project/standard/menu2/_dir.smc

@@ -0,0 +1 @@
+topic: Menu2

data/project/standard/menu2/index.html.smc

@@ -0,0 +1,8 @@
+title: Menu2
+--- |
+<h2>Menu2 index</h2>
+<ul>
+	<li><a href="./1/">Sample1</a></li>
+	<li><a href="./2/">Sample2</a></li>
+	<li><a href="redirect.html">Redirect to Sample1</a></li>
+</ul>

data/project/standard/menu2/redirect.html.smc

@@ -0,0 +1,2 @@
+template: redirect
+redirect_uri: ./1/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smallcage
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - SAITO Toshihiro
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-21 00:00:00 +09:00
+date: 2008-07-24 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -73,9 +73,11 @@ files:
 - project/relpath/_smc/filters/filters.yml
 - project/relpath/_smc/filters/relpath_filter.rb
 - project/standard/_dir.smc
+- project/standard/_smc/helpers/base_helper.rb
 - project/standard/_smc/helpers/menu_helper.rb
 - 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
@@ -84,12 +86,16 @@ files:
 - project/standard/common/css/default.css
 - project/standard/common/css/print.css
 - project/standard/index.html.smc
-- project/standard/sample1/_dir.smc
-- project/standard/sample1/index.html.smc
-- project/standard/sample1/index2.html.smc
-- project/standard/sample1/redirect.html.smc
-- project/standard/sample2/_dir.smc
-- project/standard/sample2/index.html.smc
+- project/standard/menu1/_dir.smc
+- project/standard/menu1/index.html.smc
+- project/standard/menu1/index2.html.smc
+- project/standard/menu2/1/_dir.smc
+- project/standard/menu2/1/index.html.smc
+- project/standard/menu2/2/_dir.smc
+- project/standard/menu2/2/index.html.smc
+- project/standard/menu2/_dir.smc
+- project/standard/menu2/index.html.smc
+- project/standard/menu2/redirect.html.smc
 - script/destroy
 - script/destroy.cmd
 - script/generate
@@ -139,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: smallcage
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Lightweigt CMS Package.

data/project/standard/sample1/_dir.smc

@@ -1 +0,0 @@
-topic: Sample1

data/project/standard/sample1/index.html.smc

@@ -1,7 +0,0 @@
-title: Sample1
---- |
-<p>First page of sample1.</p>
-
-<p><a href="index2.html">second page</a></p>
-
-<p><a href="redirect.html">redirect sample</a></p>

data/project/standard/sample1/redirect.html.smc

@@ -1,2 +0,0 @@
-template: redirect
-redirect_uri: ./index2.html

data/project/standard/sample2/_dir.smc

@@ -1 +0,0 @@
-topic: Sample2