smallcage 0.2.4 → 0.2.5

data/lib/smallcage/commands/import.rb

@@ -3,7 +3,7 @@ module SmallCage::Commands
     def self.execute(opts)
       self.new(opts).execute
     end
-    
+
     def initialize(opts)
       @opts = opts
       if @opts[:from] == "default"
@@ -11,21 +11,21 @@ module SmallCage::Commands
       end
       @project_dir = Pathname.new(__FILE__) + "../../../../project"
     end
-    
+
     def qp(str = "")
       print str unless @opts[:quiet]
     end
-    
+
     def qps(str = "")
       puts str unless @opts[:quiet]
     end
-    
+
     def execute
       @dest = Pathname.new(@opts[:to])
-      
+
       Dir.mkdir(@dest) unless @dest.exist?
       return unless @dest.directory?
-      
+
       from = @opts[:from].split(/,/)
       from.each do |f|
         qps
@@ -38,7 +38,7 @@ module SmallCage::Commands
         end
       end
     end
-    
+
     def import(from)
       d = @project_dir + from
       return unless d.directory?
@@ -48,7 +48,7 @@ module SmallCage::Commands
       end
       import_entries
     end
-    
+
     def import_external
       @entries = external_entries
       unless @opts[:quiet]
@@ -69,7 +69,7 @@ module SmallCage::Commands
         else
           qps "? /" + e.path
         end
-        
+
         begin
           e.import
         rescue
@@ -77,7 +77,7 @@ module SmallCage::Commands
           qps "F /" + e.path
         end
       end
-      
+
       unless failed.empty?
         qps "FAILED:"
         failed.each do |e|
@@ -101,16 +101,16 @@ module SmallCage::Commands
       return result
     end
     private :local_entries
-    
+
     def external_entries(uri)
       if uri !~ %r{/$}
         uri += "/"
       end
       mfuri = uri + "Manifest.html"
-      
+
       source = open(mfuri) {|io| io.read }
       result = []
-      
+
       files = source.scan(%r{<li><a href="(./[^"]+)">(./[^<]+)</a></li>}) #"
       files.each do |f|
         raise "illegal path:#{f[0]},#{f[1]}" if f[0] != f[1]
@@ -122,14 +122,14 @@ module SmallCage::Commands
         e.to = @dest + path
         result << e
       end
-      
+
       return result
     end
     private :external_entries
-    
+
     def confirm_entries
       overwrite = []
-      
+
       qps "Create:"
       @entries.each do |e|
         if e.overwrite?
@@ -139,7 +139,7 @@ module SmallCage::Commands
         end
       end
       qps
-      
+
       unless overwrite.empty?
         qps "Overwrite:"
         overwrite.each do |e|
@@ -147,11 +147,11 @@ module SmallCage::Commands
         end
         qps
       end
-      
+
       return y_or_n("Import these files?[Yn]: ", true)
     end
     private :confirm_entries
-    
+
     def y_or_n(prompt, default)
       loop do
         print prompt
@@ -166,8 +166,7 @@ module SmallCage::Commands
       end
     end
     private :y_or_n
-    
-    
+
     class ImportEntry
       attr_accessor :path, :from, :to
 
@@ -178,19 +177,19 @@ module SmallCage::Commands
           copy_local
         end
       end
-      
+
       def external?
         from.to_s =~ %r{^https?://}
       end
-      
+
       def exist?
         to.exist?
       end
-      
+
       def overwrite?
         to.file?
       end
-      
+
       def copy_local
         if from.directory?
           FileUtils.makedirs(to)
@@ -200,7 +199,7 @@ module SmallCage::Commands
         end
       end
       private :copy_local
-      
+
       def copy_external
         if from =~ %r{/$}
           FileUtils.makedirs(to)
@@ -211,7 +210,6 @@ module SmallCage::Commands
         end
       end
       private :copy_external
-      
     end
   end
 end

data/lib/smallcage/commands/manifest.rb

@@ -3,11 +3,11 @@ module SmallCage::Commands
     def self.execute(opts)
       self.new(opts).execute
     end
-    
+
     def initialize(opts)
       @opts = opts
     end
-    
+
     def execute
       entries = []
       root = Pathname.new(@opts[:path])
@@ -16,7 +16,7 @@ module SmallCage::Commands
           entries << f
         end
       end
-      
+
       tmp = []
       entries.each do |f|
         path = root + f
@@ -28,7 +28,7 @@ module SmallCage::Commands
         tmp << f
       end
       entries = tmp
-      
+
       template = File.dirname(__FILE__) + "/../resources/Manifest.erb"
       source = ERB.new(File.read(template), nil, "-").result(binding)
       open(root + "Manifest.html", "w") do |io|

data/lib/smallcage/commands/server.rb

@@ -3,13 +3,13 @@ module SmallCage::Commands
     def self.execute(opts)
       document_root = opts[:path]
       port = opts[:port]
-      
+
       server = SmallCage::HTTPServer.new(document_root, port)
-      
+
       sighandler = Proc.new {|signal| server.shutdown}
       SmallCage::Application.add_signal_handler(["INT", "TERM"], sighandler)
 
-      server.start    
+      server.start
     end
   end
-end
+end

data/lib/smallcage/commands/update.rb

@@ -5,18 +5,18 @@ module SmallCage::Commands
     def self.execute(opts)
       self.new(opts).execute
     end
-    
+
     def initialize(opts)
       @opts = opts
     end
-    
+
     def execute
       start = Time.now
       target = Pathname.new(@opts[:path])
       unless target.exist?
         raise "target directory or file does not exist.: " + target.to_s
       end
-      
+
       @loader   = Loader.new(target)
       @renderer = Renderer.new(@loader)
       @list     = UpdateList.create(@loader.root, target)
@@ -91,7 +91,7 @@ module SmallCage::Commands
       end
     end
     private :render_multi
-    
+
     def after_rendering_filters(obj, result)
       filters = @loader.filters("after_rendering_filters")
       filters.each do |f|
@@ -107,6 +107,5 @@ module SmallCage::Commands
       end
     end
     private :output_result
-
   end
 end

data/lib/smallcage/commands/uri.rb

@@ -4,17 +4,17 @@ module SmallCage::Commands
     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
@@ -38,7 +38,6 @@ module SmallCage::Commands
     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|
@@ -51,6 +50,5 @@ module SmallCage::Commands
       end
     end
     private :print_uri_templates
-
   end
 end

data/lib/smallcage/document_path.rb

@@ -1,8 +1,7 @@
 module SmallCage
   class DocumentPath
-    
     attr_reader :root, :uri, :path
-    
+
     def initialize(root, path)
       @root = Pathname.new(root).realpath
 
@@ -12,27 +11,27 @@ module SmallCage
       else
         @path = @path.cleanpath
       end
-      
+
       if @path.to_s[0...@root.to_s.length] != @root.to_s
         raise "Illegal path: #{path.to_s}"
       end
-      
+
       if @path == @root
         @uri = "/"
       else
         @uri = @path.to_s[@root.to_s.length .. -1]
       end
     end
-    
+
     def smc?
       return @path.extname == ".smc"
     end
-    
+
     def outfile
       return nil unless smc?
       return self.class.new(@root, @path.to_s[0 .. -5])
     end
-    
+
     def outuri
       return nil unless smc?
       return uri[0 .. -5]
@@ -64,7 +63,5 @@ module SmallCage
 
       return obj
     end
-
-
   end
 end

data/lib/smallcage/http_server.rb

@@ -2,7 +2,7 @@ require 'webrick'
 
 module SmallCage
   class HTTPServer
-  
+
     def initialize(document_root, port)
       # logger = WEBrick::Log.new(nil, 1)
       @server = WEBrick::HTTPServer.new({
@@ -17,19 +17,19 @@ module SmallCage
       @server.mount("/_smc/update_uri", UpdateUriServlet)
       @server.mount("/_smc/auto", AutoServlet)
     end
-    
+
     def start
       @server.start
     end
-    
+
     def shutdown
       @server.shutdown
     end
-    
+
     def updated_uri=(uri)
       UpdateUriServlet.uri = uri
     end
-    
+
     def reload
       UpdateUriServlet.uri = ":reload"
     end
@@ -39,21 +39,20 @@ module SmallCage
   class UpdateUriServlet < WEBrick::HTTPServlet::AbstractServlet
     @@uri = "/index.html"
     @@update_time = ""
-  
+
     def do_GET(req, res)
       res['content-type'] = "text/plain"
       res.body = @@uri + "\n" + @@update_time
     end
-    
+
     def self.uri=(uri)
       @@uri = uri
       update_time
     end
-    
+
     def self.update_time
       @@update_time = Time.now.to_s
     end
-    
   end
 
   class AutoServlet < WEBrick::HTTPServlet::AbstractServlet
@@ -63,4 +62,4 @@ module SmallCage
       res.body = File.read(html)
     end
   end
-end
+end

data/lib/smallcage/loader.rb

@@ -6,12 +6,12 @@ module SmallCage
     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.chomp('/'))
-      target = real_target(target) 
+      target = real_target(target)
 
       @target = target # absolute
       @root = self.class.find_root(target) # absolute
@@ -34,7 +34,7 @@ module SmallCage
       end
       raise "Root not found: #{path}"
     end
-  
+
     def load(path)
       raise "Not found: #{path}" unless path.exist?
 
@@ -42,7 +42,7 @@ module SmallCage
 
       if path.file?
         return load_smc_file(docpath)
-      else 
+      else
         return load_dir_prop(docpath)
       end
     end
@@ -52,7 +52,7 @@ module SmallCage
 
       result = create_base_smc_object(docpath.outfile.path, docpath.path,
                                       docpath.outuri,       docpath.uri)
-      
+
       result["template"] = DEFAULT_TEMPLATE
       result["dirs"]     = load_dirs(docpath.path)
 
@@ -82,7 +82,7 @@ module SmallCage
       return result
     end
     private :load_dir_prop
-    
+
     def create_base_smc_object(path_out, path_smc, uri_out, uri_smc)
       result = {}
       result["arrays"]   = []
@@ -139,7 +139,7 @@ module SmallCage
       return nil unless result.file?
       return result
     end
-    
+
     def each_smc_obj
       each_smc_file do |path|
         next if path.directory?
@@ -149,7 +149,7 @@ module SmallCage
         yield obj
       end
     end
-    
+
     def each_smc_file
       if @target.directory?
         path = Pathname.new(@target)
@@ -162,7 +162,7 @@ module SmallCage
         yield @target
       end
     end
-    
+
     def each_not_smc_file
       if @target.directory?
         path = Pathname.new(@target)
@@ -181,10 +181,10 @@ module SmallCage
         yield DocumentPath.new(@root, @target)
       end
     end
-    
+
     def real_target(target)
       return target.realpath if target.directory?
-      return target.realpath if target.file? and target.to_s =~ /\.smc$/ 
+      return target.realpath if target.file? and target.to_s =~ /\.smc$/
 
       tmp = Pathname.new(target.to_s + ".smc")
       return tmp.realpath if tmp.file?
@@ -192,8 +192,7 @@ module SmallCage
       raise "Target not found: " + target.to_s
     end
     private :real_target
-    
-    
+
     def load_erb_base
       result = Class.new(ErbBase)
       class << result
@@ -205,41 +204,13 @@ module SmallCage
           end
         end
       end
-      
-      helpers = load_anonymous(@helpers_dir, %r{([^/]+_helper)\.rb$})
+
+      helpers = SmallCage::AnonymousLoader.load(@helpers_dir, %r{([^/]+_helper)\.rb\z})
       result.include_helpers(helpers[:module], helpers[:names])
 
       return result
     end
     private :load_erb_base
-    
-    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
-        
-        # create anonymous module.
-        module_name = $1.camelize
-        
-        src = File.read("#{dir}/#{h}")
-        begin
-          mod.module_eval(src, "#{dir}/#{h}")
-        rescue => ex
-          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 result
-    end
-    private :load_anonymous
 
     def filters(name)
       if @filters[name].nil?
@@ -247,14 +218,14 @@ module SmallCage
       end
       return @filters[name]
     end
-    
+
     def load_filters
       result = {}
       return {} unless @filters_dir.directory?
-      
-      filter_modules = load_anonymous(@filters_dir, %r{([^/]+_filter)\.rb$})
+
+      filter_modules = SmallCage::AnonymousLoader.load(@filters_dir, %r{([^/]+_filter)\.rb\z})
       smc_module = filter_modules[:module].const_get("SmallCage")
-      
+
       load_filters_config.each do |filter_type,filter_list|
         result[filter_type] = []
         filter_list.to_a.each do |fc|
@@ -273,6 +244,5 @@ module SmallCage
       return YAML.load(path.read()) || {}
     end
     private :load_filters_config
-    
   end
 end