RubyGems - slight-lang - Versions diffs - 1.0.1 → 1.0.5 - Mend

slight-lang 1.0.1 → 1.0.5

Files changed (25) hide show

data/lib/slight/dsl.rb CHANGED Viewed

@@ -1,161 +1,169 @@
-require 'slight/utils'
-module Slight
-  module DSLEssential
-    def br; echo "<br/>\n"; end
-    def hr; echo "<hr/>\n"; end
-    def title(str); echo "<title>#{str}</title>\n"; end
-    def js(str)
-      echo "<script language=\"javascript\">\n#{str}\n</script>\n"
-    end
-    def doctype(type)
-      case type
-      when :html, :h5
-        echo "<!DOCTYPE html>\n"
-      when :h11
-        echo %q[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">] + "\n"
-      when :strict
-        echo %q[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">] + "\n"
-      when :frameset
-        echo %q[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">] + "\n"
-      when :mobile
-        echo %q[<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd">] + "\n"
-      when :basic
-        echo %q[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">] + "\n"
-      when :transitional
-        echo %q[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">] + "\n"
-      when :xml
-        echo %q[<?xml version="1.0" encoding="utf-8" ?>] + "\n"
-      end
-    end
-    def use(uri, type=nil)
-      case type ||= uri.split('.')[-1]
-      when "js"
-        echo "<script type=\"text/javascript\" src=\"#{uri}\"></script>\n"
-      when "css"
-        echo "<link rel=\"stylesheet\" href=\"#{uri}\"></link>\n"
-      end
-    end
-    # load another page into current page
-    def layout_yield(target_src)
-      #eval(File.new(target_src).read, binding_scope, target_src, __LINE__ - 48)
-      @load_history ||= [] # prevernt recursive page load
-      #unless @load_history[target_src] then
-      @load_history.push target_src
-      unless @load_history.count(target_src) == 2
-        self.instance_eval(File.new(target_src).read, target_src, __LINE__ - 48)
-      else
-        echo "<!--recursive page loading deteced, ignore.-->"
-      end
-      @load_history.pop
-      nil
-    end
-    # set the placeholder in current page
-    #def layout_placeholder(ph_alias="default")
-    #  echo "<!--######|PLACEHOLDER-#{ph_alias}|######-->"
-    #end
-    # attach itself to the placeholder in anther page
-    #def layout_attach(page, ph_alias="default")
-    #end
-  end
-  class DSLException < ScriptError ; end
-  class DSL
-    include DSLEssential
-    include Utils
-    undef :p, :select
-    def initialize(io)
-      @output_buffer = io
-      #@root = page_node.new("root")
-    end
-    def puts(str); @output_buffer << html_escape(str); nil; end
-    def echo(str); @output_buffer << str; nil; end
-    def method_missing(fun, *param, &block)
-      __dsl__define(fun)
-      self.send(fun, *param, &block)
-    end
-    def binding_scope
-      binding
-    end
-    def resolve_shortcutA(shortcutA)
-      @__dsl__attr_replacements = shortcutA
-    end
-    def resolve_shortcutT(shortcutT)
-      @__dsl__tag_replacements = shortcutT
-    end
-    def resolve_blinding(blinding)
-      blinding.each do |m|
-          undef_method m
-      end
-    end
-    private
-    def __dsl__define(tag)
-      DSL.class_eval do
-        define_method(tag){|*at, &block|
-          __dsl__packup(tag.to_s, *at, &block)
-        }
-      end
-    end
-    def __dsl__packup(tag, *at)
-      attr_replacements = @__dsl__attr_replacements||{}
-      tag_replacements = @__dsl__tag_replacements||{}
-      attrs=[]
-      if self_close = tag.end_with?("!") then
-        tag = tag[0..-2]
-      end
-      at.each do |var|
-        if var.class == Hash then
-          var.each_pair do |a, v|
-            unless a.to_sym == :_ then
-              at_new = attr_replacements.fetch(a, a)
-              at_new = v.class == String ? "#{at_new}=\"#{v}\"" : "#{at_new}=#{v.to_s}"
-            else
-              at_new = "#{v}"
-            end
-            attrs.push at_new
-          end
-        elsif var.class == String
-          attrs.push "class=\"#{var}\""
-        end
-      end
-      s_tag = tag_replacements.fetch(tag.to_sym, tag)
-      e_tag = s_tag.split(" ")[0]
-      space = attrs.length > 0 ? " " : ""
-      echo "<#{s_tag}#{space}#{attrs.join(" ")}"
-      if self_close then
-        echo "/>\n"
-      else
-        echo ">\n"
-        puts yield.to_s if block_given?
-        echo "</#{e_tag}>\n"
-      end
-    end
-  end
-end
+require 'slight/utils'
+module Slight
+  module DSLEssential
+    def br; echo "<br/>\n"; end
+    def hr; echo "<hr/>\n"; end
+    def title(str); echo "<title>#{str}</title>\n"; end
+    def js(str)
+      echo "<script language=\"javascript\">\n#{str}\n</script>\n"
+    end
+    def doctype(type)
+      case type
+      when :html, :h5
+        echo "<!DOCTYPE html>\n"
+      when :h11
+        echo %q[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">] + "\n"
+      when :strict
+        echo %q[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">] + "\n"
+      when :frameset
+        echo %q[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">] + "\n"
+      when :mobile
+        echo %q[<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd">] + "\n"
+      when :basic
+        echo %q[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">] + "\n"
+      when :transitional
+        echo %q[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">] + "\n"
+      when :xml
+        echo %q[<?xml version="1.0" encoding="utf-8" ?>] + "\n"
+      end
+    end
+    def use(uri, type=nil)
+      case type ||= uri.split('.')[-1]
+      when "js"
+        echo "<script type=\"text/javascript\" src=\"#{uri}\"></script>\n"
+      when "css"
+        echo "<link rel=\"stylesheet\" href=\"#{uri}\"></link>\n"
+      end
+    end
+    # load another page into current page
+    def layout_yield(target_src)
+      #eval(File.new(target_src).read, binding_scope, target_src, __LINE__ - 48)
+      @load_history ||= [] # prevernt recursive page load
+      #unless @load_history[target_src] then
+      @load_history.push target_src
+      unless @load_history.count(target_src) == 2
+        self.instance_eval(File.new(target_src).read, target_src, __LINE__ - 48)
+      else
+        echo "<!--recursive page loading deteced, ignore.-->"
+      end
+      @load_history.pop
+      nil
+    end
+    # set the placeholder in current page
+    #def layout_placeholder(ph_alias="default")
+    #  echo "<!--######|PLACEHOLDER-#{ph_alias}|######-->"
+    #end
+    # attach itself to the placeholder in anther page
+    #def layout_attach(page, ph_alias="default")
+    #end
+  end
+  class DSLException < ScriptError ; end
+  class DSL
+    include DSLEssential
+    include Utils
+    undef :p, :select
+    def initialize(io)
+      @output_buffer = io
+      #@root = page_node.new("root")
+    end
+    def puts(str); @output_buffer << html_escape(str); nil; end
+    def echo(str); @output_buffer << str; nil; end
+    def method_missing(fun, *param, &block)
+      __dsl__define(fun)
+      self.send(fun, *param, &block)
+    end
+    def binding_scope
+      binding
+    end
+    def resolve_shortcutA(shortcutA)
+      @__dsl__attr_replacements = shortcutA
+    end
+    def resolve_shortcutT(shortcutT)
+      @__dsl__tag_replacements = shortcutT
+    end
+    def resolve_blinding(blinding)
+      blinding.each do |m|
+          undef_method m
+      end
+    end
+    def resolve_local(var,val)
+      self.singleton_class.class_eval do
+        define_method(var.to_sym){
+          return val
+        }
+      end
+    end
+    private
+    def __dsl__define(tag)
+      self.singleton_class.class_eval do
+        define_method(tag){|*at, &block|
+          __dsl__packup(tag.to_s, *at, &block)
+        }
+      end
+    end
+    def __dsl__packup(tag, *at)
+      attr_replacements = @__dsl__attr_replacements||{}
+      tag_replacements = @__dsl__tag_replacements||{}
+      attrs=[]
+      if self_close = tag.end_with?("!") then
+        tag = tag[0..-2]
+      end
+      at.each do |var|
+        if var.class == Hash then
+          var.each_pair do |a, v|
+            unless a.to_sym == :_ then
+              at_new = attr_replacements.fetch(a, a)
+              at_new = v.class == String ? "#{at_new}=\"#{v}\"" : "#{at_new}=#{v.to_s}"
+            else
+              at_new = "#{v}"
+            end
+            attrs.push at_new
+          end
+        elsif var.class == String
+          attrs.push "class=\"#{var}\""
+        end
+      end
+      s_tag = tag_replacements.fetch(tag.to_sym, tag)
+      e_tag = s_tag.split(" ")[0]
+      space = attrs.length > 0 ? " " : ""
+      echo "<#{s_tag}#{space}#{attrs.join(" ")}"
+      if self_close then
+        echo "/>\n"
+      else
+        echo ">\n"
+        puts yield.to_s if block_given?
+        echo "</#{e_tag}>\n"
+      end
+    end
+  end
+end

data/lib/slight/engine.rb CHANGED Viewed

@@ -1,38 +1,45 @@
-require 'slight/config'
-require 'slight/template'
-module Slight
-  class Filter; def self.do(src_data); return src_data; end; end
-  class Engine
-    def initialize(options = {})
-      @options = options
-      Configuration.new(@options) do |c|
-        c.shortcut :A, :css, "style"
-        c.shortcut :A, :ln, "href"
-        c.shortcut :A, :url, "href"
-        c.shortcut :A, :char, "charset"
-        c.shortcut :A, :fn, "src"
-        c.shortcut :A, :lang, "language"
-        c.shortcut :A, :xn, "xmlns"
-        c.shortcut :A, :mf, "manifest"
-        c.shortcut :T, "_", "div"
-        #c.shortcut :T, "js", %q[script language="javascript"]
-       #c.use PrettyHtmlOutput, :after if c.get(:pretty_html)
-      end
-      @template = Template.new(@options)
-    end
-    def render(src_file, src_data = nil, local_vars={})
-      # src file name is mainly using for identify issues for debugging
-      # if data not given then read data from src file
-      src_data ||= File.new(src_file).read
-      @options[:before_filter].each do |f|
-        src_data = f.do(src_data)
-      end
-      src_data = @template.render(src_data, src_file, local_vars)
-      @options[:after_filter].each do |f|
-        src_data = f.do(src_data)
-      end
-      src_data
-    end
-  end
-end
+require 'slight/config'
+require 'slight/template'
+module Slight
+  class Filter; def self.do(src_data); return src_data; end; end
+  class Engine
+    def initialize(options = {})
+      @options = options
+      Configuration.new(@options) do |c|
+        c.shortcut :A, :css, "style"
+        c.shortcut :A, :ln, "href"
+        c.shortcut :A, :url, "href"
+        c.shortcut :A, :char, "charset"
+        c.shortcut :A, :fn, "src"
+        c.shortcut :A, :lang, "language"
+        c.shortcut :A, :xn, "xmlns"
+        c.shortcut :A, :mf, "manifest"
+        c.shortcut :T, "_", "div"
+        #c.shortcut :T, "js", %q[script language="javascript"]
+       #c.use PrettyHtmlOutput, :after if c.get(:pretty_html)
+      end
+      @template = Template.new(@options)
+    end
+    def render(src_file, src_data = nil, local_vars={})
+      # src file name is mainly using for identify issues for debugging
+      # if data not given then read data from src file
+      # Data > File
+      #src_data = script.call if block_given?
+      src_data ||= File.new(src_file).read
+      @options[:before_filter].each do |f|
+        src_data = f.do(src_data)
+      end
+      src_data = @template.render(src_data, src_file, local_vars)
+      @options[:after_filter].each do |f|
+        src_data = f.do(src_data)
+      end
+      src_data
+    end
+  end
+end

data/lib/slight/template.rb CHANGED Viewed

@@ -1,28 +1,38 @@
-require 'slight/dsl'
-module Slight
-  class Template
-    def initialize(options = {})
-      @options = options
-      @output_buffer = @options[:io_out] || ""
-      @dsl = DSL.new(@output_buffer)
-      @dsl.resolve_shortcutA(@options[:shortcutA])
-      @dsl.resolve_shortcutT(@options[:shortcutT])
-      @dsl.resolve_blinding(@options[:blinding])
-    end
-    def render(src_data, src_file, local_vars = {})
-      @output_buffer.clear
-      local_vars.each_pair do |key, value|
-        @dsl.binding_scope.local_variable_set(key.to_sym, value)
-      end
-      begin
-        eval(src_data, @dsl.binding_scope, src_file, __LINE__ - 20)
-      rescue => ex
-        raise DSLException.new(ex.message)
-      end
-      @output_buffer
-    end
-  end
-end
+require 'slight/dsl'
+module Slight
+  class Template
+    def initialize(options = {})
+      @options = options
+      @output_buffer = @options[:io_out] || ""
+      @dsl = DSL.new(@output_buffer)
+      @dsl.resolve_shortcutA(@options[:shortcutA])
+      @dsl.resolve_shortcutT(@options[:shortcutT])
+      @dsl.resolve_blinding(@options[:blinding])
+    end
+    def render(src_data, src_file, local_vars = {})
+      @output_buffer.clear
+      local_vars.each_pair do |key, value|
+        if key == :__scope then
+          scope = value
+          scope_vars = scope.instance_variables
+          scope_vars.each do |var|
+            @dsl.instance_variable_set(var, scope.instance_variable_get(var))
+          end
+        else
+          @dsl.resolve_local(key, value)
+        end
+      end
+      begin
+        @dsl.instance_eval(src_data, src_file, __LINE__ - 20)
+      rescue => ex
+        raise DSLException.new(ex.message)
+      end
+      @output_buffer
+    end
+  end
+end

data/lib/slight/tilt.rb ADDED Viewed

@@ -0,0 +1,26 @@
+require 'tilt'
+require 'tilt/template'
+require 'slight'
+module Tilt
+	class SlightTemplate < Template
+		self.default_mime_type = 'text/html'
+		def prepare
+		  @engine = ::Slight::Engine.new
+      #@engine = ::ERB.new(data, options[:safe], options[:trim], @outvar)
+    end
+    def evaluate(scope, locals, &block)
+      #scope_vars = scope.instance_variables
+      #scope_vars.each do |var|
+      #  @engine.instance_variable_set(var, scope.instance_variable_get(var))
+      #end
+      locals[:__scope] = scope
+    	@output ||= @engine.render(file, data, locals)
+    end
+	end
+  register_lazy "SlightTemplate",    'slight/tilt',    'slight', 'rb'
+end

data/lib/slight/utils.rb CHANGED Viewed

@@ -1,38 +1,38 @@
-# Borrow from ERB Source
-# ERB::Util
-module Slight
-  module Utils
-      public
-      # A utility method for escaping HTML tag characters in _s_.
-      #
-      #   require "erb"
-      #   include ERB::Util
-      #
-      #   puts html_escape("is a > 0 & a < 10?")
-      #
-      # _Generates_
-      #
-      #   is a &gt; 0 &amp; a &lt; 10?
-      #
-      # [Slight] => Add: gsub(/[[:blank:]]/,"&nbsp;") to support space.
-      def html_escape(s)
-        s.to_s.gsub(/&/, "&amp;").gsub(/[[:blank:]]/,"&nbsp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
-      end
-      module_function :html_escape
-      # A utility method for encoding the String _s_ as a URL.
-      #
-      #   require "erb"
-      #   include ERB::Util
-      #
-      #   puts url_encode("Programming Ruby:  The Pragmatic Programmer's Guide")
-      #
-      # _Generates_
-      #
-      #   Programming%20Ruby%3A%20%20The%20Pragmatic%20Programmer%27s%20Guide
-      #
-      def url_encode(s)
-        s.to_s.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
-      end
-      module_function :url_encode
-  end
-end
+# Borrow from ERB Source
+# ERB::Util
+module Slight
+  module Utils
+      public
+      # A utility method for escaping HTML tag characters in _s_.
+      #
+      #   require "erb"
+      #   include ERB::Util
+      #
+      #   puts html_escape("is a > 0 & a < 10?")
+      #
+      # _Generates_
+      #
+      #   is a &gt; 0 &amp; a &lt; 10?
+      #
+      # [Slight] => Add: gsub(/[[:blank:]]/,"&nbsp;") to support space.
+      def html_escape(s)
+        s.to_s.gsub(/&/, "&amp;").gsub(/[[:blank:]]/,"&nbsp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
+      end
+      module_function :html_escape
+      # A utility method for encoding the String _s_ as a URL.
+      #
+      #   require "erb"
+      #   include ERB::Util
+      #
+      #   puts url_encode("Programming Ruby:  The Pragmatic Programmer's Guide")
+      #
+      # _Generates_
+      #
+      #   Programming%20Ruby%3A%20%20The%20Pragmatic%20Programmer%27s%20Guide
+      #
+      def url_encode(s)
+        s.to_s.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
+      end
+      module_function :url_encode
+  end
+end

data/lib/slight.rb CHANGED Viewed

@@ -1,6 +1,8 @@
-require 'slight/engine'
-module Slight
-  # Slight version string
-  # @api public
-  VERSION = '1.0.1'
-end
+require 'slight/engine'
+module Slight
+  # Slight version string
+  # @api public
+  VERSION = '1.0.5'
+  # 1.0.0 => Basic Template features | 201703
+  # 1.0.5 => Support Tilt, Render Scope Binding | 201704
+end

data/slight.gemspec CHANGED Viewed

@@ -1,21 +1,21 @@
-# -*- encoding: utf-8
-$:.unshift File.expand_path('../lib', __FILE__)
-require 'slight'
-Gem::Specification.new do |gem|
-      gem.authors       = ["oliver.yu"]
-      gem.email         = ["nemo1023@gmail.com"]
-      gem.description   = %q{A light and sweet template language}
-      gem.summary       = %q{The goal of this is to use ruby syntax and html style shotcut to write template.}
-      gem.homepage      = "https://github.com/OliversCat/Slight"
-      gem.files         = `git ls-files`.split($\)
-      #gem.files         = dir('.')
-      #gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) unless f.end_with? ".rb" }
-      gem.executables   = ["slsh","slight"]
-      #gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-      gem.test_files    = ["spec"]
-      gem.name          = "slight-lang"
-      gem.require_paths = ["lib"]
-      gem.version       = Slight::VERSION
-      gem.license       = "MIT"
-end
+# -*- encoding: utf-8
+$:.unshift File.expand_path('../lib', __FILE__)
+require 'slight'
+Gem::Specification.new do |gem|
+      gem.authors       = ["oliver.yu"]
+      gem.email         = ["nemo1023@gmail.com"]
+      gem.description   = %q{A light and sweet template language}
+      gem.summary       = %q{The goal of this is to use ruby syntax and html style shotcut to write template.}
+      gem.homepage      = "https://github.com/OliversCat/Slight"
+      gem.files         = `git ls-files`.split($\)
+      #gem.files         = dir('.')
+      #gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) unless f.end_with? ".rb" }
+      gem.executables   = ["slsh","slight"]
+      #gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+      gem.test_files    = ["spec"]
+      gem.name          = "slight-lang"
+      gem.require_paths = ["lib"]
+      gem.version       = Slight::VERSION
+      gem.license       = "MIT"
+end

data/spec/bin_spec.rb ADDED Viewed

File without changes

data/spec/dsl_spec.rb ADDED Viewed

File without changes

data/spec/engine_spec.rb ADDED Viewed

File without changes