king_views 1.1.6 → 1.2.0

data/king_format/lib/helpers/money_helper.rb

@@ -7,7 +7,7 @@ module KingFormat
   # -
   module MoneyHelper
 
-    # returns the keys from money symbols als Hash{array} for select options 
+    # returns the keys from money symbols als Hash{array} for select options
     def money_selects
       money_symbols.keys.sort
     end
@@ -18,8 +18,8 @@ module KingFormat
     #   'USD' => {:unit=>'$'}
     def money_symbols
       @money_symbols ||= begin
-        eur = {:format => '%n %u', :precision=> '2',:delimiter=>'.', :separator=>','}
-        dol = {:format => '%n %u', :precision=> '2',:delimiter=>',', :separator=>'.'}
+        eur = {:format => '%n %u', :precision => '2',:delimiter => '.', :separator => ','}
+        dol = {:format => '%u%n', :precision => '2',:delimiter => ',', :separator => '.'}
         {
         'EUR' => eur.merge(:unit=>'€'),
         'GBP' => dol.merge(:unit=>'£'),
@@ -37,7 +37,7 @@ module KingFormat
         'HUF' => nil,
         'LTL' => nil,
         'LVL' => nil,
-        'PLN' => nil,
+        'PLN' => eur.merge(:unit=>'zł', :delimiter => ' '),
         'RON' => nil,
         'SEK' => nil,
         'SKK' => nil,
@@ -60,6 +60,6 @@ module KingFormat
       }
       end
     end
-   
+
   end
-end
+end

data/king_format/lib/king_format.rb

@@ -1,4 +1,6 @@
+require 'active_support'
 require 'active_support/deprecation'
+require 'active_support/version'
 # KingFormat
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
 

data/king_format/lib/model_mixins/has_date_fields.rb

@@ -2,7 +2,11 @@ module KingFormat
   module DateFields
 
     def self.included(base)
-      base.send :class_inheritable_accessor, :date_fields
+      if ActiveSupport::VERSION::MAJOR == 3 && ActiveSupport::VERSION::MINOR > 0
+        base.class_attribute :date_fields
+      else
+        base.send :class_inheritable_accessor, :date_fields
+      end
       base.date_fields = []
       base.extend(ClassMethods)
     end
@@ -37,6 +41,6 @@ module KingFormat
         self.class.date_fields.include?(fieldname.to_sym)
       end
     end
-    
+
   end #Fields
 end#KingFormat

data/king_format/lib/model_mixins/has_money_fields.rb

@@ -2,7 +2,11 @@ module KingFormat
   module MoneyFields
 
     def self.included(base)
-      base.send :class_inheritable_accessor, :money_fields
+      if ActiveSupport::VERSION::MAJOR == 3 && ActiveSupport::VERSION::MINOR > 0
+        base.class_attribute :money_fields
+      else
+        base.send :class_inheritable_accessor, :money_fields
+      end
       base.money_fields = []
       base.extend(ClassMethods)
     end
@@ -37,6 +41,6 @@ module KingFormat
         self.class.is_money_field?(fieldname)
       end
     end
-    
+
   end #Fields
 end#KingFormat

data/king_format/lib/model_mixins/has_percent_fields.rb

@@ -5,7 +5,11 @@ module KingFormat
   module PercentFields
 
     def self.included(base)
-      base.send :class_inheritable_accessor, :percent_fields
+      if ActiveSupport::VERSION::MAJOR == 3 && ActiveSupport::VERSION::MINOR > 0
+        base.class_attribute :percent_fields
+      else
+        base.send :class_inheritable_accessor, :percent_fields
+      end
       base.percent_fields = []
       base.extend(ClassMethods)
     end

data/king_list/Rakefile

@@ -1,19 +1,8 @@
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
-desc 'Default: run unit tests.'
-task :default => :test
 
-desc 'Test the king_list plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the king_list plugin.'
+desc 'Generate documentation for the king_list.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'KingList'

data/king_list/lib/king_list/builder/show.rb

@@ -45,6 +45,9 @@ module KingList
           object = @object
         end
 
+        dt_options = options.delete(:dt_options) if options.has_key?(:dt_options)
+        dd_options = options.delete(:dd_options) if options.has_key?(:dd_options)
+
         # Use given caption or translate column title
         caption = options.delete(:caption) || object.class.human_attribute_name(field_name.to_s)
 
@@ -57,15 +60,15 @@ module KingList
         end
 
         # Against HTML validity warnings
-        caption = ' ' if caption.blank?
-        value = ' ' if value.blank?
+        caption = ' '.html_safe if caption.blank?
+        value = ' '.html_safe if value.blank?
 
         @template.capture_haml do
-          @template.haml_tag :dt, caption, options
-          @template.haml_tag :dd, value, options
+          @template.haml_tag :dt, caption, dt_options || options
+          @template.haml_tag :dd, value, dd_options || options
         end
       end
-    
+
     end #class
   end # module
-end # module
+end # module

data/king_list/lib/king_list/builder/table.rb

@@ -2,18 +2,13 @@ module KingList
   module Builder
     class Table
 
-      attr_accessor :mode, :current_record, :current_column_number, :number_of_columns, :sorting
+      attr_accessor :mode, :current_record, :sorting
 
       def initialize(template, collection, &block)
         @template = template
         @collection = collection
       end
 
-      def start_row(data)
-        self.current_column_number = 0
-        self.current_record = data
-      end
-
       # Build a column for a table
       #
       # ==== Parameter
@@ -33,37 +28,29 @@ module KingList
       #   :td_options{Symbol=>String}:: options for the <td>
       #     :class:: the class to set on the th
       #   :class    => class as Symbol or String used on TH and TD used f.ex. for alignment.
-      def column(field_name, options = {})
-        options = options.deep_clone # for not changing outer variable
-        th_options = options[:th_options] || {}
-        td_options = options[:td_options] || {}
+      def column(field_name, opts = {})
+        opts = opts.deep_clone # for not changing outer variable
+        th_options = opts[:th_options] || {}
+        td_options = opts[:td_options] || {}
 
         # Use given object from options (or current_record as default)
-        object = options.has_key?(:object) ? options.delete(:object) : current_record
+        object = opts.has_key?(:object) ? opts.delete(:object) : current_record
 
         # :class given so add to TH and TD f.ex cell alignment :class=>'rgt'
-        if css_class = options.delete(:class)
+        if css_class = opts.delete(:class)
           (th_options[:class] ||= '') << " #{css_class}"
           (td_options[:class] ||= '') << " #{css_class}"
         end
 
-        self.current_column_number += 1
-
         case mode
-          when :counter
-            self.number_of_columns ||= 0
-            self.number_of_columns += 1
-            nil
-
           when :header
             # Take option or translate column title
-            title_text = options[:title] || object.class.human_attribute_name(field_name.to_s)
-
+            title_text = opts[:title] || object.class.human_attribute_name(field_name.to_s)
             # whole table has sorting enabled and current column has NOT :sorting=>false
             # => put sorting link into header
-            if sorting && (options.delete(:sorting) != false)
+            if sorting && (opts.delete(:sorting) != false)
               # Use given sort_fields or try to detect them automatic
-              sort_fields = options.delete(:sort_fields) || object.class.table_name + '.' + field_name.to_s
+              sort_fields = opts.delete(:sort_fields) || object.class.table_name + '.' + field_name.to_s
               # Convert to comma separated string if it is an array
               sort_fields = sort_fields.join(',') if sort_fields.is_a?(Array)
               # Swap ASC/DESC on every click of the same column title
@@ -78,43 +65,22 @@ module KingList
               # otherwise just plain text (no sorting link)
               title = title_text
             end
-            # mark the first and last columns with css classes
-            if self.current_column_number == 1
-              (th_options[:class] ||= '') << ' first'
-            elsif self.current_column_number == self.number_of_columns
-              (th_options[:class] ||= '') << ' last'
-            end
-           @template.capture_haml do
-            @template.haml_tag(:th, title.to_s, th_options)
-          end
+            "<th #{ to_attr(th_options) }>#{title.to_s}</th>".html_safe
 
           when :content
             # Use given value (or formatted value as default)
-            value = options.delete(:value) || @template.strfval(object, field_name, value)
-
+            value = opts.delete(:value) || @template.strfval(object, field_name, value)
             # If link option is set, then link to this
-            # === Example            #
+            # === Example
             # :link => true : uses current object show link
             # :link => nil or blank no linking
-            if link = options.delete(:link)
-              # link to current_oject if true given
+            if link = opts.delete(:link)
+              # link to current_object if true given
               link = object if link == true
               # link and linked text is present else leave col text empty
               value = (!value.blank? && !link.blank?) ? @template.link_to(value, link) : ''
             end
-
-            # If row_link option is set, then link to the current object
-            if row_link = options.delete(:row_link)
-              row_link = object if row_link == true
-              value = @template.link_to(value, row_link) unless value.blank?
-
-              # Set a css class for the <td>, so it can be found via JavaScript
-              # and an onclick-event can be installed (TODO)
-              td_options.merge!(:class => 'row_link')
-            end
-          @template.capture_haml do
-            @template.haml_tag(:td, value.to_s, td_options)
-          end
+            "<td #{ to_attr(td_options) }>#{value.to_s}</td>".html_safe
         end # case mode
       end
 
@@ -126,36 +92,27 @@ module KingList
       #   = action_icon :edit, edit_path(person)
       #   = action_icon :delete, destroy_path(person)
       def action_column(options={}, &block)
-        self.current_column_number += 1
-
         case mode
-          when :counter
-            self.number_of_columns ||= 0
-            self.number_of_columns += 1
-            nil
           when :header
-            options = { :align => :left }
-            if self.current_column_number == 1
-              options[:class] = 'first'
-            elsif self.current_column_number == self.number_of_columns
-              options[:class] = 'last'
-            end
-
-            @template.haml_tag :th, options do
-              @template.haml_concat I18n.t(:'link.actions')
-            end
+            "<th>#{I18n.t(:'link.actions')}</th>".html_safe
           when :content
             td_options = options[:td_options] || {}
-            td_options[:class] = td_options[:class].to_a || []
+            td_options[:class] = [td_options[:class]].flatten || []
             td_options[:class] << 'actions'
-            @template.haml_tag :td, td_options do
-              @template.haml_tag :ul, :class => 'actions' do
-                @template.haml_concat @template.capture_haml(&block)
-              end
-            end
+            td_options[:class] = td_options[:class].compact.join(' ')
+            res = "<td #{ to_attr(td_options) }><ul class='actions'>"
+            res << @template.capture(&block)
+            res << "</ul></td>"
+            res.html_safe
         end
       end
 
+      # == Param
+      # opts<Hash{Symbol=>String}}>:. options used for html attributes
+      def to_attr(opts)
+        opts.collect{|k,v| "#{k}='#{v}'" }.join(' ')
+      end
+
     end #TableBuilder
   end # module
 end # module

data/king_list/lib/king_list/list_helper.rb

@@ -30,7 +30,11 @@ module KingList
           object = args.first
         else
           object = record_or_name
-          object_name = ActionController::RecordIdentifier.singular_class_name(object)
+          object_name = if ActionController::RecordIdentifier.respond_to?(:singular_class_name)
+            ActionController::RecordIdentifier.singular_class_name(object) # rails 2
+           else #Rails 3
+              ActiveModel::Naming.singular(object)
+          end
       end
 
       haml_tag :dl, options do
@@ -81,69 +85,56 @@ module KingList
     # === Usage example:
     #
     # Header linking for all, default
-    #   - table_for(@users) do |t, user|
-    #     - t.column :name  # with sorting
-    #     - t.column :email
+    #   = table_for(@users) do |t, user|
+    #     = t.column :name  # with sorting
+    #     = t.column :email
     #
     # Header linking for all, but exclude individual columns from sorting:
-    #  - table_for(@users)do |t, user|
-    #    - t.column :name, :sorting => false  # without sorting
-    #    - t.column :last_name
+    #  = table_for(@users)do |t, user|
+    #    = t.column :name, :sorting => false  # without sorting
+    #    = t.column :last_name
     #
     # NO header linking for all columns:
-    #  - table_for(@users, :sorting => false) do |t, user|
-    #    - t.column :name
-    #    - t.column :email
+    #  = table_for(@users, :sorting => false) do |t, user|
+    #    = t.column :name
+    #    = t.column :email
     #
     # No header linking for all, but allow sorting for individual columns:
-    #  - table_for(@users, :sorting => false) do |t, user|
-    #    - t.column :name, :sorting => true # with sorting
-    #    - t.column :last_name
+    #  = table_for(@users, :sorting => false) do |t, user|
+    #    = t.column :name, :sorting => true # with sorting
+    #    = t.column :last_name
     #
     def table_for(collection, options={}, html_options={}, &block)
       return if collection.nil? || collection.empty?
-
       builder = KingList::Builder::Table.new(render_context, collection)
       # extract options
       builder.sorting = options.delete(:sorting) != false # default => true
-
-      # First step: Yield the block just for counting the columns
-      builder.mode = :counter
-      builder.start_row(collection.first)
-      yield(builder, builder.current_record)
-
-      haml_tag :table, { :summary => '' }.merge(html_options) do
+      capture do
+        concat("<table #{ to_attr(html_options) }><thead><tr>".html_safe)
         # Build header row
-        haml_tag :thead do
-          haml_tag :tr do
-            builder.mode = :header
-            builder.start_row(collection.first)
-            yield(builder, builder.current_record)
-          end
-        end
-
-        # TODO: Build footer here
-        # haml_tag :tfoot do
-        # end
-
-        haml_tag :tbody do
-          builder.mode = :content
-          # Build content row for each collection item
-          collection.each do |c|
-            tr_options = {}
-            # zebra styling
-            tr_options[:class] = render_context.cycle('odd','even')
-
-            haml_tag :tr, tr_options do
-              builder.start_row(c)
-              yield(builder, builder.current_record)
-            end
-          end
+        builder.mode = :header
+        builder.current_record = collection.first
+        yield(builder, builder.current_record)
+        concat("</tr></thead><tbody>".html_safe)
+        builder.mode = :content
+        # Build content row for each collection item
+        collection.each do |c|
+          builder.current_record = c
+          concat("<tr>".html_safe)
+          yield(builder, builder.current_record)
+          concat("</tr>".html_safe)
         end
-
+        concat( "</tbody></table>".html_safe)
       end
     end
 
+    # TODO same in table class
+    #== Param
+    # opts<Hash{Symbol=>String}}>:. options used for html attributes
+    def to_attr(opts)
+      opts.collect{|k,v| "#{k}='#{v}'" }.join(' ')
+    end
+
     # Show a list of options as ul / li list.
     # Each actions li gets a special class so image replacement can be done via css
     # ==== Example
@@ -200,8 +191,8 @@ module KingList
     # You can set html options for both the li and the a tag
     #
     #===Example haml
-    #   action_text _('link.user.edit'), edit_object_path
-    #   action_text _('link.user.edit'), edit_object_path, {li html options}, {a html options :class=>'supercssclass'}
+    #   action_text t('link.user.edit'), edit_object_path
+    #   action_text t('link.user.edit'), edit_object_path, {li html options}, {a html options :class=>'supercssclass'}
     #
     #   =>   <li>
     #         <a href="/users/edit/12">
@@ -253,7 +244,10 @@ module KingList
     #
     def action_button(fieldname, options)
       render_context.capture_haml do
-        haml_tag :li, :class=>'form_btn' do
+        li_options = options.delete(:li_options) || {}
+        li_options[:class] ||= []
+        li_options[:class] << " form_btn"
+        haml_tag :li, li_options do
           haml_concat mini_action_form(fieldname, options)
         end
       end
@@ -282,8 +276,8 @@ module KingList
             method_tag +
             request_token_tag +
             hidden_tag +
-            "<button type='submit' name='submit' title='#{options[:title]}' class='#{options[:class]}'><span>#{options[:title]}</span></button>" +
-         "</div></form>"
+            "<button type='submit' name='submit'#{" id='#{options[:id]}'" if options[:id].present?} title='#{options[:title]}' class='#{options[:class]}'><span>#{options[:title]}</span></button>" +
+         "</div></form>".html_safe
     end
 
     # Renders a <ol> for a given collection and yields the block for every item
@@ -314,21 +308,24 @@ module KingList
     # Internal method used by action_text, action_button and action_icon
     # Directly returns a haml string into the template
     def action(kind, name_or_title, link_options, li_options={}, html_options={})
-      render_context.capture_haml do
-        haml_tag :li, li_options do
-          case kind
-            when :icon   then haml_concat link_to('', link_options, html_options)
-            when :text   then haml_concat link_to(name_or_title, link_options, html_options)
-            when :button then haml_concat button_to(name_or_title, link_options)
-          end
-        end
+
+      render_context.capture do
+        concat %{ <li #{ to_attr(li_options) }>
+        #{ case kind
+          when :icon
+            link_to('', link_options, html_options)
+          when :text
+            link_to(name_or_title, link_options, html_options)
+          when :button
+            button_to(name_or_title, link_options)
+        end } </li>}.html_safe
       end
     end
 
     def render_context
-      @template || view_context
-      # if rails < 2 ..
+      # rails 2 || rails 3.2
+      @template || self
     end
 
   end #ListHelper
-end#module
+end#module