context_help 0.0.2 → 0.0.4

data/lib/context_help/base.rb

@@ -169,8 +169,7 @@ module ContextHelp
   module Helpers
     def self.is_visible(options)
       return false if options[:calculated_path].nil?
-      text = options[:text] || I18n.t(options[:calculated_path]+'.text', :default => {})
-      return false if (text.nil? or text.is_a?(Hash)) and !(Rails.env.development? and ContextHelp::Base.config[:show_missing])
+      return false if self.get_text(options,false).nil?
       true
     end
     def self.get_title(options)
@@ -178,15 +177,14 @@ module ContextHelp
       if (title.nil? or title.is_a?(Hash)) 
         title = nil
         if options[:path][:model]
-          model_class = model_name(options[:path][:model]).classify
-          if const_defined?(model_class)
-            model_class = model_class.constantize
+          begin
+            model_class = model_name(options[:path][:model]).classify.constantize
             if options[:path][:attribute] then
               title = model_class.human_attribute_name(options[:path][:attribute].to_s) rescue I18n.t(options[:calculated_path]+'.title')
             else
               title = model_class.human_name
             end
-          else
+          rescue
             title = I18n.t(options[:calculated_path]+'.title')
           end
         else
@@ -201,10 +199,14 @@ module ContextHelp
       end
       title
     end
-    def self.get_text(options)
+    def self.get_text(options,missing=true)
       text = options[:text] || I18n.t(options[:calculated_path]+'.text', :default => {})
       if (text.nil? or text.is_a?(Hash)) 
-        nil
+        if missing and Rails.env.development? and ContextHelp::Base.config[:show_missing]
+          I18n.t(options[:calculated_path]+'.text')
+        else
+          nil
+        end
       else
         text
       end
@@ -227,5 +229,10 @@ module ContextHelp
         return base || added
       end
     end
+    def self.clean(options)
+      options.delete(:context_help)
+      options.delete('context_help')
+      options
+    end
   end
 end

data/lib/context_help/patches/form_tag_helper_patch.rb

@@ -10,7 +10,7 @@ module ActionView
         help_options = ContextHelp::Helpers.merge_options({:context_help => {:path => {:tag => :label, :tag_options => options}}}, options)
         text ||= name.to_s.humanize
         text = text + ContextHelp::Base.help_for(help_options)
-        label_tag_without_context_help_label_tag name, text, help_options
+        label_tag_without_context_help_label_tag name, text, ContextHelp::Helpers.clean(options)
       end
       
       alias_method_chain :form_tag, :context_help_form_tag

data/lib/context_help/patches/tag_helper_patch.rb

@@ -4,14 +4,12 @@ module ActionView
       def tag_with_context_help_tag(name, options = {}, open = false, escape = true)
         help_options = ContextHelp::Helpers.merge_options({:context_help => {:path => {:tag => name.to_sym, :tag_options => options}}}, options)
         help = ContextHelp::Base.help_for(help_options)
-        options.delete('context_help')
-        tag_without_context_help_tag(name, options, open, escape) + help
+        tag_without_context_help_tag(name, ContextHelp::Helpers.clean(options), open, escape) + help
       end
       def content_tag_with_context_help_content_tag(name, content_or_options_with_block = nil, options = {}, escape = true, &block)
         help_options = ContextHelp::Helpers.merge_options({:context_help => {:path => {:tag => name.to_sym, :tag_options => options}}}, options)
         help = ContextHelp::Base.help_for(help_options)
-        options.delete('context_help')
-        content_tag_without_context_help_content_tag(name, content_or_options_with_block, options, escape, &block) + help
+        content_tag_without_context_help_content_tag(name, content_or_options_with_block, ContextHelp::Helpers.clean(options), escape, &block) + help
       end
 
       alias_method_chain :tag, :context_help_tag

data/lib/context_help/version.rb

@@ -1,3 +1,3 @@
 module ContextHelp
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: context_help
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000 -03:00
+date: 2011-08-30 00:00:00.000000000 -03:00
 default_executable: 
 dependencies: []
 description: ContextHelp is a gem that allows you to show inline or aside help about