fortitude 0.0.7 → 0.0.9

data/lib/fortitude/widget.rb

@@ -50,7 +50,7 @@ module Fortitude
     end
 
     rebuild_run_content!(:initial_setup)
-    rebuild_needs!(:initial_setup)
+    invalidate_needs!(:initial_setup)
     rebuild_text_methods!(:initial_setup)
   end
 end

data/lib/fortitude/widget/content.rb

@@ -27,7 +27,7 @@ module Fortitude
               text += "  " + ("  " * index) + "#{method_name}(*args) do\n"
             end
 
-            if has_localized_content_methods?
+            if use_localized_content_methods
               text += "  " + ("  " * acm.length) + "the_locale = widget_locale\n"
               text += "  " + ("  " * acm.length) + "locale_method_name = \"localized_content_\#{the_locale}\" if the_locale\n"
               text += "  " + ("  " * acm.length) + "out = if locale_method_name && respond_to?(locale_method_name)\n"

data/lib/fortitude/widget/integration.rb

@@ -1,7 +1,7 @@
 require 'active_support'
 require 'active_support/concern'
 
-require 'fortitude/method_templates/simple_template'
+require 'fortitude/method_templates/simple_compiled_template'
 
 module Fortitude
   class Widget
@@ -15,10 +15,15 @@ module Fortitude
         end
         private :rebuilding
 
+        def invalidating(what, why, klass, &block)
+          ActiveSupport::Notifications.instrument("fortitude.invalidating", :what => what, :why => why, :originating_class => klass, :class => self, &block)
+        end
+        private :invalidating
+
         # INTERNAL USE ONLY
         def rebuild_text_methods!(why, klass = self)
           rebuilding(:text_methods, why, klass) do
-            class_eval(Fortitude::MethodTemplates::SimpleTemplate.template('text_method_template').result(
+            class_eval(Fortitude::MethodTemplates::SimpleCompiledTemplate.template('text_method_template').result(
               :format_output => format_output,
               :record_emitting_tag => self._fortitude_record_emitting_tag?))
             direct_subclasses.each { |s| s.rebuild_text_methods!(why, klass) }
@@ -54,7 +59,7 @@ module Fortitude
 
         _fortitude_on_class_inheritable_attribute_change(
           :debug, :extra_assigns, :use_instance_variables_for_assigns) do |attribute_name, old_value, new_value|
-          rebuild_needs!(:"#{attribute_name}_changed")
+          invalidate_needs!(:"#{attribute_name}_changed")
         end
 
         _fortitude_on_class_inheritable_attribute_change(:implicit_shared_variable_access) do |attribute_name, old_value, new_value|
@@ -72,6 +77,10 @@ module Fortitude
             remove_around_content :start_and_end_comments, :fail_if_not_present => false
           end
         end
+
+        _fortitude_on_class_inheritable_attribute_change(:use_localized_content_methods) do |attribute_name, old_value, new_value|
+          rebuild_run_content!(:use_localized_content_methods_changed)
+        end
       end
     end
   end

data/lib/fortitude/widget/localization.rb

@@ -6,43 +6,7 @@ module Fortitude
     module Localization
       extend ActiveSupport::Concern
 
-      module ClassMethods
-        # RUBY CALLBACK
-        def method_added(method_name)
-          super(method_name)
-          check_localized_methods!
-        end
-
-        # RUBY CALLBACK
-        def method_removed(method_name)
-          super(method_name)
-          check_localized_methods!
-        end
-
-        # RUBY CALL
-        def include(*args)
-          super(*args)
-          check_localized_methods!
-        end
-
-        LOCALIZED_CONTENT_PREFIX = "localized_content_"
-
-        # INTERNAL USE ONLY
-        def check_localized_methods!(original_class = self)
-          currently_has = instance_methods(true).detect { |i| i =~ /^#{LOCALIZED_CONTENT_PREFIX}/i }
-          if currently_has != @last_localized_methods_check_has
-            @last_localized_methods_check_has = currently_has
-            rebuild_run_content!(:localized_methods_presence_changed, original_class)
-          end
-          direct_subclasses.each { |s| s.check_localized_methods!(original_class) }
-        end
-
-        # INTERNAL USE ONLY
-        def has_localized_content_methods?
-          !! (instance_methods(true).detect { |i| i =~ /^#{LOCALIZED_CONTENT_PREFIX}/i })
-        end
-        private :has_localized_content_methods?
-      end
+      LOCALIZED_CONTENT_PREFIX = "localized_content_"
 
       # PUBLIC API
       def t(key, *args)

data/lib/fortitude/widget/needs.rb

@@ -1,7 +1,7 @@
 require 'active_support'
 require 'active_support/concern'
 
-require 'fortitude/method_templates/simple_template'
+require 'fortitude/method_templates/simple_compiled_template'
 require 'fortitude/support/assigns_proxy'
 
 module Fortitude
@@ -45,7 +45,7 @@ module Fortitude
             @this_class_needs[name] = default_value.freeze
           end
 
-          rebuild_needs!(:need_declared)
+          invalidate_needs!(:need_declared)
 
           needs_as_hash
         end
@@ -65,11 +65,11 @@ module Fortitude
         end
 
         # INTERNAL USE ONLY
-        def rebuild_needs!(why, klass = self)
-          rebuilding(:needs, why, klass) do
+        def invalidate_needs!(why, klass = self)
+          invalidating(:needs, why, klass) do
             @_fortitude_needs_as_hash = nil
-            rebuild_my_needs_methods!
-            direct_subclasses.each { |s| s.rebuild_needs!(why, klass) }
+            invalidate_my_needs_methods!
+            direct_subclasses.each { |s| s.invalidate_needs!(why, klass) }
           end
         end
 
@@ -96,30 +96,59 @@ module Fortitude
         end
 
         # INTERNAL USE ONLY
+        def invalidate_my_needs_methods!
+          @_fortitude_my_needs_methods_valid = false
+        end
+
+        def ensure_needs_methods_are_valid!(originating_class = self)
+          out = false
+          out ||= superclass.ensure_needs_methods_are_valid!(originating_class) if superclass.respond_to?(:ensure_needs_methods_are_valid!)
+
+          unless @_fortitude_my_needs_methods_valid
+            rebuilding(:needs, :invalid, originating_class) do
+              rebuild_my_needs_methods!
+              @_fortitude_my_needs_methods_valid = true
+            end
+
+            out = true
+          end
+
+          out
+        end
+
         def rebuild_my_needs_methods!
           n = needs_as_hash
 
+          start_time = Time.now
           needs_text = n.map do |need, default_value|
-            Fortitude::MethodTemplates::SimpleTemplate.template('need_assignment_template').result(:extra_assigns => extra_assigns,
+            Fortitude::MethodTemplates::SimpleCompiledTemplate.template('need_assignment_template').result(:extra_assigns => extra_assigns,
               :need => need, :has_default => (default_value != REQUIRED_NEED),
               :ivar_name => instance_variable_name_for_need(need)
             )
           end.join("\n\n")
 
-          assign_locals_from_text = Fortitude::MethodTemplates::SimpleTemplate.template('assign_locals_from_template').result(
+          assign_locals_from_text = Fortitude::MethodTemplates::SimpleCompiledTemplate.template('assign_locals_from_template').result(
             :extra_assigns => extra_assigns, :needs_text => needs_text)
-          class_eval(assign_locals_from_text)
 
+          needs_methods_text = ""
           n.each do |need, default_value|
-            text = Fortitude::MethodTemplates::SimpleTemplate.template('need_method_template').result(
+            needs_methods_text << (Fortitude::MethodTemplates::SimpleCompiledTemplate.template('need_method_template').result(
               :need => need, :ivar_name => instance_variable_name_for_need(need),
-              :debug => self.debug)
-            needs_module.module_eval(text)
+              :debug => self.debug))
           end
+
+          class_eval(assign_locals_from_text)
+          needs_module.module_eval(needs_methods_text)
         end
+
         private :rebuild_my_needs_methods!
       end
 
+      def assign_locals_from(assigns)
+        self.class.ensure_needs_methods_are_valid!
+        assign_locals_from(assigns)
+      end
+
       # PUBLIC API
       def shared_variables
         @_fortitude_rendering_context.instance_variable_set

data/lib/fortitude/widget/rendering.rb

@@ -23,17 +23,19 @@ module Fortitude
         end
       end
 
-      def render_to(rendering_context)
+      def render_to(rendering_context, &block_for_content_method)
         @_fortitude_rendering_context = rendering_context
         @_fortitude_output_buffer_holder = rendering_context.output_buffer_holder
+        @_fortitude_block_for_content_method = block_for_content_method
 
-        block = lambda { |*args| @_fortitude_rendering_context.yield_from_widget(*args) }
+        block = lambda { |*args| yield_from_widget(*args) }
 
         rendering_context.record_widget(self) do
           begin
             run_content(&block)
           ensure
             @_fortitude_rendering_context = nil
+            @_fortitude_block_for_content_method = nil
           end
         end
       end
@@ -50,12 +52,12 @@ module Fortitude
       end
 
       # PUBLIC API
-      def widget(w, hash = nil)
+      def widget(w, hash = nil, &block)
         if w.respond_to?(:render_to)
-          w.render_to(@_fortitude_rendering_context)
+          w.render_to(@_fortitude_rendering_context, &block)
         elsif w.kind_of?(Class)
           hash ||= { }
-          w.new(hash).render_to(@_fortitude_rendering_context)
+          w.new(hash, &block).render_to(@_fortitude_rendering_context)
         else
           raise "You tried to render a widget, but this is not valid: #{w.inspect}(#{hash.inspect})"
         end
@@ -67,8 +69,9 @@ module Fortitude
       end
 
       # PUBLIC API
-      def initialize(assigns = { })
+      def initialize(assigns = { }, &block)
         assign_locals_from(assigns)
+        @_fortitude_constructor_block = block
       end
 
       # INTERNAL USE ONLY
@@ -96,9 +99,24 @@ module Fortitude
       end
       private :_fortitude_class_for_new_buffer
 
+      def _fortitude_yield_from_widget(*args)
+        if @_fortitude_block_for_content_method
+          @_fortitude_block_for_content_method.call(*args)
+        elsif @_fortitude_constructor_block
+          @_fortitude_constructor_block.call(*args)
+        else
+          @_fortitude_rendering_context.yield_from_widget(*args)
+        end
+      end
+
       # PUBLIC API
       def yield_from_widget(*args)
-        @_fortitude_rendering_context.yield_from_widget(*args)
+        _fortitude_yield_from_widget(self, *args)
+      end
+
+      # PUBLIC API (Erector compatibility)
+      def call_block
+        _fortitude_yield_from_widget
       end
     end
   end

data/lib/fortitude/widget/start_and_end_comments.rb

@@ -35,6 +35,7 @@ module Fortitude
               out << "(DEFAULT) " if assigns.is_default?(assign)
 
               value_string = if value.respond_to?(:to_fortitude_comment_string) then value.to_fortitude_comment_string else value.inspect end
+              value_string ||= ''
               if value_string.length > MAX_START_COMMENT_VALUE_STRING_LENGTH
                 value_string = value_string[0..(MAX_START_COMMENT_VALUE_STRING_LENGTH - START_COMMENT_VALUE_STRING_TOO_LONG_ELLIPSIS.length)] + START_COMMENT_VALUE_STRING_TOO_LONG_ELLIPSIS
               end

data/lib/fortitude/widget/tags.rb

@@ -48,7 +48,8 @@ module Fortitude
                 :record_emitting_tag => self._fortitude_record_emitting_tag?,
                 :enforce_attribute_rules => self.enforce_attribute_rules,
                 :enforce_id_uniqueness => self.enforce_id_uniqueness,
-                :close_void_tags => self.close_void_tags)
+                :close_void_tags => self.close_void_tags,
+                :allows_bare_attributes => self.doctype.allows_bare_attributes?)
             end
 
             direct_subclasses.each { |s| s.rebuild_tag_methods!(why, which_tags_in, klass) }

data/lib/fortitude/widget/widget_class_inheritable_attributes.rb

@@ -30,6 +30,7 @@ module Fortitude
           end
         end)
         _fortitude_class_inheritable_attribute :debug, false, [ true, false ]
+        _fortitude_class_inheritable_attribute :use_localized_content_methods, false, [ true, false ]
       end
 
       module ClassMethods

data/spec/helpers/system_helpers.rb

@@ -42,6 +42,10 @@ module SystemHelpers
       { }
     end
 
+    def allows_bare_attributes?
+      true
+    end
+
     def needs_cdata_in_javascript_tag?
       false
     end

data/spec/rails/class_loading_system_spec.rb

@@ -45,10 +45,18 @@ describe "Rails class-loading support", :type => :rails do
     expect_exception('underscore_view', 'ActionView::MissingTemplate', /class_loading_system_spec\/underscore_view/)
   end
 
-  it "should not let me define a widget in a file starting with an underscore, and autoload it" do
-    expect_exception('underscore_widget', 'NameError', /uninitialized constant Views::ClassLoadingSystemSpec::UnderscoreWidget/)
+  it "should prefer widgets defined in a file without an underscore to those with" do
+    expect_match('foo', /foo WITHOUT underscore/)
   end
 
+  it "should prefer widgets ending in .html.rb to those just ending in .rb" do
+    expect_match('bar', /bar WITH html/)
+  end
+
+  # it "should not let me define a widget in a file starting with an underscore, and autoload it" do
+  #   expect_exception('underscore_widget', 'NameError', /uninitialized constant Views::ClassLoadingSystemSpec::UnderscoreWidget/)
+  # end
+
   it "should not let me 'require' files in app/views without a views/ prefix" do
     expect_exception('require_loaded_underscore_widget_without_views', 'LoadError', /(cannot load such file|no such file to load)/)
   end

data/spec/rails/development_mode_system_spec.rb

@@ -82,7 +82,98 @@ describe "Rails development-mode support", :type => :rails do
     expect_match("namespace_reference", /before.*referenced.*after/mi)
   end
 
+  it "should allow you to toggle back and forth between two forms of referencing a superclass" do
+    current_form = :full_reference
+    5.times do
+      if current_form == :full_reference
+        splat_full_reference_edit!
+      else
+        splat_partial_reference_edit!
+      end
+
+      sleep 1
+      $stderr.puts "checking for #{current_form.inspect}"
+      expect_match("edit", /#{Regexp.escape(current_form.to_s)}/i)
+
+      current_form = if current_form == :full_reference
+        :partial_reference
+      else
+        :full_reference
+      end
+    end
+  end
+
   private
+  def splat_full_reference_edit!
+    widget_file = File.join(rails_server.rails_root, "app/views/development_mode_system_spec/edit.rb")
+    File.open(widget_file, 'w') do |f|
+      f.puts <<-EOS
+module Views
+  module DevelopmentModeSystemSpec
+    if const_defined?(:Edit)
+      $stderr.puts "(full) Edit constant: \#{const_get(:Edit).inspect}"
+      $stderr.puts "(full) Edit superclass: \#{const_get(:Edit).superclass}/\#{const_get(:Edit).superclass.object_id}"
+
+      if (::Views.const_defined?(:Base))
+        $stderr.puts "(full) Views::Base already defined: \#{::Views::Base.object_id}"
+      else
+        $stderr.puts "(full) Views::Base not defined"
+      end
+
+      $stderr.puts "(full) ::Views::Base: \#{::Views::Base.name}/\#{::Views::Base.object_id}"
+      $stderr.puts "(full) Views::Base: \#{Views::Base.name}/\#{Views::Base.object_id}"
+    else
+      $stderr.puts "(full) No edit constant!"
+    end
+
+    class Edit < Views::Base
+      def content
+        widget(Views::DevelopmentModeSystemSpec::Form, :label => "full_reference")
+      end
+    end
+
+    $stderr.puts "(full) After definition: \#{::Views::Base.object_id}"
+  end
+end
+EOS
+    end
+  end
+
+  def splat_partial_reference_edit!
+    widget_file = File.join(rails_server.rails_root, "app/views/development_mode_system_spec/edit.rb")
+    File.open(widget_file, 'w') do |f|
+      f.puts <<-EOS
+module Views
+  module DevelopmentModeSystemSpec
+    if const_defined?(:Edit)
+      $stderr.puts "(partial) Edit constant: \#{const_get(:Edit).inspect}"
+      $stderr.puts "(partial) Edit superclass: \#{const_get(:Edit).superclass}/\#{const_get(:Edit).superclass.object_id}"
+
+      if (::Views.const_defined?(:Base))
+        $stderr.puts "(partial) Views::Base already defined: \#{::Views::Base.object_id}"
+      else
+        $stderr.puts "(partial) Views::Base not defined"
+      end
+
+      $stderr.puts "(partial) ::Views::Base: \#{::Views::Base.name}/\#{::Views::Base.object_id}"
+      $stderr.puts "(partial) Views::Base: \#{Views::Base.name}/\#{Views::Base.object_id}"
+    else
+      $stderr.puts "(partial) No edit constant!"
+    end
+
+    class Edit < Views::Base
+      def content
+        widget(Form, :label => "partial_reference")
+      end
+    end
+
+    $stderr.puts "(partial) After definition: \#{::Views::Base.object_id}"
+  end
+end
+EOS
+    end
+  end
+
   def splat_new_widget!
     reload_file = File.join(rails_server.rails_root, 'app/views/development_mode_system_spec/reload_widget.rb')
     File.open(reload_file, 'w') do |f|