hammer_builder 0.2.0 → 0.3.1

data/README.md

@@ -5,12 +5,9 @@ Fast Ruby xhtml5 renderer
 ## Links
 
 *   **Presentation**: <http://hammer.pitr.ch/hammer_builder/presentation/presentation.html>
-*   Gemcutter: <https://rubygems.org/gems/hammer_builder>
 *   Github: <https://github.com/ruby-hammer/hammer-builder>
-*   Yardoc: <http://rubydoc.info/github/ruby-hammer/hammer-builder/frames>
+*   Yardoc: <http://rubydoc.info/gems/hammer_builder/frames>
 *   Issues: <https://github.com/ruby-hammer/hammer-builder/issues>
-*   Changelog: <http://hammer.pitr.ch/hammer-builder/file.CHANGELOG.html>
-*   Gem: [https://rubygems.org/gems/hammer_builder](https://rubygems.org/gems/hammer_builder)
 *   Blog: <http://hammer.pitr.ch/>
 
 ## Syntax

data/lib/hammer_builder/abstract.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/string/inflections'
 
 require 'hammer_builder/dynamic_classes'
-require 'hammer_builder/strings'
+require 'hammer_builder/strings_injector'
 require 'hammer_builder/data'
 require 'hammer_builder/data/html5'
 require "hammer_builder/pool"
@@ -19,6 +19,27 @@ module HammerBuilder
     require "hammer_builder/abstract/abstract_single_tag"
     require "hammer_builder/abstract/abstract_double_tag"
 
+    def self.strings_injector
+      @strings_injector ||= StringsInjector.new do
+        add :lt, '<'
+        add :gt, '>'
+        add :slash_lt, '</'
+        add :slash_gt, ' />'
+        add :dash, '-'
+        add :underscore, '_'
+        add :space, ' '
+        add :spaces, Array.new(300) { |i| ('  ' * i).freeze }
+        add :newline, "\n"
+        add :quote, '"'
+        add :eql, '='
+        add :eql_quote, self[:eql] + self[:quote]
+        add :comment_start, '<!--'
+        add :comment_end, '-->'
+        add :cdata_start, '<![CDATA['
+        add :cdata_end, ']]>'
+      end
+    end
+
     # << faster then +
     # yield faster then block.call
     # accessing ivar and constant is faster then accesing hash or cvar
@@ -58,6 +79,9 @@ module HammerBuilder
       @_output  = ""
       @_stack   = []
       @_current = nil
+
+      self.class.strings_injector.inject_to self
+
       # tag classes initialization
       tags.each do |klass|
         instance_variable_set(:"@_#{klass}", self.class.dynamic_classes[klass.camelize.to_sym].new(self))
@@ -79,13 +103,13 @@ module HammerBuilder
     # inserts +comment+
     def comment(comment)
       flush
-      @_output << Strings::COMMENT_START << comment.to_s << Strings::COMMENT_END
+      @_output << @_str_comment_start << comment.to_s << @_str_comment_end
     end
 
     # insersts CDATA with +content+
     def cdata(content)
       flush
-      @_output << Strings::CDATA_START << content.to_s << Strings::CDATA_END
+      @_output << @_str_cdata_start << content.to_s << @_str_cdata_end
     end
 
     # renders html5 doc type
@@ -120,7 +144,7 @@ module HammerBuilder
     # @example
     #  HammerBuilder::Formatted.new.go_in('asd') do |string|
     #    div string
-    #  end.to_html! #=> "<div>asd</div>"
+    #  end.to_html #=> "<div>asd</div>"
     #
     def go_in(*variables, &block)
       instance_exec *variables, &block
@@ -186,13 +210,13 @@ module HammerBuilder
     def join(collection, glue = nil, &it)
       # TODO as helper? two block method call #join(collection, &item).with(&glue)
       glue_block = case glue
-        when String
-          lambda { text glue }
-        when Proc
-          glue
-        else
-          lambda { }
-      end
+                     when String
+                       lambda { text glue }
+                     when Proc
+                       glue
+                     else
+                       lambda { }
+                   end
 
       collection.each_with_index do |obj, i|
         glue_block.call() if i > 0

data/lib/hammer_builder/abstract/abstract_double_tag.rb

@@ -5,55 +5,53 @@ module HammerBuilder
       def_class :AbstractDoubleTag, :AbstractTag do ###import
         nil
 
-        # defined by class_eval because there is a error cased by super
-        # super from singleton method that is defined to multiple classes is not supported;
-        # this will be fixed in 1.9.3 or later (NotImplementedError)
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          # @api private
-          def initialize(builder)
-            super
-            @content = nil
-          end
+        # @api private
+        def initialize(builder)
+          super
+          @content = nil
+        end
 
-          # allows data-* attributes and id, classes by method_missing
-          def method_missing(method, *args, &block)
-            method = method.to_s
-            if method =~ METHOD_MISSING_REGEXP
-              if $1
-                self.rclass.add_attributes Data::Attribute.new(method.to_sym, :string)
-                self.send method, *args, &block
-              else
-                self.content(args[0]) if args[0]
-                self.__send__($3 == '!' ? :id : :class, $2, &block)
-              end
+        # allows data-* attributes and id, classes by method_missing
+        def method_missing(method, *args, &block)
+          method = method.to_s
+          if method =~ METHOD_MISSING_REGEXP
+            if $1
+              self.rclass.add_attributes Data::Attribute.new(method.to_sym, :string)
+              self.send method, *args, &block
             else
-              super(method, *args, &block)
+              attributes(if args.last.is_a?(Hash)
+                           args.pop
+                         end)
+              content args.first
+              self.__send__($3 == '!' ? :id : :class, $2.gsub(@_str_underscore, @_str_dash), &block)
             end
+          else
+            super(method, *args, &block)
           end
+        end
 
-          # @api private
-          def open(*args, &block)
-            attributes = if args.last.is_a?(Hash)
-              args.pop
-            end
-            content args[0]
-            super attributes
-            @stack << @tag_name
-            if block
-              with &block
-            else
-              self
-            end
+        # @api private
+        def open(*args, &block)
+          attributes = if args.last.is_a?(Hash)
+                         args.pop
+                       end
+          content args[0]
+          super attributes
+          @stack << @tag_name
+          if block
+            with &block
+          else
+            self
           end
-        RUBY
+        end
 
         # @api private
         # closes the tag
         def flush
           flush_classes
-          @output << Strings::GT
+          @output << @_str_gt
           @output << CGI.escapeHTML(@content) if @content
-          @output << Strings::SLASH_LT << @stack.pop << Strings::GT
+          @output << @_str_slash_lt << @stack.pop << @_str_gt
           @content = nil
         end
 
@@ -76,7 +74,7 @@ module HammerBuilder
         #   end # => <div id="id">content</div>
         def with
           flush_classes
-          @output << Strings::GT
+          @output << @_str_gt
           @content         = nil
           @builder.current = nil
           yield
@@ -84,37 +82,35 @@ module HammerBuilder
           #  @output << EscapeUtils.escape_html(content)
           #end
           @builder.flush
-          @output << Strings::SLASH_LT << @stack.pop << Strings::GT
+          @output << @_str_slash_lt << @stack.pop << @_str_gt
           nil
         end
 
         alias_method :w, :with
 
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def mimic(obj, &block)
-            super(obj, &nil)
-            return with(&block) if block
-            self
-          end
+        def mimic(obj, &block)
+          super(obj, &nil)
+          return with(&block) if block
+          self
+        end
 
-          def data(hash, &block)
-            super(hash, &nil)
-            return with(&block) if block
-            self
-          end
+        def data(hash, &block)
+          super(hash, &nil)
+          return with(&block) if block
+          self
+        end
 
-          def attribute(name, value, &block)
-            super(name, value, &nil)
-            return with(&block) if block
-            self
-          end
+        def attribute(name, value, &block)
+          super(name, value, &nil)
+          return with(&block) if block
+          self
+        end
 
-          def attributes(attrs, &block)
-            super(attrs, &nil)
-            return with(&block) if block
-            self
-          end
-        RUBY
+        def attributes(attrs, &block)
+          super(attrs, &nil)
+          return with(&block) if block
+          self
+        end
 
         protected
 
@@ -125,20 +121,20 @@ module HammerBuilder
 
           if instance_methods.include?(attribute.name)
             class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{name}(*args, &block)
-            super(*args, &nil)
-            return with(&block) if block
-            self
-          end
+              def #{name}(*args, &block)
+                super(*args, &nil)
+                return with(&block) if block
+                self
+              end
             RUBY
           else
             content_rendering = attribute_content_rendering(attribute)
             class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{name}(content#{' = true' if attribute.type == :boolean}, &block)
-            #{content_rendering}
-            return with(&block) if block
-            self
-          end
+              def #{name}(content#{' = true' if attribute.type == :boolean}, &block)
+                #{content_rendering}
+                return with(&block) if block
+                self
+              end
             RUBY
           end
         end

data/lib/hammer_builder/abstract/abstract_single_tag.rb

@@ -8,7 +8,7 @@ module HammerBuilder
         # closes the tag
         def flush
           flush_classes
-          @output << Strings::SLASH_GT
+          @output << @_str_slash_gt
           nil
         end
       end ###import

data/lib/hammer_builder/abstract/abstract_tag.rb

@@ -3,6 +3,10 @@ module HammerBuilder
     dynamic_classes do
       def_class :AbstractTag do ###import
 
+        def self.strings_injector
+          dynamic_class_base.strings_injector
+        end
+
         class_attribute :_attributes, :instance_writer => false, :instance_reader => false
         self._attributes = []
 
@@ -58,11 +62,13 @@ module HammerBuilder
           name = attribute.name.to_s
           case attribute.type
             when :string
-              Strings.add "attr_#{name}", " #{name.gsub('_', '-')}=\""
-              "@output << Strings::ATTR_#{name.upcase} << CGI.escapeHTML(content.to_s) << Strings::QUOTE"
+              strings_injector.add "attr_#{name}", " #{name.gsub('_', '-')}=#{strings_injector[:quote]}"
+              "@output << @_str_attr_#{name} << CGI.escapeHTML(content.to_s) << @_str_quote"
             when :boolean
-              Strings.add "attr_#{name}", " #{name.gsub('_', '-')}=\"#{name}\""
-              "@output << Strings::ATTR_#{name.upcase} if content"
+              strings_injector.add(
+                  "attr_#{name}",
+                  " #{name.gsub('_', '-')}=#{strings_injector[:quote]}#{name}#{strings_injector[:quote]}")
+              "@output << @_str_attr_#{name} if content"
           end
         end
 
@@ -87,11 +93,13 @@ module HammerBuilder
           @stack    = builder.instance_eval { @_stack }
           @classes  = []
           @tag_name = self.rclass.tag_name
+
+          self.rclass.strings_injector.inject_to self
         end
 
         # @api private
         def open(attributes = nil)
-          @output << Strings::LT << @tag_name
+          @output << @_str_lt << @tag_name
           @builder.current = self
           attributes(attributes)
           default
@@ -103,7 +111,7 @@ module HammerBuilder
         # @param [#to_s] value
         def attribute(name, value)
           return __send__(name, value) if respond_to?(name)
-          @output << Strings::SPACE << name.to_s << Strings::EQL_QUOTE << CGI.escapeHTML(value.to_s) << Strings::QUOTE
+          @output << @_str_space << name.to_s << @_str_eql_quote << CGI.escapeHTML(value.to_s) << @_str_quote
           self
         end
 
@@ -131,28 +139,27 @@ module HammerBuilder
         data_attribute = /^data_([a-z_]+)$/
         METHOD_MISSING_REGEXP = /#{data_attribute}|#{id_class}/ unless defined? METHOD_MISSING_REGEXP
 
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          # allows data-* attributes and id, classes by method_missing
-          def method_missing(method, *args, &block)
-            method = method.to_s
-            if method =~ METHOD_MISSING_REGEXP
-              if $1
-                self.rclass.add_attributes Data::Attribute.new(method, :string)
-                self.send method, *args
-              else
-                self.__send__($3 == '!' ? :id : :class, $2)
-              end
+        # allows data-* attributes and id, classes by method_missing
+        def method_missing(method, *args, &block)
+          method = method.to_s
+          if method =~ METHOD_MISSING_REGEXP
+            if $1
+              self.rclass.add_attributes Data::Attribute.new(method, :string)
+              self.send method, *args
             else
-              super(method, *args, &block)
+              self.__send__($3 == '!' ? :id : :class, $2.gsub(@_str_underscore, @_str_dash))
+              self.attributes args.first
             end
+          else
+            super(method, *args, &block)
           end
+        end
 
-          #def respond_to?(symbol, include_private = false)
-          #  symbol.to_s =~ METHOD_MISSING_REGEXP || super(symbol, include_private)
-          #end
-        RUBY
+        #def respond_to?(symbol, include_private = false)
+        #  symbol.to_s =~ METHOD_MISSING_REGEXP || super(symbol, include_private)
+        #end
 
-        Strings.add "attr_class", " class=\""
+        strings_injector.add "attr_class", " class=#{strings_injector[:quote]}"
         # adds classes to the tag by joining +classes+ with ' ' and skipping non-true classes
         # @param [Array<#to_s>] classes
         # @example
@@ -162,14 +169,13 @@ module HammerBuilder
           self
         end
 
-        Strings.add "attr_id", " id=\""
+        strings_injector.add "attr_id", " id=#{strings_injector[:quote]}"
         # adds id to the tag by joining +values+ with '_'
         # @param [Array<#to_s>] values
         # @example
-        #   id('user', 12) #=> id="user_15"
+        #   id('user', 12) #=> id="user-15"
         def id(*values)
-          @output << Strings::ATTR_ID << CGI.escapeHTML(values.select { |v| v }.join(Strings::UNDERSCORE)) <<
-              Strings::QUOTE
+          @output << @_str_attr_id << CGI.escapeHTML(values.select { |v| v }.join(@_str_dash)) << @_str_quote
           self
         end
 
@@ -182,19 +188,19 @@ module HammerBuilder
         #   div[AUser.new].with { text 'a' } # => <div id="a_user_1" class="a_user">a</div>
         def mimic(obj)
           klass = if obj.class.respond_to? :hammer_builder_ref
-            obj.class.hammer_builder_ref
-          else
-            ActiveSupport::Inflector.underscore(obj.class.to_s).tr('/', '-')
-          end
+                    obj.class.hammer_builder_ref
+                  else
+                    ActiveSupport::Inflector.underscore(obj.class.to_s).tr('/', '-')
+                  end
 
           id = case
-            when obj.respond_to?(:hammer_builder_ref)
-              obj.hammer_builder_ref
-            when obj.respond_to?(:id)
-              [klass, obj.id]
-            else
-              [klass, obj.object_id]
-          end
+                 when obj.respond_to?(:hammer_builder_ref)
+                   obj.hammer_builder_ref
+                 when obj.respond_to?(:id)
+                   [klass, obj.id]
+                 else
+                   [klass, obj.object_id]
+               end
           #noinspection RubyArgCount
           self.class(klass).id(id)
         end
@@ -222,7 +228,7 @@ module HammerBuilder
         # @api private
         def flush_classes
           unless @classes.empty?
-            @output << Strings::ATTR_CLASS << CGI.escapeHTML(@classes.join(Strings::SPACE)) << Strings::QUOTE
+            @output << @_str_attr_class << CGI.escapeHTML(@classes.join(@_str_space)) << @_str_quote
             @classes.clear
           end
         end