lib/wrap_it/base.rb in wrap_it-0.2.0 vs lib/wrap_it/base.rb in wrap_it-1.0.0

@@ -17,63 +17,83 @@
   #     end
   #   end
   # @author Alexey Ovchinnikov <[e-mail]>
   #
   class Base
+    # Documentation includes
+    #
+    # @!parse extend  Arguments::ClassMethods
+    # @!parse extend  Enums::ClassMethods
+    # @!parse extend  HTML::ClassMethods
+    # @!parse extend  Sections::ClassMethods
+    # @!parse extend  Switches::ClassMethods
+
+    #
+    # include appropriate functionality from modules
     include DerivedAttributes
     include Callbacks
 
     callback :initialize, :capture, :render
 
+    include Arguments
     include Sections
-    include HTMLClass
-    include HTMLData
+    include HTML
     include Switches
     include Enums
     include Renderer
 
     @omit_content = false
 
-    attr_reader :tag
-    attr_reader :options
-
+    attr_reader :helper_name
+    option :helper_name
+    option :tag
     section :content, :render_arguments, :render_block
     place :content, :after, :begin
     place :render_block, :after, :begin
     place :render_arguments, :after, :begin
 
     def initialize(template, *args, &block)
-      @template, @arguments, @block = template, args, block
-      self.options = @arguments.extract_options!
-
-      @helper_name = @options.delete(:helper_name)
-      @helper_name.is_a?(String) && @helper_name = @helper_name.to_sym
-
-      @arguments.extend ArgumentsArray
+      @template, @block = template, block
       add_default_classes
-
       run_callbacks :initialize do
-        @tag = @options.delete(:tag) ||
-          self.class.get_derived(:@default_tag) || 'div'
-        @tag = @tag.to_s
+        capture_arguments!(args, &block)
+        # TODO: uncomment following after html_attr implementation finished
+        #html_attr.merge!(args.extract_options!)
+        self.html_attr = args.extract_options!
+        # TODO: find convenient way to save unprocessed arguments
+        @arguments = args
       end
     end
 
+    def tag
+      @tag ||= (self.class.get_derived(:@default_tag) || 'div').to_s
+    end
+
+    def tag=(value)
+      value.is_a?(Symbol) && value = value.to_s
+      value.is_a?(String) && @tag = value
+    end
+
+    def helper_name=(value)
+      value.is_a?(String) && value = value.to_sym
+      value.is_a?(Symbol) && @helper_name = value
+    end
+
     def omit_content?
-      self.class.get_derived(:@omit_content)
+      self.class.get_derived(:@omit_content) == true
     end
 
     #
     # Renders element to template
     #
-    # @override render([content, ...])
-    # @param  content [String] additional content that will be appended
-    #                          to element content
-    # @yield [element] Runs block after capturing element content and before
-    #                  rendering it. Returned value appended to content.
-    # @yieldparam element [Base] rendering element.
-    # @yieldreturn [String, nil] content to append to HTML
+    # @overload render([content, ...])
+    #   @param content [String] additional content that will be appended
+    #                           to element content
+    #   @yield [element] Runs block after capturing element content and before
+    #                    rendering it. Returned value appended to content.
+    #   @yieldparam element [Base] rendering element.
+    #   @yieldreturn [String, nil] content to append to HTML
     #
     # @return [String] rendered HTML for element
     def render(*args, &render_block)
       # return cached copy if it available
       return @rendered unless @rendered.nil?
@@ -108,21 +128,21 @@
     # arguments and options. If wrapper class ommited, WrapIt::Base will
     # be used.
     #
     # If block present, it will be called when wrapper will rendered.
     #
-    # @override wrap(wrapper)
-    # @param  wrapper [Base] wrapper instance.
+    # @overload wrap(wrapper)
+    #   @param  wrapper [Base] wrapper instance.
     #
-    # @override wrap(wrapper_class, [arg, ...], options = {})
-    # @param  wrapper_class [Class] WrapIt::Base subclass for wrapper.
-    # @param  arg [String, Symbol] wrapper creation arguments.
-    # @param  options [Hash] wrapper creation options.
+    # @overload wrap(wrapper_class, [arg, ...], options = {})
+    #   @param  wrapper_class [Class] WrapIt::Base subclass for wrapper.
+    #   @param  arg [String, Symbol] wrapper creation arguments.
+    #   @param  options [Hash] wrapper creation options.
     #
-    # @override wrap([arg, ...], options = {})
-    # @param  arg [String, Symbol] wrapper creation arguments.
-    # @param  options [Hash] wrapper creation options.
+    # @overload wrap([arg, ...], options = {})
+    #   @param  arg [String, Symbol] wrapper creation arguments.
+    #   @param  options [Hash] wrapper creation options.
     #
     # @return [void]
     def wrap(*args, &block)
       if args.first.is_a?(Base)
         @wrapper = args.shift
@@ -137,11 +157,10 @@
     end
 
     protected
 
     #
-    # @dsl
     # Defines or gets default tag name for element. This tag can be changed
     # soon. Without parameters returns current default_tag value.
     # @param  name [<Symbol, String>] Tag name. Converted to `String`.
     # @param  override [Boolean] Whether to override default tag value if it
     #   allready exists.
@@ -156,21 +175,10 @@
 
     def self.omit_content
       @omit_content = true
     end
 
-    def options=(hash)
-      hash.is_a?(Hash) || return
-      hash.symbolize_keys!
-
-      # sanitize class
-      hash[:class] ||= []
-      hash[:class] = [hash[:class]] unless hash[:class].is_a?(Array)
-      hash[:class] = hash[:class].map { |c| c.to_s }.uniq
-      @options = hash
-    end
-
     def capture_sections
       run_callbacks :capture do
         unless @block.nil?
           captured = capture(self, &@block) || empty_html
           omit_content? || self[:content] << captured
@@ -197,15 +205,16 @@
 
     private
 
     def do_render
       # cleanup options from empty values
-      @options.select! do |k, v|
+      html_attr.select! do |k, v|
         !v.nil? && (!v.respond_to?(:empty?) || !v.empty?)
       end
       @rendered = render_sections
       run_callbacks :render do
-        @rendered = content_tag(@tag, @rendered, @options)
+        options = html_attr.merge(class: html_class.to_html, data: html_data)
+        @rendered = content_tag(tag, @rendered, options)
       end
     end
 
     def do_wrap
       @wrapper.is_a?(Base) && @rendered = capture do