context_help 0.0.5 → 0.0.6

data/lib/context_help/base.rb

@@ -214,7 +214,6 @@ module ContextHelp
       
       plugin_prefixes.each do |prefix|
         begin
-          Rails.logger.info "CHH: " + prefix + path
           item = I18n.translate prefix + path, :raise => true
           if item.start_with?('t.')
             item = I18n.t item[2, item.length]
@@ -244,7 +243,7 @@ module ContextHelp
         end
         return base
       else
-        return base || added
+        return added || base
       end
     end
     def self.clean(options)

data/lib/context_help/patches/formtastic_patch.rb

@@ -3,19 +3,25 @@ module ContextHelp
     def inputs(*args, &block)
       title = field_set_title_from_args(*args)
       html_options = args.extract_options!
+
       help_options = ContextHelp::Helpers.merge_options({:context_help => {:path => {:tag => 'fieldset', :tag_options => html_options}}}, html_options)
       help_options[:context_help][:title] = title if help_options[:context_help][:path][:tag]
+
       help = ContextHelp::Base.help_for(help_options)
       super *(args<<help_options), &block
     end
     def input(method, options = {})   
       options = ContextHelp::Helpers.merge_options({:context_help => {:path => {:model => model_name.to_sym, :attribute=> method.to_sym}}}, options || {})
-      super
+      options[:input_html] ||= {}
+      options[:input_html][:context_help] = options[:context_help]
+      options[:label_html] ||= {}
+      options[:label_html][:context_help] = options[:context_help]
+      super method, options
     end
     def radio_input(method, options)
       options[:label] = localized_string(method, options[:label], :label) || humanized_attribute_name(method)
       ContextHelp::Base.help_for(options) 
-      super
+      super method, options
     end
     def legend_tag(method, options = {})
       if options[:label] == false

data/lib/context_help/version.rb

@@ -1,3 +1,3 @@
 module ContextHelp
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: context_help
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: