mustache_render 0.0.7 → 0.0.9

data/lib/generators/mustache_render/install/templates/config/initializers/mustache_render.rb

@@ -9,17 +9,43 @@ MustacheRender.configure do |config|
   config.file_template_root_path = "#{Rails.root}/app/templates"
 
   # 默认的文件模板的扩展名称
-  config.file_template_extension = 'mustache'
+  config.file_template_extension = '.mustache'
 
-  # 当模板缺少的时候是否抛出异常
+  # 默认的数据模板的扩展名称
+  config.db_template_extension   = '.mustache'
+
+  # 当字段缺少的时候是否抛出异常
   config.raise_on_context_miss   = false
 
+  # 当数据库模板不存在时候是否抛出异常
+  config.raise_on_db_template_miss   = true
+
+  # 当文件模板不存在时候是否抛出异常
+  config.raise_on_file_template_miss = true
+
+  ### 模板的相关配置 ###########################
+  # 数据库模板是否需要缓存
+  config.db_template_cache   = true
+  # 文件模板是否需要缓存
+  config.file_template_cache = false
+  # 数据库模板缓存过期时间
+  config.db_template_cache_expires_in   = 1.hours
+  # 文件模板缓存的过期时间, 注意文件系统没有自动清理缓存的机制，建议设置的短一些
+  config.file_template_cache_expires_in = 1.minutes
+  # 缓存的媒介
+  config.cache_store                    = Rails.cache
+
+  # 版本适配器的配置
   config.adapter_configure do |adapter|
 
   end
 
+  # 管理中心是否需要登录
   config.manage_center_need_login      = true
+  # 用户登录的url
   config.user_login_url             = '/login'
+  # 管理员登录失败后跳往的URL
   config.manager_authenticate_fail_url = '/login'
+
 end
 

data/lib/mustache_render/config.rb

@@ -25,7 +25,7 @@ module MustacheRender
     # 默认的渲染媒介
     #
     def default_render_media
-      @default_render_media ||= :db
+      @default_render_media ||= :file
     end
 
     def default_render_media= media
@@ -48,6 +48,69 @@ module MustacheRender
       @user_login_url ||= url
     end
 
+    def cache
+      return @_cache_store if defined?(@_cache_store)
+
+      @_cache_store ||= Rails.cache
+      # @_cache_store ||= MemCache.new('localhost:11211', :namespace => 'mustache_render#cache')
+    end
+
+    def cache_store= cache_store
+      @_cache_store ||= cache_store
+    end
+
+    #
+    # 是否开启缓存
+    #
+    def db_template_cache?
+      if defined?(@_db_template_cache)
+        @_db_template_cache
+      else
+        true
+      end
+    end
+
+    #
+    # 是否开启缓存
+    #
+    def file_template_cache?
+      if defined?(@_file_template_cache)
+        @_file_template_cache
+      else
+        false
+      end
+    end
+
+    #
+    # 设置是否启用缓存
+    #
+    def db_template_cache= user_cache
+      @_db_template_cache = user_cache unless defined?(@_db_template_cache)
+    end
+
+    #
+    # 设置是否启用缓存
+    #
+    def file_template_cache= user_cache
+      @_file_template_cache = user_cache unless defined?(@_file_template_cache)
+    end
+
+    def db_template_cache_expires_in
+      @db_template_cache_expires_in ||= 1.hours
+    end
+
+    def file_template_cache_expires_in
+      @file_template_cache_expires_in ||= 5.minutes
+    end
+
+    def db_template_cache_expires_in= expires_in
+      @db_template_cache_expires_in ||= expires_in
+    end
+
+    def file_template_cache_expires_in= expires_in
+      @file_template_cache_expires_in ||= expires_in
+    end
+
     def manage_center_need_login?
       if defined?(@manage_center_need_login)
         @manage_center_need_login
@@ -76,20 +139,46 @@ module MustacheRender
       @file_template_root_path ||= path
     end
 
+    def db_template_extension
+      @db_template_extension ||= '.mustache'
+    end
+
+    def db_template_extension= name
+      @db_template_extension ||= name
+    end
+
     def file_template_extension
-      @file_template_extension ||= 'mustache'
+      @file_template_extension ||= '.mustache'
     end
 
     def file_template_extension= name
       @file_template_extension ||= name
     end
 
+    # 是否抛出文件模板丢失的异常？
+    def raise_on_file_template_miss= _bool
+      @raise_on_file_template_miss = _bool unless defined?(@raise_on_file_template_miss)
+    end
+
+    def raise_on_file_template_miss?
+      defined?(@raise_on_file_template_miss) ? @raise_on_file_template_miss : true
+    end
+
+    # 是否抛出数据库模板miss的异常
+    def raise_on_db_template_miss= _bool
+      @raise_on_db_template_miss = _bool unless defined?(@raise_on_db_template_miss)
+    end
+
+    def raise_on_db_template_miss?
+      defined?(@raise_on_db_template_miss) ? @raise_on_db_template_miss : true
+    end
+
     def raise_on_context_miss?
       defined?(@raise_on_context_miss) ? @raise_on_context_miss : false
     end
 
-    def raise_on_context_miss=(boolean)
-      @raise_on_context_miss = boolean
+    def raise_on_context_miss=(_bool)
+      @raise_on_context_miss = _bool unless defined?(@raise_on_context_miss)
     end
 
     def manage_view_base

data/lib/mustache_render/models/mustache_render_template_mixin.rb

@@ -20,11 +20,16 @@ module MustacheRender::Models
         validates_presence_of   :folder_id
         validates_presence_of   :name
         validates_presence_of   :change_log, :if => Proc.new { |r| !(r.new_record?) }
+        validates_uniqueness_of :name, :scope => [:folder_id, :name]
 
         validate do |r|
           r.errors.add :change, '没有改动' if !(r.new_record?) && !(r.changed?)
         end
 
+        before_save do |r|
+          ::MustacheRender::Mustache.delete_partial_cache(r.full_path_was, :db)
+        end
+
         extend  ClassMethods
         include InstanceMethods
       end
@@ -38,12 +43,27 @@ module MustacheRender::Models
         # 首先获取文件夹的名称, 然后获取文件名
         tmp_paths = name.to_s.split('/')
 
-        template_name = tmp_paths.pop.to_s
+        template_name = ::MustacheRender::Mustache.generate_template_name(
+          tmp_paths.pop.to_s,
+          ::MustacheRender.config.db_template_extension
+        )
 
         folder_full_path = "#{tmp_paths.join('/')}"
+
+        # 需要以 / 开头，此处fix一下这里
+        unless folder_full_path.start_with?('/')
+          folder_full_path = "/#{folder_full_path}"
+        end
+
         folder = ::MustacheRenderFolder.find_by_full_path(folder_full_path)
 
-        self.find_by_folder_id_and_name(folder.try(:id), template_name)
+        template = self.find_by_folder_id_and_name(folder.try(:id), template_name)
+
+        if ::MustacheRender.config.raise_on_db_template_miss? && template.nil?
+          raise ::MustacheRender::Mustache::TemplateMiss.new("read db template error: folder_full_path -> #{folder_full_path} template_name: #{template_name}")
+        end
+
+        template
       end
     end
 

data/lib/mustache_render/mustache.rb

@@ -19,18 +19,23 @@ module MustacheRender
     end
 
     def render(data = template, ctx = {})
-      tpl = templateify(data)
- 
-      return tpl.render(context) if ctx == {}
+      self.template = data
+
+      return self.template.render(context) if ctx == {}
 
       begin
         context.push(ctx)
-        tpl.render(context)
+        self.template.render(context)
       ensure
         context.pop
       end
     end
 
+    # 片段树
+    def partials_tree
+      
+    end
+
     # Context accessors.
     #
     # view = Mustache.new
@@ -74,13 +79,68 @@ module MustacheRender
       render(partial(full_path), context)
     end
 
-    def read_template_from_meida name
+    def impl_read_db_template name
+      db_template = ::MustacheRenderTemplate.find_with_full_path(name)
+      db_template.try :content
+    end
+
+    def self.generate_template_name(name, template_extension)
+      # 如果路径中以扩展名结尾，则直接去取这个文件
+      name = name.to_s.strip
+
+      if name.start_with?('/')
+        name = name[1..-1]
+      end
+
+      if name.end_with?(template_extension)
+        "#{name}"
+      else
+        "#{name}#{template_extension}"
+      end
+    end
+
+    def impl_read_file_template name
+      # TODO: 对路径的语法需要加强
+      full_path = "#{config.file_template_root_path}/#{self.class.generate_template_name(name, config.file_template_extension)}"
+      begin
+        File.read full_path
+      rescue
+        if config.raise_on_file_template_miss?
+          raise ::MustacheRender::Mustache::TemplateMiss.new("read file template error: #{full_path}")
+        else
+          ''
+        end
+      end
+    end
+
+    def read_template_from_media name, media
+      # puts "read_template_from_media: #{name} #{media}"
       case media
       when :db
-        db_template = ::MustacheRenderTemplate.find_with_full_path(name)
-        db_template.try :content
+        if ::MustacheRender.config.db_template_cache?
+          self.class.fetch_partial_cache name, media, :expires_in => ::MustacheRender.config.db_template_cache_expires_in do
+            impl_read_db_template name
+          end
+        else
+          impl_read_db_template name
+        end
       when :file
-        File.read "#{config.file_template_root_path}/#{name}.#{config.file_template_extension}"
+        if ::MustacheRender.config.file_template_cache?
+          self.class.fetch_partial_cache name, media, :expires_in => ::MustacheRender.config.file_template_cache_expires_in do
+            impl_read_file_template name
+          end
+        else
+          impl_read_file_template name
+        end
+      end
+    end
+
+    def self.fix_path_name name
+      # 需要以 / 开头，此处fix一下这里
+      if name.to_s.start_with?('/')
+        name.to_s
+      else
+        "/#{name}"
       end
     end
 
@@ -88,7 +148,39 @@ module MustacheRender
     # reading templates from a database. It will be rendered by the
     # context, so all you need to do is return a string.
     def partial(name)
-      self.read_template_from_meida name
+      name = self.class.fix_path_name name
+      # return self.read_template_from_media name, media
+      @_cached_partials ||= {}
+      (@_cached_partials[media] ||= {})[name] ||= self.read_template_from_media name, media
+    end
+
+    def self.partial_cache_key(name, media)
+      raise 'options key: :media must in(:file, :db)' unless [:file, :db].include?(media)
+      "MustacheRender::Mustache#Template.cache##{media}##{name}"
+    end
+
+    def self.exist_partial_cache?(name, media)
+      ::MustacheRender.config.cache.exist?(self.partial_cache_key(name, media))
+    end
+
+    def self.delete_partial_cache(name, media)
+      ::MustacheRender.config.cache.delete(self.partial_cache_key(name, media))
+    end
+
+    def self.fetch_partial_cache(name, media, options={}, &block)
+      ::MustacheRender.config.cache.fetch(self.partial_cache_key(name, media), options) do
+        if block_given?
+          block.call
+        end
+      end
+    end
+
+    def self.read_partial_cache(name, media)
+      ::MustacheRender.config.cache.read(self.partial_cache_key(name, media))
+    end
+
+    def self.write_partial_cache(name, media, value, options={})
+      ::MustacheRender.config.cache.write(self.partial_cache_key(name, media), value, options)
     end
 
     # Override this to provide custom escaping.
@@ -165,6 +257,16 @@ module MustacheRender
       (@template && @template.is_a?(Template)) || self.class.compiled?
     end
 
+    def template
+      return @template if @template
+
+      self.template = ''
+    end
+
+    def template= template
+      @template = templateify(template)
+    end
+
     # template_partial => TemplatePartial
     # template/partial => Template::Partial
     def self.classify(underscored)

data/lib/mustache_render/mustache/context.rb

@@ -39,7 +39,7 @@ module MustacheRender
       # Find the first Mustache in the stack. If we're being rendered
       # inside a Mustache object as a context, we'll use that one.
       def mustache_in_stack
-        @stack.detect { |frame| frame.is_a?(Mustache) }
+        @stack.detect { |frame| frame.is_a?(::MustacheRender::Mustache) }
       end
 
       # Allows customization of how Mustache escapes things.
@@ -104,7 +104,7 @@ module MustacheRender
           end
         end
 
-        if default == :__raise || MustacheRender.config.raise_on_context_miss?
+        if default == :__raise || ::MustacheRender.config.raise_on_context_miss?
           raise ContextMiss.new("Can't find #{name} in #{@stack.inspect}")
         else
           default

data/lib/mustache_render/mustache/parser.rb

@@ -102,6 +102,10 @@ module MustacheRender
           error "Unclosed section #{type.inspect}", pos
         end
 
+        # puts ""
+        # puts "-----------------------------------------------------"
+        # puts @result
+
         @result
       end
 

data/lib/mustache_render/mustache/template.rb

@@ -6,6 +6,11 @@ require 'mustache_render/mustache/generator'
 
 module MustacheRender
   class Mustache
+    # 模板缺失
+    class TemplateMiss < ::RuntimeError
+
+    end
+
     # A Template represents a Mustache template. It compiles and caches
     # a raw string template into something usable.
     #
@@ -15,7 +20,7 @@ module MustacheRender
     #
     # You shouldn't use this class directly, instead:
     #
-    # >> Mustache.render(template, hash)
+    # >> ::MustacheRender::Mustache.render(template, hash)
     class Template
       attr_reader :source
 

data/lib/mustache_render/version.rb

@@ -3,7 +3,7 @@ module MustacheRender
   VERSION_NUMBERS = [
     VERSION_MAJOR = 0,
     VERSION_MINOR = 0,
-    VERSION_BUILD = 7,
+    VERSION_BUILD = 9,
   ]
 
   VERSION = VERSION_NUMBERS.join(".")

data/spec/lib/mustache/file_render_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe 'MustacheRender::Mustache.db_render' do
+  before :each do
+    MustacheRender.configure do |config|
+      config.file_template_root_path = ROOT_PATH + '/resources/templates'
+    end
+  end
+
+  it 'template scan_tags test' do
+    result = MustacheRender::Mustache.file_render 'scan_tags/1', {}
+
+  end
+
+  it 'template file 5.mustache render ok' do
+    result = MustacheRender::Mustache.file_render 'basic/5', {}
+    result.should == <<-TEXT
+file:5, in-file6
+
+file:5-2, in-file6
+
+file:5-3, in-file6
+
+file:5-4, in-file6
+
+file:5-5, in-file6
+
+file:5-6, in-file6
+
+file:5-7, in-file6
+
+file:5-8, in-file6
+
+file:5-9, in-file6
+
+file:5-10, in-file6
+
+file:5-11, in-file6
+
+TEXT
+  end
+
+  it 'template file 1.mustache render ok' do
+    result = MustacheRender::Mustache.file_render 'basic/1', {:filename => '1.mustache'}
+    result.should == <<-TEXT
+Hello!1.mustache
+TEXT
+  end
+
+  it 'template 2 with partial 1 render OK' do
+     result = MustacheRender::Mustache.file_render 'basic/2', {:filename => 'in1'}
+     result.should == <<-TEXT
+file-2Hello!in1
+
+TEXT
+  end
+
+  it 'template file 3.mustache partial with 2 render OK' do
+     result = MustacheRender::Mustache.file_render 'basic/3', {:filename => 'in1'}
+     result.should == <<-TEXT
+file3file-2Hello!in1
+
+
+TEXT
+
+  end
+end

data/spec/lib/resources/templates/basic/1.mustache

@@ -0,0 +1 @@
+Hello!{{filename}}

data/spec/lib/resources/templates/basic/2.mustache

@@ -0,0 +1 @@
+file-2{{>basic/1}}

data/spec/lib/resources/templates/basic/3.mustache

@@ -0,0 +1 @@
+file3{{>basic/2}}

data/spec/lib/resources/templates/basic/4.mustache

@@ -0,0 +1 @@
+file4{{>basic/3}}

data/spec/lib/resources/templates/basic/5.mustache

@@ -0,0 +1,11 @@
+file:5, {{>basic/6}}
+file:5-2, {{>basic/6}}
+file:5-3, {{>basic/6}}
+file:5-4, {{>basic/6}}
+file:5-5, {{>basic/6}}
+file:5-6, {{>basic/6}}
+file:5-7, {{>basic/6}}
+file:5-8, {{>basic/6}}
+file:5-9, {{>basic/7}}
+file:5-10, {{>basic/7}}
+file:5-11, {{>basic/7}}

data/spec/lib/resources/templates/basic/6.mustache

@@ -0,0 +1 @@
+in-file6

data/spec/lib/resources/templates/basic/7.mustache

@@ -0,0 +1 @@
+{{>/basic/6}}

data/spec/lib/resources/templates/scan_tags/1.mustache

@@ -0,0 +1,2 @@
+{{>/scan_tags/2}}
+{{>/scan_tags/3}}

data/spec/lib/resources/templates/scan_tags/2.mustache

@@ -0,0 +1 @@
+{{>/scan_tags/3}}

data/spec/lib/resources/templates/scan_tags/3.mustache

@@ -0,0 +1 @@
+{{name}}

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+require 'mustache_render'
+
+ROOT_PATH = File.dirname(__FILE__) + '/lib'

metadata

@@ -1,61 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mustache_render
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
+version: !ruby/object:Gem::Version
+  version: 0.0.9
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - happy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-13 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Description of MustacheRender.
-email: 
+email:
 - andywang7259@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/mustache_render.rb
 - lib/tasks/mustache_render_tasks.rake
 - lib/generators/mustache_render/install_generator.rb
@@ -110,42 +104,43 @@ files:
 - lib/mustache_render/views/mustache_render/manage/folders/_new_2.html.erb
 - lib/mustache_render/views/mustache_render/manage/folders/_edit_2.html.erb
 - lib/mustache_render/adapter.rb
+- spec/lib/mustache/file_render_spec.rb
+- spec/lib/resources/templates/basic/6.mustache
+- spec/lib/resources/templates/basic/2.mustache
+- spec/lib/resources/templates/basic/1.mustache
+- spec/lib/resources/templates/basic/7.mustache
+- spec/lib/resources/templates/basic/3.mustache
+- spec/lib/resources/templates/basic/5.mustache
+- spec/lib/resources/templates/basic/4.mustache
+- spec/lib/resources/templates/scan_tags/2.mustache
+- spec/lib/resources/templates/scan_tags/1.mustache
+- spec/lib/resources/templates/scan_tags/3.mustache
+- spec/spec_helper.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-has_rdoc: true
 homepage: http://blogsoso.net/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Summary of MustacheRender.
 test_files: []
-