fortitude 0.9.4-java → 0.9.5-java

data/spec/system/widget_class_from_spec.rb

@@ -60,6 +60,24 @@ describe "Fortitude widget-class-from-(file|source) support", :type => :system d
       expect(cdne.tried_class_names).to be_include("WidgetFromClass11")
     end
 
+    it "should allow specifying additional widget base classes, and return those if needed" do
+      eval("module WidgetFromClass26; class SomeOtherBase; end; end")
+      text = "class WidgetFromClass27 < WidgetFromClass26::SomeOtherBase; end"
+      eval(text)
+      expect(wcfs(text, :valid_base_classes => [ ::Fortitude::Widget, ::WidgetFromClass26::SomeOtherBase ])).to eq(::WidgetFromClass27)
+    end
+
+    it "should allow excluding Fortitude::Widget" do
+      eval("module WidgetFromClass28; class SomeOtherBase; end; end")
+      text = "class WidgetFromClass29 < ::Fortitude::Widget; end"
+      eval(text)
+
+      cdne = capture_exception(::Fortitude::Widget::Files::CannotDetermineWidgetClassNameError) do
+        wcfs(text, :valid_base_classes => [ ::WidgetFromClass28::SomeOtherBase ])
+      end
+      expect(cdne.tried_class_names).to eq([ 'WidgetFromClass29' ])
+    end
+
     it "should fail, but return the object, if the source code contains an object of that class that just isn't a widget class" do
       cdne = capture_exception(::Fortitude::Widget::Files::CannotDetermineWidgetClassNameError) do
         wcfs("module WidgetFromClass24\nend")
@@ -198,11 +216,32 @@ class WidgetFromClass17 < Fortitude::Widget; end}
       expect(wcff('wcfs10/wcfs_11/widget_from_class_23.rb', :root_dirs => tempdir)).to eq(Wcfs10::Wcfs11::WidgetFromClass23)
     end
 
+    it "should be able to use a root directory to infer a class name, even if it the class name ends in other extensions before .rb" do
+      ::Object.class_eval("module Wcfs12; end")
+      splat!('wcfs12/widget_from_class_30.html.rb', %{cname = 'WidgetFromCla' + 'ss30'; eval('class Wcfs12::' + cname + ' < ::Fortitude::Widget; end')})
+      expect(wcff('wcfs12/widget_from_class_30.html.rb', :root_dirs => tempdir)).to eq(Wcfs12::WidgetFromClass30)
+    end
+
     it "should be able to use an array of root directories to infer a class name, and find the right one" do
       ::Object.class_eval("module Wcfs10; module Wcfs11; end; end")
       splat!('bar/wcfs10/wcfs_11/widget_from_class_23.rb', %{cname = 'WidgetFromCla' + 'ss23'; eval('class Wcfs10::Wcfs11::' + cname + ' < ::Fortitude::Widget; end')})
       expect(wcff('bar/wcfs10/wcfs_11/widget_from_class_23.rb', :root_dirs => [ "#{tempdir}/foo", "#{tempdir}/bar" ])).to eq(Wcfs10::Wcfs11::WidgetFromClass23)
     end
+
+    it "should be able to have an additional base class and use it" do
+      eval("module Wcff12; class OtherBaseClass; end; end")
+      splat!("wcff12/widget_from_file_12.rb", %{class WidgetFromFile12 < Wcff12::OtherBaseClass; end})
+      expect(wcff('wcff12/widget_from_file_12.rb', :valid_base_classes => [ ::Fortitude::Widget, ::Wcff12::OtherBaseClass ])).to eq(WidgetFromFile12)
+    end
+
+    it "should be able to exclude ::Fortitude::Widget successfully" do
+      eval("module Wcff13; class OtherBaseClass; end; end")
+      splat!("wcff13/widget_from_file_13.rb", %{class WidgetFromFile13 < ::Fortitude::Widget; end})
+      cdne = capture_exception(::Fortitude::Widget::Files::CannotDetermineWidgetClassNameError) do
+        wcff('wcff13/widget_from_file_13.rb', :valid_base_classes => [ ::Wcff13::OtherBaseClass ])
+      end
+      expect(cdne.tried_class_names).to eq([ "WidgetFromFile13" ])
+    end
   end
 
   it "should prioritize a magic comment above class names you told it to try or directory-based names or scanned source text" do

data/spec/system/yield_system_spec.rb

@@ -1,4 +1,56 @@
 describe "Fortitude widgets and 'yield'", :type => :system do
+  it "should not have a block available if none is supplied" do
+    wc = widget_class do
+      def content
+        text "block_given? #{block_given?.inspect}"
+      end
+    end
+
+    expect(render(wc.new)).to eq("block_given? false")
+  end
+
+  it "should have a block available if one is passed to the constructor" do
+    wc = widget_class do
+      def content
+        text "block_given? #{block_given?.inspect}"
+      end
+    end
+
+    expect(render(wc.new { |w| nil })).to eq("block_given? true")
+  end
+
+  it "should have a block available if one is passed to #widget" do
+    wc_sub = widget_class do
+      def content
+        text "inner block_given? #{block_given?.inspect}"
+      end
+    end
+
+    wc = widget_class do
+      cattr_accessor :other_widget_class
+
+      def content
+        text "before"
+        widget(self.class.other_widget_class) { text "middle" }
+        text "after"
+      end
+    end
+
+    wc.other_widget_class = wc_sub
+    expect(render(wc.new)).to eq("beforeinner block_given? trueafter")
+  end
+
+  it "should have a block available if one is passed to the rendering context" do
+    wc = widget_class do
+      def content
+        text "block_given? #{block_given?.inspect}"
+      end
+    end
+
+    the_rc = rc(:yield_block => lambda { |w| nil })
+    expect(render(wc.new, :rendering_context => the_rc)).to eq("block_given? true")
+  end
+
   it "should call the block passed to the constructor when you call 'yield' from #content" do
     wc = widget_class do
       def content
@@ -88,7 +140,7 @@ describe "Fortitude widgets and 'yield'", :type => :system do
 
       def content
         text "before"
-        widget(self.class.other_widget_class) { text "middle"  }
+        widget(self.class.other_widget_class) { text "middle" }
         text "after"
       end
     end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: fortitude
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: java
 authors:
 - Andrew Geweke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: ref
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
-  requirement: !ruby/object:Gem::Requirement
+        version: '1.0'
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.0'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.99'
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.99'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: tilt
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: oop_rails_server
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.7
-  requirement: !ruby/object:Gem::Requirement
+        version: 0.0.22
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.22
   prerelease: false
   type: :development
 description: 'Views Are Code: use all the power of Ruby to build views in your own
@@ -144,9 +144,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec-local
-- .travis.yml
+- ".fix_bundler_for_jruby_17"
+- ".gitignore"
+- ".rspec-local"
+- ".travis.yml"
 - CHANGES.md
 - CONTRIBUTORS.md
 - Gemfile
@@ -281,6 +282,7 @@ files:
 - lib/fortitude/support/assigns_proxy.rb
 - lib/fortitude/support/class_inheritable_attributes.rb
 - lib/fortitude/support/instance_variable_set.rb
+- lib/fortitude/support/method_overriding.rb
 - lib/fortitude/support/staticized_method.rb
 - lib/fortitude/tags/partial_tag_placeholder.rb
 - lib/fortitude/tags/render_widget_placeholder.rb
@@ -382,6 +384,7 @@ files:
 - 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
+- spec/rails/templates/class_loading_system_spec/app/views/some_namespace/some_other_namespace/placeholder.rb
 - spec/rails/templates/class_loading_system_spec/app/views/sub_widget.rb
 - spec/rails/templates/class_loading_system_spec/lib/arbitrary_name/some_widget.rb
 - spec/rails/templates/class_loading_system_spec/lib/views/class_loading_system_spec/lib_views_helper.rb
@@ -392,6 +395,7 @@ files:
 - spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/cache_test.rb
 - spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/fields_for_test.rb
 - spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/form_for_test.rb
+- spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/label_block_test.rb
 - spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/nesting_test.rb
 - spec/rails/templates/complex_helpers_system_spec/config/environments/development.rb
 - spec/rails/templates/data_passing_system_spec/app/controllers/data_passing_system_spec_controller.rb
@@ -490,6 +494,7 @@ files:
 - spec/rails/templates/helpers_include_all_off_system_spec/app/views/helpers_include_all_off_system_spec/include_all_off.rb
 - spec/rails/templates/helpers_include_all_off_system_spec/config/application.rb
 - spec/rails/templates/helpers_system_spec/app/controllers/helpers_system_spec_controller.rb
+- spec/rails/templates/helpers_system_spec/app/controllers/home_controller.rb
 - spec/rails/templates/helpers_system_spec/app/helpers/some_helper.rb
 - spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/automatic_helpers_disabled.rb
 - spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/automatic_helpers_inheritance.rb
@@ -513,6 +518,10 @@ files:
 - spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/helpers_that_output_when_refined.rb
 - spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/private_helper_erb.html.erb
 - spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/private_helper_fortitude.rb
+- spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/rails_helpers_without_automatic_helper_access.rb
+- spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/url_helpers_without_automatic_helper_access.rb
+- spec/rails/templates/helpers_system_spec/config/initializers/host.rb
+- spec/rails/templates/helpers_system_spec/config/routes.rb
 - spec/rails/templates/helpers_system_spec/lib/some_stuff.rb
 - spec/rails/templates/helpers_unrefined_system_spec/app/controllers/helpers_unrefined_system_spec_controller.rb
 - spec/rails/templates/helpers_unrefined_system_spec/app/views/helpers_unrefined_system_spec/helpers_that_output_when_refined.rb
@@ -619,6 +628,14 @@ files:
 - spec/rails/templates/static_method_system_spec/app/views/static_method_system_spec/localization.rb
 - spec/rails/templates/static_method_system_spec/config/locales/en.yml
 - spec/rails/templates/static_method_system_spec/config/locales/fr.yml
+- spec/rails/templates/view_paths_system_spec/app/controllers/view_paths_system_spec_controller.rb
+- spec/rails/templates/view_paths_system_spec/config/application.rb
+- spec/rails/templates/view_paths_system_spec/view_path_one/baseone/basetwo/base_class_one.rb
+- spec/rails/templates/view_paths_system_spec/view_path_one/view_paths_system_spec/added_view_path.html.rb
+- spec/rails/templates/view_paths_system_spec/view_path_one/view_paths_system_spec/autoloading_from_added_view_path.html.rb
+- spec/rails/templates/view_paths_system_spec/view_path_two/view_paths_system_spec/added_view_path_from_controller.html.rb
+- spec/rails/templates/view_paths_system_spec/view_path_two/view_paths_system_spec/added_view_path_from_controller_with_impossible_to_guess_name.html.rb
+- spec/rails/view_paths_system_spec.rb
 - spec/system/around_content_system_spec.rb
 - spec/system/assigns_system_spec.rb
 - spec/system/attribute_rules_system_spec.rb
@@ -666,17 +683,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key:
 specification_version: 4
 summary: 'Views Are Code: use all the power of Ruby to build views in your own language.'
@@ -741,6 +758,7 @@ test_files:
 - 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
+- spec/rails/templates/class_loading_system_spec/app/views/some_namespace/some_other_namespace/placeholder.rb
 - spec/rails/templates/class_loading_system_spec/app/views/sub_widget.rb
 - spec/rails/templates/class_loading_system_spec/lib/arbitrary_name/some_widget.rb
 - spec/rails/templates/class_loading_system_spec/lib/views/class_loading_system_spec/lib_views_helper.rb
@@ -751,6 +769,7 @@ test_files:
 - spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/cache_test.rb
 - spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/fields_for_test.rb
 - spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/form_for_test.rb
+- spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/label_block_test.rb
 - spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/nesting_test.rb
 - spec/rails/templates/complex_helpers_system_spec/config/environments/development.rb
 - spec/rails/templates/data_passing_system_spec/app/controllers/data_passing_system_spec_controller.rb
@@ -849,6 +868,7 @@ test_files:
 - spec/rails/templates/helpers_include_all_off_system_spec/app/views/helpers_include_all_off_system_spec/include_all_off.rb
 - spec/rails/templates/helpers_include_all_off_system_spec/config/application.rb
 - spec/rails/templates/helpers_system_spec/app/controllers/helpers_system_spec_controller.rb
+- spec/rails/templates/helpers_system_spec/app/controllers/home_controller.rb
 - spec/rails/templates/helpers_system_spec/app/helpers/some_helper.rb
 - spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/automatic_helpers_disabled.rb
 - spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/automatic_helpers_inheritance.rb
@@ -872,6 +892,10 @@ test_files:
 - spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/helpers_that_output_when_refined.rb
 - spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/private_helper_erb.html.erb
 - spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/private_helper_fortitude.rb
+- spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/rails_helpers_without_automatic_helper_access.rb
+- spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/url_helpers_without_automatic_helper_access.rb
+- spec/rails/templates/helpers_system_spec/config/initializers/host.rb
+- spec/rails/templates/helpers_system_spec/config/routes.rb
 - spec/rails/templates/helpers_system_spec/lib/some_stuff.rb
 - spec/rails/templates/helpers_unrefined_system_spec/app/controllers/helpers_unrefined_system_spec_controller.rb
 - spec/rails/templates/helpers_unrefined_system_spec/app/views/helpers_unrefined_system_spec/helpers_that_output_when_refined.rb
@@ -978,6 +1002,14 @@ test_files:
 - spec/rails/templates/static_method_system_spec/app/views/static_method_system_spec/localization.rb
 - spec/rails/templates/static_method_system_spec/config/locales/en.yml
 - spec/rails/templates/static_method_system_spec/config/locales/fr.yml
+- spec/rails/templates/view_paths_system_spec/app/controllers/view_paths_system_spec_controller.rb
+- spec/rails/templates/view_paths_system_spec/config/application.rb
+- spec/rails/templates/view_paths_system_spec/view_path_one/baseone/basetwo/base_class_one.rb
+- spec/rails/templates/view_paths_system_spec/view_path_one/view_paths_system_spec/added_view_path.html.rb
+- spec/rails/templates/view_paths_system_spec/view_path_one/view_paths_system_spec/autoloading_from_added_view_path.html.rb
+- spec/rails/templates/view_paths_system_spec/view_path_two/view_paths_system_spec/added_view_path_from_controller.html.rb
+- spec/rails/templates/view_paths_system_spec/view_path_two/view_paths_system_spec/added_view_path_from_controller_with_impossible_to_guess_name.html.rb
+- spec/rails/view_paths_system_spec.rb
 - spec/system/around_content_system_spec.rb
 - spec/system/assigns_system_spec.rb
 - spec/system/attribute_rules_system_spec.rb