king_views 1.1.4 → 1.1.5

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake'
-require 'rake/rdoctask'
-require 'spec/rake/spectask'
+require 'rdoc/task'
+require 'rspec/core/rake_task'
 
 begin
   require 'jeweler'

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module KingForm
   module Builder
     module FormFields

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module KingForm
   module Builder
     # Create forms with a fieldset->div->label->input structure

data/king_form/lib/king_form/nested_form_helper.rb

@@ -43,7 +43,7 @@ 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

data/king_format/README.rdoc

@@ -3,7 +3,7 @@
 Define fields being of type date, currency or percent.  When the fields are shown
 within KingList/KingForm views, their format is detected and the output is
 automatically formatted. Default formats of date and currency fields can be set
-and both also take te current I18n.locale into account.
+or they take the current I18n.locale into account.
 
 KingFormat consists of two different formatting helper regions:
 

data/king_format/lib/helpers/formatting_helper.rb

@@ -43,8 +43,8 @@ module KingFormat
     #   one differs eg. in precision
     #   3. @default_currency_format
     #   4. I18n actually resided in rails
-    # Whatever you use be aware to always pass all formatting options since rails
-    # merges unavailable keys with i18n defaults
+    #   Whatever you use be aware to always pass all formatting options since rails
+    #   merges unavailable keys with i18n defaults
     def strfval( object, fld, val=nil, opts={} )
       # If no value given, call fld on object to get the current value
       #return the content(a pointer) or an empty string OR  nil of field is not available
@@ -61,14 +61,12 @@ module KingFormat
       elsif (object.class.is_percent_field?(fld) rescue nil)
         (val && !val.blank?) ? number_to_percentage_auto_precision(val) : ''
       elsif (object.class.is_money_field?(fld) rescue nil) || opts[:currency]
-      # field is defined as money field OR currency options are passed in
         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)
       elsif ( val.is_a?(Date) || (object.class.is_date_field?(fld) rescue nil) || opts[:date] )
-      # field is defined as date field OR date options are passed in
-        return val if val.blank? # blank value can occur when a is_date_field is empty       
+        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
         format = opts[:date] || default_date_format
         format.blank? ? ::I18n.localize(val) : val.strftime(format)

data/king_format/lib/helpers/money_helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module KingFormat
   # a little rewrite of the rails internal number helper with better:
   # - rounding

data/king_list/lib/king_list/list_helper.rb

@@ -1,5 +1,5 @@
 module KingList
-  # The List Helper aides in lists anddetail views by providing helpers for:
+  # The List Helper provides methods for lists and detail views:
   # tables, action icons, action buttons and action links, definition list helper
   module ListHelper
 
@@ -34,7 +34,7 @@ module KingList
       end
 
       haml_tag :dl, options do
-        yield KingList::Builder::Show.new(object_name, object, @template)
+        yield KingList::Builder::Show.new(object_name, object, render_context)
       end
     end
 
@@ -60,16 +60,16 @@ module KingList
 
       caption ||= options.delete(:caption)
 
-      @template.haml_tag :fieldset, options do
-        @template.haml_tag :legend, caption unless caption.blank?
-        @template.haml_concat @template.capture_haml(&block)
+      render_context.haml_tag :fieldset, options do
+        render_context.haml_tag :legend, caption unless caption.blank?
+        render_context.haml_concat render_context.capture_haml(&block)
       end
     end
 
     # Create a div for form actions
     def actions(options = {}, &block)
-      @template.haml_tag :div, options.merge(:class => 'form_actions') do
-        @template.haml_concat @template.capture_haml(&block)
+      render_context.haml_tag :div, options.merge(:class => 'form_actions') do
+        render_context.haml_concat render_context.capture_haml(&block)
       end
     end
 
@@ -103,7 +103,7 @@ module KingList
     def table_for(collection, options={}, html_options={}, &block)
       return if collection.nil? || collection.empty?
 
-      builder = KingList::Builder::Table.new(@template, collection)
+      builder = KingList::Builder::Table.new(render_context, collection)
       # extract options
       builder.sorting = options.delete(:sorting) != false # default => true
 
@@ -132,7 +132,7 @@ module KingList
           collection.each do |c|
             tr_options = {}
             # zebra styling
-            tr_options[:class] = @template.cycle('odd','even')
+            tr_options[:class] = render_context.cycle('odd','even')
 
             haml_tag :tr, tr_options do
               builder.start_row(c)
@@ -252,7 +252,7 @@ module KingList
     #   </form>
     #
     def action_button(fieldname, options)
-      @template.capture_haml do
+      render_context.capture_haml do
         haml_tag :li, :class=>'form_btn' do
           haml_concat mini_action_form(fieldname, options)
         end
@@ -300,7 +300,7 @@ module KingList
       haml_tag :ol, options do
         collection.each_with_index do |c,i|
           li_options = {}
-          li_options[:class] = @template.cycle('odd','even')
+          li_options[:class] = render_context.cycle('odd','even')
           li_options[:value] = collection.length - i if descending
           haml_tag :li, li_options do
             yield(c)
@@ -314,7 +314,7 @@ 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={})
-      @template.capture_haml do
+      render_context.capture_haml do
         haml_tag :li, li_options do
           case kind
             when :icon   then haml_concat link_to('', link_options, html_options)
@@ -325,5 +325,10 @@ module KingList
       end
     end
 
+    def render_context
+      @template || view_context
+      # if rails < 2 ..
+    end
+
   end #ListHelper
 end#module

data/king_views.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{king_views}
-  s.version = "1.1.4"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Georg Leciejewski"]
-  s.date = %q{2011-02-17}
+  s.date = %q{2011-12-25}
   s.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. }
   s.email = %q{gl@salesking.eu}
   s.extra_rdoc_files = [
@@ -63,7 +63,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/salesking/king_views}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Ultraclean haml views with list and forms helpers for rails}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: king_views
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Georg Leciejewski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 +01:00
+date: 2011-12-25 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ultraclean haml views with list and forms helpers for rails