storefront 0.2.1 → 0.2.7

data/lib/storefront/helpers/dashboard_helper.rb

@@ -3,35 +3,27 @@ module Storefront
     def dashboard_for(*args, &block)
       record            = args.shift
       options           = args.extract_options!
-      condition         = extract_condition!(options)
       @dashboard_record = record
-      concat(capture(&block)) if record && condition != false
+      concat(capture(&block)) if record
       @dashboard_record = nil
     end
-    
-    def dashboard(key, locals = {})
-      render :partial => key, :locals => locals.reverse_merge(:figures => [])
-    end
-    
+  
     def figure(*names, &block)
       locals = names.extract_options!
-      condition = extract_condition!(locals)
 
-      if condition != false
-        locals.reverse_merge(:locale => nil)
-        locals.merge!(:yielded_content => capture(&block)) if block_given?
-        result = capture_haml do
-          names.each do |name|
-            haml_concat render(:partial => "shared/dashboard/#{name}", :locals => locals)
-          end
+      locals.reverse_merge(:locale => nil)
+      locals.merge!(:yielded_content => capture(&block)) if block_given?
+      result = capture_haml do
+        names.each do |name|
+          haml_concat render(:partial => "shared/dashboard/#{name}", :locals => locals)
         end
       end
 
       result
     end
-    
+  
     def report_for(record_or_key, hash, options = {}, &block)
-      Semantic::Dashboard.new(self, record_or_key, hash, options, &block).content
+      Storefront::Dashboard.new(self, record_or_key, hash, options, &block).content
     end
   end
 end

data/lib/storefront/helpers/definition_list_helper.rb

@@ -1,29 +1,97 @@
 module Storefront
-  module DefinitionListHelper    
-    def term(key, value, options = {})
-      return if value.blank?
-      condition = extract_condition!(options)
+  module DefinitionListHelper
+    def definition_list_widget(*args, &block)
+      options = definition_list_widget_options(*args)
+      
+      capture_haml do
+        haml_tag options[:as], options[:outer_html] do
+          @separator = options.has_key?(:separator) ? options[:separator] : storefront_config.term_separator
+          header = header_widget(options)
+          haml_concat header.gsub(/\n$/, "") if header.present?
 
-      if condition != false
-        result = capture_haml do
-          haml_tag :tr, :class => "term" do
-            text = key.is_a?(String) ? key : t("widgets.details.#{key}")
-            haml_tag :td, text.gsub(/:?$/, ":"), :class => "key first"
-            haml_tag :td, value, :class => "value"
+          haml_tag options[:tag], options[:content_html], &block
+          
+          if options[:footer_html].present?
+            haml_concat footer_widget(options[:footer_html])
           end
+          @separator = nil
         end
       end
+    end
+    alias terms_widget definition_list_widget
+    
+    def definition_list_widget_options(*args)
+      options = widget_options("definition-list-widget", *args)
+      
+      options[:as] ||= :section
+      options[:tag] ||= storefront_config.terms_tag
+      
+      options[:content_html] ||= {}
+      merge_class! options[:content_html], storefront_config.content_class
+      
+      options
+    end
+    
+    def definition(key, value, options = {})
+      locale_options = options.delete(:locale_options) || {}
+      label       = t?(key, locale_options.reverse_merge(:scope => :"terms.labels"))
+      
+      key_html   = options.delete(:key_html) || {}
+      value_html = options.delete(:value_html) || {}
+      
+      key_html.reverse_merge! clone_attributes(options)
+      value_html.reverse_merge! clone_attributes(options)
+      
+      merge_class! key_html, storefront_config.term_key_class
+      merge_class! value_html, storefront_config.term_value_class
+      
+      id_base    = label.underscore.strip.gsub(/[\s|_]+/, storefront_config.separator).squeeze(storefront_config.separator)
+      
+      key_html[:id] ||= "#{id_base}-key"
+      value_html[:id] ||= "#{id_base}-value"
+      
+      separator = options[:separator] || @separator
+      
+      label.gsub!(/#{separator}?$/, separator) if separator.present?
+      
+      if storefront_config.include_aria
+        value_html[:role] ||= :definition
+        value_html[:"aria-labelledby"] = key_html[:id]
+        #value_html[:"aria-describedby"] = hint_html[:id]
+      end
       
-      result
+      if storefront_config.terms_tag == :table
+        _table_term(label, value, key_html, value_html)
+      else
+        _definiton_list_term(label, value, key_html, value_html)
+      end
     end
+    alias term definition
     
-    def terms(&block)
+    def definition_list(&block)
       capture_haml do
-        haml_tag :dl do
+        haml_tag storefront_config.terms_tag do
           yield
         end
       end
     end
-    alias definition_list terms
+    alias terms definition_list
+    
+    protected
+    def _definiton_list_term(label, value, key_html, value_html)      
+      capture_haml do
+        haml_tag :dt, label, key_html
+        haml_tag :dd, value, value_html
+      end
+    end
+    
+    def _table_term(label, value, key_html, value_html)
+      capture_haml do
+        haml_tag :tr, :class => storefront_config.term_class do
+          haml_tag :td, label, key_html
+          haml_tag :td, value, value_html
+        end
+      end
+    end
   end
 end

data/lib/storefront/helpers/form_helper.rb

@@ -1,8 +1,13 @@
 module Storefront
   module FormHelper
     def form_for(*args, &block)
-      Storefront::Form.new(self, *args, &block).content
+      Storefront::Form.new(self, *args).render(&block)
+    end
+    
+    def submit_for(text, url, options = {})
+      form_for(object, options.merge(:url => url)) do |form|
+        haml_concat Storefront::Form::Input.find(:submit).new(:value => text).render
+      end
     end
   end
 end
-

data/lib/storefront/helpers/head_helper.rb

@@ -193,7 +193,7 @@ module Storefront
     def content_type_tag(type = "text/html", charset = "UTF-8")
       meta_tag("Content-Type", "#{type}; charset=#{charset}")
     end
-  
+    
     def search_link_tag(href, title)
       link_tag({:rel => "search", :type => "application/opensearchdescription+xml", :href => href, :title => title})
     end  
@@ -201,7 +201,7 @@ module Storefront
     def favicon_link_tag(favicon = "/favicon.ico")
       link_tag({:rel => "shortcut icon", :href => favicon, :type => "image/x-icon"})
     end
-  
+    
     def link_tag(options = {})
       tag(:link, options)
     end

data/lib/storefront/helpers/image_helper.rb

@@ -20,31 +20,7 @@ module Storefront
 
       tag("img", options)
     end
-
-    def load_logo(parent, size = "small", link = nil, lightbox = true)
-      if parent && parent.logo_id.present?
-        path = parent.logo.url(size.to_s) rescue nil
-      end
-
-      if path.blank?
-        path  = "/images/vendors/no-logo.png"
-        alt   = "No logo"
-      else
-        alt   = "Logo for #{parent.is_a?(::Group) ? parent.name : parent.vendor_name}"
-      end
-
-      if parent && parent.logo
-        path << "?#{parent.logo.updated_at.to_i}"
-      end
-      if link
-        # , :width => 74, :height => 74
-        clazz = lightbox == true ? 'fancy-ajax logo' : 'logo'
-        link_to [content_tag(:span), image_tag(path, :class =>  "photo", :alt => alt, :title => alt)].join("").html_safe, link, :class => clazz, :"data-deal-id" => parent.id, :"data-ajax" => "false"
-      else
-        image_tag(path)
-      end
-    end
-
+    
     # http://snippets.dzone.com/posts/show/805
     def read_image_size(path)
       width, height = IO.read("#{Rails.root}/public/images/#{path}")[0x10..0x18].unpack('NN')

data/lib/storefront/helpers/list_helper.rb

@@ -1,47 +1,135 @@
 module Storefront
   module ListHelper
-    def nav(key, path = nil, attributes = {}, &block)
-      condition = extract_condition!(attributes)
-      return if condition == false
-      text      = widget_text(key, :nav)
+    def list_widget(*args, &block)
+      options    = list_widget_options("list-widget", *args)
+      
+      capture_haml do
+        haml_tag :nav, options[:outer_html] do
+          @list_context = :list
+          
+          header = header_widget(options)
+          haml_concat header if header.present?
+          
+          haml_tag options[:tag], options[:inner_html], &block
+          
+          footer_widget(options[:footer_html]) if options[:footer_html].present?
+          
+          @list_context = nil
+        end
+      end
+    end
+    
+    def list_widget_options(*args)
+      options = widget_options(*args)
+      
+      options[:tag] ||= :ul
+      
+      if storefront_config.include_aria
+        options[:outer_html][:role] ||= :list
+      end
+      
+      options[:inner_html] ||= {}
+      
+      merge_class! options[:inner_html], *[
+        "list-items"
+      ]
+      
+      options
+    end
+    
+    def menu_widget(*args, &block)
+      options              = menu_widget_options("menu-widget", *args)
+      
+      capture_haml do
+        haml_tag :nav, options[:outer_html] do
+          @list_context = :menu
+          header = header_widget(options)
+          haml_concat header if header.present?
+          
+          haml_tag options[:tag], options[:inner_html], &block
+          
+          footer_widget(options[:footer_html]) if options[:footer_html].present?
+          @list_context = nil
+        end
+      end
+    end
+    alias nav_widget menu_widget
+    
+    def menu_widget_options(*args)
+      options = widget_options(*args)
+      
+      if storefront_config.include_aria
+        options[:outer_html][:role] ||= :menu
+      end
+      
+      options[:inner_html] ||= {}
+      
+      options[:tag] ||= :ol
+      
+      merge_class! options[:inner_html], *[
+        "list-items"
+      ]
+      
+      options
+    end
+    
+    def list_item(key, path = nil, attributes = {}, &block)
+      locale_options = attributes.delete(:locale_options) || {}
+      text           = t?(key, locale_options.reverse_merge(:scope => :"widgets.nav"))
+      
+      as             = attributes.delete(:as) || :span
+      separator      = attributes.delete(:separator)
+      
       if attributes.has_key?(:current)
-        current = attributes.delete(:current) == true
+        current      = attributes.delete(:current) == true
       else
-        current = on_current_page?(path)
+        current      = on_current_page?(path)
       end
-      li_class  = "primary-navigation-item"
-      if current
-        li_class  << " active"
-        attributes[:class] = [attributes[:class], "active"].compact.uniq.join(" ")
+      
+      inner_html     = attributes.delete(:inner_html) || {}
+      outer_html     = attributes.delete(:outer_html) || {}
+      
+      inner_html.merge! clone_attributes(attributes)
+      
+      merge_class! outer_html, *[
+        storefront_config.nav_class,
+        current ? storefront_config.active_class : nil
+      ].compact.uniq
+      
+      if storefront_config.include_aria
+        outer_html[:role] ||= case @list_context
+        when :list
+          :listitem
+        when :menu
+          :menuitem
+        else
+          :listitem
+        end
       end
-      as = attributes.delete(:as) || :span
-      li_class  << " #{attributes.delete(:li_class)}" if attributes[:li_class]
-      li_class  = li_class.present? ? {:class => li_class} : nil
-      separator = attributes.delete(:separator)
-      checkbox  = attributes.delete(:checkbox) == true
-      result    = capture_haml do
-        haml_tag :li, li_class do
-          if checkbox
-            haml_tag :label, text.strip
-            haml_tag :input, :type => "checkbox"
-          else
-            if block_given?
-              case block.arity
-              when 1
-                yield(text.strip)
-              else
-                yield
-              end
-            elsif current && as == :span
-              haml_tag :span, text.strip, attributes
+      
+      text.strip!
+      
+      outer_html[:id] ||= [text.underscore.parameterize, storefront_config.nav_class].join(storefront_config.separator).gsub(/[\s|_]+/, storefront_config.separator).squeeze(storefront_config.separator)
+      
+      capture_haml do
+        haml_tag storefront_config.nav_tag, outer_html do
+          if block_given?
+            case block.arity
+            when 1
+              yield(text.strip)
             else
-              haml_concat link_to(text.strip, path, attributes)
+              yield
             end
+          elsif current && as == :span
+            haml_tag :span, text, inner_html
+          else
+            inner_html[:title] ||= "Link to the #{text.strip} page."
+            haml_concat link_to(text, path, inner_html)
           end
           haml_tag :span, separator if separator
         end
       end
-      result
     end
+    alias nav list_item
   end
 end

data/lib/storefront/helpers/locale_helper.rb

@@ -1,23 +1,61 @@
 module Storefront
   module LocaleHelper
-    # t!(:"what.summary", :scope => :"reports.titles", :model => deal)
+    SCOPES_WITH_NAMESPACE_AND_NESTED_MODEL = [
+      '%{namespace}.%{model}.%{nested_model}.%{action}.%{attribute}',
+      '%{model}.%{nested_model}.%{action}.%{attribute}',
+      '%{namespace}.%{model}.%{action}.%{attribute}',
+      '%{model}.%{action}.%{attribute}',
+      '%{namespace}.%{model}.%{nested_model}.%{attribute}',
+      '%{model}.%{nested_model}.%{attribute}',
+      '%{namespace}.%{model}.%{attribute}',
+      '%{model}.%{attribute}',
+      '%{namespace}.%{nested_model}.%{attribute}',
+      '%{nested_model}.%{attribute}',
+      '%{namespace}.%{attribute}',
+      '%{attribute}'
+    ]
+    
+    SCOPES_WITH_NESTED_MODEL = [
+      '%{model}.%{nested_model}.%{action}.%{attribute}',
+      '%{model}.%{action}.%{attribute}',
+      '%{model}.%{nested_model}.%{attribute}',
+      '%{model}.%{attribute}',
+      '%{nested_model}.%{attribute}',
+      '%{attribute}'
+    ]
+    
+    SCOPES_WITH_NAMESPACE = [
+      '%{namespace}.%{model}.%{action}.%{attribute}',
+      '%{namespace}.%{model}.%{attribute}',
+      '%{model}.%{action}.%{attribute}',
+      '%{model}.%{attribute}',
+      '%{namespace}.%{attribute}',
+      '%{attribute}'
+    ]
+    
+    SCOPES = [
+      '%{model}.%{action}.%{attribute}',
+      '%{model}.%{attribute}',
+      '%{attribute}'
+    ]
+    
+    # t?(:"what.summary", :scope => :"reports.titles", :model => deal)
     def t?(key, options = {})
-      return key if key.is_a?(::String)
-      model_names = options[:model_names]
-      model_names ||= options[:model].present? ? options[:model].class.ancestor_classes.map { |i| i.name.underscore } : []
-      allow_blank = options.delete(:allow_blank) == true
-
-      keys        = [key.to_s]
-      if options[:try].present?
-        keys += Array(options[:default]).map do |extra_key|
-          "#{key}.#{extra_key}"
-        end
-      end
+      return key if key.is_a?(::String) || key.blank?
 
+      models      = Storefront::ModelProxy.model_names(options[:model] || options[:models] || options[:model_names] || storefront_config.current_scope[:resource] || [])
+      models      << "" if models.blank?
+      namespaces  = Array(options[:namespaces] || options[:namespace] || storefront_config.current_scope[:namespace])
+      namespaces  << "" if namespaces.blank? && !!storefront_config.localize_with_namespace
+      action_name = options[:action] || storefront_config.current_scope[:action]
+      defaults    = []
+      allow_blank = options.delete(:allow_blank) == true
       count       = options.delete(:count)
       # none, one, many, other
       count_key   = count != 1 ? :other : :one
 
+      keys        = [key.to_s]
+
       if options.has_key?(:present) || options.has_key?(:past) || options.has_key?(:future)
         if options[:future] == true
           tense_key = :future
@@ -28,21 +66,53 @@ module Storefront
         tense_key = nil
       end
 
-      defaults    = []
+      if options.has_key?(:nested_model)
+        with_nested_model = !!options[:nested_model]
+      else
+        with_nested_model = !!storefront_config.localize_with_nested_model
+      end
 
-      keys.each do |key|
-        model_names.each do |model_name|
-          path      = '{{model}}.{{key}}'
-          path.gsub!('{{model}}', model_name)
-          path.gsub!('{{key}}', key)
-          path.gsub!('..', '.')
-          defaults << path
-        end
+      if options.has_key?(:namespace)
+        with_namespace = !!options[:namespace]
+      else
+        with_namespace = !!storefront_config.localize_with_namespace
+      end
 
-        path        = '{{key}}'
-        path.gsub!('{{key}}', key)
-        path.gsub!('..', '.')
-        defaults << path
+      if with_nested_model && with_namespace
+        # TODO, need to performance test before we do this many operations
+        SCOPES_WITH_NAMESPACE_AND_NESTED_MODEL
+      elsif with_nested_model
+        # TODO
+        SCOPES_WITH_NESTED_MODEL
+      elsif with_namespace
+        namespaces.each do |namespace|
+          models.each do |model|
+            keys.each do |_key|
+              SCOPES_WITH_NAMESPACE.each do |path|
+                path = path.dup
+                path.gsub!('%{namespace}', namespace)
+                path.gsub!('%{model}', model)
+                path.gsub!('%{action}', action_name)
+                path.gsub!('%{attribute}', _key)
+                path.gsub!('..', '.')
+                defaults << path
+              end
+            end
+          end
+        end
+      else
+        models.each do |model|
+          keys.each do |_key|
+            SCOPES.each do |path|
+              path = path.dup
+              path.gsub!('%{model}', model)
+              path.gsub!('%{action}', action_name)
+              path.gsub!('%{attribute}', _key)
+              path.gsub!('..', '.')
+              defaults << path
+            end
+          end
+        end
       end
 
       defaults.map!(&:to_sym)
@@ -146,9 +216,9 @@ module Storefront
       title             = object[:title] || object[:label]
       subtitle          = object[:subtitle]
       
-      title             = t!(:"#{key}", options.merge(:try => :title))
+      title             = t?(:"#{key}", options.merge(:try => :title))
       title             = key.to_s.split(".").last.titleize if title.blank? || title.is_a?(::Hash)
-      subtitle          = t!(:"#{key}.subtitle", options.merge(:allow_blank => true))
+      subtitle          = t?(:"#{key}.subtitle", options.merge(:allow_blank => true))
 
       # everything has to have a title
       result[:title]    = title
@@ -156,7 +226,7 @@ module Storefront
       # not everything has to have a subtitle
       result[:subtitle] = subtitle if subtitle.present?
 
-      # it's a leaf if we're at this point!
+      # it's a leaf if we're at this point?
       if object.has_key?(:value)
         result[:value]  = object[:value]
       else