fortitude 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 434f5a087c5b30e778267de15a4bf61de1a414ab
-  data.tar.gz: 01cb3a65d7b6086e4203837c455255cd2d9a5419
+  metadata.gz: 18462239455549b7d5cb928e800d12039ee251d5
+  data.tar.gz: 36098bcd9321189387d6321c9211e335adb4d530
 SHA512:
-  metadata.gz: 30efa375a3fb544c59a271b7f82a512a1cd845cbb227c21a2b4f65cb2b6d4e90c427b95d7691cb09267401048048005f21fbac1e765c97bb4757094af29a6755
-  data.tar.gz: 7b51d93fbca484ce657f11cdae73737155169bd2185f1dec0a0dc9d1658922d72e7a498e315094d41177b8e5d8b61a3965d02eb96c5bb9d02c7e5f2b511b195b
+  metadata.gz: f2ccd3ba05b45c281a0d5919ab747c8a2afcaec9c06c7b303e45a757502c6201f58968279af65077a358cd8d92662cb93e9b59cb03b5a45de7db014e2a9fe112
+  data.tar.gz: db8657d85913dfa462056ca3965bcf41120cc64bd3fca78976a228eee205a552f78f354877f4c7ce5896b9cfba5b121da5516cabac05b572fc0d4272cffd32a3

data/.travis.yml

@@ -13,8 +13,7 @@ env:
     - FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.1.1
     - FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=3.0.20
 before_script:
-    - export JRUBY_OPTS="$JRUBY_OPTS -J-Xmx256m -J-Xms256m -J-Xss2048k"
-    - echo "JRUBY_OPTS=$JRUBY_OPTS"
+    - export JRUBY_OPTS="$JRUBY_OPTS -J-Xmx128m -J-Xms128m -J-Xss2048k"
 matrix:
     exclude:
         # Rails 4.x doesn't support Ruby 1.8.7
@@ -24,3 +23,28 @@ matrix:
             env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.1.1
         -   rvm: 1.8.7
             env: FORTITUDE_SPECS_RAILS_VERSION=4.0.5
+        # 2014-06-19 ageweke -- ARGH. After trying about seventeen different things, no matter what I do,
+        # Travis fails JRuby builds about 20% of the time with "Killed". Their documentation indicates that this
+        # is likely an out-of-memory issue (i.e., entire VM's memory is consumed). However, I'm running JRuby with
+        # only 128MB allocated to each VM (per above) -- yuck -- and it's still happening; this makes no sense, as it
+        # would take something like 20+ concurrent JRuby processes to consume 3GB, and we should never be running
+        # more than 2-3.
+        #
+        # At this point, I have little choice other than to mark these as 'allowed failures', and check in on each
+        # one manually to make sure there aren't other failures, too. This is very frustrating, but I can't seem to
+        # find a way around it. If there's a fix out there somewhere, I'm all ears!
+    allow_failures:
+        -   rvm: jruby-1.7.12
+            env: FORTITUDE_SPECS_RAILS_VERSION=4.1.1
+        -   rvm: jruby-1.7.12
+            env: FORTITUDE_SPECS_RAILS_VERSION=4.0.5
+        -   rvm: jruby-1.7.12
+            env: FORTITUDE_SPECS_RAILS_VERSION=3.2.18
+        -   rvm: jruby-1.7.12
+            env: FORTITUDE_SPECS_RAILS_VERSION=3.1.12
+        -   rvm: jruby-1.7.12
+            env: FORTITUDE_SPECS_RAILS_VERSION=3.0.20
+        -   rvm: jruby-1.7.12
+            env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.1.1
+        -   rvm: jruby-1.7.12
+            env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=3.0.20

data/CHANGES.md

@@ -0,0 +1,29 @@
+# Fortitude Releases
+
+## 0.0.2, 21 June 2014
+
+* Void tags (those that can't take content, ever, like `<hr>` or `<br>`) are now never closed in HTML4 doctypes
+  (_i.e._, just output as plain `<hr>`, with no close tag), since using self-closing syntax (`<hr/>`) is
+  [broken](http://stackoverflow.com/questions/3558119/are-self-closing-tags-valid-in-html5) and an end tag (`</hr>`)
+  is illegal according to the [W3C Validator](http://validator.w3.org/). In XHTML doctypes, they are always closed
+  using self-closing syntax (`<hr/>`) since they have to be closed somehow and that's a good way to indicate that
+  they are void (can't ever take content). In HTML5, they are left unclosed by default (since HTML5 knows they're void
+  and isn't expecting an end tag for them, ever), but you can use `close_void_tags true` to add self-closing syntax
+  for them (`<br/>`) if you want, since
+  [that is now allowed in HTML5](http://stackoverflow.com/questions/3558119/are-self-closing-tags-valid-in-html5).
+  See [this article](http://www.colorglare.com/2014/02/03/to-close-or-not-to-close.html) for even more discussion.
+* Empty tags (those that _can_ take content, but just happen not to) are now always closed using a separate tag
+  (_e.g._, `<p></p>`), since it is
+  [not legal or correct](http://stackoverflow.com/questions/3558119/are-self-closing-tags-valid-in-html5) to use
+  self-closing syntax (`<p/>`) here in HTML doctypes (HTML4 or HTML5), and it is perfectly legal in XHTML doctypes to
+  use a separate closing tag &mdash; and, in a way, nice, since it lets you visually differentiate between void tags
+  and normal tags that just happen to be empty.
+* Very significant internal refactoring of code to make development easier, and new developers' lives easier.
+* Fixed support for Tilt < 2.x; earlier Tilt versions expect to be able to instantiate a template class with an empty
+  string and have it not raise an exception, as a way of testing whether an engine works. (Empty strings are not
+  valid Fortitude templates, since we expect to see a class declaration in there.) Now we trap that case explicitly to
+  do nothing, which allows Tilt 1.4.x to work.
+
+## 0.0.1, 18 June 2014
+
+* Very first release of Fortitude.

data/lib/fortitude.rb

@@ -1,93 +1,7 @@
 require "fortitude/version"
-
-module Fortitude
-  module Widgets
-    autoload :Html5, 'fortitude/widgets/html5'
-    autoload :Html4Strict, 'fortitude/widgets/html4_strict'
-    autoload :Html4Transitional, 'fortitude/widgets/html4_transitional'
-    autoload :Html4Frameset, 'fortitude/widgets/html4_frameset'
-    autoload :Xhtml10Strict, 'fortitude/widgets/xhtml10_strict'
-    autoload :Xhtml10Transitional, 'fortitude/widgets/xhtml10_transitional'
-    autoload :Xhtml10Frameset, 'fortitude/widgets/xhtml10_frameset'
-    autoload :Xhtml11, 'fortitude/widgets/xhtml11'
-  end
-end
-
-# See if we can load Rails -- but don't fail if we can't; we'll just use this to decide whether we should
-# load the Railtie or not.
-begin
-  gem 'rails'
-rescue Gem::LoadError => le
-  # ok
-end
-
-begin
-  require 'rails'
-rescue LoadError => le
-  # ok
-end
-
-if defined?(::Rails)
-  require 'action_view'
-
-  require 'fortitude/rails/widget_methods'
-  require 'fortitude/rails/renderer'
-  require 'fortitude/rails/template_handler'
-  require 'fortitude/railtie'
-else
-  require 'fortitude/non_rails_widget_methods'
-
-  ::String.class_eval do
-    alias_method :original_concat, :concat
-  end
-end
-
-require 'fortitude/widget'
-
-native_loaded = false
-
-if %w{false off 0}.include?((ENV['FORTITUDE_NATIVE_EXTENSIONS'] || '').strip.downcase)
-  $stderr.puts <<-EOM
-WARNING: Fortitude native extensions disabled via environment variable FORTITUDE_NATIVE_EXTENSIONS.
-         Performance may be reduced by a factor of 3-5x!
-EOM
-else
-  begin
-    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-      require 'fortitude_jruby_native_ext.jar'
-    else
-      require File.join(File.dirname(__FILE__), 'fortitude_native_ext')
-    end
-
-    native_loaded = true
-  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}
-         Error: #{le.message} (#{le.class})
-EOM
-    native_loaded = false
-  end
-end
-
-unless native_loaded
-  require 'fortitude/fortitude_ruby_ext'
-end
-
-if defined?(::ActiveSupport::SafeBuffer)
-  ::ActiveSupport::SafeBuffer.class_eval do
-    public :original_concat
-  end
-end
-
-begin
-  require 'tilt'
-rescue LoadError => le
-  # ok, whatever
-end
-
-if defined?(::Tilt)
-  require 'fortitude/tilt/fortitude_template'
-
-  Tilt.register(Fortitude::Tilt::FortitudeTemplate, 'rb')
-end
+require "fortitude/widgets"
+require "fortitude/rails"
+require "fortitude/extensions/native_extensions"
+require "fortitude/rendering_context"
+require "fortitude/widget"
+require "fortitude/tilt"

data/lib/fortitude/doctypes.rb

@@ -1,11 +1,13 @@
-require 'fortitude/doctypes/html5'
+require 'fortitude/doctypes/base'
+require 'fortitude/doctypes/html4'
+require 'fortitude/doctypes/html4_frameset'
 require 'fortitude/doctypes/html4_strict'
 require 'fortitude/doctypes/html4_transitional'
-require 'fortitude/doctypes/html4_frameset'
-require 'fortitude/doctypes/unknown_doctype'
+require 'fortitude/doctypes/html5'
+require 'fortitude/doctypes/xhtml10'
+require 'fortitude/doctypes/xhtml10_frameset'
 require 'fortitude/doctypes/xhtml10_strict'
 require 'fortitude/doctypes/xhtml10_transitional'
-require 'fortitude/doctypes/xhtml10_frameset'
 require 'fortitude/doctypes/xhtml11'
 
 module Fortitude

data/lib/fortitude/doctypes/base.rb

@@ -1,9 +1,9 @@
-require 'fortitude/tag_store'
+require 'fortitude/tags/tag_store'
 
 module Fortitude
   module Doctypes
     class Base
-      extend Fortitude::TagStore
+      extend Fortitude::Tags::TagStore
 
       class << self
         def delegate_tag_stores
@@ -30,6 +30,10 @@ module Fortitude
         w.doctype(@doctype_line)
       end
 
+      def close_void_tags_must_be
+        nil
+      end
+
       def to_s
         "<Doctype #{name.inspect}>"
       end

data/lib/fortitude/doctypes/html4.rb

@@ -1,3 +1,4 @@
+require 'fortitude/doctypes'
 require 'fortitude/doctypes/base'
 require 'fortitude/doctypes/html4_tags_strict'
 
@@ -12,7 +13,7 @@ module Fortitude
         false
       end
 
-      def close_void_tags?
+      def close_void_tags_must_be
         false
       end
     end

data/lib/fortitude/doctypes/html4_frameset.rb

@@ -1,5 +1,7 @@
+require 'fortitude/doctypes'
 require 'fortitude/doctypes/html4'
 require 'fortitude/doctypes/html4_tags_frameset'
+require 'fortitude/doctypes/html4_transitional'
 
 module Fortitude
   module Doctypes

data/lib/fortitude/doctypes/html4_strict.rb

@@ -1,3 +1,4 @@
+require 'fortitude/doctypes'
 require 'fortitude/doctypes/html4'
 
 module Fortitude

data/lib/fortitude/doctypes/html4_tags_frameset.rb

@@ -1,10 +1,11 @@
-require 'fortitude/tag_store'
+require 'fortitude/doctypes'
+require 'fortitude/tags/tag_store'
 require 'fortitude/doctypes/html4_tags_transitional'
 
 module Fortitude
   module Doctypes
     module Html4TagsFrameset
-      extend Fortitude::TagStore
+      extend Fortitude::Tags::TagStore
 
       class << self
         def delegate_tag_stores

data/lib/fortitude/doctypes/html4_tags_strict.rb

@@ -1,9 +1,10 @@
-require 'fortitude/tag_store'
+require 'fortitude/doctypes'
+require 'fortitude/tags/tag_store'
 
 module Fortitude
   module Doctypes
     module Html4TagsStrict
-      extend Fortitude::TagStore
+      extend Fortitude::Tags::TagStore
 
       # HTML4.01 DTD
       I18N_ATTRIBUTES = %w{lang dir}

data/lib/fortitude/doctypes/html4_tags_transitional.rb

@@ -1,10 +1,11 @@
-require 'fortitude/tag_store'
+require 'fortitude/doctypes'
+require 'fortitude/tags/tag_store'
 require 'fortitude/doctypes/html4_tags_strict'
 
 module Fortitude
   module Doctypes
     module Html4TagsTransitional
-      extend Fortitude::TagStore
+      extend Fortitude::Tags::TagStore
 
       class << self
         def delegate_tag_stores

data/lib/fortitude/doctypes/html4_transitional.rb

@@ -1,3 +1,4 @@
+require 'fortitude/doctypes'
 require 'fortitude/doctypes/html4'
 require 'fortitude/doctypes/html4_tags_transitional'
 

data/lib/fortitude/doctypes/html5.rb

@@ -1,3 +1,4 @@
+require 'fortitude/doctypes'
 require 'fortitude/doctypes/base'
 
 module Fortitude
@@ -15,8 +16,8 @@ module Fortitude
         false
       end
 
-      def close_void_tags?
-        false
+      def close_void_tags_must_be
+        nil
       end
 
       # HTML5 spec, section 3.2.5

data/lib/fortitude/doctypes/unknown_doctype.rb

@@ -1,3 +1,4 @@
+require 'fortitude/doctypes'
 require 'fortitude/doctypes/base'
 
 module Fortitude

data/lib/fortitude/doctypes/xhtml10.rb

@@ -1,3 +1,4 @@
+require 'fortitude/doctypes'
 require 'fortitude/doctypes/base'
 
 module Fortitude
@@ -11,7 +12,7 @@ module Fortitude
         true
       end
 
-      def close_void_tags?
+      def close_void_tags_must_be
         true
       end
     end

data/lib/fortitude/doctypes/xhtml10_frameset.rb

@@ -1,3 +1,4 @@
+require 'fortitude/doctypes'
 require 'fortitude/doctypes/xhtml10'
 
 module Fortitude

data/lib/fortitude/doctypes/xhtml10_strict.rb

@@ -1,3 +1,4 @@
+require 'fortitude/doctypes'
 require 'fortitude/doctypes/xhtml10'
 
 module Fortitude

data/lib/fortitude/doctypes/xhtml10_transitional.rb

@@ -1,3 +1,4 @@
+require 'fortitude/doctypes'
 require 'fortitude/doctypes/xhtml10'
 
 module Fortitude

data/lib/fortitude/doctypes/xhtml11.rb

@@ -1,3 +1,4 @@
+require 'fortitude/doctypes'
 require 'fortitude/doctypes/base'
 
 module Fortitude
@@ -15,7 +16,7 @@ module Fortitude
         true
       end
 
-      def close_void_tags?
+      def close_void_tags_must_be
         true
       end
 

data/lib/fortitude/{fortitude_ruby_ext.rb → extensions/fortitude_ruby_ext.rb}

@@ -13,17 +13,22 @@ require 'erb'
 end
 
 ::Hash.class_eval do
-  FORTITUDE_HYPHEN = "-".html_safe.freeze
-  FORTITUDE_EQUALS_QUOTE = "=\"".html_safe.freeze
-  FORTITUDE_QUOTE = "\"".html_safe.freeze
-  FORTITUDE_SPACE = " ".html_safe.freeze
-
-  TARGET_BASE = "".html_safe.freeze
+  {
+    'FORTITUDE_HYPHEN' => '-',
+    'FORTITUDE_EQUALS_QUOTE' => '="',
+    'FORTITUDE_QUOTE' => '"',
+    'FORTITUDE_SPACE' => ' ',
+    'TARGET_BASE' => ""
+  }.each do |constant_name, value|
+    value = value.html_safe if value.respond_to?(:html_safe)
+    value = value.freeze
+    const_set(constant_name, value)
+  end
 
   def fortitude_append_as_attributes(output, prefix)
     raise ArgumentError, "You can only append to a String" unless output.kind_of?(String)
 
-    target = TARGET_BASE.dup
+    target = ::Hash::TARGET_BASE.dup
 
     each do |key, value|
       if value.kind_of?(Hash)
@@ -33,10 +38,10 @@ end
         else raise ArgumentError, "You can only use a String as a prefix"
         end
 
-        new_prefix.original_concat(FORTITUDE_HYPHEN)
+        new_prefix.original_concat(::Hash::FORTITUDE_HYPHEN)
         value.fortitude_append_as_attributes(target, new_prefix)
       else
-        target.original_concat(FORTITUDE_SPACE)
+        target.original_concat(::Hash::FORTITUDE_SPACE)
 
         case prefix
         when String then target.original_concat(prefix)
@@ -45,9 +50,9 @@ end
         end
 
         fortitude_append_to(key, target)
-        target.original_concat(FORTITUDE_EQUALS_QUOTE)
+        target.original_concat(::Hash::FORTITUDE_EQUALS_QUOTE)
         fortitude_append_to(value, target)
-        target.original_concat(FORTITUDE_QUOTE)
+        target.original_concat(::Hash::FORTITUDE_QUOTE)
       end
     end
 

data/lib/fortitude/extensions/native_extensions.rb

@@ -0,0 +1,33 @@
+native_loaded = false
+
+if %w{false off 0}.include?((ENV['FORTITUDE_NATIVE_EXTENSIONS'] || '').strip.downcase)
+  $stderr.puts <<-EOM
+WARNING: Fortitude native extensions disabled via environment variable FORTITUDE_NATIVE_EXTENSIONS.
+         Performance may be reduced by a factor of 3-5x!
+EOM
+else
+  begin
+    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+      require 'fortitude_jruby_native_ext.jar'
+    else
+      require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'fortitude_native_ext'))
+    end
+
+    native_loaded = true
+  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}
+         Error: #{le.message} (#{le.class})
+EOM
+    native_loaded = false
+  end
+end
+
+unless native_loaded
+  require 'fortitude/extensions/fortitude_ruby_ext'
+end
+
+require 'active_support'
+
+::ActiveSupport::SafeBuffer.class_eval { public :original_concat } if defined?(::ActiveSupport::SafeBuffer)