haml-rails 0.4 → 0.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: affec05aedfc4836104c3cd57622266f8e353384
+  data.tar.gz: f1947207022b57cbd39eed2550f41ec39b960500
+SHA512:
+  metadata.gz: 8815f932866290239d39b4953f2e66a7623fa3389fab5b35ecc5fe75c3f22600f86c9a0da8079da54075a3f1ed7dd2988a5a6544b59ff8e3afd4deea62883a13
+  data.tar.gz: 5bf5bffbef7d76a62b0a9a270d6befad62a22bb0e52248ea3afd409036749f0b5f36b7f1e931e2e51e3119edd51813247ba535e2b1351addafbb55ae50026f0d

data/.gitignore

@@ -1,3 +1,6 @@
 *.gem
 .bundle/
+*.lock
+gemfiles/*.lock
 tmp/
+/vendor/bundle

data/.travis.yml

@@ -1,5 +1,16 @@
 language: ruby
 rvm:
-  - "1.8.7"
-  - "1.9.2"
-  - "1.9.3"
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+gemfile:
+  - gemfiles/rails_3_1.gemfile
+  - gemfiles/rails_3_2.gemfile
+  - gemfiles/rails_4_0.gemfile
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails_4_0.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails_4_0.gemfile

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "rails_3_1" do
+  gem "rails", "~> 3.1.0"
+end
+
+appraise "rails_3_2" do
+  gem "rails", "~> 3.2.0"
+end
+
+appraise "rails_4_0" do
+  gem "rails", "~> 4.0.0"
+end

data/Gemfile

@@ -1,4 +1,4 @@
-source :gemcutter
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in haml-rails.gemspec
 gemspec

data/README.md

@@ -6,9 +6,12 @@ To use it, add this line to your Gemfile:
 
     gem "haml-rails"
 
-Pretty fancy, eh?
+This ensures that:
+  * Any time you generate a controller or scaffold, you'll get Haml templates (instead of ERB)
+  * When your Rails application loads, Haml will be loaded and initialized automatically
+  * Haml templates will be respected by the view template cache digestor
 
-Once you've done that, any time you generate a controller or scaffold, you'll get Haml instead of ERB templates. On top of that, when your Rails application loads, Haml will be loaded and initialized completely automatically! The modern world is just so amazing.
+Pretty fancy, eh? The modern world is just so amazing.
 
 ### Contributors
 

data/Rakefile

@@ -1,6 +1,8 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
+require 'appraisal'
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'

data/gemfiles/rails_3_1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.1.0"
+
+gemspec :path=>"../"

data/gemfiles/rails_3_2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.2.0"
+
+gemspec :path=>"../"

data/gemfiles/rails_4_0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+
+gemspec :path=>"../"

data/haml-rails.gemspec

@@ -15,14 +15,15 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "haml-rails"
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency "haml",          [">= 3.1", "< 4.1"]
-  s.add_dependency "activesupport", [">= 3.1", "< 4.1"]
-  s.add_dependency "actionpack",    [">= 3.1", "< 4.1"]
-  s.add_dependency "railties",      [">= 3.1", "< 4.1"]
+  s.add_dependency "haml",          [">= 3.1", "< 5.0"]
+  s.add_dependency "activesupport", ["~> 4.0.0"]
+  s.add_dependency "actionpack",    ["~> 4.0.0"]
+  s.add_dependency "railties",      ["~> 4.0.0"]
 
-  s.add_development_dependency "rails",   [">= 3.1", "< 4.1"]
+  s.add_development_dependency "rails",   ["~> 4.0.0"]
   s.add_development_dependency "bundler", "~> 1.2"
   s.add_development_dependency "rake"
+  s.add_development_dependency 'appraisal', '>= 0.3.8'
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").select{|f| f =~ /^bin/}

data/lib/generators/haml/controller/templates/view.html.haml

@@ -1,2 +1,2 @@
 %h1 <%= class_name %>#<%= @action %>
-%p Find me in <%= @path %>
+%p Find me in <%= @path %>

data/lib/generators/haml/mailer/templates/view.text.haml

@@ -1,3 +1,3 @@
 <%= class_name %>#<%= @action %>
 
-= @greeting + ", find me in <%= @path %>"
+= @greeting + ", find me in <%= @path %>"

data/lib/haml-rails.rb

@@ -4,7 +4,7 @@ require 'rails'
 module Haml
   module Rails
     class Railtie < ::Rails::Railtie
-      if ::Rails.version.to_f >= 3.1
+      if ::Rails.version.to_s >= "3.1"
         config.app_generators.template_engine :haml
       else
         config.generators.template_engine :haml
@@ -14,6 +14,54 @@ module Haml
         Haml.init_rails(binding)
         Haml::Template.options[:format] = :html5
       end
+
+      initializer 'haml_rails.configure_template_digestor' do
+        # Configure cache digests to parse haml view templates
+        # when calculating cache keys for view fragments
+
+        ActiveSupport.on_load(:action_view) do
+          ActiveSupport.on_load(:after_initialize) do
+            begin
+              if defined?(CacheDigests::DependencyTracker)
+                # 'cache_digests' gem being used (overrides Rails 4 implementation)
+                CacheDigests::DependencyTracker.register_tracker :haml, CacheDigests::DependencyTracker::ERBTracker
+
+                if ::Rails.env.development?
+                  # recalculate cache digest keys for each request
+                  CacheDigests::TemplateDigestor.cache = ActiveSupport::Cache::NullStore.new
+                end
+              else
+                # will only apply if Rails 4, which includes 'action_view/dependency_tracker'
+                require 'action_view/dependency_tracker'
+                ActionView::DependencyTracker.register_tracker :haml, ActionView::DependencyTracker::ERBTracker
+
+                if ::Rails.env.development?
+                  # recalculate cache digest keys for each request
+
+                  # using blackhole cache until code is released to allow us to get this behavior
+                  # by simply setting `config.action_view.cache_template_loading` false in development.rb
+                  # https://github.com/rails/rails/pull/10791
+                  class BlackHole < Hash
+                    def []=(*); end
+                    def put_if_absent(*); end
+                    def fetch(*); yield; end
+                    def delete_pair(*); end
+                  end
+
+                  module ::ActionView
+                    class Digestor
+                      @@cache = BlackHole.new
+                    end
+                  end
+                end
+              end
+            rescue
+              # likely this version of Rails doesn't support dependency tracking
+              # so, we can't parse haml templates without 'cache_digests' gem anyway :)
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/haml-rails/version.rb

@@ -1,5 +1,5 @@
 module Haml
   module Rails
-    VERSION = "0.4"
+    VERSION = "0.5.1"
   end
 end

metadata

@@ -1,130 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: haml-rails
 version: !ruby/object:Gem::Version
-  version: '0.4'
-  prerelease: 
+  version: 0.5.1
 platform: ruby
 authors:
 - André Arko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
     - - <
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
     - - <
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,7 +96,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -140,19 +103,31 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.8
 description: Haml-rails provides Haml generators for Rails 3. It also enables Haml
   as the templating engine for you, so you don't have to screw around in your own
   application.rb when your Gemfile already clearly indicated what templating engine
@@ -165,10 +140,14 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- Appraisals
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/rails_3_1.gemfile
+- gemfiles/rails_3_2.gemfile
+- gemfiles/rails_4_0.gemfile
 - haml-rails.gemspec
 - lib/generators/haml/controller/controller_generator.rb
 - lib/generators/haml/controller/templates/view.html.haml
@@ -191,27 +170,25 @@ files:
 homepage: http://github.com/indirect/haml-rails
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: haml-rails
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: let your Gemfile do the configuring
 test_files: []
-has_rdoc: