fortitude 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bc0feb041f46a5daae1e38effcc4f63c04a6585
-  data.tar.gz: 76f87dc4c555d49e3316cd11ceeeeeecd94c98c8
+  metadata.gz: 979ec914d2f256b806b70ad35fc10046423c6ebf
+  data.tar.gz: 6d12dd12a458019abce25cb3d6d1fa7b8cdbabde
 SHA512:
-  metadata.gz: 860c7e733059f5fc5ec10bce8bbf05a8c547587d937d88641cc40f69003ec723371d27a25c2cc39c84854551a0847648a27611a3f8e66efe9dc6002ed9edb919
-  data.tar.gz: 6e59c6df7ddcb49be326c3f8ba80a35ead5a7888f83b5dc55d28c09ddc1349670bd850e78a36dae6bec85b7fe538a50d5c2e5ee97f7291f320faa107c1157b3f
+  metadata.gz: c82032c67ec5e95e238b5914bc6b1fc8b6e14dc71aa90d81d47fd560e21e231059e097a0412e952acbc08142f5bdb05ae48655e6b3f8f8bc4223ce27ad5761e6
+  data.tar.gz: 4b1af326ecd906612c06e4fe528f14135e4a845d87dec9c72308d5a061a78dd3bbf41226cee8a10a5e55ac04d45f2bd08920c298de21c0f7d8c7cfcb1d2790fb

data/.gitignore

@@ -7,7 +7,6 @@ Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
-doc/
 lib/bundler/man
 pkg
 rdoc
@@ -18,3 +17,4 @@ tmp
 lib/*.bundle
 /*.sublime-project
 /*.sublime-workspace
+/doc/source/.retina_images_workaround

data/.travis.yml

@@ -1,16 +1,18 @@
 rvm:
     - "1.8.7"
-    - "1.9.3"
-    - "2.0.0"
-    - "2.1.4"
-    - "jruby-1.7.16.1"
+    - "1.9.3-p551"
+    - "2.0.0-p598"
+    - "2.1.5"
+    - "2.2.0"
+    - "jruby-1.7.18"
 env:
-    - FORTITUDE_SPECS_RAILS_VERSION=4.1.7
-    - FORTITUDE_SPECS_RAILS_VERSION=4.0.11
-    - FORTITUDE_SPECS_RAILS_VERSION=3.2.20
+    - FORTITUDE_SPECS_RAILS_VERSION=4.2.0
+    - FORTITUDE_SPECS_RAILS_VERSION=4.1.9
+    - FORTITUDE_SPECS_RAILS_VERSION=4.0.13
+    - FORTITUDE_SPECS_RAILS_VERSION=3.2.21
     - FORTITUDE_SPECS_RAILS_VERSION=3.1.12
     - FORTITUDE_SPECS_RAILS_VERSION=3.0.20
-    - FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.1.7
+    - FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.2.0
     - FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=3.0.20
 before_script:
     - export JRUBY_OPTS="$JRUBY_OPTS -J-Xmx128m -J-Xms128m -J-Xss2048k"
@@ -18,11 +20,13 @@ matrix:
     exclude:
         # Rails 4.x doesn't support Ruby 1.8.7
         -   rvm: 1.8.7
-            env: FORTITUDE_SPECS_RAILS_VERSION=4.1.7
+            env: FORTITUDE_SPECS_RAILS_VERSION=4.2.0
         -   rvm: 1.8.7
-            env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.1.7
+            env: FORTITUDE_SPECS_RAILS_VERSION=4.1.9
         -   rvm: 1.8.7
-            env: FORTITUDE_SPECS_RAILS_VERSION=4.0.11
+            env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.2.0
+        -   rvm: 1.8.7
+            env: FORTITUDE_SPECS_RAILS_VERSION=4.0.13
         # 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
@@ -34,17 +38,19 @@ matrix:
         # 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.16.1
-            env: FORTITUDE_SPECS_RAILS_VERSION=4.1.7
-        -   rvm: jruby-1.7.16.1
-            env: FORTITUDE_SPECS_RAILS_VERSION=4.0.11
-        -   rvm: jruby-1.7.16.1
-            env: FORTITUDE_SPECS_RAILS_VERSION=3.2.20
-        -   rvm: jruby-1.7.16.1
+        -   rvm: jruby-1.7.18
+            env: FORTITUDE_SPECS_RAILS_VERSION=4.2.0
+        -   rvm: jruby-1.7.18
+            env: FORTITUDE_SPECS_RAILS_VERSION=4.1.9
+        -   rvm: jruby-1.7.18
+            env: FORTITUDE_SPECS_RAILS_VERSION=4.0.13
+        -   rvm: jruby-1.7.18
+            env: FORTITUDE_SPECS_RAILS_VERSION=3.2.21
+        -   rvm: jruby-1.7.18
             env: FORTITUDE_SPECS_RAILS_VERSION=3.1.12
-        -   rvm: jruby-1.7.16.1
+        -   rvm: jruby-1.7.18
             env: FORTITUDE_SPECS_RAILS_VERSION=3.0.20
-        -   rvm: jruby-1.7.16.1
-            env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.1.7
-        -   rvm: jruby-1.7.16.1
+        -   rvm: jruby-1.7.18
+            env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.2.0
+        -   rvm: jruby-1.7.18
             env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=3.0.20

data/CHANGES.md

@@ -1,5 +1,55 @@
 # Fortitude Releases
 
+## 0.9.2, 22 January 2015
+
+* Began writing lots of documentation for Fortitude, beginning with the reasons why you should use it.
+* Fixed a single spec that caused failures under Rails 4.2.0 (which was an issue with the spec and something changed
+  in Rails 4.2, not Fortitude).
+* Fixed a bug where if you call `return` from inside a block passed to a tag method, the closing tags would not be
+  output, resulting in invalid HTML. (Thanks to [Leaf](https://github.com/leafo) for the bug report!)
+* Fixed a bug where if you raised an exception from inside a block passed to a tag method, the closing tags would not
+  be output, resulting in invalid HTML.
+* Added a couple of missing `form_for` helper methods (`button`, `submit`) that somehow I missed. (Thanks to
+  [Leaf](https://github.com/leafo) for the bug report!)
+* Fixed a bug where passing an object that was a `Hash`, or a subclass of `Hash`, to a view would cause that object to
+  become an object of class `ActiveSupport::HashWithIndifferentAccess` instead. (This was because we were, internally,
+  calling `#with_indifferent_access` on the `Hash` we had that contained all assignments to a widget, and
+  `#with_indifferent_access` is recursive.)
+* `Fortitude::Widget.widget_class_from_file`, when it cannot find a class in the given file, now returns any constants
+  it _did_ find matching names it thinks that file might use in the resulting exception. This can be used to, for
+  example, determine if the file in question actually contains a module with the appropriate name, rather than a
+  widget class.
+* When rendering using Tilt, Fortitude now properly supplies the file and line to the call to `eval` the source code of
+  the widget. This, in turn, means that `__FILE__`, `__LINE__`, and `caller` will work properly when used at class
+  level inside a widget rendered via Tilt.
+* Fixed a bug where `Fortitude::Widget.widget_class_from_file` and `Fortitude::Widget.widget_class_from_source` would,
+  when scanning a file containing an ordinary class definition like
+  `module Foo; module Bar; class Baz < Fortitude::Widget`, instead return a class `Foo::Baz` if such existed and
+  was a descendant of `Fortitude::Widget` instead of the correct `Foo::Bar::Baz`.
+* Fixed a bug where, if `format_output` was turned on, `<pre>` tags would still insert whitespace and newlines for
+  formatting like any other tag &mdash; which is incorrect, because, only inside `<pre>` tags, such whitespace is
+  significant. Now, `<pre>` tags correctly suppress all formatting within them.
+* Added `Fortitude::Widget#content_and_attributes_from_tag_arguments`; this takes as input any style of arguments
+  permitted to a Fortitude tag method (_e.g._, `p`, `p 'hello'`, `p :id => :foo`, `p 'hello', :id => :foo`) and always
+  returns a two-element array &mdash; the first element is the text supplied to the method (if any), and the second
+  is the attributes supplied to the method (if any), or an empty `Hash` otherwise. This can help take a fair amount of
+  bookkeeping burden off of helper methods you might build on top of Fortitude.
+* Added `Fortitude::Widget#add_css_classes` (_a.k.a._ `#add_css_class`). This takes as its first argument one or more
+  CSS classes to add (as a `String`, `Symbol`, or `Array` of such), and, as its remainder, any arguments valid for a
+  Fortitude tag method (_e.g._, textual content, a `Hash` of attributes, textual content and a `Hash`, or neither).
+  It then returns a two-argument array of textual content and attributes; the attributes will have a `class` or
+  `:class` key that contains any classes specified in the original, plus the additional classes to add. In other
+  words, you can use it as such:
+
+```ruby
+def super_p(*args, &block)
+  p(*add_css_classes(:super, *args), &block)
+end
+```
+
+  ...and now `super_p` acts just like `p`, except that it adds a class of `super` to its output. This is an extremely
+  common pattern in code built on top of Fortitude, and so now it is baked into the core.
+
 ## 0.9.1, 14 December 2014
 
 * Fixed a bug where doing something like `div nil, :class => 'foo'` would simply output `<div></div>`, rather than the

data/CONTRIBUTORS.md

@@ -31,6 +31,7 @@ Fortitude is written by [Andrew Geweke](https://github.com/ageweke), with contri
     properly.
   * Reporting a bug where doing something like `div(nil, :class => 'foo')` would produce just `<div></div>` instead of
     the desired `<div class="foo"></div>`.
+  * Reporting an issue where `return`ing from inside a block passed to a tag method would not render the closing tags.
 * [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/doc/.gitignore

@@ -0,0 +1,18 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+# git config --global core.excludesfile ~/.gitignore_global
+
+# Ignore bundler config
+/.bundle
+
+# Ignore the build directory
+/build
+
+# Ignore cache
+/.sass-cache
+/.cache
+
+# Ignore .DS_store file
+.DS_Store

data/doc/Gemfile

@@ -0,0 +1,21 @@
+# If you do not have OpenSSL installed, update
+# the following line to use "http://" instead
+source 'https://rubygems.org'
+
+gem "middleman", "~>3.3.7"
+
+# Live-reloading plugin
+gem "middleman-livereload", "~> 3.1.0"
+
+# For faster file watcher updates on Windows:
+gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
+
+# Windows does not come with time zone data
+gem "tzinfo-data", platforms: [:mswin, :mingw]
+
+gem "fortitude", :path => "../"
+gem "parcels", :path => '../../parcels'
+gem "bootstrap-sass", :require => false
+gem "retina_images", :path => '../../retina_images'
+gem "humanize"
+gem "awesome_print"

data/doc/config.rb

@@ -0,0 +1,92 @@
+require 'fortitude'
+require 'parcels'
+require 'retina_images'
+require 'source/shared/base'
+require 'source/shared/standard_page'
+
+###
+# Compass
+###
+
+# Change Compass configuration
+# compass_config do |config|
+#   config.output_style = :compact
+# end
+
+###
+# Page options, layouts, aliases and proxies
+###
+
+# Per-page layout changes:
+#
+# With no layout
+# page "/path/to/file.html", :layout => false
+#
+# With alternative layout
+# page "/path/to/file.html", :layout => :otherlayout
+#
+# A path which all have the same layout
+# with_layout :admin do
+#   page "/admin/*"
+# end
+
+# Proxy pages (http://middlemanapp.com/basics/dynamic-pages/)
+# proxy "/this-page-has-no-template.html", "/template-file.html", :locals => {
+#  :which_fake_page => "Rendering a fake page with a local variable" }
+
+###
+# Helpers
+###
+
+# Automatic image dimensions on image_tag helper
+# activate :automatic_image_sizes
+
+# Reload the browser automatically whenever files change
+# configure :development do
+#   activate :livereload
+# end
+
+# Methods defined in the helpers block are available in templates
+# helpers do
+#   def some_helper
+#     "Helping"
+#   end
+# end
+
+set :css_dir, 'stylesheets'
+
+set :js_dir, 'javascripts'
+
+set :images_dir, 'images'
+
+# Build-specific configuration
+configure :build do
+  # For example, change the Compass output style for deployment
+  # activate :minify_css
+
+  # Minify Javascript on build
+  # activate :minify_javascript
+
+  # Enable cache buster
+  # activate :asset_hash
+
+  # Use relative URLs
+  # activate :relative_assets
+
+  # Or use a different image path
+  # set :http_prefix, "/Content/images/"
+end
+
+sprockets.import_asset 'bootstrap.js'
+
+after_configuration do
+  doc_root = File.expand_path(File.dirname(__FILE__))
+  widgets_root = File.join(doc_root, 'source')
+  images_root = File.join(doc_root, 'source', 'images')
+  temp_dir_root = File.expand_path(File.join(File.dirname(doc_root), 'tmp', 'docs'))
+
+  sprockets.parcels.workaround_directories_root = temp_dir_root
+  sprockets.parcels.add_widget_tree!(widgets_root)
+
+  sprockets.retina_images.add_image_tree!(images_root)
+end

data/doc/source/index.html.pcss

@@ -0,0 +1,96 @@
+@at-root #{&} { padding-left: 0; padding-right: 0; }
+
+.highlighted {
+  background-color: $background-color;
+  padding-bottom: 60px;
+}
+
+.jumbotron {
+  text-align: center;
+  padding-top: 60px;
+  padding-bottom: 20px;
+}
+
+h2 {
+  font-family: $body-font;
+  font-weight: $body-font-medium-weight;
+  color: $highlight-color;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 60px;
+}
+
+h3 {
+  font-family: $body-font;
+  color: $highlight-color;
+}
+
+.what-is {
+  text-align: left;
+  margin-top: 30px;
+  h3 {
+    padding-left: 10px;
+  }
+  p {
+    color: $highlight-color;
+    font-size: 130%;
+    padding-left: 10%;
+    padding-right: 10%;
+  }
+}
+
+.praise-quotes {
+  padding-left: 30px;
+  padding-right: 30px;
+}
+
+blockquote {
+  .attribution {
+    margin-top: 10px;
+    text-align: right;
+  }
+
+  border: none;
+  color: $highlight-color;
+  font-style: italic;
+}
+
+.nav-links {
+  margin-top: 30px;
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
+.nav-link-button {
+  border: 1px solid $highlight-color;
+  background-color: $bold-translucent;
+  vertical-align: center;
+
+  h3 {
+    padding-top: 15px;
+    padding-bottom: 15px;
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+
+  a {
+    h3 {
+      font-weight: $body-font-medium-weight;
+      text-align: center;
+    }
+  }
+}
+
+.offsite-links {
+  padding-left: 30px;
+  padding-right: 30px;
+  padding-top: 15px;
+  padding-bottom: 50px;
+
+  font-family: $heading-font;
+  font-weight: $heading-font-light-weight;
+  a { padding-bottom: 15px; color: black; }
+  color: black;
+  font-size: 16px;
+  text-align: center;
+}

data/doc/source/index.html.rb

@@ -0,0 +1,66 @@
+class Views::Index < ::Views::Shared::Base
+  def content
+    fluid_container {
+      div(:class => :highlighted) {
+        jumbotron {
+          h1 "Fortitude"
+          h2 "Beautifully-factored HTML views for your Ruby or Rails application.", :class => :subhead
+        }
+
+        row(:class => 'praise-quotes') {
+          praise_quote "Quin H.", %{At first, I was skeptical. But after writing views in Fortitude for a couple of weeks,
+  I realized I could never go back to anything else. It makes that big a difference.}
+          praise_quote "Oleksiy K.", %{I’ve been doing Rails (95% backend) for 8 years now...and today, after hearing about Fortitude
+  and Parcels, was the first time ever that I wanted to actually try to do some user-facing feature development.}
+        }
+
+        row(:class => 'what-is') {
+          columns(:medium => 12) {
+            p %{Fortitude is a templating engine for Ruby, with or without Rails, that gives you all the power of
+  Ruby to factor your views. Using Fortitude, you'll build dramatically better-factored, more readable,
+  more maintainable views.}
+          }
+        }
+
+        row(:class => 'nav-links') {
+          big_nav_link "Why use Fortitude?", "/why"
+          big_nav_link "Getting Started", "/getting-started"
+          big_nav_link "Reference", "/reference"
+        }
+      }
+
+      row(:class => 'offsite-links') {
+        columns(:medium => 4) {
+          a("Fortitude on GitHub", :href => 'https://github.com/ageweke/fortitude')
+        }
+        columns(:medium => 4) {
+          a("Fortitude on Travis CI", :href => 'https://travis-ci.org/ageweke/fortitude')
+        }
+        columns(:medium => 4) {
+          a("Fortitude on Google Groups", :href => 'https://groups.google.com/forum/#!forum/fortitude-ruby')
+        }
+      }
+    }
+  end
+
+  def big_nav_link(text, to_where)
+    columns(:small => 4) {
+      div(:class => 'nav-link-button') {
+        a(:href => to_where) {
+          h3 text, :class => 'nav-link'
+        }
+      }
+    }
+  end
+
+  def praise_quote(attribution, quote)
+    columns(:medium => 6) {
+      blockquote {
+        span(:class => 'quote') {
+          text quote
+        }
+        div("— #{attribution}", :class => 'attribution')
+      }
+    }
+  end
+end