haml 4.0.0.rc.1 → 4.0.0

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Haml Changelog
 
-## 4.0.0 (Unreleased)
+## 4.0.0
 
 * The Haml exectutable now accepts an `--autoclose` option. You can now
   specify a list of tags that should be autoclosed
@@ -64,7 +64,7 @@
   with a helper method that makes adding support for other Tilt-based template
   engines trivial.
 
-  As of 3.2, Haml will also ship with a "haml-contrib" gem that includes useful
+  As of 4.0, Haml will also ship with a "haml-contrib" gem that includes useful
   but less-frequently used filters and helpers. This includes several additional
   filters such as Nokogiri, Yajl, Markaby, and others.
 
@@ -105,10 +105,26 @@
 * Add command-line option to suppress script evaluation.
 
 * It's now possible to use Rails's asset helpers inside the Sass and SCSS
-  filters.
+  filters. Note that to do so, you must make sure sass-rails is loaded in
+  production, usually by moving it out of the assets gem group.
 
 * The Haml project now uses [semantic versioning](http://semver.org/).
 
+## 3.2.0
+
+The Haml 3.2 series was released only as far as 3.2.0.rc.4, but then was
+renamed to Haml 4.0 when the project adopted semantic versioning.
+
+## 3.1.8
+
+* Fix for line numbers reported from exceptions in nested blocks
+  (thanks to Grant Hutchins & Sabrina Staedt).
+
+## 3.1.7
+
+* Fix for compatibility with Sass 3.2.x.
+  (thanks [Michael Westbom](https://github.com/totallymike)).
+
 ## 3.1.6
 
 * In indented mode, don't reindent buffers that contain preserved tags, and

data/README.md

@@ -129,20 +129,23 @@ on a specific area:
 Haml supports Ruby 1.8.7 and higher, so please make sure your changes run on
 both 1.9 and 1.8.
 
-## Authors
+## Team
+
+### Current Maintainers
+
+* [Norman Clarke](http://github.com/norman)
+* [Matt Wildig](http://github.com/mattwildig)
+* [Akira Matsuda](https://github.com/amatsuda)
+
+### Alumni
 
 Haml was created by [Hampton Catlin](http://hamptoncatlin.com), the author of
-the original implementation. However, Hampton doesn't even know his way around
-the code anymore and now just occasionally consults on the language issues.
+the original implementation. Hampton is no longer involved in day-to-day coding,
+but still consults on language issues.
 
 [Nathan Weizenbaum](http://nex-3.com) was for many years the primary developer
-and architect of the "modern" Ruby implementation of Haml. His hard work
-endlessly answering forum posts, fixing bugs, refactoring, finding speed
-improvements, writing documentation, and implementing new features is what has
-kept the project alive.
+and architect of the "modern" Ruby implementation of Haml.
 
-[Norman Clarke](http://github.com/norman), the author of Haml Spec and the Haml
-implementation in Lua, took over as maintainer in April 2012.
 
 ## License
 
@@ -150,7 +153,7 @@ Some of Nathan's work on Haml was supported by Unspace Interactive.
 
 Beyond that, the implementation is licensed under the MIT License.
 
-Copyright (c) 2006-2009 Hampton Catlin and Nathan Weizenbaum
+Copyright (c) 2006-2013 Hampton Catlin, Nathan Weizenbaum and the Haml team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/REFERENCE.md

@@ -1131,7 +1131,7 @@ implemented using Tilt.
 Parses the filtered text with [Maruku](https://github.com/nex3/maruku), which
 has some non-standard extensions to Markdown.
 
-As of Haml 3.2, this filter is defined in [Haml
+As of Haml 4.0, this filter is defined in [Haml
 contrib](https://github.com/haml/haml-contrib) but is loaded automatically for
 historical reasons. In future versions of Haml it will likely not be loaded by
 default. This filter is implemented using Tilt.
@@ -1171,7 +1171,7 @@ SCSS syntax to produce CSS output. This filter is implemented using Tilt.
 Parses the filtered text with [Textile](http://www.textism.com/tools/textile).
 Only works if [RedCloth](http://redcloth.org) is installed.
 
-As of Haml 3.2, this filter is defined in [Haml
+As of Haml 4.0, this filter is defined in [Haml
 contrib](https://github.com/haml/haml-contrib) but is loaded automatically for
 historical reasons. In future versions of Haml it will likely not be loaded by
 default. This filter is implemented using Tilt.

data/lib/haml/filters.rb

@@ -34,7 +34,7 @@ module Haml
     # @option options [String] :extend The name of a module to extend when
     #   defining the filter. Defaults to "Plain". This allows filters such as
     #   Coffee to "inherit" from Javascript, wrapping its output in script tags.
-    # @since 3.2.0
+    # @since 4.0
     def register_tilt_filter(name, options = {})
       if constants.map(&:to_s).include?(name.to_s)
         raise "#{name} filter already defined"
@@ -63,7 +63,7 @@ module Haml
     # to redefine a filter, Haml will raise an error. Use this method first to
     # explicitly remove the filter before redefining it.
     # @return Module The filter module that has been removed
-    # @since 3.2.0
+    # @since 4.0
     def remove_filter(name)
       defined.delete name.to_s.downcase
       if constants.map(&:to_s).include?(name.to_s)
@@ -393,7 +393,7 @@ RUBY
 end
 
 # These filters have been demoted to Haml Contrib but are still included by
-# default in Haml 3.2. Still, we rescue from load error if for some reason
+# default in Haml 4.0. Still, we rescue from load error if for some reason
 # haml-contrib is not installed.
 begin
   require "haml/filters/maruku"

data/lib/haml/helpers/rails_323_textarea_fix.rb

@@ -1,24 +1,9 @@
-# Rails 3.2.3's form helpers add a newline after opening textareas, which can
-# cause problems with newlines being considered content rather than markup.
-# These changes fix the issue by making the helpers emit "<haml:newline/>"
-# rather than the leading newline. The tag is then replaced by a newline after
-# rendering.
-#
-# This should be considered nothing more than an emergency hotfix to ensure
-# compatibility with the latest version of Rails, made at a moment when the Haml
-# project is transitioning to a new maintainer.
-
-# module AbstractController
-#   module Rendering
-#     def render_to_body_with_haml(options = {})
-#       if rendered = render_to_body_without_haml(options)
-#         rendered.gsub('<haml:newline/>', "\n").html_safe
-#       end
-#     end
-#     alias_method_chain :render_to_body, :haml
-#   end
-# end
-
+# As of 3.2.3, Rails's form helpers add a newline after opening textareas,
+# which can cause problems with newlines being considered content rather than
+# markup. Here we decode the first newline back into a real newline to make the
+# textarea work as expected. Note that in order for this to work, the compiler
+# code was also change to avoid indenting code with textareas, even when Haml
+# is running in indented mode.
 module ActionView
   module Helpers
 
@@ -36,4 +21,4 @@ module ActionView
       alias_method_chain :text_area, :haml
     end
   end
-end
+end

data/lib/haml/options.rb

@@ -97,7 +97,7 @@ module Haml
 
     # If set to `true`, Haml will convert underscores to hyphens in all
     # {file:REFERENCE.md#html5_custom_data_attributes Custom Data Attributes} As
-    # of Haml 3.2, this defaults to `true`.
+    # of Haml 4.0, this defaults to `true`.
     attr_accessor :hyphenate_data_attrs
 
     # The line offset of the Haml template being parsed. This is useful for

data/lib/haml/version.rb

@@ -1,3 +1,3 @@
 module Haml
-  VERSION = "4.0.0.rc.1"
+  VERSION = "4.0.0"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  prerelease: 6
-  version: 4.0.0.rc.1
+  prerelease: 
+  version: 4.0.0
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -250,14 +250,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 547892051030667947
+      hash: 3355577792412640496
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      segments:
+      - 0
+      hash: 3355577792412640496
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24