mustache_render 0.0.21 → 0.0.22

data/lib/mustache_render/mustache/parser.rb

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

data/lib/mustache_render/mustache/template.rb

@@ -1,16 +1,11 @@
 # -*- encoding : utf-8 -*-
 require 'cgi'
 
-require 'mustache_render/mustache/parser'
-require 'mustache_render/mustache/generator'
+require "#{File.dirname(__FILE__)}/parser"
+require "#{File.dirname(__FILE__)}/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.
     #

data/lib/mustache_render/populator.rb

@@ -0,0 +1,7 @@
+module MustacheRender
+  class Populator
+    def to_mustache result, options, &block
+
+    end
+  end
+end

data/lib/mustache_render/utils.rb

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+module MustacheRender
+  autoload :ActionControllerUtil, "#{File.dirname(__FILE__)}/utils/action_controller_util"
+  autoload :FieldsFilterUtil,     "#{File.dirname(__FILE__)}/utils/fields_filter_util"
+  autoload :ArrayUtil,            "#{File.dirname(__FILE__)}/utils/array_util"
+end
+
+if defined?(::ActionController::Base)
+  ::ActionController::Base.send :include, ::MustacheRender::ActionControllerUtil
+end
+
+if defined?(::ActionView::Base)
+  ::ActionView::Base.send :include, ::MustacheRender::ActionControllerUtil
+end
+

data/lib/mustache_render/{core_ext/base_controller_ext.rb → utils/action_controller_util.rb}

@@ -1,10 +1,9 @@
 # -*- encoding : utf-8 -*-
-module MustacheRender::CoreExt
-  module BaseControllerExt
-    def self.included(base)
+module MustacheRender
+  # include ::MustacheRender::ActionControllerUtil
+  module ActionControllerUtil
+    def self.included base
       base.class_eval do
-        helper HelperMethods
-
         extend   ClassMethods
         include InstanceMethods
       end
@@ -24,7 +23,9 @@ module MustacheRender::CoreExt
       #   file_render template_path, data
       #
       [:render, :file_render, :impl_render].each do |method_name|
-        define_method "mustache_#{method_name}".to_sym do |path_or_template, data|
+        define_method "mustache_#{method_name}".to_sym do |path_or_template, *data|
+          data = data.first || Hash.new
+
           impl_mustache_result_render method_name, path_or_template, data
         end
       end

data/lib/mustache_render/utils/array_util.rb

@@ -0,0 +1,15 @@
+module MustacheRender
+  class ArrayUtil
+    def self.extract_options!(arr)
+      if arr.last.is_a?(Hash)
+        arr.pop
+      else
+        {}
+      end
+    end
+
+    def self.init args
+      args.is_a?(Array) ? args : [args]
+    end
+  end
+end

data/lib/mustache_render/utils/fields_filter_util.rb

@@ -0,0 +1,127 @@
+# -*- encoding : utf-8 -*-
+module MustacheRender
+  class FieldsFilterUtil
+    RULE_JOIN_GAP = '#'
+
+    attr_reader :rules, :rules_tree
+
+    # data = {
+    #   :deals => [
+    #      {
+    #        :name  => 'name_1',
+    #        :title => 'title_1',
+    #        :price => 23.4,
+    #        :shops => [
+    #           {
+    #             :name => 'shop_1',
+    #             :address => 'address 1'
+    #           }
+    #        ]
+    #      }
+    #   ],
+    #   :shop => {
+    #     :name => 1,
+    #     :deals => [
+    #       {
+    #          :name => "deal_1"
+    #       }
+    #     ]
+    #   },
+    #   :deal => {
+    #     :name => ''
+    #   }
+    # }
+    #
+    # ########
+    # filter = {
+    #   :default => {
+    #     :deals => {
+    #       :name => true
+    #     }
+    #   }
+    # }
+    #
+    # 转译配置语言
+    def initialize rule={}
+      @rules = {}
+      @rules_tree = {}
+
+      @empty = (
+        rule.is_a?(Hash) || rule.is_a?(Array)
+      ) ? rule.empty? : true
+
+      parse_rules :rule => rule
+
+      @rules.freeze
+      @rules_tree.freeze
+
+      self
+    end
+
+    def empty?
+      @empty
+    end
+
+    def present?
+      !(empty?)
+    end
+
+    def load formater=nil
+      if @rules_tree.key?(str = generate_string_formater(formater))
+        @rules_tree[str]
+      else
+        self.class.new
+      end
+    end
+
+    def match?(formater=nil)
+      present? && !!at(formater)
+    end
+
+    alias :hit? :match?
+
+    def at(formater=nil)
+      @rules[generate_string_formater(formater)]
+    end
+
+    private
+
+    def generate_string_formater formater
+       if formater.is_a?(Array)
+        formater.join(RULE_JOIN_GAP)
+      else
+        "#{formater}"
+      end
+    end
+
+    def parse_rules options={}
+      path = "#{options[:path]}"
+      rule = options[:rule]
+      path_empty = path.strip.size == 0
+
+      case rule
+      when Hash
+        rule.each do |key, val|
+          _path = path_empty ? "#{key}" : "#{path}#{RULE_JOIN_GAP}#{key}"
+          @rules_tree[_path] = self.class.new(val)
+          @rules[_path] = parse_rules :path => _path, :rule => val
+          parse_rules :path => "#{_path}", :rule => val
+        end
+      when Array
+        rule.each do |rul|
+          parse_rules :path => "#{path}", :rule => rul
+        end
+      when NilClass
+        unless path_empty
+          @rules[path] = nil
+          @rules_tree[path] = nil
+        end
+      else
+        unless path_empty
+          @rules[path] = rule
+          @rules_tree[path] = rule
+        end
+      end
+    end
+  end
+end

data/lib/mustache_render/version.rb

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

data/spec/lib/ables/render_able_spec.rb

@@ -0,0 +1,183 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe ::MustacheRender::RenderAble do
+
+  context '测试基本情况' do
+    module DefaultShopDataPopulator
+      def impl_to_mustache result, filter_util, options, &block
+        if filter_util.hit?("current_name")
+          result[:current_name] = 'ShopDataPopulator'
+        end
+
+        deals_filter_util = filter_util.load("deals")
+
+        if deals_filter_util.present?
+          result[:deals] = {}
+
+          if deals_filter_util.hit?("name")
+            result[:deals][:name] = self.name
+          end
+
+          if deals_filter_util.hit?("title")
+            result[:deals][:title] = self.title
+          end
+
+          if deals_filter_util.at('address') == :detail
+            result[:deals][:address] = "detail:#{self.address}"
+          end
+        end
+
+      end
+    end
+
+    class ShopData
+      include ::MustacheRender::RenderAble::ForRecord
+
+      attr_reader :name, :age, :address, :title
+
+      def initialize param={}
+        @name    = param[:name]
+        @age     = param[:age]
+        @title   = param[:title]
+        @address = param[:address]
+      end
+
+      self.load_mustache_populator(
+        :populators => DefaultShopDataPopulator
+      ) do |config|
+        config.filters_util = {
+          :default => {
+            :deals => {
+              :name => false,
+              :title => true,
+              :address => true
+            },
+            :current_name => false
+          },
+          :array => {
+            :deals => {
+              :title => false,
+              :address => :detail
+            }
+          }
+        }
+      end
+    end
+
+    it 'mustache_render Test' do
+      start = Time.now
+
+      a1 = ShopData.new
+      a2 = ShopData.new :name => 'a2', :address => 'address2'
+      a3 = ShopData.new :name => 'a3'
+      a4 = ShopData.new :name => 'a4'
+      a5 = ShopData.new :name => 'a5'
+      a6 = ShopData.new :name => 'a6'
+      a7 = ShopData.new :name => 'a7'
+
+      a = [a1, a2, a3, nil]
+
+      num = 1000
+
+      (1..num).each do |i|
+        a.mustache_render("", :filter => :array).should == ""
+
+        a.mustache_render(
+          "{{#any?}}any-true{{/any?}}{{#list}}{{#deals}}-address:{{address}}{{/deals}}{{/list}}",
+            :filter => :array
+        ).should == "any-true-address:detail:-address:detail:address2-address:detail:"
+
+        a.mustache_file_render(
+          "/mustache_render_ables/1",
+            :filter => :array
+        ).should == "<ul>\n  <li>name: </li>\n  <li>age: </li>\n  <li>address: detail:</li>\n</ul>\n<ul>\n  <li>name: </li>\n  <li>age: </li>\n  <li>address: detail:address2</li>\n</ul>\n<ul>\n  <li>name: </li>\n  <li>age: </li>\n  <li>address: detail:</li>\n</ul>\n"
+
+
+        # a.to_mustache(:filter => :array).should == {
+        #   :any? => true, :list => [
+        #     {:nil? => false, :deals => {:address => "detail:"}},
+        #     {:nil? => false, :deals => {:address => "detail:address2"}},
+        #     {:nil? => false, :deals => {:address => "detail:"}},
+        #     {:nil? => true}
+        #   ], :pagination => {
+        #     :support? => false
+        #   }
+        # }
+      end
+
+      time = Time.now - start
+      puts "#{num}次执行时间mustache_render:#{time}"
+    end
+
+    it 'array to_mustache Test' do
+      start = Time.now
+
+      a1 = ShopData.new
+      a2 = ShopData.new :name => 'a2', :address => 'address2'
+      a3 = ShopData.new :name => 'a3'
+      a4 = ShopData.new :name => 'a4'
+      a5 = ShopData.new :name => 'a5'
+      a6 = ShopData.new :name => 'a6'
+      a7 = ShopData.new :name => 'a7'
+
+      a = [a1, a2, a3, nil]
+
+      num = 10000
+
+      (1..num).each do |i|
+        a.to_mustache(:filter => :array).should == {
+          :any? => true, :list => [
+            {:nil? => false, :deals => {:address => "detail:"}},
+            {:nil? => false, :deals => {:address => "detail:address2"}},
+            {:nil? => false, :deals => {:address => "detail:"}},
+            {:nil? => true}
+          ], :pagination => {
+            :support? => false
+          }
+        }
+      end
+
+      time = Time.now - start
+      puts "#{num}次执行时间array to_mustache:#{time}"
+      time.should < 1
+    end
+
+    it 'class methods Test' do
+      ShopData.mustache_populator_config.is_a?(MustacheRender::RenderAble::MustachePopulatorConfig).should be_true
+
+      start = Time.now
+
+      (1..10000).each do |i|
+        a = ShopData.new :title => 'title_abc'
+
+        a.to_mustache.should == {
+          :deals => {
+            :title => "title_abc"
+          },
+          :nil? => false
+        }
+
+        a = ShopData.new(
+          :title => :title_bcd,
+          :name  => :name_bcd
+        )
+
+        a.to_mustache.should == {
+          :deals => {
+            :title => :title_bcd
+          },
+          :nil? => false
+        }
+
+      end
+
+      (Time.now - start).should < 0.5
+    end
+
+    it 'nil to_mustache' do
+      nil.to_mustache[:nil?].should == true
+    end
+  end
+end
+

data/spec/lib/mustache/basic_render_spec.rb

@@ -7,13 +7,38 @@ describe 'MustacheRender Render Basic Render' do
 
     end
 
+    it "class extend test" do
+      class DealFormat < ::MustacheRender::Mustache
+        def data
+          'data1'
+        end
+
+        def render1
+          "render2"
+        end
+
+        def hello
+          {
+            :name => 'happy',
+            :age  => 28
+          }
+        end
+      end
+
+      DealFormat.render("{{data}}").should == 'data1'
+      DealFormat.render("{{render1}}").should == 'render2'
+      DealFormat.render("{{hello.name}}").should == 'happy'
+    end
+
     it 'basic render' do
       viewer = ::MustacheRender::Mustache.new
 
       viewer[:name] = 'Happy Wang'
       viewer.template = '{{name}}'
       viewer.render.should == 'Happy Wang'
-      viewer.file_render('basic/8').should == "in-8file:Happy Wang\n"
+      expect {
+        viewer.file_render('basic/8').should == "in-8file:Happy Wang\n"
+      }.to raise_error(MustacheRender::MustacheTemplateMissError)
     end
   end
 end