fortitude 0.0.10-java → 0.9.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1a542c4ed9adc0639a95c15852b627673bb55c5
-  data.tar.gz: 905df6f3d00b4e5740e9de43fd0486b4e4b9131e
+  metadata.gz: fe5a63f683c45d929d11bb4875c1e99042ee8e2a
+  data.tar.gz: 60eb4dbf18313d1e641b002df42f975d5fa14725
 SHA512:
-  metadata.gz: 1245a668c62617e44b205e63f662b2a47735e97d13dd2315b26fdb832adec5a04f1eb5e464e0329f261cfcbdfe351d239306a95d97463714d4c5660c6c3cdd72
-  data.tar.gz: 2f428702bbd1ed28557fe677a2f8b09c13a5864acec8669919fecd042b8a89bad35191dd706f24e3ed1bad4db7d55a47c211bd5fac05bba614eea917c57b2728
+  metadata.gz: 474bcd4bb594f99f5192d97c3c43738636da8ddcb762ae306942d6407eaf924ac6d82d369f4447d381b9871ec9646f0501aaf311871f1aaaced3d5ace37dab33
+  data.tar.gz: 94a87ae21f53e0164b12453fe6f59ce000904f1893fb149eec73b717b2a7149d8df2aa584ee27026bb064cc3a3ba901fd51fc6341c0ae0a0313e3ba76d4151e1

data/CHANGES.md

@@ -1,5 +1,16 @@
 # Fortitude Releases
 
+## 0.9.0, 29 November 2014
+
+Updated Fortitude's version number to 0.9.0: at this point, Fortitude should be considered fully production-ready,
+as it is used successfully in multiple very large systems and bug reports are increasingly rare. I don't want to
+release a 1.0 until there's excellent documentation, but the codebase seems to be ready.
+
+* Added explicit support for eager-loading Fortitude widget classes under `views/` for Rails applications. This both
+  should improve first-run performance of Fortitude-using Rails applications in production, and should avoid an
+  occasional problem where Fortitude widget classes were not properly loaded in environments that used eager loading,
+  rather than autoloading, for classes.
+
 ## 0.0.10, 25 November 2014
 
 * Fixed an issue where `#capture` was not working properly if you rendered a widget using `render :widget =>` in a

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 
 gem 'erector'
 # gem 'erector-rails4', :path => '../erector-rails4'
+gem 'oop_rails_server', :path => '../oop_rails_server'

data/lib/fortitude/extensions/native_extensions.rb

@@ -17,7 +17,8 @@ else
   rescue LoadError => le
     $stderr.puts <<-EOM
 WARNING: The Fortitude gem cannot load its native extensions. Performance may be reduced by a factor of 3-5x!
-         Load path: #{$:.inspect}
+         Load path:
+            #{$:.join("\n            ")}
          Error: #{le.message} (#{le.class})
 EOM
     native_loaded = false

data/lib/fortitude/rails/railtie.rb

@@ -71,6 +71,10 @@ module Fortitude
         ::ActiveSupport::Dependencies.module_eval do
           @@_fortitude_views_root = views_root
 
+          def self._fortitude_views_root
+            @@_fortitude_views_root
+          end
+
           # This is the method that gets called to auto-generate namespacing empty
           # modules (_e.g._, the toplevel <tt>Views::</tt> module) for directories
           # under an autoload path.
@@ -176,8 +180,54 @@ module Fortitude
           alias_method_chain :search_for_file, :fortitude
         end
 
+        # Two important comments here:
+        #
+        # 1: We also need to patch ::Rails::Engine.eager_load! so that it loads classes under app/views/. However, we
+        # can't just add it to the normal eager load paths, because that will allow people to do "require 'foo/bar'"
+        # and have it match app/views/foo/bar.rb, which we don't want. So, instead, we load these classes ourselves.
+        # Note that we ALSO have to do things slightly differently than Rails does it, because we need to skip loading
+        # 'foo.rb' if 'foo.html.rb' exists -- and because we have to require the fully-qualified pathname, since
+        # app/views is not actually on the load path.
+        #
+        # 2: I (ageweke) added this very late in the path of Fortitude development, after trying to use Fortitude in a
+        # deployment (production) environment in which widgets just weren't getting loaded at all. Yet there's something
+        # I don't understand: clearly, without this code, widgets will not be eager-loaded (which is probably not a
+        # great thing for performance reasons)...but I think they still should get auto-loaded and hence actually work
+        # just fine. But they don't in that environment (you'll get errors like "uninitialized constant Views::Base").
+        # Since I understand what's going on and have the fix for it here, that's fine...except that I can't seem to
+        # write a spec for it, because I don't know how to actually *make* it fail. If anybody comes along later and
+        # knows what would make it fail (and I double-checked, and we don't have autoloading disabled in production or
+        # anything like that), let me know, so that I can write a spec for this. Thanks!
+        ::Rails::Engine.class_eval do
+          def eager_load_with_fortitude!
+            eager_load_without_fortitude!
+            eager_load_fortitude_views!
+          end
+
+          def eager_load_fortitude_views!
+            load_path = ::ActiveSupport::Dependencies._fortitude_views_root
+            all_files = Dir.glob("#{load_path}/**/*.rb")
+            matcher = /\A#{Regexp.escape(load_path.to_s)}\/(.*)\.rb\Z/
+
+            all_files.sort.each do |full_path|
+              filename = File.basename(full_path, ".rb")
+              directory = File.dirname(full_path)
+
+              longer_name_regex = /^#{Regexp.escape(filename)}\..+\.rb$/i
+              longer_name = Dir.entries(directory).detect { |e| e =~ longer_name_regex }
+
+              unless longer_name
+                require_dependency File.join('views', full_path.sub(matcher, '\1'))
+              end
+            end
+          end
+
+          alias_method_chain :eager_load!, :fortitude
+        end
+
         # And, finally, this is where we add our root to the set of autoload paths.
         ::ActiveSupport::Dependencies.autoload_paths << views_root
+        # app.config.eager_load_paths << views_root
 
         # This is our support for partials. Fortitude doesn't really have a distinction between
         # partials and "full" templates -- everything is just a widget, which is much more elegant --

data/lib/fortitude/version.rb

@@ -1,3 +1,3 @@
 module Fortitude
-  VERSION = "0.0.10"
+  VERSION = "0.9.0"
 end

data/spec/rails/class_loading_system_spec.rb

@@ -1,11 +1,6 @@
 describe "Rails class-loading support", :type => :rails do
   uses_rails_with_template :class_loading_system_spec
 
-  it "should not load classes under app/views without the Views:: prefix" do
-    expect_exception('the_class_should_not_load', 'NameError',
-      /uninitialized constant ClassLoadingSystemSpec::ClassShouldNotLoad/i)
-  end
-
   it "should allow me to define classes under Views:: outside of app/views, like in lib/views" do
     expect_match('lib_views', /hello: i am lib\/views/)
   end
@@ -53,9 +48,9 @@ describe "Rails class-loading support", :type => :rails 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 let me define a widget in a file starting with an underscore, and autoload it" do
+    expect_match('underscore_widget_surrounding', /surrounding_widget before.*this is underscore_widget.*surrounding_widget after/)
+  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)/)
@@ -68,4 +63,8 @@ describe "Rails class-loading support", :type => :rails do
   it "should let me render a widget defined outside of app/views/ if I use render :widget" do
     expect_match('render_widget_outside_app_views', /arbitrary_name_some_widget/)
   end
+
+  it "should not load view classes with any module nesting applied" do
+    expect_match('show_module_nesting', /module_nesting: \[\]/)
+  end
 end

data/spec/rails/development_mode_system_spec.rb

@@ -23,6 +23,11 @@ describe "Rails development-mode support", :type => :rails do
     expect_match("reload_widget_with_html_extension", /with_html_extension.*helper: yo/)
   end
 
+  it "should not autoload classes that live under views/ but don't start with a Views:: prefix" do
+    expect_exception('the_class_should_not_load', 'NameError',
+      /uninitialized constant DevelopmentModeSystemSpec::ClassShouldNotLoad/i)
+  end
+
   it "should let you change the controller, and that should work fine, too" do
     expect(rails_server.get("replaced/reload_widget")).to match(/datum\s+one\s+datum/)
     sleep 1

data/spec/rails/templates/class_loading_system_spec/app/controllers/class_loading_system_spec_controller.rb

@@ -1,8 +1,4 @@
 class ClassLoadingSystemSpecController < ApplicationController
-  def the_class_should_not_load
-    render :text => ::ClassLoadingSystemSpec::ClassShouldNotLoad.name
-  end
-
   def lib_views
     # nothing here
   end
@@ -53,6 +49,10 @@ class ClassLoadingSystemSpecController < ApplicationController
     # nothing here
   end
 
+  def underscore_widget_surrounding
+    # nothing here
+  end
+
   def foo
     # nothing here
   end
@@ -75,4 +75,8 @@ class ClassLoadingSystemSpecController < ApplicationController
     require 'arbitrary_name/some_widget'
     render :widget => ArbitraryName::SomeWidget.new
   end
+
+  def show_module_nesting
+    # nothing here
+  end
 end

data/spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/show_module_nesting.rb

@@ -0,0 +1,7 @@
+$_show_module_nesting = Module.nesting
+
+class Views::ClassLoadingSystemSpec::ShowModuleNesting < Fortitude::Widgets::Html5
+  def content
+    text "module_nesting: #{$_show_module_nesting.inspect}"
+  end
+end

data/spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/underscore_widget.rb

@@ -0,0 +1,5 @@
+class Views::ClassLoadingSystemSpec::UnderscoreWidget < Fortitude::Widgets::Html5
+  def content
+    text "this is underscore_widget"
+  end
+end

data/spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/underscore_widget_surrounding.rb

@@ -0,0 +1,7 @@
+class Views::ClassLoadingSystemSpec::UnderscoreWidgetSurrounding < Fortitude::Widgets::Html5
+  def content
+    text "surrounding_widget before"
+    widget Views::ClassLoadingSystemSpec::UnderscoreWidget
+    text "surrounding_widget after"
+  end
+end

data/spec/rails/templates/development_mode_system_spec/app/controllers/development_mode_system_spec_controller.rb

@@ -1,4 +1,8 @@
 class DevelopmentModeSystemSpecController < ApplicationController
+  def the_class_should_not_load
+    render :text => ::DevelopmentModeSystemSpec::ClassShouldNotLoad.name
+  end
+
   def reload_widget
     @datum = "one"
   end

data/spec/rails/templates/{class_loading_system_spec/app/views/class_loading_system_spec → development_mode_system_spec/app/views/development_mode_system_spec}/class_should_not_load.rb

@@ -1,4 +1,4 @@
-module ClassLoadingSystemSpec
+module DevelopmentModeSystemSpec
   class ClassShouldNotLoad
     class << self
       def is_loaded

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fortitude
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.9.0
 platform: java
 authors:
 - Andrew Geweke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -276,9 +276,11 @@ files:
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/autoload_one_widget_from_another.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/bar.html.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/bar.rb
-- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/class_should_not_load.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/foo.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/lib_views.rb
+- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/show_module_nesting.rb
+- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/underscore_widget.rb
+- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/underscore_widget_surrounding.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/use_lib_widget_from_view_widget.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/use_models_widget_from_view_widget.rb
 - spec/rails/templates/class_loading_system_spec/app/views/some_namespace/some_other_namespace/.git_keep
@@ -339,6 +341,7 @@ files:
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_mailer/mailer_formatting_test.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_mailer/mailer_layout_test.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_mailer/mailer_view_test.rb
+- spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/class_should_not_load.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/form.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/mailer_formatting_test.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/mailer_layout_test.rb
@@ -621,9 +624,11 @@ test_files:
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/autoload_one_widget_from_another.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/bar.html.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/bar.rb
-- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/class_should_not_load.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/foo.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/lib_views.rb
+- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/show_module_nesting.rb
+- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/underscore_widget.rb
+- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/underscore_widget_surrounding.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/use_lib_widget_from_view_widget.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/use_models_widget_from_view_widget.rb
 - spec/rails/templates/class_loading_system_spec/app/views/some_namespace/some_other_namespace/.git_keep
@@ -684,6 +689,7 @@ test_files:
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_mailer/mailer_formatting_test.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_mailer/mailer_layout_test.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_mailer/mailer_view_test.rb
+- spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/class_should_not_load.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/form.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/mailer_formatting_test.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/mailer_layout_test.rb