fortitude 0.9.4-java → 0.9.5-java

data/spec/rails/templates/complex_helpers_system_spec/app/controllers/complex_helpers_system_spec_controller.rb

@@ -11,6 +11,10 @@ class ComplexHelpersSystemSpecController < ApplicationController
     # nothing here
   end
 
+  def label_block_test
+    # nothing here
+  end
+
   def cache_test
     @a = params[:a]
     @b = params[:b]

data/spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/label_block_test.rb

@@ -0,0 +1,9 @@
+class Views::ComplexHelpersSystemSpec::LabelBlockTest < Fortitude::Widgets::Html5
+  def content
+    form_for :person do |f|
+      f.label(:name) do
+        text 'Foo'
+      end
+    end
+  end
+end

data/spec/rails/templates/helpers_system_spec/app/controllers/helpers_system_spec_controller.rb

@@ -83,4 +83,8 @@ class HelpersSystemSpecController < ApplicationController
   def helpers_that_output_when_refined
     # nothing here
   end
+
+  def default_url_options
+    { :host => 'example.com' }
+  end
 end

data/spec/rails/templates/helpers_system_spec/app/controllers/home_controller.rb

@@ -0,0 +1,9 @@
+class HomeController < ApplicationController
+  def index
+    # nothing here
+  end
+
+  def foo
+    # nothing here
+  end
+end

data/spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/rails_helpers_without_automatic_helper_access.rb

@@ -0,0 +1,37 @@
+class Views::HelpersSystemSpec::RailsHelpersWithoutAutomaticHelperAccess < Fortitude::Widgets::Html5
+  automatic_helper_access false
+
+  def content
+    excitedly_value = begin
+      excitedly("great")
+    rescue => e
+      e.class.name
+    end
+
+    three_months_value = begin
+      distance_of_time_in_words_to_now(3.months.ago)
+    rescue => e
+      e.class.name
+    end
+
+    million_dollars_value = begin
+      number_to_currency(1_000_000.00)
+    rescue => e
+      e.class.name
+    end
+
+    debug_value = begin
+      debug(Object.new)
+    rescue => e
+      e.class.name
+    end
+
+    p "Excitedly: #{excitedly_value}"
+
+    p "Three months ago: #{three_months_value}"
+
+    p "A million dollars: #{million_dollars_value}"
+
+    p "debug: #{debug_value}"
+  end
+end

data/spec/rails/templates/helpers_system_spec/app/views/helpers_system_spec/url_helpers_without_automatic_helper_access.rb

@@ -0,0 +1,45 @@
+class Views::HelpersSystemSpec::UrlHelpersWithoutAutomaticHelperAccess < Fortitude::Widgets::Html5
+  automatic_helper_access false
+
+  def content
+    excitedly_value = begin
+      excitedly("great")
+    rescue => e
+      e.class.name
+    end
+
+    root_path_value = begin
+      root_path
+    rescue => e
+      e.class.name
+    end
+
+    foo_path_value = begin
+      foo_path
+    rescue => e
+      e.class.name
+    end
+
+    foo_url_value = begin
+      foo_url
+    rescue => e
+      e.class.name
+    end
+
+    foo_url_with_host_override_value = begin
+      foo_url(:host => 'override.com')
+    rescue => e
+      e.class.name
+    end
+
+    p "Excitedly: #{excitedly_value}"
+
+    p "Root Path: #{root_path_value}"
+
+    p "Foo Path: #{foo_path_value}"
+
+    p "Foo Url: #{foo_url_value}"
+
+    p "Foo Url with host override: #{foo_url_with_host_override_value}"
+  end
+end

data/spec/rails/templates/helpers_system_spec/config/initializers/host.rb

@@ -0,0 +1 @@
+Rails.application.routes.default_url_options[:host] = 'example.com'

data/spec/rails/templates/helpers_system_spec/config/routes.rb

@@ -0,0 +1,7 @@
+app_class = "#{File.basename(Rails.root).camelize}::Application".constantize
+app_class.routes.draw do
+  get ':controller/:action'
+
+  root :to => 'home#index'
+  get '/foo', :to => 'home#foo'
+end

data/spec/rails/templates/static_method_system_spec/app/views/static_method_system_spec/localization.rb

@@ -3,5 +3,5 @@ class Views::StaticMethodSystemSpec::Localization < Fortitude::Widgets::Html5
     text "hello is: #{t('.hello')}"
   end
 
-  # static :content
+  static :content
 end

data/spec/rails/templates/view_paths_system_spec/app/controllers/view_paths_system_spec_controller.rb

@@ -0,0 +1,15 @@
+class ViewPathsSystemSpecController < ApplicationController
+  def added_view_path
+  end
+
+  def autoloading_from_added_view_path
+  end
+
+  def added_view_path_from_controller
+    append_view_path(File.join(File.expand_path(::Rails.root), 'view_path_two'))
+  end
+
+  def added_view_path_from_controller_with_impossible_to_guess_name
+    append_view_path(File.join(File.expand_path(::Rails.root), 'view_path_two'))
+  end
+end

data/spec/rails/templates/view_paths_system_spec/config/application.rb

@@ -0,0 +1,30 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env)
+
+module ViewPathsSystemSpec
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    new_path = Rails.root.join('view_path_one')
+    if ::Rails.version =~ /^3\.0\./
+      config.paths.app.views.unshift(new_path)
+    else
+      config.paths['app/views'].unshift(new_path)
+    end
+  end
+end

data/spec/rails/templates/view_paths_system_spec/view_path_one/baseone/basetwo/base_class_one.rb

@@ -0,0 +1,5 @@
+class Views::Baseone::Basetwo::BaseClassOne < Fortitude::Widgets::Html5
+  def base_class_one_method_one
+    "this is base class one method one!"
+  end
+end

data/spec/rails/templates/view_paths_system_spec/view_path_one/view_paths_system_spec/added_view_path.html.rb

@@ -0,0 +1,5 @@
+class Views::ViewPathsSystemSpec::AddedViewPath < Fortitude::Widgets::Html5
+  def content
+    p "from an added view path"
+  end
+end

data/spec/rails/templates/view_paths_system_spec/view_path_one/view_paths_system_spec/autoloading_from_added_view_path.html.rb

@@ -0,0 +1,5 @@
+class Views::ViewPathsSystemSpec::AutoloadingFromAddedViewPath < Views::Baseone::Basetwo::BaseClassOne
+  def content
+    p "helper method: #{base_class_one_method_one}: there it is!"
+  end
+end

data/spec/rails/templates/view_paths_system_spec/view_path_two/view_paths_system_spec/added_view_path_from_controller.html.rb

@@ -0,0 +1,5 @@
+class Views::ViewPathsSystemSpec::AddedViewPathFromController < Fortitude::Widgets::Html5
+  def content
+    p "from an added view path from the controller"
+  end
+end

data/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

@@ -0,0 +1,14 @@
+$stderr.puts "LOADED AT:\n    #{caller.join("\n    ")}"
+
+initial = "class ViewPathsSystemSpec::AddedViewPathFromControllerWithImposs"
+
+rest = <<-EOS
+ibleToGuessName < Fortitude::Widgets::Html5
+  def content
+    p "from an added view path from the controller with an impossible-to-guess name"
+  end
+end
+EOS
+
+total = initial.strip + rest.strip
+eval(total)

data/spec/rails/view_paths_system_spec.rb

@@ -0,0 +1,19 @@
+describe "Rails view-path support", :type => :rails do
+  uses_rails_with_template :view_paths_system_spec
+
+  it "should be able to render a view from an added view path" do
+    expect_match("added_view_path", /from an added view path/)
+  end
+
+  it "should be able to autoload classes from an added view path" do
+    expect_match("autoloading_from_added_view_path", /helper method: this is base class one method one!: there it is!/)
+  end
+
+  it "should be able to render a view from an added view path from the controller" do
+    expect_match("added_view_path_from_controller", /from an added view path from the controller/)
+  end
+
+  it "should be able to render a view from an added view path from the controller with an impossible-to-guess name" do
+    expect_match("added_view_path_from_controller_with_impossible_to_guess_name", /from an added view path from the controller with an impossible-to-guess name/)
+  end
+end

data/spec/system/escaping_system_spec.rb

@@ -23,8 +23,16 @@ describe "Fortitude escaping behavior", :type => :system do
     expect(render(widget_class_with_content { p 'a<b' => 123 })).to eq("<p a&lt;b=\"123\"></p>")
   end
 
-  it "should escape attribute values" do
-    expect(render(widget_class_with_content { p :foo => 'a<b' })).to eq("<p foo=\"a&lt;b\"></p>")
+  it "should escape double quotes inside attribute values" do
+    expect(render(widget_class_with_content { p :foo => 'a"b' })).to eq("<p foo=\"a&quot;b\"></p>")
+  end
+
+  it "should escape ampersands inside attribute values" do
+    expect(render(widget_class_with_content { p :foo => 'a&b' })).to eq("<p foo=\"a&amp;b\"></p>")
+  end
+
+  it "should not escape less than signs, greater than signs, or single quotes inside attribute values" do
+    expect(render(widget_class_with_content { p :foo => 'a<b>c\'d' })).to eq("<p foo=\"a<b>c'd\"></p>")
   end
 
   it "should escape direct arguments to tags" do

data/spec/system/helpers_system_spec.rb

@@ -27,6 +27,14 @@ describe "Fortitude helper support", :type => :system do
         "foo #{result} bar"
       end
 
+      def helper5=(arg)
+        @helper5 = arg
+      end
+
+      def helper5
+        "aa#{@helper5}bb"
+      end
+
       def p(input)
         "pp#{input}pp"
       end
@@ -85,18 +93,25 @@ describe "Fortitude helper support", :type => :system do
     it "should allow calling a method that's overridden on Widget" do
       expect(render(widget_class_with_content { text invoke_helper(:p, "a") })).to eq("ppapp")
     end
+
+    it "should allow calling a helper method that uses a setter" do
+      expect(render(widget_class_with_content { invoke_helper(:helper5=, "ccc"); text invoke_helper(:helper5) })).to eq("aacccbb")
+    end
   end
 
   it "should, by default, allow automatic access to helpers" do
     expect(render(widget_class_with_content { text "helper1: #{helper1}" })).to eq("helper1: this is helper1")
     expect(render(widget_class_with_content { text "helper2: #{helper2("yo")}" })).to eq("helper2: this is yo helper2")
     expect(render(widget_class_with_content { helper3("ho") })).to eq("this is ho helper3")
+    expect(render(widget_class_with_content { self.helper5 = "ccc"; text helper5 })).to eq("aacccbb")
   end
 
   it "should indicate that it responds to helpers using respond_to? for automatic helper methods" do
     expect(render(widget_class_with_content { text "respond_to helper1: #{respond_to?(:helper1)}" } )).to eq("respond_to helper1: true")
     expect(render(widget_class_with_content { text "respond_to helper2: #{respond_to?(:helper2)}" } )).to eq("respond_to helper2: true")
     expect(render(widget_class_with_content { text "respond_to helper3: #{respond_to?(:helper3)}" } )).to eq("respond_to helper3: true")
+    expect(render(widget_class_with_content { text "respond_to helper5=: #{respond_to?(:helper5=)}" } )).to eq("respond_to helper5=: true")
+    expect(render(widget_class_with_content { text "respond_to helper5: #{respond_to?(:helper5)}" } )).to eq("respond_to helper5: true")
   end
 
   it "should not allow automatic access to helpers if we say not to" do
@@ -121,17 +136,23 @@ describe "Fortitude helper support", :type => :system do
           e.class.name
         end
 
-        text "helper1: #{helper1_value}, helper2: #{helper2_value}, helper3: #{helper3_value}"
+        helper5equal_value = begin
+          self.helper5 = 'ccc'
+        rescue => e
+          e.class.name
+        end
+
+        text "helper1: #{helper1_value}, helper2: #{helper2_value}, helper3: #{helper3_value}; helper5equal: #{helper5equal_value}"
       end
     end
 
-    expect(render(wc)).to eq("helper1: NameError, helper2: NoMethodError, helper3: NoMethodError")
+    expect(render(wc)).to eq("helper1: NameError, helper2: NoMethodError, helper3: NoMethodError; helper5equal: NoMethodError")
   end
 
   it "should allow manually declaring helpers" do
     wc = widget_class do
       automatic_helper_access false
-      helper :helper1, :helper3
+      helper :helper1, :helper3, :helper5=, :helper5
       def content
         helper2_value = begin
           helper2("foo")
@@ -141,10 +162,12 @@ describe "Fortitude helper support", :type => :system do
 
         text "helper1: #{helper1}, helper2: #{helper2_value}, helper3: "
         helper3("hi")
+        self.helper5 = 'ccc'
+        text ", helper5: #{helper5}"
       end
     end
 
-    expect(render(wc)).to eq("helper1: this is helper1, helper2: NoMethodError, helper3: this is hi helper3")
+    expect(render(wc)).to eq("helper1: this is helper1, helper2: NoMethodError, helper3: this is hi helper3, helper5: aacccbb")
   end
 
   it "should allow overriding a manually-declared helper, and allow use of #super" do
@@ -208,14 +231,22 @@ describe "Fortitude helper support", :type => :system do
     wc = widget_class do
       helper :h2a, :call => :helper2
       helper :h2b, :call => :helper2, :transform => :output_return_value
+      helper :h5a, :call => :helper5=
+      helper :h5b=, :call => :helper5=
+      helper :helper5
 
       def content
         h2b("yo")
-        text ", h2a: #{h2a('xx')}, done"
+        text ", h2a: #{h2a('xx')}"
+        self.h5a('ccc')
+        text ", h5a: #{helper5}"
+        self.h5b = 'ddd'
+        text ", h5b: #{helper5}"
+        text ", done"
       end
     end
 
-    expect(render(wc)).to eq("this is yo helper2, h2a: this is xx helper2, done")
+    expect(render(wc)).to eq("this is yo helper2, h2a: this is xx helper2, h5a: aacccbb, h5b: aadddbb, done")
   end
 
   it "should allow declaring helpers with :transform = nil, false, or none" do

data/spec/system/inline_system_spec.rb

@@ -35,6 +35,25 @@ describe "Fortitude inline-code support", :type => :system do
     expect(data).to eq("<p>hello, world</p>")
   end
 
+  it "should let you get rendered content back with .inline_html, passing assigns and a helpers object" do
+    my_helpers = Object.new
+    class << my_helpers
+      def nameify(x)
+        "_#{x}_!"
+      end
+    end
+
+    rc = ::Fortitude::RenderingContext.new(:helpers_object => my_helpers)
+    wc = widget_class do
+      needs :name
+    end
+
+    content = wc.inline_html({ :name => 'julia' }, rc) do
+      p "hello, #{nameify(name)}"
+    end
+    expect(content).to eq("<p>hello, _julia_!</p>")
+  end
+
   it "should let you pass assigns to the new widget with .inline_html, and inherit settings of the parent" do
     wc = widget_class do
       start_and_end_comments true

data/spec/system/static_method_system_spec.rb

@@ -38,6 +38,22 @@ describe "Fortitude staticization behavior", :type => :system do
     expect(render(wc)).to eq('<p class="foo">bar: 12345</p><p>baz</p>')
   end
 
+  it "should give you a good error if you try to make a method static before it's defined" do
+    expect do
+      widget_class do
+        def content
+          foo
+        end
+
+        static :foo
+
+        def foo
+          p "bar"
+        end
+      end
+    end.to raise_error(NameError, /no method declared on this class with that name/mi)
+  end
+
   it "should update the static definition of a method if static is called again" do
     $global_value = 12345
     wc = widget_class do

data/spec/system/tag_rendering_system_spec.rb

@@ -253,8 +253,8 @@ describe "Fortitude tag rendering", :type => :system do
     should_render_to("<hr &lt;&amp;&quot;&gt;=\"foo\">") { hr '<&">' => "foo" }
   end
 
-  it "should escape attribute values" do
-    should_render_to("<hr class=\"&lt;&amp;&quot;&gt;\">") { hr :class => "<&\">" }
+  it "should escape attribute values, but only the necessary characters" do
+    should_render_to("<hr class=\"<&amp;&quot;>\">") { hr :class => "<&\">" }
   end
 
   it "should separate multiple attributes with spaces" do
@@ -336,9 +336,9 @@ describe "Fortitude tag rendering", :type => :system do
     should_render_to("<p and&amp;&lt;&gt;&quot;this=\"bar\"></p>") { p foo => "bar" }
   end
 
-  it "should render an arbitrary object as an attribute value, escaping it" do
+  it "should render an arbitrary object as an attribute value, escaping the necessary characters" do
     foo = arbitrary_object_with_to_s("and&<>\"this")
-    should_render_to("<p foo=\"and&amp;&lt;&gt;&quot;this\"></p>") { p :foo => foo }
+    should_render_to("<p foo=\"and&amp;<>&quot;this\"></p>") { p :foo => foo }
   end
 
   it "should render an arbitrary object as an attribute key nested in a hash, escaping it" do