smallcage 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24a1fa9291e27aa8accda9f6a2f59110ed2e85e6
-  data.tar.gz: eef2ad497718133501587a57a06b6444a047988f
+  metadata.gz: 0dffbb6fce3a9475d63031e493df9fca89882db8
+  data.tar.gz: d74db6f35ee176c826eca45cb4ad466a76a54f75
 SHA512:
-  metadata.gz: 30db05e645ca960f444d8a9f23fc1e724199e053cc29ccfe1e69cb03117f4e08d1d6f02daff9bbd60cd44a77fc513e9f46b6ca2c1691c9598d899957781b8760
-  data.tar.gz: 1c9dbed249dc5512594639aa1600721c72760186b47b3819feb5fa5b628f943090871fa261c2f9962b7818cbd9f64de95a0877ed53d2f4e75a38308b6acf7172
+  metadata.gz: 1bfeb6c9c749416e15a47cd3d520530aa36fd4384bb91fcfae8b317ae2f1090e79734f16523b95b256241d0090dc1f7375026268d5fe437bfabf17efcfa58463
+  data.tar.gz: 9106bd451c8b31d2948fcb56ce78b0cdd8987aeddd5c2fc2c4f815d6ea122362f283f20d8a755fb2e4195120010c77e0b26b618c0f9bc980e4c5ecf1f53ddb1d

data/lib/smallcage/commands/update.rb

@@ -47,8 +47,14 @@ module SmallCage::Commands
     private :expire_old_files
 
     def render_smc_files
-      @loader.each_smc_obj do |obj|
-        render_smc_obj(obj)
+      if @opts[:fast]
+        @loader.each_smc_obj_using_target_template(@list) do |obj|
+          render_smc_obj(obj)
+        end
+      else
+        @loader.each_smc_obj do |obj|
+          render_smc_obj(obj)
+        end
       end
     end
     private :render_smc_files
@@ -67,10 +73,11 @@ module SmallCage::Commands
       mark = obj['path'].exist? ? 'U ' : 'A '
       mtime ||= obj['path'].smc.stat.mtime.to_i
 
-      if @opts[:fast]
+      # Do not skip if the target is file.
+      if @opts[:fast] && @loader.dir_target && !@loader.target_template
         last_mtime = @list.mtime(obj['uri'].smc)
         if mtime == last_mtime
-          @list.update(obj['uri'].smc, mtime, String.new(obj['uri']))
+          @list.update(obj['uri'].smc, mtime, String.new(obj['uri']), obj['template'])
           return
         end
       end
@@ -81,7 +88,7 @@ module SmallCage::Commands
       puts mark + obj['uri'] unless @opts[:quiet]
 
       # create new uri String to remove smc instance-specific method.
-      @list.update(obj['uri'].smc, mtime, String.new(obj['uri']))
+      @list.update(obj['uri'].smc, mtime, String.new(obj['uri']), obj['template'])
     end
     private :render_single
 

data/lib/smallcage/loader.rb

@@ -10,14 +10,18 @@ module SmallCage
     LOCAL_PROP_FILE  = '_local.smc'
     MAX_DEPTH = 100
 
-    attr_reader :root, :target, :erb_base
+    attr_reader :root, :target, :erb_base, :target_template, :dir_target
 
     def initialize(target)
-      target = Pathname.new(target.to_s.strip.chomp('/'))
-      target = real_target(target)
-
-      @target = target # absolute
-      @root = self.class.find_root(target) # absolute
+      target = target.to_s.strip.chomp('/')
+      if target.to_s =~ %r{(.*/|\A)_smc/templates/((?:.+/)?(?:[^/]+))\.rhtml\z}
+        target = Regexp.last_match[1]
+        target = '.' if target == ''
+        @target_template = Regexp.last_match[2]
+      end
+      @target = real_target(Pathname.new(target))
+      @dir_target = @target.directory?
+      @root = self.class.find_root(@target) # absolute
       @templates_dir = @root + '_smc/templates'
       @helpers_dir = @root + '_smc/helpers'
       @filters_dir = @root + '_smc/filters'
@@ -27,7 +31,7 @@ module SmallCage
 
     # return root dir Pathname object.
     def self.find_root(path, depth = MAX_DEPTH)
-      fail "Not found: #{ path }" unless path.exist?
+      fail "Not found: #{path}" unless path.exist?
       d = path.realpath
       d = d.parent if d.file?
       loop do
@@ -35,11 +39,11 @@ module SmallCage
         break if d.root? || (depth -= 1) <= 0
         d = d.parent
       end
-      fail "Root not found: #{ path }"
+      fail "Root not found: #{path}"
     end
 
     def load(path)
-      fail "Not found: #{ path }" unless path.exist?
+      fail "Not found: #{path}" unless path.exist?
 
       docpath = DocumentPath.new(@root, path)
 
@@ -51,7 +55,7 @@ module SmallCage
     end
 
     def load_smc_file(docpath)
-      fail "Path is not smc file: #{ docpath }" unless docpath.smc?
+      fail "Path is not smc file: #{docpath}" unless docpath.smc?
 
       result = create_base_smc_object(docpath.outfile.path, docpath.path,
                                       docpath.outuri,       docpath.uri)
@@ -106,7 +110,7 @@ module SmallCage
         obj = YAML.load_stream(source)
         return result if obj.nil?
       rescue => e
-        raise "Can't load file: #{ path } / #{ e }"
+        raise "Can't load file: #{path} / #{e}"
       end
       obj.documents.each do |o|
         case o
@@ -114,7 +118,7 @@ module SmallCage
           result.merge!(o)
         when Array
           result['arrays'] ||= []
-          result['arrays']  << o
+          result['arrays'] << o
         else
           result['strings'] ||= []
           result['strings'] << o.to_s
@@ -138,7 +142,7 @@ module SmallCage
     end
 
     def template_path(name)
-      result = @templates_dir + "#{ name }.rhtml"
+      result = @templates_dir + "#{name}.rhtml"
       return nil unless result.file?
       result
     end
@@ -149,6 +153,8 @@ module SmallCage
         next if path.basename.to_s == DIR_PROP_FILE
         next if path.basename.to_s == LOCAL_PROP_FILE
         obj = load(path)
+        next if @target_template && obj['template'] != @target_template
+
         yield obj
       end
     end
@@ -185,6 +191,18 @@ module SmallCage
       end
     end
 
+    # When the target is template, try to find source using the template.
+    def each_smc_obj_using_target_template(list, &block)
+      return each_smc_obj(&block) unless @target_template
+
+      list.filter_by_template(@target_template).each do |path|
+        path = @root + path[1..-1]
+        next unless path.file?
+        obj = load(path)
+        yield obj
+      end
+    end
+
     def real_target(target)
       return target.realpath if target.directory?
       return target.realpath if target.file? && target.to_s =~ /\.smc$/
@@ -208,7 +226,7 @@ module SmallCage
         end
       end
 
-      helpers = SmallCage::AnonymousLoader.load(@helpers_dir, /([^\/]+_helper)\.rb\z/)
+      helpers = SmallCage::AnonymousLoader.load(@helpers_dir, %r{([^/]+_helper)\.rb\z})
       result.include_helpers(helpers[:module], helpers[:names])
 
       result
@@ -223,7 +241,7 @@ module SmallCage
       result = {}
       return {} unless @filters_dir.directory?
 
-      filter_modules = SmallCage::AnonymousLoader.load(@filters_dir, /([^\/]+_filter)\.rb\z/)
+      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|

data/lib/smallcage/update_list.rb

@@ -81,28 +81,37 @@ module SmallCage
       item['mtime'].to_i
     end
 
-    def update(srcuri, mtime, dsturi)
-      update_list(srcuri, mtime, dsturi)
+    def filter_by_template(template)
+      result = []
+      @src_item_map.each do |src, item|
+        result << src if item['template'] == template
+      end
+      result
+    end
+
+    def update(srcuri, mtime, dsturi, template = nil)
+      update_list(srcuri, mtime, dsturi, template)
       stop_expiration(srcuri, dsturi)
       @update_count += 1
     end
 
-    def update_list(srcuri, mtime, dsturi)
-      add_list_item(srcuri, mtime, dsturi) unless update_list_item(srcuri, mtime, dsturi)
+    def update_list(srcuri, mtime, dsturi, template)
+      add_list_item(srcuri, mtime, dsturi, template) unless update_list_item(srcuri, mtime, dsturi, template)
     end
     private :update_list
 
-    def update_list_item(srcuri, mtime, dsturi)
+    def update_list_item(srcuri, mtime, dsturi, template)
       return false unless @src_item_map[srcuri]
       item = @src_item_map[srcuri]
       item['mtime'] = mtime.to_i
+      item['template'] = template if template
       item['dst'] << dsturi unless item['dst'].include?(dsturi)
       true
     end
     private :update_list_item
 
-    def add_list_item(srcuri, mtime, dsturi)
-      item = { 'src' => srcuri, 'dst' => [dsturi], 'mtime' => mtime.to_i }
+    def add_list_item(srcuri, mtime, dsturi, template)
+      item = { 'src' => srcuri, 'dst' => [dsturi], 'mtime' => mtime.to_i, 'template' => template }
       @src_item_map[srcuri] = item
       @yaml['list'] << item
     end

data/lib/smallcage/version.rb

@@ -1,3 +1,3 @@
 module SmallCage #:nodoc:
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smallcage
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - SAITO Toshihiro
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies: []
 description: SmallCage is a simple, but powerful website generator. It converts content
   and template files, which has common elements in a website, to a plain, static website.