fortitude 0.0.7-java → 0.0.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d58342fff5dde4206e5085e5111c2bd10275d60
-  data.tar.gz: fe414b50a1d86fbb7504fa0dc5b45820e4c05780
+  metadata.gz: bfef6b124f74ca790f7b374119f5f1a2b88851d3
+  data.tar.gz: d74465173f9aeb5008fe0ad11f13187cd02ab7a5
 SHA512:
-  metadata.gz: 019c7e138f27db207dc8ce479a393c1ed027f2ef2fb79523224ec0e88bf1a0245bc44fcdb23a7b9677cc4dbd8ca79bd2daaf7df083a5d60ef83c322383869cc1
-  data.tar.gz: 9137c4f333b5b477e488e6f6f8538901205f838f00b203d3c8c08f98bdf32c442895b31174de2a56204bcf23ee57529dabdf7182fc2a55d7e0935f7735272534
+  metadata.gz: bb2840406f5ad37c7aae1c710cc916d43067afa793c0c797c90f4c336d77b7ed4002ced4de37282ce71f414fdebfa56398c8412c6f65512b84d5f0a1d7589049
+  data.tar.gz: a37f299d18af00808f3382cc4adc5ac2c91d4f08f4862fdab6f81f6190b11248d64b01fbd6fbccf047b7d28872a08f65901c81c0b0f3964b15b66cdaf3deaceb

data/CHANGES.md

@@ -1,5 +1,78 @@
 # Fortitude Releases
 
+## 0.0.9, 20 November 2014
+
+* Fortitude now supports passing blocks to widgets (above and beyond support for Rails' standard layouts and their
+  usage using `yield`). You can now do the following:
+
+```ruby
+class Views::Foo < Views::Base
+  def content
+    p "something here"
+    widget Views::Bar, :name => 'Yoko' { text "hello" }
+    p "something else"
+  end
+end
+
+class Views::Bar < Views::Base
+  def content
+    p "more content"
+    yield
+    p "even more content"
+  end
+end
+```
+
+  This will do as expected and cause `Views::Bar`'s `yield` call to call the block passed to it. Furthermore, because
+  it's often very useful to break a widget down into methods, and you might not want to explicitly pass the block all
+  over, you can call `yield_from_widget` from _any_ widget method and it will behave correctly. (This has actually
+  always been true in Fortitude for yielding to layouts; it just now will also yield to blocks passed into the widget
+  directly, too).
+
+  Fortitude first prefers a block passed in to `#widget`; it then looks for a block passed to the constructor of a
+  widget, and, finally, it will delegate to the layout (if any) if no other block is found. If there isn't even a
+  layout, you will receive an error.
+
+  Unlike Erector, Fortitude passes any arguments you give `yield` through to the widget, whether using `yield` or
+  `yield_from_widget`; it also passes, as the first argument, the widget instance being yielded from, too. This allows
+  a more elegant solution to the fact that the block is evaluated in the scope of the caller, not the wiget, and thus
+  may not have access to Fortitude methods (like `p`, `text`, and so on) if the caller is not itself a widget; you can
+  simply call those methods on the passed-in widget instance.
+
+  Thank you to [Leaf](https://github.com/leafo) for bringing up this issue!
+
+* The exact interpretation of attribute values has changed. Along with
+  [considerable discussion](https://github.com/ageweke/fortitude/issues/12), it became clear that the most desirable
+  behavior was the following: attributes with a value of `false` or `nil` simply are not output at all (thus making
+  behavior like `input(:type => :checkbox, :checked => some_boolean_variable)` work properly); attributes with a
+  value of `true` are output as the key only (so the previous example becomes `<input type="checkbox" checked>` if
+  `some_boolean_variable` is `true`) &mdash; except in XHTML document types, where that would be illegal, so they
+  become (_e.g._) `<input type="checkbox" checked="checked">`; and attributes mapped to the empty string are output
+  with a value of the empty string. Many thanks to [Leaf](https://github.com/leafo) and
+  [Adam Becker](https://github.com/ajb) for all the discussion and validation around this!
+
+* Multiple huge performance increases in Fortitude's class-loading time for widgets. Fortitude internally uses
+  dynamic compilation of many methods to achieve the very highest runtime performance; however, the system that did
+  this compilation could cause slow startup times if you had a very large number of widgets. Fortitude now lazy-
+  compiles some methods and caches its own internal trivial template language in order to make startup much faster
+  without slowing down critical runtime performance. Many thanks to [Leaf](https://github.com/leafo) for reporting this
+  issue and testing a number of fixes for it as they were made!
+
+* Fixed a number of bugs in Fortitude's support for `render :widget => ...`, including use of helpers, coexistence
+  with Erector, and being able to pass a widget class rather than an already-instantiated widget. Many thanks to
+  [Leaf](https://github.com/leafo) for the detailed bug report, suggestions for fixes, and pointers to new methods that
+  made the implementation much more robust.
+
+## 0.0.8, 13 November 2014
+
+* Fixed an issue where repeated reloading of a view in development mode in Rails could cause an error of the form
+  `superclass mismatch for class MyView`. (The issue was that Fortitude was calling `require_dependency` on the view
+  `.rb` file in the template handler, which caused it to get loaded outside of the scope where Rails is watching for
+  loaded constants, so that it can unload them before the next request. This caused view classes to hang around
+  forever, but not necessarily their superclasses, causing a very confusing `superclass mismatch` error.) Many thanks
+  again to [Jacob Maine](https://github.com/mainej) for the very detailed bug report and collaboration to fix the
+  issue.
+
 ## 0.0.7, 11 November 2014
 
 * Fortitude 0.0.6 introduced a regression, where referring to an autoloaded view class by partially-qualified namespace

data/CONTRIBUTORS.md

@@ -6,3 +6,20 @@ Fortitude is written by [Andrew Geweke](https://github.com/ageweke), with contri
   `gem install fortitude` works properly no matter which platform you're on.
 * [Roman Heinrich](https://github.com/mindreframer): reporting a bug where trying to use Fortitude as a Tilt
   engine to render would fail if the locals passed in were `nil`.
+* [Jacob Maine](https://github.com/mainej):
+  * Reporting the lack of `ActionMailer` support for Fortitude, and offering a patch to add it;
+  * Reporting a bug where view classes ending in `.html.rb` would encounter classloading issues
+    (resulting in `uninitialized constant` or `superclass mismatch` errors) in development mode.
+* [Leaf](https://github.com/leafo) for:
+  * Reporting slow widget classloading in very large systems due to eager, not lazy, complication of `needs`-related
+    methods, and significant work helping determine that widget localization support was a major source of slowness
+    here.
+  * Reporting the need for support for passing blocks to `widget`, and thus being able to `yield` from one widget
+    to another.
+  * Discussion and details around exactly what `:attribute => true`, `:attribute => false`, and so on should render
+    from Fortitude.
+  * Reporting multiple bugs in support for `render :widget => ...`, and many useful pointers to possible fixes and
+    additional methods to make the implementation a lot more robust.
+* [Adam Becker](https://github.com/ajb) for:
+  * Discussion and details around exactly what `:attribute => true`, `:attribute => false`, and so on should render
+    from Fortitude.

data/ext/com/fortituderuby/ext/fortitude/FortitudeNativeLibrary.java

@@ -3,6 +3,7 @@ package com.fortituderuby.ext.fortitude;
 import java.io.IOException;
 import org.jruby.Ruby;
 import org.jruby.RubyBasicObject;
+import org.jruby.RubyBoolean;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.RubyFixnum;
@@ -159,13 +160,15 @@ public class FortitudeNativeLibrary implements Library {
             public final ThreadContext threadContext;
             public final RubyString prefix;
             public final RubyString output;
+            public final RubyBoolean allowsBareAttributes;
 
             public static final byte[] EQUALS_QUOTE = new byte[] { (byte) '=', (byte) '"' };
 
-            public AppendKeyAndValueVisitor(ThreadContext threadContext, RubyString prefix, RubyString output) {
+            public AppendKeyAndValueVisitor(ThreadContext threadContext, RubyString prefix, RubyString output, RubyBoolean allowsBareAttributes) {
                 this.threadContext = threadContext;
                 this.prefix = prefix;
                 this.output = output;
+                this.allowsBareAttributes = allowsBareAttributes;
             }
 
             public void visit(IRubyObject key, IRubyObject value) {
@@ -181,7 +184,9 @@ public class FortitudeNativeLibrary implements Library {
                     }
 
                     newPrefix.cat('-');
-                    fortitude_append_as_attributes(threadContext, value, output, newPrefix);
+                    fortitude_append_as_attributes(threadContext, value, output, newPrefix, this.allowsBareAttributes);
+                } else if ((value instanceof RubyNil) || ((value instanceof RubyBoolean) && (! value.isTrue()))) {
+                    // nothing here
                 } else {
                     output.cat(' ');
 
@@ -192,15 +197,26 @@ public class FortitudeNativeLibrary implements Library {
                     }
 
                     fortitude_append_to(key, output);
-                    output.cat(EQUALS_QUOTE);
-                    fortitude_append_to(value, output);
-                    output.cat('"');
+
+                    if ((value instanceof RubyBoolean) && (value.isTrue())) {
+                        if (this.allowsBareAttributes.isTrue()) {
+                            // ok, nothing here
+                        } else {
+                            output.cat(EQUALS_QUOTE);
+                            fortitude_append_to(key, output);
+                            output.cat('"');
+                        }
+                    } else {
+                        output.cat(EQUALS_QUOTE);
+                        fortitude_append_to(value, output);
+                        output.cat('"');
+                    }
                 }
             }
         }
 
         @JRubyMethod(name = "fortitude_append_as_attributes")
-        public static IRubyObject fortitude_append_as_attributes(ThreadContext context, IRubyObject self, IRubyObject output, IRubyObject prefix) {
+        public static IRubyObject fortitude_append_as_attributes(ThreadContext context, IRubyObject self, IRubyObject output, IRubyObject prefix, IRubyObject allowsBareAttributes) {
             if (! (output instanceof RubyString)) {
                 RaiseException exception = runtime.newArgumentError("You can only append to a String (this is a native (Java) method)");
                 throw exception;
@@ -213,7 +229,7 @@ public class FortitudeNativeLibrary implements Library {
                 throw exception;
             }
 
-            AppendKeyAndValueVisitor visitor = new AppendKeyAndValueVisitor(context, (RubyString) prefix, (RubyString) output);
+            AppendKeyAndValueVisitor visitor = new AppendKeyAndValueVisitor(context, (RubyString) prefix, (RubyString) output, (RubyBoolean) allowsBareAttributes);
 
             ((RubyHash) self).visitAll(visitor);
 

data/ext/fortitude_native_ext/fortitude_native_ext.c

@@ -3,7 +3,7 @@
 void Init_fortitude_native_ext();
 
 VALUE method_append_escaped_string(VALUE self, VALUE rb_output);
-VALUE method_append_as_attributes(VALUE self, VALUE rb_output, VALUE prefix);
+VALUE method_append_as_attributes(VALUE self, VALUE rb_output, VALUE prefix, VALUE allows_bare_attributes);
 
 void Init_fortitude_native_ext() {
     VALUE string_class, hash_class;
@@ -12,7 +12,7 @@ void Init_fortitude_native_ext() {
     rb_define_method(string_class, "fortitude_append_escaped_string", method_append_escaped_string, 1);
 
     hash_class = rb_const_get(rb_cObject, rb_intern("Hash"));
-    rb_define_method(hash_class, "fortitude_append_as_attributes", method_append_as_attributes, 2);
+    rb_define_method(hash_class, "fortitude_append_as_attributes", method_append_as_attributes, 3);
 }
 
 #define BUF_SIZE 256
@@ -145,85 +145,122 @@ void fortitude_append_to(VALUE object, VALUE rb_output) {
     }
 }
 
-struct fortitude_prefix_and_output {
+struct fortitude_append_key_and_value_data {
     VALUE prefix;
     VALUE rb_output;
+    VALUE allows_bare_attributes;
 };
 
-int fortitude_append_key_and_value(VALUE key, VALUE value, VALUE prefix_and_output_value) {
-    struct fortitude_prefix_and_output * prefix_and_output = (struct fortitude_prefix_and_output *)prefix_and_output_value;
+int fortitude_append_key_and_value(VALUE key, VALUE value, VALUE key_and_value_data_param) {
+    struct fortitude_append_key_and_value_data * key_and_value_data = (struct fortitude_append_key_and_value_data *)key_and_value_data_param;
 
-    VALUE prefix = prefix_and_output->prefix;
-    VALUE rb_output = prefix_and_output->rb_output;
+    VALUE prefix = key_and_value_data->prefix;
+    VALUE rb_output = key_and_value_data->rb_output;
+    VALUE allows_bare_attributes = key_and_value_data->allows_bare_attributes;
 
-    if (TYPE(value) == T_HASH) {
-        VALUE new_prefix_as_string;
-        ID dup;
-        ID to_s;
+    VALUE new_prefix_as_string;
+    ID dup;
+    ID to_s;
 
-#ifdef CONST_ID
-        CONST_ID(dup, "dup");
-        CONST_ID(to_s, "to_s");
-#else
-        dup = rb_intern("dup");
-        to_s = rb_intern("to_s");
-#endif
+    switch(TYPE(value)) {
+        case T_HASH:
+            #ifdef CONST_ID
+                CONST_ID(dup, "dup");
+                CONST_ID(to_s, "to_s");
+            #else
+                dup = rb_intern("dup");
+                to_s = rb_intern("to_s");
+            #endif
+
+            switch (TYPE(prefix)) {
+                case T_STRING:
+                    new_prefix_as_string = rb_funcall(prefix, dup, 0);
+                    fortitude_append_to(key, new_prefix_as_string);
+                    break;
+
+                case T_NIL:
+                    new_prefix_as_string = rb_str_new("", 0);
+                    fortitude_append_to(key, new_prefix_as_string);
+                    break;
+
+                default:
+                    rb_raise(rb_eArgError, "You can only use a String as a prefix (this is a native (C) method)");
+                    break;
+            }
 
-        switch (TYPE(prefix)) {
-            case T_STRING:
-                new_prefix_as_string = rb_funcall(prefix, dup, 0);
-                fortitude_append_to(key, new_prefix_as_string);
-                break;
+            rb_str_cat2(new_prefix_as_string, "-");
+            method_append_as_attributes(value, rb_output, new_prefix_as_string, allows_bare_attributes);
+            break;
 
-            case T_NIL:
-                new_prefix_as_string = rb_str_new("", 0);
-                fortitude_append_to(key, new_prefix_as_string);
-                break;
+        case T_NIL:
+        case T_FALSE:
+            break;
 
-            default:
-                rb_raise(rb_eArgError, "You can only use a String as a prefix (this is a native (C) method)");
-                break;
-        }
+        case T_TRUE:
+            rb_str_cat2(rb_output, " ");
 
-        rb_str_cat2(new_prefix_as_string, "-");
-        method_append_as_attributes(value, rb_output, new_prefix_as_string);
-    } else {
-        rb_str_cat2(rb_output, " ");
+            switch (TYPE(prefix)) {
+                case T_STRING:
+                    rb_str_append(rb_output, prefix);
+                    break;
 
-        switch (TYPE(prefix)) {
-            case T_STRING:
-                rb_str_append(rb_output, prefix);
-                break;
+                case T_NIL:
+                    break;
 
-            case T_NIL:
-                break;
+                default:
+                    rb_raise(rb_eArgError, "You can only use a String as a prefix (this is a native (C) method)");
+                    break;
+            }
 
-            default:
-                rb_raise(rb_eArgError, "You can only use a String as a prefix (this is a native (C) method)");
-                break;
-        }
+            fortitude_append_to(key, rb_output);
+            if (TYPE(allows_bare_attributes) == T_TRUE) {
+                /* ok */
+            } else {
+                rb_str_cat2(rb_output, "=\"");
+                fortitude_append_to(key, rb_output);
+                rb_str_cat2(rb_output, "\"");
+            }
+            break;
 
-        fortitude_append_to(key, rb_output);
-        rb_str_cat2(rb_output, "=\"");
-        fortitude_append_to(value, rb_output);
-        rb_str_cat2(rb_output, "\"");
+        default:
+            rb_str_cat2(rb_output, " ");
+
+            switch (TYPE(prefix)) {
+                case T_STRING:
+                    rb_str_append(rb_output, prefix);
+                    break;
+
+                case T_NIL:
+                    break;
+
+                default:
+                    rb_raise(rb_eArgError, "You can only use a String as a prefix (this is a native (C) method)");
+                    break;
+            }
+
+            fortitude_append_to(key, rb_output);
+            rb_str_cat2(rb_output, "=\"");
+            fortitude_append_to(value, rb_output);
+            rb_str_cat2(rb_output, "\"");
+            break;
     }
 
     return 0;
 }
 
 
-VALUE method_append_as_attributes(VALUE self, VALUE rb_output, VALUE prefix) {
-    struct fortitude_prefix_and_output prefix_and_output;
+VALUE method_append_as_attributes(VALUE self, VALUE rb_output, VALUE prefix, VALUE allows_bare_attributes) {
+    struct fortitude_append_key_and_value_data key_and_value_data;
 
     if (TYPE(rb_output) != T_STRING) {
         rb_raise(rb_eArgError, "You can only append to a String (this is a native (C) method)");
     }
 
-    prefix_and_output.prefix = prefix;
-    prefix_and_output.rb_output = rb_output;
+    key_and_value_data.prefix = prefix;
+    key_and_value_data.rb_output = rb_output;
+    key_and_value_data.allows_bare_attributes = allows_bare_attributes;
 
-    rb_hash_foreach(self, fortitude_append_key_and_value, (VALUE) &prefix_and_output);
+    rb_hash_foreach(self, fortitude_append_key_and_value, (VALUE) &key_and_value_data);
     return Qnil;
 }
 

data/lib/fortitude/doctypes/html4.rb

@@ -13,6 +13,10 @@ module Fortitude
         false
       end
 
+      def allows_bare_attributes?
+        true
+      end
+
       def close_void_tags_must_be
         false
       end

data/lib/fortitude/doctypes/html5.rb

@@ -16,6 +16,10 @@ module Fortitude
         false
       end
 
+      def allows_bare_attributes?
+        true
+      end
+
       def close_void_tags_must_be
         nil
       end

data/lib/fortitude/doctypes/unknown_doctype.rb

@@ -15,6 +15,10 @@ module Fortitude
       def needs_cdata_in_javascript_tag?
         false
       end
+
+      def allows_bare_attributes?
+        true
+      end
     end
   end
 end

data/lib/fortitude/doctypes/xhtml10.rb

@@ -12,6 +12,10 @@ module Fortitude
         true
       end
 
+      def allows_bare_attributes?
+        false
+      end
+
       def close_void_tags_must_be
         true
       end

data/lib/fortitude/doctypes/xhtml11.rb

@@ -16,6 +16,10 @@ module Fortitude
         true
       end
 
+      def allows_bare_attributes?
+        false
+      end
+
       def close_void_tags_must_be
         true
       end

data/lib/fortitude/erector.rb

@@ -23,6 +23,7 @@ module Fortitude
 
       def is_erector_widget_class?(widget_class)
         return false unless is_erector_available?
+        return false unless widget_class.kind_of?(::Class)
         return true if widget_class == ::Erector::Widget
         return false if widget_class == ::Object
         return is_erector_widget_class?(widget_class.superclass)

data/lib/fortitude/errors.rb

@@ -149,5 +149,21 @@ you simply need to convert these to "p :class => :some_class" or
         @tag_name = tag_name
       end
     end
+
+    class NoBlockToYieldTo < Base
+      attr_reader :widget
+
+      def initialize(widget)
+        super(%{You're trying to call 'yield' (or 'yield_from_widget', or the Erector-compatibility method 'call_block')
+from the widget #{widget}; however, there is nothing to yield to. Fortitude
+looks for something to yield to in this order:
+  1. A block passed to a yield at render time directly (usually via the 'widget' call);
+  2. A block passed to the constructor of the widget;
+  3. The layout the widget is being rendered in.
+None of these exist here, and so calling 'yield', 'yield_from_widget', or 'call_block' is an
+undefined operation.})
+        @widget = widget
+      end
+    end
   end
 end