storefront 0.3.2 → 0.5.0

data/lib/storefront/{form → components/form}/base.rb

@@ -1,8 +1,8 @@
 module Storefront
   class Form
-    class Base
-      include Storefront::LocaleHelper
-      include Storefront::AttributeHelper
+    class Base < Storefront::Components::Base
+      include Storefront::Helpers::ContentHelper
+      include Storefront::Helpers::DomHelper
       
       def initialize(options = {})
         @template       = options[:template]

data/lib/storefront/{form → components/form}/builder.rb

@@ -38,9 +38,9 @@ module Storefront
         # do something here for counts
         sub_parent     = model.object
         sub_object     = args.shift
-
+        
         index          = options.delete(:index)
-
+        
         unless index.present? && index.is_a?(::String)
           if sub_object.blank? && index.present?
             sub_object   = sub_parent.send(attribute)[index]
@@ -71,7 +71,7 @@ module Storefront
       def field(*args, &block)        
         options        = args.extract_options!
         attribute_name = args.shift || attribute.name
-        attribute      = Storefront::AttributeProxy.new(
+        attribute      = Storefront::Attribute.new(
           :name        => attribute_name,
           :model       => @model, 
           :required    => options[:required] == true, 

data/lib/storefront/{form → components/form}/errors.rb

@@ -18,9 +18,7 @@ module Storefront
       def render(&block)
         template.capture_haml do
           if value.present?
-            template.haml_tag config.error_tag, attributes do
-              template.haml_concat value.join("\n").html_safe.gsub(/\n$/)
-            end
+            template.haml_tag config.error_tag, value.join("\n").html_safe.gsub(/\n$/, ""), attributes
           elsif config.always_include_error_tag
             template.haml_tag config.error_tag, attributes
           end

data/lib/storefront/{form → components/form}/field.rb

@@ -22,7 +22,7 @@ module Storefront
             attribute.required? ? config.required_class : config.optional_class, 
             attribute.errors? ? config.error_class : config.valid_class,
           ]
-          if attribute.validations.present?
+          if options[:validate] != false && attribute.validations.present?
             classes << config.validate_class
           end
         end

data/lib/storefront/{form → components/form}/input.rb

@@ -39,6 +39,8 @@ module Storefront
         @dynamic        = options[:dynamic] == true
         @rich_input     = options.has_key?(:rich_input) ? !!options[:rich_input] : config.rich_input
         
+        @validate       = attributes.delete(:validate) != false
+        
         classes = [input_type, self.class.name.split("::").last.underscore, attribute.name.to_s.underscore.strip.gsub(/[_\s]+/, config.separator)]
         
         if options[:input_html].present?
@@ -52,7 +54,7 @@ module Storefront
             "input"
           ]
           
-          if attribute.validations.present?
+          if @validate && attribute.validations.present?
             classes << config.validate_class
           end
         end
@@ -61,10 +63,12 @@ module Storefront
         merge_class! attributes, *classes.compact.uniq.map(&:to_s)
         
         # id
-        attributes[:id] ||= attribute.to_id(:index => index, :parent_index => parent_index)
+        attributes[:id] ||= attribute.to_id(:index => index, :parent_index => parent_index) if config.id_enabled_on.include?("input")
         
         # validations
-        attributes.merge!(attribute.validations) if config.inline_validations && attribute.validations.present?
+        if @validate
+          attributes.merge!(attribute.validations) if config.inline_validations && attribute.validations.present?
+        end  
         attributes[:placeholder] = options[:placeholder] if options[:placeholder].present?
         
         # name
@@ -93,8 +97,6 @@ module Storefront
         attributes.delete :include_template
         attributes.delete :as
         attributes.delete :dynamic
-        attributes.delete :max
-        attributes.delete :min
         attributes.delete :parent_index
         
         attributes[:required] = "true" if attributes.delete(:required) == true

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

@@ -0,0 +1,7 @@
+module Storefront
+  class Form
+    module Inputs
+      
+    end
+  end
+end

data/lib/storefront/{form → components/form}/inputs/select.rb

@@ -7,7 +7,7 @@ module Storefront
       def select_input(options = {})
         collection = self.collection
         collection = [[prompt, ""]] + collection if prompt.present?
-        @value     = attributes.delete(:value)
+        @value     = attributes.delete(:value).to_s
         
         base_input :select, attributes.merge(options) do
           collection_iterator(collection, value)
@@ -20,17 +20,17 @@ module Storefront
           optgroup = false
           case item
           when Array
-            name            = item[0]
-            options[:value] = item[1]
+            name            = item[0].to_s
+            options[:value] = item[1].to_s
           when Hash
-            name            = item[:name]
-            options[:value] = item[:value]
+            name            = item[:name].to_s
+            options[:value] = item[:value].to_s
             optgroup = item[:children].present?
           when ::String, ::Float, ::Integer, ::BigDecimal
             options[:value] = item.to_s
           else
             name            = item.name.strip.humanize
-            options[:value] = item.id
+            options[:value] = item.id.to_s
           end
           if optgroup
             template.capture_haml do

data/lib/storefront/{form → components/form}/label.rb

@@ -11,7 +11,7 @@ module Storefront
         unless options[:label] == false
           merge_class! attributes, config.label_class
           attributes[:id]       ||= attribute.to_id(:type => :error, :index => index, :parent_index => parent_index) if config.id_enabled_on.include?("label")
-          attributes[:for]      ||= attribute.to_id(:type => :input, :index => index, :parent_index => parent_index)
+          attributes[:for]      ||= attribute.to_id(:type => :input, :index => index, :parent_index => parent_index) if config.id_enabled_on.include?("input")
           
           @value    = localize(:labels, attribute.name, options[:label].is_a?(::String) ? options[:label] : nil)
           @value    = attribute.to_label if @value.blank?

data/lib/storefront/components/header.rb

@@ -0,0 +1,73 @@
+module Storefront
+  module Components
+    class Header < Storefront::Components::Base
+      def render(&block)
+        return nil if options.blank?
+        
+        template.capture_haml do
+          if block_given? && !pointer.include?("footer")
+            template.haml_tag :header, options[:header_html], &block
+          elsif options[:header] == false || pointer.include?("footer")
+            render_titles
+          else
+            if options[:title_html][:value].present?
+              template.haml_tag :header, options[:header_html] do
+                render_titles
+              end
+            else
+              template.haml_tag :header, options[:header_html]
+            end
+          end
+        end
+      end
+      
+      def render_titles
+        level    = options[:level] || config.default_component_header_level
+        title    = options[:title_html].delete(:value)
+        subtitle = options[:subtitle_html].delete(:value)
+        
+        if title.present?
+          if subtitle.present?
+            if options[:header] == false || pointer.include?("footer")
+              template.haml_tag :"h#{level}", title, options[:title_html]
+              template.haml_tag :"h#{level + 1}", subtitle, options[:subtitle_html]
+            else
+              template.haml_tag :hgroup do
+                template.haml_tag :"h#{level}", title, options[:title_html]
+                template.haml_tag :"h#{level + 1}", subtitle, options[:subtitle_html]
+              end
+            end
+          else
+            template.haml_tag :"h#{level}", title, options[:title_html]
+          end
+        end
+      end
+      
+      def extract_options!(*args)
+        options = args.extract_options!
+        return options if options[:skip_format]
+        return {} if options[:title] == false
+        
+        header_html                       = options[:header_html] || {}
+        header_html.reverse_merge!(:class => config.header_class)
+        
+        title_html                        = options[:title_html] || {}
+        title_html.reverse_merge!(:class  => config.title_class)
+        title_html[:value]                = options.delete(:title)
+        
+        title_html[:value] = t?(title_html[:value], :scope => :"widgets.headers") if title_html[:value].is_a?(::Symbol)
+      
+        subtitle_html = options[:subtitle_html] || {}
+        if subtitle_html.present? || options[:subtitle].present?
+          subtitle_html.reverse_merge!(:class  => config.subtitle_class)
+          subtitle_html[:value]           = options.delete(:subtitle)
+          subtitle_html[:value]           = t?(subtitle_html[:value], :scope => :"widgets.headers") if subtitle_html[:value].is_a?(::Symbol)
+        end
+      
+        options.merge! :header_html => header_html, :title_html => title_html, :subtitle_html => subtitle_html
+      
+        options
+      end
+    end
+  end
+end

data/lib/storefront/components/image.rb

@@ -0,0 +1,12 @@
+module Storefront
+  module Components
+    class Image < Base
+      def render(label, path, options = {})
+        capture_haml do
+          haml_tag :span
+          haml_concat image_tag(label, path, options)
+        end
+      end
+    end
+  end
+end

data/lib/storefront/components/javascript_template.rb

@@ -0,0 +1,21 @@
+module Storefront
+  module Components
+    class JavascriptTemplate < Base
+      def render(&block)
+        template.capture_haml do
+          template.haml_tag :script, options, &block
+        end
+      end
+      
+      def extract_options!(*args)
+        options = args.extract_options!
+        name    = args.shift
+        if name
+          options[:id] ||= name.to_s.strip.gsub(/[\s|_]+/, config.separator).squeeze(config.separator)
+        end
+        options[:type] ||= "text/html"
+        options
+      end
+    end
+  end
+end

data/lib/storefront/components/list.rb

@@ -0,0 +1,27 @@
+module Storefront
+  module Components
+    class List < Base
+      def render(&block)
+        template.capture_haml do
+          template.haml_tag options[:tag], options[:outer_html], &block
+        end
+      end
+      
+      def extract_options!(*args)
+        options = super(*args)
+        
+        options[:tag] ||= :ul
+        
+        if config.include_aria
+          options[:outer_html][:role] ||= :list
+        end
+        
+        merge_class! options[:outer_html], *[
+          "list"
+        ]
+        
+        options
+      end
+    end
+  end
+end

data/lib/storefront/components/menu.rb

@@ -0,0 +1,41 @@
+module Storefront
+  module Components
+    class Menu < Base
+      def render(&block)
+        template.capture_haml do
+          template.haml_tag :nav, options[:outer_html] do
+            header = template.header_widget(options)
+            
+            if header.present?
+              template.haml_concat header
+            end
+            
+            template.haml_tag options[:tag], options[:inner_html], &block
+            
+            if options[:footer_html].present?
+              template.footer_widget(options[:footer_html])
+            end
+          end
+        end
+      end
+      
+      def extract_options!(*args)
+        options = super(*args)
+        
+        options[:tag] ||= :ol
+        options[:inner_html] ||= {}
+        
+        if config.include_aria
+          options[:outer_html][:role] ||= :menu
+          options[:inner_html][:role] ||= :list
+        end
+        
+        merge_class! options[:inner_html], *[
+          "list"
+        ]
+        
+        options
+      end
+    end
+  end
+end

data/lib/storefront/components/nav.rb

@@ -0,0 +1,78 @@
+module Storefront
+  module Components
+    class Nav < Storefront::Components::Base
+      def render(&block)
+        template.capture_haml do
+          template.haml_tag options[:tag], options[:outer_html] do
+            if block_given?
+              case block.arity
+              when 1
+                yield(options[:value].strip)
+              else
+                yield
+              end
+            elsif options[:current] && options[:as] == :span
+              template.haml_tag :span, options[:value], options[:inner_html]
+            else
+              # inner_html[:title] ||= "Link to the #{text.strip} page."
+              template.haml_concat link_to(options[:value], options[:path], options[:inner_html])
+            end
+            template.haml_tag :span, options[:separator] if options[:separator]
+          end
+        end
+      end
+      
+      def extract_options!(*args)
+        options        = args.extract_options!
+        key, path      = args
+        
+        locale_options = options.delete(:locale_options) || {}
+        text           = t?(key, locale_options.reverse_merge(:scope => :"widgets.nav"))
+        
+        as             = options.delete(:as) || :span
+        separator      = options.delete(:separator)
+        
+        if options.has_key?(:current)
+          current      = options.delete(:current) == true
+        else
+          current      = on_current_page?(path)
+        end
+        
+        inner_html     = options.delete(:inner_html) || {}
+        outer_html     = options.delete(:outer_html) || {}
+        
+        inner_html.merge! clone_attributes(options)
+        
+        merge_class! outer_html, *[
+          config.nav_class,
+          current ? config.active_class : nil
+        ].compact.uniq
+        
+        if config.include_aria
+          outer_html[:role] ||= if pointer.include?("menu")
+            :menuitem
+          else
+            :listitem
+          end
+        end
+      
+        text.strip!
+        
+        if config.auto_id_nav
+          outer_html[:id] ||= [text.underscore.parameterize, config.nav_class].join(config.separator).gsub(/[\s|_]+/, config.separator).squeeze(config.separator)
+        end
+        
+        options.merge(
+          :inner_html => inner_html,
+          :outer_html => outer_html,
+          :separator  => separator,
+          :current    => current,
+          :as         => as,
+          :value      => text,
+          :path       => path,
+          :tag        => config.nav_tag
+        )
+      end
+    end
+  end
+end

data/lib/storefront/components/sidebar.rb

@@ -0,0 +1,23 @@
+module Storefront
+  module Components
+    class Sidebar < Base
+      def sidebar(*args)
+        locals  = args.extract_options!
+        path    = args.shift
+        if path.blank?
+          path = resource.class.name.underscore.pluralize.to_sym rescue nil
+        end
+        if path.is_a?(Symbol)
+          path = [path_namespace, path.to_s, "sidebar"].compact.join("/")
+        end
+        content_for :sidebar do
+          render :partial => path, :locals => locals
+        end
+      end
+    
+      def sidebar_record
+        @sidebar_record
+      end
+    end
+  end
+end