storefront 0.2.1 → 0.2.7

data/Rakefile

@@ -5,14 +5,14 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
   s.name              = "storefront"
   s.authors           = ["Lance Pollard"]
-  s.version           = "0.2.1"
+  s.version           = "0.2.7"
   s.description       = "Semantic HTML5 for Rails"
   s.summary           = "Semantic HTML5 for Rails"
   s.homepage          = "http://github.com/viatropos/storefront"
   s.email             = "lancejpollard@gmail.com"
   s.rubyforge_project = "storefront"
   s.platform          = Gem::Platform::RUBY
-  s.files             = %w(Rakefile init.rb) + Dir["{lib,rails,test}/**/*"] - Dir["test/tmp"]
+  s.files             = %w(Rakefile) + Dir["{lib,rails,test}/**/*"] - Dir["test/tmp"]
   s.require_path      = "lib"
 end
 

data/lib/storefront.rb

@@ -11,11 +11,29 @@
 # http://github.com/html/once/blob/master/lib/once.rb
 # http://github.com/fnando/breadcrumbs.git
 # http://github.com/semanticart/smart-meta
-Dir["#{File.expand_path(File.dirname(__FILE__))}/storefront/railtie"]
-Dir["#{File.expand_path(File.dirname(__FILE__))}/storefront/helpers/*"].each do |path|
+base = "#{File.expand_path(File.dirname(__FILE__))}/storefront"
+Dir["#{base}/railtie"]
+Dir["#{base}/helpers/*"].each do |path|
   require path unless ::File.directory?(path)
 end
+
+require "#{base}/form/base"
+require "#{base}/form/input"
+require "#{base}/form/builder"
+
 # make this more explicit
-Dir["#{File.expand_path(File.dirname(__FILE__))}/storefront/**/*"].each do |path|
+Dir["#{base}/**/*"].each do |path|
   require path unless ::File.directory?(path) || path =~ /helpers/
 end
+
+module Storefront
+  class << self
+    def configure(&block)
+      yield configuration
+    end
+    
+    def configuration
+      @configuration ||= Storefront::Configuration.new
+    end
+  end  
+end

data/lib/storefront/configuration.rb

@@ -0,0 +1,154 @@
+module Storefront
+  class Configuration
+    attr_accessor :field,
+      :hint_class,
+      :hint_tag,
+      :label_class,
+      :error_class,
+      :error_tag,
+      :valid_class,
+      :required_class,
+      :required_abbr,
+      :required_title,
+      :optional_class,
+      :optional_abbr,
+      :optional_title,
+      :label_method,
+      :label_attribute,
+      :validation_max_limit,
+      :default_text_field_size,
+      :default_text_area_width,
+      :all_fields_required_by_default,
+      :list_tag,
+      :list_class,
+      :separator,
+      :breadcrumb,
+      :include_blank_for_select_by_default,
+      :collection_label_methods,
+      :i18n_lookups_by_default,
+      :rename_nested_attributes,
+      :inline_validations,
+      :fieldset_class,
+      :field_class,
+      :legend_class,
+      :validate_class,
+      :form_class,
+      :id_enabled_on,
+      :widgets_path,
+      :nav_class,
+      :include_aria,
+      :active_class,
+      :nav_tag,
+      :terms_tag,
+      :term_class,
+      :term_key_class,
+      :term_value_class,
+      :hint_is_popup,
+      :field_list_tag,
+      :list_partial,
+      :definition_list_partial,
+      :page_header_id,
+      :page_title_id,
+      :page_subtitle_id,
+      :widget_class,
+      :header_class,
+      :title_class,
+      :subtitle_class,
+      :content_class,
+      :default_header_level,
+      :term_separator,
+      :rich_input,
+      :submit_fieldset_class,
+      :add_label,
+      :remove_label,
+      :always_include_hint_tag,
+      :always_include_error_tag,
+      :cycle_fields,
+      :require_if_validates_presence,
+      # localization
+      :localize_with_inheritance,
+      :localize_with_namespace,
+      :localize_with_nested_model
+    
+    def initialize
+      @hint_class                               = "hint"
+      @hint_tag                                 = :figure
+      @label_class                              = "label"
+      @required_class                           = "required"
+      @required_abbr                            = "*"
+      @required_title                           = "Required"
+      @error_class                              = "error"
+      @error_tag                                = :output
+      @valid_class                              = nil
+      @optional_class                           = "optional"
+      @optional_abbr                            = ""
+      @optional_title                           = "Optional"
+      @label_method                             = :humanize
+      @label_attribute                          = :to_label
+      @validation_max_limit                     = 255
+      @default_text_field_size                  = nil
+      @default_text_area_width                  = 300
+      @all_fields_required_by_default           = true
+      @field_list_tag                           = :ol
+      @list_class                               = "field-list"
+      @separator                                = "-"
+      @breadcrumb                               = " - "
+      @include_blank_for_select_by_default      = true
+      @collection_label_methods                 = %w(to_label display_name full_name name title to_s)
+      @i18n_lookups_by_default                  = true
+      @escape_html_entities_in_hints_and_labels = false
+      @rename_nested_attributes                 = true
+      @inline_validations                       = true
+      @fieldset_class                           = "fieldset"
+      @field_class                              = "field"
+      @validate_class                           = "validate"
+      @legend_class                             = "legend"
+      @form_class                               = "form"
+      @id_enabled_on                            = [] # %w(field label error hint)
+      @widgets_path                             = "shared/widgets"
+      @nav_class                                = "list-item"
+      @include_aria                             = true
+      @active_class                             = "active"
+      @nav_tag                                  = :li
+      @terms_tag                                = :dl
+      @term_class                               = "term"
+      @term_key_class                           = "key"
+      @term_value_class                         = "value"
+      @hint_is_popup                            = false
+      @list_tag                                 = :ul
+      @page_header_id                           = "header"
+      @page_title_id                            = "title"
+      @page_subtitle_id                         = "subtitle"
+      @widget_class                             = "widget"
+      @header_class                             = "header"
+      @title_class                              = "title"
+      @subtitle_class                           = "subtitle"
+      @content_class                            = "content"
+      @default_header_level                     = 3
+      @term_separator                           = ":"
+      @rich_input                               = true
+      @submit_fieldset_class                    = "submit-fieldset"
+      @add_label                                = "+"
+      @remove_label                             = "-"
+      @cycle_fields                             = false
+      @always_include_hint_tag                  = false
+      @always_include_error_tag                 = true
+      @require_if_validates_presence            = true
+      @localize_with_namespace                  = false
+      @localize_with_nested_model               = false
+      @localize_with_inheritance                = true
+    end
+    
+    def get(key)
+      send(key).respond_to?(:call) ? send(key).call : send(key)
+    end
+    
+    def current_scope
+      Thread.current[:storefront_config]
+    end
+    
+    def current_scope=(value)
+      Thread.current[:storefront_config] = value
+    end
+  end
+end

data/lib/storefront/dashboard.rb

@@ -1,6 +1,7 @@
-module Storefront  
+module Storefront
   class Dashboard
     include Storefront::AttributeHelper
+    include Storefront::LocaleHelper
     attr_reader :content, :template, :key, :report, :keys
     
     def initialize(template, record_or_key, hash, options = {}, &block)
@@ -18,14 +19,14 @@ module Storefront
       @report           = hash
       options[:id]      ||= "#{record_or_key.to_s}-section"
       @keys             = options.delete(:keys) || {}
-
+    
       @content = template.capture_haml do
         template.haml_tag :article, options do
           yield(self)
         end
       end
     end
-
+    
     # section :when, :cols => 3
     def section(*args, &block)
       attributes     = args.extract_options!
@@ -45,7 +46,7 @@ module Storefront
         template.haml_tag :section, attributes do
           if @header
             template.haml_tag :header, :class => "header" do
-              template.haml_tag :h3, t!(:"#{@section_scope}.title", locale_keys.merge(:scope => :"reports.titles")), :class => "title"
+              template.haml_tag :h3, t?(:"#{@section_scope}.title", locale_keys.merge(:scope => :"reports.titles")), :class => "title"
               if @subtitle.present?
                 template.haml_tag :h4, @subtitle, :class => "subtitle"
               end
@@ -73,7 +74,7 @@ module Storefront
     def locale_keys
       hash = {}
       keys.each do |key, value|
-        hash[key] = value.is_a?(::Symbol) ? t!(:"#{value}", :scope => :"reports.keys", :model_names => @model_names) : value
+        hash[key] = value.is_a?(::Symbol) ? t?(:"#{value}", :scope => :"reports.keys", :model_names => @model_names) : value
       end
       hash.merge(:model_names => @model_names)
     end
@@ -91,7 +92,7 @@ module Storefront
       merge_class! attributes, index_class(@column_index, @cols), "#{@column_scope}-column", "col#{@cols}", "column"
       attributes[:"data-column"] = @column_scope.to_s
 
-      title = attributes.delete(:title) || t!(:"#{@section_scope}.#{@column_scope}.title", locale_keys.merge(:scope => :"reports.titles"))
+      title = attributes.delete(:title) || t?(:"#{@section_scope}.#{@column_scope}.title", locale_keys.merge(:scope => :"reports.titles"))
 
       template.capture_haml do
         template.capture_haml(&block)
@@ -123,7 +124,7 @@ module Storefront
 
       merge_class! attributes, index_class(@row_index, @rows)
 
-      template.haml_tag :dt, t!(:"#{@section_scope}.#{@column_scope}.#{@row_scope}", locale_keys.merge(attributes.slice(:past, :present, :future).merge(:scope => :"reports.titles"))), merge_class(attributes, "key")
+      template.haml_tag :dt, t?(:"#{@section_scope}.#{@column_scope}.#{@row_scope}", locale_keys.merge(attributes.slice(:past, :present, :future).merge(:scope => :"reports.titles"))), merge_class(attributes, "key")
       template.haml_tag :dd, report_value, merge_class(attributes.merge(:"data-stat" => @row_scope.to_s), "value")
     end
 

data/lib/storefront/form.rb

@@ -1,65 +1,82 @@
 module Storefront
   class Form
-    attr_reader :content, :template, :object, :parent, :tabindex, :access_keys
-    include Haml::Helpers
+    include Storefront::LocaleHelper
+    include Storefront::AttributeHelper
     
-    # - form_for @user do |form|
-    #   = form.inputs do
-    #     = form.input :name, :as => :string
-    #     = form.input :email, :as => :email
-    #     = form.partial :name, :values
-    # novalidate
-    def initialize(template, *args, &block)
-      init_haml_helpers
-      @template              = template
-      options                = args.extract_options!
-      record_or_key          = args.shift
-      if record_or_key.is_a?(::Symbol) || record_or_key.is_a?(::String)
-        record_or_key = record_or_key.to_s.camelize.constantize.new
-      end
-      @object                = record_or_key
-      attributes             = options.delete(:html) || {}
-      attributes[:action]    = options.delete(:url)
-      attributes[:class]     = options.delete(:class) if options.has_key?(:class)
-      attributes[:id]        = options.delete(:id) if options.has_key?(:id)
-      attributes[:multipart] = options.delete(:multipart).to_s if options.has_key?(:multipart)
-      method                 = attributes.delete(:method)
-      if method.blank?
-        if record_or_key.respond_to?(:new_record?) && !record_or_key.new_record?
-          method = :put
-        else
-          method = :post
-        end
-      end
-      
-      if method == :get
-        attributes[:method] = :get
-      else
-        attributes[:method] = :post
-      end
-      #role="form" 
-      #role="search" 
-      # other roles = button, checkbox, link, menuitem, menuitemcheckbox, menuitemradio, presentation, progressbar, radio, slider, scrollbar, tab, or treeitem
-      # article, document, application, presentation or main
-      # http://www.w3.org/TR/wai-aria/roles#widget_roles
+    attr_reader :model, :template, :tabindex, :access_keys, :attributes
+    delegate :object, :parent, :to => :model
+  
+    def initialize(template, *args)
+      options     = args.extract_options!
+      @template   = template
+      @model      = Storefront::ModelProxy.new(:object => extract_object!(args.shift))
+      @attributes = extract_attributes!(options)
+      @builder    = Storefront::Form::Builder.new(
+        :template    => template, 
+        :tabindex    => 1, 
+        :access_keys => {},
+        :model       => model
+      )
+    end
     
-      @content = template.capture_haml do
+    def render(&block)
+      template.capture_haml do
         template.haml_tag :form, attributes do
-          if block_given?
-            fields = Storefront::Form::Fields.new(@template, 
-              :tabindex    => 1, 
-              :access_keys => {}, 
-              :object      => @object, 
-              :keys        => [@object.class.name.underscore],
-              &block
-            )
-          end
+          @builder.render(&block) if block_given?
           
-          unless method == attributes[:method]
-            template.haml_tag :input, :type => :hidden, :name => :_method, :value => method
+          unless attributes[:"data-method"] == attributes[:method]
+            template.haml_tag :input, :type => :hidden, :name => :_method, :value => attributes[:"data-method"]
           end
         end
       end
     end
+  
+    protected
+    def extract_object!(object)
+      if (object.is_a?(::Symbol) || object.is_a?(::String))
+        begin
+          "::#{object.to_s.camelize}".constantize.new
+        rescue Exception => e
+          require 'ostruct'
+          result = ::OpenStruct.new
+          result.klass = object.to_s.camelize
+          result
+        end
+      else
+        object
+      end
+    end
+  
+    def config
+      Storefront.configuration
+    end
+  
+    def extract_attributes!(options = {})
+      attributes                 = options[:html] || {}
+      attributes[:action]        = options[:url]
+      attributes[:class]         = options[:class] if options.has_key?(:class)
+      merge_class! attributes, config.form_class
+      attributes[:id]            = options[:id] if options.has_key?(:id)
+      #attributes[:id]            ||= 
+      attributes[:multipart]     = "true" if options[:multipart] == "true"
+      attributes[:role]          = :form
+      attributes[:novalidate]    = "true" if options[:validate] == false
+      attributes[:"data-validate"] = options[:validate].to_s if options.has_key?(:validate)
+      
+      method                     = attributes[:method] || options[:method]
+      
+      if method.blank?
+        if @model.new_record?
+          method                 = :put
+        else
+          method                 = :post
+        end
+      end
+    
+      attributes[:"data-method"] = method
+      attributes[:method]        = method == :get ? :get : :post
+    
+      attributes
+    end
   end
 end

data/lib/storefront/form/base.rb

@@ -0,0 +1,50 @@
+module Storefront
+  class Form
+    class Base
+      include Storefront::LocaleHelper
+      include Storefront::AttributeHelper
+      
+      def initialize(options = {})
+        @template       = options[:template]
+        @model          = options[:model]
+        @attribute      = options[:attribute]
+        @parent_index   = options[:parent_index]
+        @index          = options[:index]
+        @tabindex       = options[:tabindex]
+        @access_keys    = options[:access_keys]
+        @attributes     = clone_attributes(options.except(:template, :model, :attribute, :access_keys, :index, :tabindex))
+      end
+      
+      protected
+      
+      attr_accessor :template, :model, :attribute, :index, :parent_index
+      attr_accessor :attributes, :value, :label, :access_keys, :tabindex, :input_type
+      
+      def default_options!(options = {})
+        options[:model]     ||= model
+        options[:index]     ||= index
+        options[:attribute] ||= attribute
+        options[:template]  ||= template
+        options
+      end
+      
+      def config
+        Storefront.configuration
+      end
+      alias_method :storefront_config, :config
+      
+      def value?
+        @value.present?
+      end
+      
+      def localize(key, attribute, default, options = {})
+        if default.present?
+          return default.to_s unless default.is_a?(::Symbol)
+          attribute = default
+        end
+        
+        t?(attribute, options.reverse_merge(:scope => :"forms.#{key}", :model => model.object))
+      end
+    end
+  end
+end