storefront 0.5.1 → 0.5.2

data/lib/storefront/components/form/fieldset.rb

@@ -1,40 +1,42 @@
 module Storefront
-  class Form
-    class Fieldset < Storefront::Form::Base
-      attr_reader :builder
+  module Components
+    class Form
+      class Fieldset < Storefront::Components::Form::Base
+        attr_reader :builder
       
-      def initialize(options = {})
-        super
+        def initialize(options = {})
+          super
         
-        @label      = localize(:titles, options[:label], nil, (attributes[:locale_options] || {}).merge(:allow_blank => true)) if options[:label].present?
+          @label      = localize(:titles, options[:label], nil, (attributes[:locale_options] || {}).merge(:allow_blank => true)) if options[:label].present?
         
-        merge_class! attributes, *[
-          config.fieldset_class
-        ]
+          merge_class! attributes, *[
+            config.fieldset_class
+          ]
         
-        attributes[:id] ||= label.underscore.strip.gsub(/[_\s]+/, config.separator) if label.present?
-        attributes.delete(:index)
-        attributes.delete(:parent_index)
-        attributes.delete(:label)
+          attributes[:id] ||= label.underscore.strip.gsub(/[_\s]+/, config.separator) if label.present?
+          attributes.delete(:index)
+          attributes.delete(:parent_index)
+          attributes.delete(:label)
         
-        @builder     = Storefront::Form::Builder.new(
-          :template       => template, 
-          :model          => model,
-          :attribute      => attribute,
-          :index          => index,
-          :parent_index   => parent_index
-        )
-      end
+          @builder     = Storefront::Components::Form::Builder.new(
+            :template       => template, 
+            :model          => model,
+            :attribute      => attribute,
+            :index          => index,
+            :parent_index   => parent_index
+          )
+        end
       
-      # form.inputs :basic_info, :locale_options => {:count => 1, :past => true}
-      def render(&block)
-        template.capture_haml do
-          template.haml_tag :fieldset, attributes do
-            template.haml_tag :legend, :class => config.legend_class do
-              template.haml_tag :span, label
-            end if label.present?
-            template.haml_tag config.field_list_tag, :class => config.list_class do
-              builder.render(&block)
+        # form.inputs :basic_info, :locale_options => {:count => 1, :past => true}
+        def render(&block)
+          template.capture_haml do
+            template.haml_tag :fieldset, attributes do
+              template.haml_tag :legend, :class => config.legend_class do
+                template.haml_tag :span, label
+              end if label.present?
+              template.haml_tag config.field_list_tag, :class => config.list_class do
+                builder.render(&block)
+              end
             end
           end
         end

data/lib/storefront/components/form/hint.rb

@@ -1,31 +1,33 @@
 module Storefront
-  class Form
-    class Hint < Storefront::Form::Base
-      def initialize(options = {})
-        super
+  module Components
+    class Form
+      class Hint < Storefront::Components::Form::Base
+        def initialize(options = {})
+          super
         
-        attributes.merge!(options[:hint_html]) if options[:hint_html]
-        attributes.delete :hint_html
-        attributes.delete :hint
+          attributes.merge!(options[:hint_html]) if options[:hint_html]
+          attributes.delete :hint_html
+          attributes.delete :hint
         
-        unless options[:hint] == false
-          merge_class! attributes, config.hint_class
-          attributes[:id]  ||= attribute.to_id(:type => :hint, :index => index, :parent_index => parent_index) if config.id_enabled_on.include?("hint")
-          if config.include_aria && config.hint_is_popup
-            attributes[:role] ||= :tooltip
+          unless options[:hint] == false
+            merge_class! attributes, config.hint_class
+            attributes[:id]  ||= attribute.to_id(:type => :hint, :index => index, :parent_index => parent_index) if config.id_enabled_on.include?("hint")
+            if config.include_aria && config.hint_is_popup
+              attributes[:role] ||= :tooltip
+            end
+            @value            = localize(:hints, attribute.name, options[:hint].is_a?(::String) ? options[:hint] : nil, :allow_blank => true)
           end
-          @value            = localize(:hints, attribute.name, options[:hint].is_a?(::String) ? options[:hint] : nil, :allow_blank => true)
         end
-      end
       
-      def render(&block)
-        template.capture_haml do
-          if value.present?
-            template.haml_tag config.hint_tag, attributes do
-              template.haml_concat value.html_safe.gsub(/\n$/, "")
+        def render(&block)
+          template.capture_haml do
+            if value.present?
+              template.haml_tag config.hint_tag, attributes do
+                template.haml_concat value.html_safe.gsub(/\n$/, "")
+              end
+            elsif config.always_include_hint_tag
+              template.haml_tag config.hint_tag, attributes
             end
-          elsif config.always_include_hint_tag
-            template.haml_tag config.hint_tag, attributes
           end
         end
       end

data/lib/storefront/components/form/input.rb

@@ -1,192 +1,194 @@
 module Storefront
-  class Form
-    class Input < Storefront::Form::Base
-      class << self
-        attr_accessor :resolves
-        
-        def resolves(*input_types)
-          @resolves ||= []
-          @resolves = @resolves.concat(input_types.flatten.compact).uniq
-        end
+  module Components
+    class Form
+      class Input < Storefront::Components::Form::Base
+        class << self
+          attr_accessor :resolves
+        
+          def resolves(*input_types)
+            @resolves ||= []
+            @resolves = @resolves.concat(input_types.flatten.compact).uniq
+          end
         
-        def resolves?(name)
-          @resolves ||= []
-          @resolves.include?(name)
-        end
+          def resolves?(name)
+            @resolves ||= []
+            @resolves.include?(name)
+          end
         
-        def registry
-          @registry ||= Dir[::File.join(::File.dirname(__FILE__), "inputs", "*")].map do |path|
-            next unless ::File.extname(path) == ".rb"
-            "Storefront::Form::#{::File.basename(path, ::File.extname(path)).camelize}".constantize
-          end.compact
-        end
+          def registry
+            @registry ||= Dir[::File.join(::File.dirname(__FILE__), "inputs", "*")].map do |path|
+              next unless ::File.extname(path) == ".rb"
+              "Storefront::Components::Form::#{::File.basename(path, ::File.extname(path)).camelize}".constantize
+            end.compact
+          end
         
-        def find(name)
-          registry.detect do |input_class|
-            input_class.resolves?(name)
+          def find(name)
+            registry.detect do |input_class|
+              input_class.resolves?(name)
+            end
           end
         end
-      end
       
-      def initialize(options = {})
-        super
+        def initialize(options = {})
+          super
         
-        # input type
-        options[:as]    ||= attribute.input_type(options)
-        @input_type     = options[:as]
-        @include_blank  = options[:include_blank] != false
-        @value          = options[:value]
-        @dynamic        = options[:dynamic] == true
-        @rich_input     = options.has_key?(:rich_input) ? !!options[:rich_input] : config.rich_input
+          # input type
+          options[:as]    ||= attribute.input_type(options)
+          @input_type     = options[:as]
+          @include_blank  = options[:include_blank] != false
+          @value          = options[:value]
+          @dynamic        = options[:dynamic] == true
+          @rich_input     = options.has_key?(:rich_input) ? !!options[:rich_input] : config.rich_input
         
-        @validate       = attributes.delete(:validate) != false
+          @validate       = attributes.delete(:validate) != false
         
-        classes = [input_type, self.class.name.split("::").last.underscore, attribute.name.to_s.underscore.strip.gsub(/[_\s]+/, config.separator)]
+          classes = [input_type, self.class.name.split("::").last.underscore, attribute.name.to_s.underscore.strip.gsub(/[_\s]+/, config.separator)]
         
-        if options[:input_html].present?
-          classes << options[:input_html].delete(:class)
-        end
+          if options[:input_html].present?
+            classes << options[:input_html].delete(:class)
+          end
         
-        unless [:submit].include?(input_type)
-          classes += [
-            attribute.required? ? config.required_class : config.optional_class, 
-            attribute.errors? ? config.error_class : config.valid_class,
-            "input"
-          ]
+          unless [:submit].include?(input_type)
+            classes += [
+              attribute.required? ? config.required_class : config.optional_class, 
+              attribute.errors? ? config.error_class : config.valid_class,
+              "input"
+            ]
           
-          if @validate && attribute.validations.present?
-            classes << config.validate_class
+            if @validate && attribute.validations.present?
+              classes << config.validate_class
+            end
           end
-        end
         
-        # class
-        merge_class! attributes, *classes.compact.uniq.map(&:to_s)
+          # class
+          merge_class! attributes, *classes.compact.uniq.map(&:to_s)
         
-        # id
-        attributes[:id] ||= attribute.to_id(:index => index, :parent_index => parent_index) if config.id_enabled_on.include?("input")
+          # id
+          attributes[:id] ||= attribute.to_id(:index => index, :parent_index => parent_index) if config.id_enabled_on.include?("input")
         
-        # validations
-        if @validate
-          attributes.merge!(attribute.validations) if config.inline_validations && attribute.validations.present?
-        end  
-        attributes[:placeholder] = options[:placeholder] if options[:placeholder].present?
+          # validations
+          if @validate
+            attributes.merge!(attribute.validations) if config.inline_validations && attribute.validations.present?
+          end  
+          attributes[:placeholder] = options[:placeholder] if options[:placeholder].present?
         
-        # name
-        attributes[:name]     ||= attribute.to_param(:index => index, :parent_index => parent_index)
+          # name
+          attributes[:name]     ||= attribute.to_param(:index => index, :parent_index => parent_index)
         
-        # value
-        attributes[:value]    ||= attribute.value(options[:value])
+          # value
+          attributes[:value]    ||= attribute.value(options[:value])
         
-        # attributes[:tabindex]      = @tabindex
-        attributes[:maxlength]       = options[:max] if options[:max].present?
+          # attributes[:tabindex]      = @tabindex
+          attributes[:maxlength]       = options[:max] if options[:max].present?
         
-        # expressions
-        pattern                      = options[:match]
-        pattern                      = pattern.source if pattern.is_a?(::Regexp)
-        attributes[:"data-match"]    = pattern if pattern.present?
-        attributes[:"aria-required"] = attribute.required.to_s if attribute.required?
+          # expressions
+          pattern                      = options[:match]
+          pattern                      = pattern.source if pattern.is_a?(::Regexp)
+          attributes[:"data-match"]    = pattern if pattern.present?
+          attributes[:"aria-required"] = attribute.required.to_s if attribute.required?
         
-        # access key
-        access_key                   = attributes[:accesskey] || attribute.access_key
-        attributes[:accesskey]       = access_key
+          # access key
+          access_key                   = attributes[:accesskey] || attribute.access_key
+          attributes[:accesskey]       = access_key
         
-        attributes.merge!(options[:input_html]) if options[:input_html]
+          attributes.merge!(options[:input_html]) if options[:input_html]
         
-        attributes.delete :include_blank
-        attributes.delete :input_html
-        attributes.delete :include_template
-        attributes.delete :as
-        attributes.delete :dynamic
-        attributes.delete :parent_index
+          attributes.delete :include_blank
+          attributes.delete :input_html
+          attributes.delete :include_template
+          attributes.delete :as
+          attributes.delete :dynamic
+          attributes.delete :parent_index
         
-        attributes[:required] = "true" if attributes.delete(:required) == true
-        attributes[:disabled] = "true" if attributes.delete(:disabled) == true
-        attributes[:autofocus] = "true" if attributes.delete(:autofocus) == true
-        attributes[:"data-dynamic"] = "true" if @dynamic
+          attributes[:required] = "true" if attributes.delete(:required) == true
+          attributes[:disabled] = "true" if attributes.delete(:disabled) == true
+          attributes[:autofocus] = "true" if attributes.delete(:autofocus) == true
+          attributes[:"data-dynamic"] = "true" if @dynamic
         
-        attributes[:title] ||= attributes[:placeholder] if attributes[:placeholder].present?
+          attributes[:title] ||= attributes[:placeholder] if attributes[:placeholder].present?
         
-        autocomplete = attributes.delete(:autocomplete)
-        if autocomplete && config.include_aria
-          attributes[:"aria-autocomplete"] = case autocomplete
-          when :inline, :list, :both
-            autocomplete.to_s
-          else
-            "both"
+          autocomplete = attributes.delete(:autocomplete)
+          if autocomplete && config.include_aria
+            attributes[:"aria-autocomplete"] = case autocomplete
+            when :inline, :list, :both
+              autocomplete.to_s
+            else
+              "both"
+            end
           end
         end
-      end
       
-      def render(&block)
-        send(:"#{@input_type}_input")
-      end
+        def render(&block)
+          send(:"#{@input_type}_input")
+        end
       
-      protected
-      attr_reader :include_blank
+        protected
+        attr_reader :include_blank
       
-      def simple_input(type, options = {}, &block)
-        template.capture_haml do
-          template.haml_tag :input, extract_attributes!(type, options), &block
-          if @dynamic
-            template.haml_tag :ul, :class => "buttons" do
-              template.haml_tag :li do
-                template.haml_tag :a, config.add_label, :class => :add, :role => :button, :type => :button, :href => "#"
-              end
-              template.haml_tag :li do
-                template.haml_tag :a, config.remove_label, :class => :remove, :role => :button, :type => :button, :href => "#"
+        def simple_input(type, options = {}, &block)
+          template.capture_haml do
+            template.haml_tag :input, extract_attributes!(type, options), &block
+            if @dynamic
+              template.haml_tag :ul, :class => "buttons" do
+                template.haml_tag :li do
+                  template.haml_tag :a, config.add_label, :class => :add, :role => :button, :type => :button, :href => "#"
+                end
+                template.haml_tag :li do
+                  template.haml_tag :a, config.remove_label, :class => :remove, :role => :button, :type => :button, :href => "#"
+                end
               end
             end
           end
         end
-      end
       
-      def rich_input(type, options = {}, &block)
-        template.capture_haml do
-          result = template.rich_button :inner_html => extract_attributes!(type, options), :as => :input
-          template.haml_concat result.gsub(/\n$/, "") if result
+        def rich_input(type, options = {}, &block)
+          template.capture_haml do
+            result = template.rich_button :inner_html => extract_attributes!(type, options), :as => :input
+            template.haml_concat result.gsub(/\n$/, "") if result
+          end
         end
-      end
       
-      def extract_attributes!(type, options = {})
-        if [:numeric, :string, :password, :text, :phone, :url, :email].include?(type)
-          attributes = model.default_string_options(attribute.name, type).merge(self.attributes)
-        else
-          attributes = self.attributes
-        end
+        def extract_attributes!(type, options = {})
+          if [:numeric, :string, :password, :text, :phone, :url, :email].include?(type)
+            attributes = model.default_string_options(attribute.name, type).merge(self.attributes)
+          else
+            attributes = self.attributes
+          end
 
-        merge_class! attributes, options.delete(:class)
+          merge_class! attributes, options.delete(:class)
 
-        attributes[:type] = input_type_for(type)
+          attributes[:type] = input_type_for(type)
 
-        attributes.merge(options)
-      end
+          attributes.merge(options)
+        end
       
-      def base_input(tag, *args, &block)
-        options    = args.extract_options!
-        attributes = self.attributes
-        text       = args.shift
-        
-        template.capture_haml do
-          if block_given?
-            template.haml_tag tag, attributes, &block
-          else
-            if text.present?
-              template.haml_tag tag, text, attributes
+        def base_input(tag, *args, &block)
+          options    = args.extract_options!
+          attributes = self.attributes
+          text       = args.shift
+        
+          template.capture_haml do
+            if block_given?
+              template.haml_tag tag, attributes, &block
             else
-              template.haml_tag tag, attributes
+              if text.present?
+                template.haml_tag tag, text, attributes
+              else
+                template.haml_tag tag, attributes
+              end
             end
           end
         end
-      end
       
-      def input_type_for(type)
-        case type
-        when :password, :text, :url, :email, :file, :textarea, :search, :submit, :radio, :checkbox
-          type
-        when :phone, :tel
-          :tel
-        else
-          :string
+        def input_type_for(type)
+          case type
+          when :password, :text, :url, :email, :file, :textarea, :search, :submit, :radio, :checkbox
+            type
+          when :phone, :tel
+            :tel
+          else
+            :string
+          end
         end
       end
     end