rasputin 0.11.3 → 0.12.1

data/Gemfile.lock

@@ -1,64 +1,66 @@
 PATH
   remote: .
   specs:
-    rasputin (0.2.0)
-      actionpack (~> 3.1.0.rc4)
-      railties (~> 3.1.0.rc4)
-      sprockets (>= 2.0.0.beta.10)
+    rasputin (0.11.3)
+      actionpack (~> 3.1.0)
+      jquery-rails (~> 1.0)
+      railties (~> 3.1.0)
+      sprockets (~> 2.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.1.0.rc4)
-      activemodel (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.0)
-      rack-cache (~> 1.0.1)
-      rack-mount (~> 0.8.1)
-      rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.10)
-      tzinfo (~> 0.3.27)
-    activemodel (3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
-      bcrypt-ruby (~> 2.1.4)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activesupport (3.1.0.rc4)
+    activesupport (3.1.3)
       multi_json (~> 1.0)
-    bcrypt-ruby (2.1.4)
     builder (3.0.0)
     erubis (2.7.0)
-    hike (1.1.0)
+    hike (1.2.1)
     i18n (0.6.0)
-    multi_json (1.0.3)
-    rack (1.3.0)
-    rack-cache (1.0.2)
+    jquery-rails (1.0.19)
+      railties (~> 3.0)
+      thor (~> 0.14)
+    json (1.6.3)
+    multi_json (1.0.4)
+    rack (1.3.5)
+    rack-cache (1.1)
       rack (>= 0.4)
-    rack-mount (0.8.1)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.0)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    railties (3.1.0.rc4)
-      actionpack (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2)
-    rdoc (3.8)
-    sprockets (2.0.0.beta.10)
-      hike (~> 1.0)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
+    sprockets (2.0.3)
+      hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
-    tilt (1.3.2)
-    tzinfo (0.3.29)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby

data/README.md

@@ -7,7 +7,7 @@ It provide direct requires for official ember packages :
 
 * ember
 * ember-datetime
-* ember-datastore
+* ember-data
 * ember-touch
 * ember-routing
 
@@ -37,7 +37,7 @@ If you do not want this behavior you can tourn it off in your rails configuratio
 
     config.rasputin.precompile_handlebars = false
 
-If you use Slim templates, you can use handlebars filter :
+If you use Slim of Haml templates, you can use handlebars filter :
 
     handlebars:
         {{view Ember.Button}}OK{{/view}}
@@ -63,7 +63,7 @@ In your javascript asset manifest (app/assets/javascripts/application.js) add th
 And any of the following you want to include:
 
     //= require ember-datetime
-    //= require ember-datastore
+    //= require ember-data
     //= require ember-touch
     //= require ember-routing
     //= require ember-i18n
@@ -77,6 +77,10 @@ In your stylesheet asset manifest (app/assets/stylesheets/application.css) add t
 ChangeLog
 ----------
 
+0.12.0
+
+* replace ember-datastore with ember-data
+
 0.11.3
 
 * update Ember.js to 0.9.3 and clean up ember-datastore

data/lib/rasputin/haml.rb

@@ -0,0 +1,11 @@
+module Haml
+  module Filters
+    module Handlebars
+      include Base
+      def render_with_options(text, options)
+        type = "type=#{options[:attr_wrapper]}text/x-handlebars#{options[:attr_wrapper]}"
+        "<script #{type}>\n#{text.rstrip}\n</script>"
+      end
+    end
+  end
+end

data/lib/rasputin/handlebars/compiler.rb

@@ -4,12 +4,20 @@ module Rasputin
   module Handlebars
     module Source
 
+      def self.precompiler_path
+        assets_path("ember-precompiler.js")
+      end
+
+      def self.assets_path(name)
+        File.expand_path(File.join(__FILE__, "..", "..", "..", "..", "vendor/assets/javascripts/#{name}"))
+      end
+
       def self.bundled_path
-        File.expand_path("../handlebars.js", __FILE__)
+        assets_path("ember.js")
       end
 
       def self.path
-        @path ||= ENV["HANDLEBARS_SOURCE_PATH"] || bundled_path
+        @path ||= ENV["EMBER_SOURCE_PATH"] || bundled_path
       end
 
       def self.path=(path)
@@ -18,7 +26,7 @@ module Rasputin
       end
 
       def self.contents
-        @contents ||= File.read(path)
+        @contents ||= [File.read(precompiler_path), File.read(path)].join("\n")
       end
 
       def self.version
@@ -37,7 +45,7 @@ module Rasputin
 
       def compile(template)
         template = template.read if template.respond_to?(:read)
-        Source.context.call("Ember.Handlebars.precompile", template)
+        Source.context.call("EmberHandlebars.precompile", template)
       end
     end
   end

data/lib/rasputin/version.rb

@@ -1,3 +1,3 @@
 module Rasputin
-  VERSION = "0.11.3"
+  VERSION = "0.12.1"
 end

data/lib/rasputin.rb

@@ -6,11 +6,12 @@ require "rasputin/handlebars/compiler"
 require "rasputin/handlebars/template"
 
 require "rasputin/slim" if defined? Slim
+require "rasputin/haml" if defined? Haml
 
 module Rasputin
   class Engine < ::Rails::Engine
     config.rasputin = ActiveSupport::OrderedOptions.new
-    config.rasputin.precompile_handlebars = true
+    config.rasputin.precompile_handlebars = Rails.env.production?
     config.rasputin.template_name_separator = '/'
 
     initializer :setup_rasputin do |app|