mustache_render 0.0.15 → 0.0.20

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

@@ -1,9 +1,8 @@
 # -*- encoding : utf-8 -*-
 MustacheRender.configure do |config|
   # 默认的模板渲染媒介
-  #   :db   => 数据库渲染
   #   :file => 文件系统渲染
-  config.default_render_media = :db
+  config.default_render_media = :file
 
   # 默认的文件模板的根目录
   config.file_template_root_path = "#{Rails.root}/app/templates"
@@ -11,32 +10,14 @@ MustacheRender.configure do |config|
   # 默认的文件模板的扩展名称
   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.logger = Rails.logger
 
-  ### 模板的相关配置 ###########################
-  # # 数据库模板是否需要缓存
-  # 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|
 

data/lib/generators/mustache_render/install_generator.rb

@@ -4,22 +4,10 @@ require 'rails/generators/migration'
 
 module MustacheRender
     class InstallGenerator < Rails::Generators::Base
-      include Rails::Generators::Migration
-
-      desc "Generates MustacheRender database migration, models"
+      desc "Generates MustacheRender"
 
       def copy_files
-        orm = options[:orm].to_s
-        orm = "active_record" unless %w{active_record}.include?(orm)
-        %w(mustache_render_folder mustache_render_template mustache_render_manager mustache_render_template_version).each do |file|
-          copy_model(orm, file)
-        end
-
         template "config/initializers/mustache_render.rb", "config/initializers/mustache_render.rb"
-
-        if self.class.orm_has_migration?
-          migration_template "#{orm}/migration.rb", 'db/migrate/mustache_render_migration'
-        end
       end
 
       def self.orm
@@ -43,7 +31,7 @@ module MustacheRender
           "%.3d" % (current_migration_number(dirname) + 1)
         end
       end
-        
+
       private
 
       def copy_model(orm, name)

data/lib/mustache_render.rb

@@ -12,28 +12,8 @@ module MustacheRender
   autoload :Adapter,       'mustache_render/adapter'
   autoload :PopulatorBase, 'mustache_render/populator_base'
 
-  module Manage
-    autoload :BaseHelper,          'mustache_render/helpers/mustache_render/manage/base_helper'
-
-    autoload :BaseController,             'mustache_render/controllers/mustache_render/manage/base_controller'
-    autoload :FoldersController,          'mustache_render/controllers/mustache_render/manage/folders_controller'
-    autoload :TemplatesController,        'mustache_render/controllers/mustache_render/manage/templates_controller'
-    autoload :TemplateVersionsController, 'mustache_render/controllers/mustache_render/manage/template_versions_controller'
-  end
-
   module CoreExt
     autoload :BaseControllerExt,   'mustache_render/core_ext/base_controller_ext'
-    # autoload :ActionViewHandler,   'mustache_render/core_ext/action_view_handler'
-  end
-
-  module Controllers
-  end
-
-  module Models
-    autoload :MustacheRenderManagerMixin,           'mustache_render/models/mustache_render_manager_mixin'
-    autoload :MustacheRenderFolderMixin,            'mustache_render/models/mustache_render_folder_mixin'
-    autoload :MustacheRenderTemplateMixin,          'mustache_render/models/mustache_render_template_mixin'
-    autoload :MustacheRenderTemplateVersionMixin,   'mustache_render/models/mustache_render_template_version_mixin'
   end
 end
 

data/lib/mustache_render/config.rb

@@ -95,58 +95,6 @@ module MustacheRender
       @_logger ||= logger
     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
@@ -175,22 +123,6 @@ module MustacheRender
       @file_template_root_path ||= path
     end
 
-    # def action_view_handler_extension
-    #   @action_view_handler_extension ||= :mustache
-    # end
-
-    # def action_view_handler_extension= name
-    #   @action_view_handler_extension ||= name
-    # 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'
     end
@@ -208,15 +140,6 @@ module MustacheRender
       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
@@ -238,9 +161,3 @@ module MustacheRender
   end
 end
 
-# if ::MustacheRender.config.action_view_handler?
-#   ActionView::Template.register_template_handler(
-#     ::MustacheRender.config.db_template_extension.to_sym,
-#     ::MustacheRender::CoreExt::ActionViewHandler
-#   )
-# end

data/lib/mustache_render/core_ext/base_controller_ext.rb

@@ -22,9 +22,8 @@ module MustacheRender::CoreExt
       # 定义了三个方法：
       #   render template, data
       #   file_render template_path, data
-      #   db_render template_path, data
       #
-      [:render, :file_render, :db_render, :impl_render].each do |method_name|
+      [:render, :file_render, :impl_render].each do |method_name|
         define_method "mustache_#{method_name}".to_sym do |path_or_template, data|
           impl_mustache_result_render method_name, path_or_template, data
         end

data/lib/mustache_render/mustache.rb

@@ -5,9 +5,6 @@ require 'mustache_render/mustache/data'
 
 module MustacheRender
   class Mustache
-    # 可用的渲染的方法
-    # AVAILABLE_RENDER_METHODS = [:render, :file_render, :db_render].freeze
-
     def self.render(*args)
       new.render(*args)
     end
@@ -78,22 +75,6 @@ module MustacheRender
       end
     end
 
-    def self.db_render(full_path, context={})
-      self.new.db_render full_path, context
-    end
-
-    def db_render(full_path, context={})
-      impl_logger :level => :debug, :operation => "#{self.class}.db_render" do
-        @media = :db
-        render(partial(full_path), context)
-      end
-    end
-
-    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
@@ -131,15 +112,6 @@ module MustacheRender
         :operation => "MustacheRender render -> read template from #{media}: #{name}" do
 
         case media
-        when :db
-          # 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
-          impl_read_file_template name
         when :file
           # if ::MustacheRender.config.file_template_cache?
           #   self.class.fetch_partial_cache name, media, :expires_in => ::MustacheRender.config.file_template_cache_expires_in do
@@ -164,35 +136,6 @@ module MustacheRender
       (@_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.
     #
     # class PersonView < Mustache

data/lib/mustache_render/mustache/data.rb

@@ -7,24 +7,12 @@ module MustacheRender
         self.merge! options
       end
 
-      [:render, :file_render, :db_render, :impl_render].each do |method_name|
+      [:render, :file_render, :impl_render].each do |method_name|
         define_method method_name do |path_or_template|
           ::MustacheRender::Mustache.send method_name, path_or_template, self
         end
       end
 
-      # def render(template='')
-      #   ::MustacheRender::Mustache.render template, self
-      # end
-
-      # def file_render path
-      #   ::MustacheRender::Mustache.file_render path, self
-      # end
-
-      # def db_render path
-      #   ::MustacheRender::Mustache.db_render path, self
-      # end
-
       def []=(name, value)
         result = super(name.to_s, value)
         self.each_pair do |k, v|

data/lib/mustache_render/populator_base.rb

@@ -37,9 +37,8 @@ module MustacheRender
     #
     #   render template
     #   file_render template_path
-    #   db_render   template_path
     #
-    [:render, :file_render, :db_render, :impl_render].each do |method_name|
+    [:render, :file_render, :impl_render].each do |method_name|
       define_method method_name do |path_or_template=nil|
         @context.send "mustache_#{method_name}".to_sym, "#{path_or_template || @template}", @data
       end
@@ -78,7 +77,7 @@ module MustacheRender
       #
       # 定义了
       #
-      [:render, :file_render, :db_render, :impl_render].each do |method_name|
+      [:render, :file_render, :impl_render].each do |method_name|
         define_method method_name do |options|
           self.new(options).send method_name
         end

data/lib/mustache_render/version.rb

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

data/spec/lib/mustache/file_render_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'spec_helper'
 
-describe 'MustacheRender::Mustache.db_render' do
+describe 'MustacheRender::Mustache.xxx_render' do
   before :each do
   end
 

data/spec/spec_helper.rb

@@ -7,9 +7,8 @@ ROOT_PATH = File.dirname(__FILE__) + '/lib'
 # -*- encoding : utf-8 -*-
 MustacheRender.configure do |config|
   # 默认的模板渲染媒介
-  #   :db   => 数据库渲染
   #   :file => 文件系统渲染
-  config.default_render_media = :db
+  config.default_render_media = :file
 
   # 默认的文件模板的根目录
   config.file_template_root_path = ROOT_PATH + '/resources/templates'
@@ -17,15 +16,9 @@ MustacheRender.configure do |config|
   # 默认的文件模板的扩展名称
   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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mustache_render
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,6 @@ bindir: bin
 cert_chain: []
 date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: awesome_nested_set
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -53,58 +37,16 @@ files:
 - lib/mustache_render.rb
 - lib/tasks/mustache_render_tasks.rake
 - lib/generators/mustache_render/install_generator.rb
-- lib/generators/mustache_render/install/templates/active_record/migration.rb
 - lib/generators/mustache_render/install/templates/config/initializers/mustache_render.rb
-- lib/generators/mustache_render/install/templates/models/active_record/mustache_render_folder.rb
-- lib/generators/mustache_render/install/templates/models/active_record/mustache_render_manager.rb
-- lib/generators/mustache_render/install/templates/models/active_record/mustache_render_template.rb
-- lib/generators/mustache_render/install/templates/models/active_record/mustache_render_template_version.rb
 - lib/mustache_render/mustache/generator.rb
 - lib/mustache_render/mustache/context.rb
 - lib/mustache_render/mustache/template.rb
 - lib/mustache_render/mustache/parser.rb
 - lib/mustache_render/mustache/data.rb
-- lib/mustache_render/controllers/mustache_render/manage/base_controller.rb
-- lib/mustache_render/controllers/mustache_render/manage/templates_controller.rb
-- lib/mustache_render/controllers/mustache_render/manage/template_versions_controller.rb
-- lib/mustache_render/controllers/mustache_render/manage/folders_controller.rb
 - lib/mustache_render/mustache.rb
-- lib/mustache_render/resources/jquery.js
-- lib/mustache_render/resources/jquery_ujs.js
 - lib/mustache_render/config.rb
-- lib/mustache_render/core_ext/action_view_handler.rb
 - lib/mustache_render/core_ext/base_controller_ext.rb
-- lib/mustache_render/helpers/mustache_render/manage/base_helper.rb
 - lib/mustache_render/version.rb
-- lib/mustache_render/models/mustache_render_template_mixin.rb
-- lib/mustache_render/models/mustache_render_template_version_mixin.rb
-- lib/mustache_render/models/mustache_render_manager_mixin.rb
-- lib/mustache_render/models/mustache_render_folder_mixin.rb
-- lib/mustache_render/views/layouts/mustache_render/manage/base.html.erb
-- lib/mustache_render/views/mustache_render/manage/template_versions/_form.html.erb
-- lib/mustache_render/views/mustache_render/manage/template_versions/_list.html.erb
-- lib/mustache_render/views/mustache_render/manage/template_versions/index.html.erb
-- lib/mustache_render/views/mustache_render/manage/template_versions/_edit_3.html.erb
-- lib/mustache_render/views/mustache_render/manage/template_versions/edit.html.erb
-- lib/mustache_render/views/mustache_render/manage/template_versions/show.html.erb
-- lib/mustache_render/views/mustache_render/manage/template_versions/_edit_2.html.erb
-- lib/mustache_render/views/mustache_render/manage/templates/new.html.erb
-- lib/mustache_render/views/mustache_render/manage/templates/_new_3.html.erb
-- lib/mustache_render/views/mustache_render/manage/templates/_form.html.erb
-- lib/mustache_render/views/mustache_render/manage/templates/_edit_3.html.erb
-- lib/mustache_render/views/mustache_render/manage/templates/edit.html.erb
-- lib/mustache_render/views/mustache_render/manage/templates/show.html.erb
-- lib/mustache_render/views/mustache_render/manage/templates/_new_2.html.erb
-- lib/mustache_render/views/mustache_render/manage/templates/_edit_2.html.erb
-- lib/mustache_render/views/mustache_render/manage/folders/new.html.erb
-- lib/mustache_render/views/mustache_render/manage/folders/_new_3.html.erb
-- lib/mustache_render/views/mustache_render/manage/folders/_form.html.erb
-- lib/mustache_render/views/mustache_render/manage/folders/index.html.erb
-- lib/mustache_render/views/mustache_render/manage/folders/_edit_3.html.erb
-- lib/mustache_render/views/mustache_render/manage/folders/edit.html.erb
-- lib/mustache_render/views/mustache_render/manage/folders/show.html.erb
-- 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/populator_base.rb
 - lib/mustache_render/adapter.rb
 - spec/lib/mustache/data_spec.rb