smallcage 0.1.8 → 0.1.9

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.9 2009-11-09
+
+* add uri command.
+
 == 0.1.8 2009-11-05
 
 * add URI template feature.

data/README.rdoc

@@ -1,4 +1,4 @@
-= SmallCage -- Lightweigt CMS Package.
+= SmallCage -- simple website generator
 
 
 == Installation
@@ -12,7 +12,7 @@ If successfully installed, smc command will be available.
 
   $ smc
   Usage: smc <subcommand> [options]
-  SmallCage 0.1.5 - Lightweight CMS Package.
+  SmallCage 0.1.9 - simple website generator
   Subcommands are:
       update [path]                    Build smc contents.
       clean  [path]                    Remove files generated from *.smc source.

data/Rakefile

@@ -1,18 +1,45 @@
+require 'rubygems'
+require 'rake'
+
 begin
   require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "smallcage"
-    gemspec.summary = "Lightweight CMS package."
-    gemspec.description = "Lightweight CMS package."
-    gemspec.email = "smallcage@googlegroups.com"
-    gemspec.homepage = "http://www.smallcage.org"
-    gemspec.authors = ["SAITO Toshihiro", "gommmmmm", "KOSEKI Kengo"]
-    gemspec.rubyforge_project = 'smallcage'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "smallcage"
+    gem.summary = "Lightweight CMS package."
+    gem.description = "Lightweight CMS package."
+    gem.email = "smallcage@googlegroups.com"
+    gem.homepage = "http://www.smallcage.org"
+    gem.authors = ["SAITO Toshihiro", "gommmmmm", "KOSEKI Kengo"]
+    gem.add_development_dependency "rspec", ">= 1.2.9"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-  end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "smallcage #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/lib/smallcage/application.rb

@@ -1,6 +1,6 @@
 class SmallCage::Application
   require 'optparse'
-  VERSION_NOTE = "SmallCage #{SmallCage::VERSION::STRING} - Lightweight CMS Package."
+  VERSION_NOTE = "SmallCage #{SmallCage::VERSION::STRING} - simple website generator"
   
   @@signal_handlers = nil
 
@@ -53,6 +53,7 @@ Subcommands are:
     auto   [path] [port]             Start auto update server.
     import [name|uri]                Import project.
     export [path] [outputpath]       Export project.
+    uri    [path]                    Print URIs.
     manifest [path]                  Generate Manifest.html file.
 
 Options are:
@@ -89,6 +90,7 @@ BANNER
       :import => "smc import [name|uri]",
       :export => "smc export [path] [outputpath]",
       :help   => "smc help [command]\n",
+      :uri    => "smc uri [path]\n",
     }
   
     banners.each do |k,v|
@@ -151,6 +153,9 @@ BANNER
       @options[:path] = ARGV.shift
       @options[:path] ||= "."
       @options[:out] = ARGV.shift
+    elsif @options[:command] == :uri
+      @options[:path] = ARGV.shift
+      @options[:path] ||= "."
     elsif @options[:command] == :manifest
       @options[:path] = ARGV.shift
       @options[:path] ||= "."

data/lib/smallcage/commands/uri.rb

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

data/lib/smallcage/runner.rb

@@ -44,8 +44,13 @@ module SmallCage
       SmallCage::Commands::Export.execute(@opts)
     end
 
+    def uri
+      require_command "uri"
+      SmallCage::Commands::Uri.execute(@opts)
+    end
+
     def require_command(name)
       require "smallcage/commands/#{name}.rb"
     end
   end
-end
+end

data/lib/smallcage/version.rb

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

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

@@ -22,7 +22,7 @@
 
 <div id="header">
 	<h1 class="site_title"><a href="/index.html">SmallCage</a></h1>
-	<h2 class="description">Lightweight CMS Package.</h2>
+	<h2 class="description">simple website generator</h2>
 <%= menu %>
 </div>
 

data/smallcage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smallcage}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   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.date = %q{2009-11-09}
   s.default_executable = %q{smc}
   s.description = %q{Lightweight CMS package.}
   s.email = %q{smallcage@googlegroups.com}
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "lib/smallcage/commands/manifest.rb",
      "lib/smallcage/commands/server.rb",
      "lib/smallcage/commands/update.rb",
+     "lib/smallcage/commands/uri.rb",
      "lib/smallcage/document_path.rb",
      "lib/smallcage/erb_base.rb",
      "lib/smallcage/http_server.rb",
@@ -126,6 +127,7 @@ Gem::Specification.new do |s|
      "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/index.html.smc",
      "spec/data/multifiles/items/index.html.smc",
      "spec/data/updatelists/list1.yml",
      "spec/document_path_spec.rb",
@@ -138,12 +140,12 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/update_list_spec.rb",
-     "spec/update_spec.rb"
+     "spec/update_spec.rb",
+     "spec/uri_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 = [
@@ -156,7 +158,8 @@ Gem::Specification.new do |s|
      "spec/smallcage_spec.rb",
      "spec/spec_helper.rb",
      "spec/update_list_spec.rb",
-     "spec/update_spec.rb"
+     "spec/update_spec.rb",
+     "spec/uri_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -164,9 +167,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end
 

data/spec/data/multifiles/_smc/templates/items.uri.rhtml

@@ -1,4 +1,4 @@
-<%- 10.times do |i| -%>
+<%- 5.times do |i| -%>
 items-<%= "%03d" % i %>.html
 <%- end -%>
 

data/spec/data/multifiles/index.html.smc

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

data/spec/spec_helper.rb

@@ -1,4 +1,9 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-
-require 'rubygems'
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'smallcage'
 require 'spec'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
+
+end

data/spec/uri_spec.rb

@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'smallcage/commands/uri'
+
+describe SmallCage::Commands::Uri do
+  it "should prints all uris" do
+    path = Pathname.new(File.dirname(__FILE__) + "/data/multifiles")
+
+    old_stdout = $stdout
+    begin
+      $stdout = StringIO.new
+      opts = { :command => "uri", :path => path.to_s }
+      SmallCage::Runner.run(opts)
+      $stdout.string.should == <<EOT
+/index.html
+/items/items-000.html
+/items/items-001.html
+/items/items-002.html
+/items/items-003.html
+/items/items-004.html
+
+/items/items-after-emptyline.html
+EOT
+    ensure
+      $stdout = old_stdout
+    end
+  end
+
+  it "should prints partial uris" do
+    path = Pathname.new(File.dirname(__FILE__) + "/data/multifiles")
+
+    old_stdout = $stdout
+    begin
+      $stdout = StringIO.new
+      opts = { :command => "uri", :path => path.to_s + "/index.html.smc" }
+      SmallCage::Runner.run(opts)
+      $stdout.string.should == <<EOT
+/index.html
+EOT
+
+      $stdout = StringIO.new
+      opts = { :command => "uri", :path => path.to_s + "/items/index.html.smc"}
+      SmallCage::Runner.run(opts)
+      $stdout.string.should == <<EOT
+/items/items-000.html
+/items/items-001.html
+/items/items-002.html
+/items/items-003.html
+/items/items-004.html
+
+/items/items-after-emptyline.html
+EOT
+      
+    ensure
+      $stdout = old_stdout
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smallcage
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - SAITO Toshihiro
@@ -11,10 +11,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 +09:00
+date: 2009-11-09 00:00:00 +09:00
 default_executable: smc
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
 description: Lightweight CMS package.
 email: smallcage@googlegroups.com
 executables: 
@@ -41,6 +50,7 @@ files:
 - lib/smallcage/commands/manifest.rb
 - lib/smallcage/commands/server.rb
 - lib/smallcage/commands/update.rb
+- lib/smallcage/commands/uri.rb
 - lib/smallcage/document_path.rb
 - lib/smallcage/erb_base.rb
 - lib/smallcage/http_server.rb
@@ -132,6 +142,7 @@ files:
 - 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/index.html.smc
 - spec/data/multifiles/items/index.html.smc
 - spec/data/updatelists/list1.yml
 - spec/document_path_spec.rb
@@ -145,6 +156,7 @@ files:
 - spec/spec_helper.rb
 - spec/update_list_spec.rb
 - spec/update_spec.rb
+- spec/uri_spec.rb
 has_rdoc: true
 homepage: http://www.smallcage.org
 licenses: []
@@ -168,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: smallcage
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
@@ -184,3 +196,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/update_list_spec.rb
 - spec/update_spec.rb
+- spec/uri_spec.rb