king_views 1.1.6 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7528c9f76a2b366d8a4f42001c70b7a8566cf4b2
+  data.tar.gz: cf91b3cbe24369196457f2e92b53983437ea538d
+SHA512:
+  metadata.gz: e8de0b59e7dabc1aef47faec45155040c9ce46f8f9e44b301a4423a3e31582ebc866b5b8906d8e3b50909800aeadb3ebd42923c41e3773a411f9468568279d31
+  data.tar.gz: f601ef0eb413ce869aed79f58fa77a3fa7f70aedc7ea438886be734dd81f26387ae95913802e12e4b024dc2ca2101c5b36a642535afd8169860cf2543b00a255

data/.gitignore

@@ -0,0 +1,23 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+## PROJECT::GENERAL
+rdoc
+pkg
+/.idea/
+Gemfile.lock
+tmp/
+log/
+vendor/
+test.sqlite3

data/Gemfile

@@ -0,0 +1,19 @@
+source 'https://rubygems.org'
+gemspec
+
+#
+# group :development, :test do
+#   gem 'rails', '>= 3.0.0'
+#   gem "haml"
+#   gem "sqlite3-ruby", :require => "sqlite3"
+#   gem 'jeweler', '>= 1.5.2'
+#   gem 'rake'
+#   gem 'tzinfo'
+#   gem 'rdoc'
+#   gem 'rspec'
+#   gem "rspec-rails"
+#   # For debugging under ruby 1.9 special gems are needed
+# #  gem 'ruby-debug19', :platform => :mri
+# #  gem 'ruby-debug-base19', '>=0.11.26'
+# #  gem 'linecache19', '>=0.5.13'
+# end

data/Rakefile

@@ -1,31 +1,8 @@
-require 'rubygems'
+#!/usr/bin/env rake
+require 'bundler/gem_tasks'
 require 'rake'
-require 'rdoc/task'
 require 'rspec/core/rake_task'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "king_views"
-    gem.summary = %Q{Ultraclean haml views with list and forms helpers for rails }
-    gem.description = %Q{Clean up your Forms using king_form for dl or labeled forms. Use king_list for an easy markup of tables in your lists and dl-enabled listings in your detail views. }
-    gem.email = "gl@salesking.eu"
-    gem.homepage = "http://github.com/salesking/king_views"
-    gem.authors = ["Georg Leciejewski"]
-    #gem.add_development_dependency "rspec", ">= 0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-desc 'Generate king_views documentation.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'KingViews'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('king_form/lib/**/*.rb')
-  rdoc.rdoc_files.include('king_format/lib/**/*.rb')
-  rdoc.rdoc_files.include('king_list/lib/**/*.rb')
-end
+RSpec::Core::RakeTask.new('spec')
+desc 'Default: run specs.'
+task :default => :spec

data/king_form/lib/king_form/builder/base.rb

@@ -57,7 +57,7 @@ module KingForm
         super(associated, opts)
       end
 
-      
+
       # wraps a list of action links/buttons in a td od div
       # those wrappers can then be formated with css td.actions
       # also see #ListHelper
@@ -112,7 +112,7 @@ module KingForm
       end
 
       # Build a single table row, only needed to be be able to render the table
-      # headers(th) 
+      # headers(th)
       def table_row(&block)
         @config[:row_number] += 1
         @template.concat "<tr> #{@template.capture(&block)}</tr>"
@@ -168,7 +168,7 @@ module KingForm
         if values && values.first.is_a?(Symbol)
           values_with_translated_keys = {}
           values.each do |value|
-            key = current_class.human_attribute_name("enum.#{fieldname.to_s}.#{value.to_s}")
+            key = translate_namespaced_enum_key(current_class, fieldname, value)
             values_with_translated_keys[key] = value.to_s
           end
           return values_with_translated_keys
@@ -178,6 +178,17 @@ module KingForm
         end
       end
 
+      # translation_key for fieldname
+      # replaces current_class.human_attribute_name("enum.#{fieldname.to_s}.#{value.to_s}")
+      # as `human_attribute_name` changed the way how "."'s are interpreted in 3.2.x (now as namespaces)
+      def translate_namespaced_enum_key(klass, field, value)
+        defaults = klass.lookup_ancestors.map do |_klass|
+          :"#{klass.i18n_scope}.attributes.#{_klass.model_name.i18n_key}.enum.#{field.to_s}.#{value.to_s}"
+        end
+
+        I18n.translate(default: defaults)
+      end
+
       # add titles to Input-Tag and embed/wrap in dt/dd
       #   options: Hash with following keys
       #     :dt => options for dt
@@ -199,7 +210,7 @@ module KingForm
         else
           fieldname_or_title
         end
-      end      
+      end
 
       # Build span-tag with an info text after a field
       # ==== Parameter
@@ -210,18 +221,21 @@ module KingForm
         when String #just use the plain string
           value = fieldname_or_text
         when Symbol # lookup the the field in i18n under activerecord.attributes.class.fieldname_info
-          trans = I18n.translate("#{current_class.name.underscore}.#{fieldname_or_text.to_s}_info",
-                                 :default => '',
+          key = "#{current_class.name.underscore}.#{fieldname_or_text.to_s}_info"
+          trans = I18n.translate("#{key}_html",
+                                 :default => I18n.translate(key,
+                                   :default => '',
+                                   :scope => [:activerecord, :attributes]),
                                  :scope => [:activerecord, :attributes])
           value = trans.blank? ? nil : trans
         else
           raise ArgumentError
         end
 
-        value ? content_tag(:div, value, :class => 'info') : ''
+        value ? content_tag(:div, value.html_safe, :class => 'info').html_safe : ''
       end
 
-      
+
       # Create the id of a field
       # ==== Parameter
       # name<String>::The name of the id
@@ -235,4 +249,4 @@ module KingForm
 
     end #Class Base
   end#Module Builder
-end#Module KingForm
+end#Module KingForm

data/king_form/lib/king_form/builder/definition_list.rb

@@ -66,7 +66,7 @@ module KingForm
       #
       # ==== Parameter
       # fieldname_or_title<Symbol, String>:: The fieldname to be used as the title in dt
-      # tags<String>:: a bunch of html/haml tags 
+      # tags<String>:: a bunch of html/haml tags
       # options<Hash{Symbol=>String}>: Hash with following keys
       # ==== Options:
       #     :dt => options hash for dt
@@ -85,7 +85,7 @@ module KingForm
             @template.haml_tag(:td, tags.to_s, options)
           end
         else #wrap or no wrap
-          @no_wrap ? tags : dt_tag(fieldname_or_title, options[:dt]) + dd_tag(tags.to_s, options[:dd])
+          (@no_wrap ? tags : dt_tag(fieldname_or_title, options[:dt]) + dd_tag(tags.to_s, options[:dd])).html_safe
         end
       end
 
@@ -100,7 +100,11 @@ module KingForm
         @bundle_counter = 0
         tags = @template.capture(&block)
         @config[:bundle] = false
-        @template.concat( @config[:table] ? tag_wrapper(title, tags) : tag_wrapper(title, tags, :dt => options, :dd => { :class => "elements_#{@bundle_counter}" }) )
+        if @config[:table]
+          tag_wrapper(title, tags)
+        else
+          tag_wrapper(title, tags, :dt => options, :dd => { :class => "elements_#{@bundle_counter}" })
+        end
       end
 
       # The definition type dt tag
@@ -116,4 +120,4 @@ module KingForm
 
     end
   end
-end
+end

data/king_form/lib/king_form/builder/form_fields.rb

@@ -154,6 +154,7 @@ module KingForm
         options[:include_blank] = true unless options.has_key?(:include_blank)
         options[:selected] ||= value.is_a?(Array) ? value : value.to_s
 
+        html_options[:'data-placeholder'] ||= title
         # Got an AR object so full automatic contruction should work
         if current_object.is_a?(ActiveRecord::Base) && fieldname.is_a?(Symbol)
           # try to sort by key f.ex. when transl. enum_fields
@@ -219,7 +220,7 @@ module KingForm
             select_options << "</optgroup>"
           end
         end
-        tag_wrapper title, select_tag(fieldname, select_options, options)
+        tag_wrapper title, select_tag(fieldname, select_options.html_safe, options)
       end
 
       def time_zone_selection(fieldname, options = {}, html_options = {})
@@ -281,4 +282,4 @@ module KingForm
 
     end
   end
-end
+end

data/king_form/lib/king_form/builder/form_fields_overrides.rb

@@ -16,9 +16,9 @@ module KingForm
         super(method, opts) + info_tag(info_text || method)
       end
 
-      def check_box(method, opts = {})
+      def check_box(method, opts = {}, checked_value = "1", unchecked_value = "0")
         info_text = opts.delete(:info)
-        super(method, opts) + info_tag(info_text || method)
+        super(method, opts, checked_value, unchecked_value) + info_tag(info_text || method)
       end
 
       def radio_button(method, tag_value, opts = {})
@@ -53,7 +53,7 @@ module KingForm
         name, infos, opts = build_id_name_info(name, opts)
         @template.text_field_tag(name, value, opts) + infos
       end
-      
+
       # Create a hidden field tag and construct its fieldname (object[name]) from
       # the current object
       # When the name is beeing passed in as string its just taken like it is
@@ -132,7 +132,7 @@ module KingForm
           # build info tag, cause info_tag(:symbol) is looking into I18n transl
           infos = info_tag( opts.delete(:info) || name)
           #now set real name as string
-          name = "#{@object_name}[#{name}]"
+          name = "#{@object_name}[#{name}]".html_safe
         else
           opts[:id] ||= nil
           info_text = opts.delete(:info)
@@ -143,4 +143,4 @@ module KingForm
 
     end
   end
-end
+end

data/king_form/lib/king_form/builder/labeled.rb

@@ -70,7 +70,7 @@ module KingForm
         @bundle_counter = 0
         tags = @template.capture(&block)
         @config[:bundle] = false
-        @template.concat( tag_wrapper(title, tags, options) )
+        tag_wrapper(title, tags.html_safe, options)
       end
 
       # Add titles/labels to input tag and wrap in div
@@ -86,7 +86,7 @@ module KingForm
       def tag_wrapper(fieldname_or_title, tags, options = {})
         if @config[:bundle]
           @bundle_counter += 1
-          tags
+          tags.html_safe
         elsif @config[:table] # called from "table" => build a table cell (td)
           # Only in first row: Build column header
           if @config[:row_number] == 1
@@ -102,7 +102,7 @@ module KingForm
                 else # other tags stay outside label tag, because they don't like to be wrapped sometimes
                   label_tag(fieldname_or_title, options[:label]) + tags
                 end
-          "<div> #{out}</div>"
+          "<div> #{out}</div>".html_safe
         end
       end
 

data/king_form/lib/king_form/helper.rb

@@ -35,7 +35,17 @@ module KingForm
     def dl_fields_for(record_or_name_or_array, *args, &block)
       options = args.last.is_a?(Hash) ? args.pop : {}
       options[:builder] =  KingForm::Builder::DefinitionList
-      fields_for(record_or_name_or_array, *(args << options), &block)
+
+      case record_or_name_or_array
+      when String, Symbol
+        object_name = record_or_name_or_array
+        object = args.first
+      else
+        object = record_or_name_or_array
+        object_name = ActiveModel::Naming.singular(object)
+      end
+
+      fields_for(object_name, object, options, &block)
     end
 
     # renders a form with the KingForm::Builder::Labeled
@@ -68,8 +78,15 @@ module KingForm
     #
     def labeled_form_for(record_or_name_or_array, *args, &proc)
       options = args.last.is_a?(Hash) ? args.pop : {}
-      options[:builder] =  KingForm::Builder::Labeled
-      form_for(record_or_name_or_array, *(args << options), &proc)
+      options[:builder] = KingForm::Builder::Labeled
+
+      case record_or_name_or_array
+      when String, Symbol
+        options[:as] = record_or_name_or_array
+        form_for(args.shift, *(args << options), &proc)
+      else
+        form_for(record_or_name_or_array, *(args << options), &proc)
+      end
     end
 
     def labeled_fields_for(record_or_name_or_array, *args, &block)
@@ -94,4 +111,4 @@ module KingForm
       result
     end
   end
-end
+end

data/king_form/lib/king_form/nested_form_helper.rb

@@ -2,15 +2,15 @@ module KingForm
   #  was attribute_fu with changes from: http://github.com/odadata/attribute_fu/commit/a0402d12f2d380d8decc82bdfbcc5d8a0a185524
   # Methods for building forms that contain fields for associated models.
   module NestedFormHelper
-    
+
     # Renders the form for nested objects defined via activerecord accepts_nested_attributes_for
     #
     # The associated argument can be either an object, or a collection of objects to be rendered.
     #
     # An options hash can be specified to override the default behaviors.
-    # 
+    #
     # Options are:
-    # * <tt>:new</tt>        - specify a certain number of new elements to be added to the form. Useful for displaying a 
+    # * <tt>:new</tt>        - specify a certain number of new elements to be added to the form. Useful for displaying a
     #                         few blank elements at the bottom.
     # * <tt>:name</tt>       - override the name of the association, both for the field names, and the name of the partial
     # * <tt>:partial</tt>    - specify the name of the partial in which the form is located.
@@ -21,8 +21,8 @@ module KingForm
     #                       eg. obj.addresses, render the firt address on top of form, render all the other addresses at the bottom
     #
     def render_nested_form(associated, opts = {})
-      associated = associated.is_a?(Array) ? associated : [associated] # preserve association proxy if this is one      
-      opts.symbolize_keys!
+      associated = associated.is_a?(Array) ? associated : [associated] # preserve association proxy if this is one
+      opts = opts.to_hash.symbolize_keys
       (opts[:new] - associated.select(&:new_record?).length).times { associated.build } if opts[:new]
 
       unless associated.empty?
@@ -43,13 +43,13 @@ module KingForm
                                #The current objects classname is always present in partial so:
                                #when Object is LineItem locals has :line_item => object
                                :locals => {name.to_sym => f.object, :f => f}.merge( opts[:locals] || {} )
-                              }.merge( opts[:render] || {} ) )      
+                              }.merge( opts[:render] || {} ) )
           end
         end
-        output.join
+        output.join.html_safe
       end
     end
-    
+
     private
       def association_name(class_name)
         @object.respond_to?("#{class_name}_attributes=") ? class_name : class_name.pluralize
@@ -58,4 +58,4 @@ module KingForm
         (hash.delete(option) || object.class.name.split('::').last.underscore).to_s
       end
   end
-end
+end

data/king_form/lib/king_form/overrides.rb

@@ -9,17 +9,17 @@ module ActionView::Helpers::FormTagHelper
   private
   # overridden method to kill inline styles
   # from actionpack-2.1.0/lib/action_view/helpers/form_tag_helper.rb
-  def extra_tags_for_form(html_options)
-    case method = html_options.delete("method").to_s
-      when /^get$/i # must be case-insentive, but can't use downcase as might be nil
-        html_options["method"] = "get"
-        ''
-      when /^post$/i, "", nil
-        html_options["method"] = "post"
-        protect_against_forgery? ? content_tag(:div, token_tag) : ''
-      else
-        html_options["method"] = "post"
-        content_tag(:div, tag(:input, :type => "hidden", :name => "_method", :value => method) + token_tag)
-    end
-  end
+  #def extra_tags_for_form(html_options)
+  #  case method = html_options.delete("method").to_s
+  #    when /^get$/i # must be case-insentive, but can't use downcase as might be nil
+  #      html_options["method"] = "get"
+  #      ''
+  #    when /^post$/i, "", nil
+  #      html_options["method"] = "post"
+  #      protect_against_forgery? ? content_tag(:div, token_tag) : ''
+  #    else
+  #      html_options["method"] = "post"
+  #      content_tag(:div, tag(:input, :type => "hidden", :name => "_method", :value => method) + token_tag)
+  #  end
+  #end
 end

data/king_format/lib/helpers/formatting_helper.rb

@@ -16,7 +16,7 @@ module KingFormat
     # When set this will be used instead of asking the object for its value.
     # See types for more
     # opts<Hash{Symbol=>String}>:: Options
-    #  
+    #
     # ==== Options opts
     #  :currency<Hash{Symbol=>String}>:: Currency settings to format string as
     #  money like found in rails I18n(see rails number_helper)
@@ -64,7 +64,7 @@ module KingFormat
         format_method = "#{fld}_format_opts".to_sym
         # check if the object has a custom money format method => price_total_format_opts
         fopts = object && object.respond_to?(format_method) ? object.send(format_method) : opts[:currency]
-        strfmoney(val, fopts)
+        strfmoney(val, fopts, object)
       elsif ( val.is_a?(Date) || (object.class.is_date_field?(fld) rescue nil) || opts[:date] )
         return val if val.blank? # blank value can occur when a is_date_field is empty
         # get date from opts or default or fallback into i18n
@@ -89,9 +89,9 @@ module KingFormat
     # val<Number>:: the number to format
     # opts<Hash{Symbol=>String}>:: Rails compatible currency formatting options,
     # when nil searches default format, last exit is rails i18n
-    def strfmoney(val, opts=nil)
+    def strfmoney(val, opts=nil, object = nil)
       settings = opts || default_currency_format || {}
-      number_to_currency(val, settings.merge({:locale => I18n.locale}))
+      number_to_currency(val, settings.merge({:locale => I18n.locale}).to_hash)
     end
 
     # Deprecated, to be dropped
@@ -107,10 +107,10 @@ module KingFormat
     #   => 7,5%
     def number_to_percentage_auto_precision(number)
       return nil unless number
-      # for now use separator
-      pres = (number.to_i == number.to_f) ? 0 : 1
       sep =  I18n.t(:'number.format.separator')
-      number_to_percentage(number,{:precision => pres, :separator=>sep } )
+      number_to_percentage(number,{ :separator=>sep,
+                                    :precision => 4,
+                                    :strip_insignificant_zeros=>true } )
     end
 
     # Translate the value of an enum field, as defined by act_as_enum
@@ -129,9 +129,14 @@ module KingFormat
       # Don't translate blank value
       return nil if value.blank?
       #return the translation
-      klass.human_attribute_name("enum.#{fieldname.to_s}.#{value.to_s}")
+      defaults = klass.lookup_ancestors.map do |_klass|
+        :"#{klass.i18n_scope}.attributes.#{_klass.model_name.i18n_key}.enum.#{fieldname.to_s}.#{value.to_s}"
+      end
+      defaults << klass.human_attribute_name("enum.#{fieldname.to_s}.#{value.to_s}")
+
+      I18n.translate(default: defaults)
     end
-    
+
     # Returns the default date formatting, as string '%d.%m.%Y'
     # The returned string is passed to strftime(format)
     # Override this function or set the thread var somehere in your including
@@ -142,7 +147,7 @@ module KingFormat
     def default_date_format
       Thread.current[:default_date_format]
     end
-   
+
     # Returns the default currency formatting, in I18n style
     # The returned hash is used in rails number_to_currency helper.
     # Override this function or set the thread var somehere in your including
@@ -154,17 +159,17 @@ module KingFormat
     def default_currency_format
       Thread.current[:default_currency_format]
     end
-    
-    # Formats a number to the visible decimal places. If there are more decimal 
+
+    # Formats a number to the visible decimal places. If there are more decimal
     # places than the given prescision those are used.
     #
     # === Examples
     #   auto_precision(1.2340, 2)
     #   => "1.234"
-    #   
+    #
     #   auto_precision(1.234500)
     #   => "1.2345"
-    #   
+    #
     #   auto_precision(1.2345, 5)
     #   => "1.23450"
     #
@@ -182,5 +187,5 @@ module KingFormat
       "%01.#{precision}f" % rounded_number
     end
 
-  end # FormattingHelper  
-end # KingFormat
+  end # FormattingHelper
+end # KingFormat