ember-rails 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d4a9590ae4039949ea614394ca0caeb2abad7ca
-  data.tar.gz: 9d95fc4cd477131afa246207da35e9798015e9ef
+  metadata.gz: 857d69b6457718515597605b4b7a6fee74eea6b0
+  data.tar.gz: 054906e52dc2d3d04d9ae241c4cfde1871cff4df
 SHA512:
-  metadata.gz: 25c951f6949cbac70a518294866198458f61226d0024f230999bb6ab3ffe4826630ef7620c9e517c6566be707119f25892dd88f66d97c9cf59584cb62544ee96
-  data.tar.gz: 114946b802515c50194646f4f3c474ae8279c06fd7b38ec2c6f0d49d682848fe27691e18013016813a241df4aaa1d703d575428784e9c78cf7007c377c7dab08
+  metadata.gz: e8fd238eacab85e0de0658485283faf51469fda6227f5257d41aab71f31871d8ab601066a6f9d8c3f29724c62c91a2a80f75910912b271d4daf70ce8228172a7
+  data.tar.gz: 5e8ad49780dec29b586c2b9b37bda647477010f8f9434828f867abe545d4e30b7c7404bdba249243a7117134847c4c72dc9ff58cf4bd4075d8f314c7bd971160

data/README.md

@@ -54,7 +54,7 @@ You'll probably need to clear out your cache after doing this with:
 rake tmp:clear
 ```
 
-Also, ember-rails include some flags for the bootstrap generator:
+Also, ember-rails includes some flags for the bootstrap generator:
 
 ```
 --ember-path or -d   # custom ember path
@@ -119,6 +119,7 @@ config files (`config/application.rb`, `config/environments/development.rb`, etc
 | `config.handlebars.templates_root`           | Sets the root path (under `app/assets/javascripts`) for templates to be looked up in. Default value: `"templates"`. |
 | `config.handlebars.templates_path_separator` | The path separator to use for templates. Default value: `'/'`.                                                      |
 | `config.handlebars.output_type`              | Configures the style of output (options are `:amd` and `:global`). Default value: `:global`.                        |
+| `config.handlebars.amd_namespace`            | Configures the module prefix for AMD formatted output. Default value: `nil`.                        |
 | `config.handlebars.ember_template`           | Default which Ember template type to compile. Valid options: `'Handlebars', `HTMLBars`. Defaults to 'Handlebars`' when `Ember::VERSION` is under 1.10.0, `HTMLBars` when `Ember::VERSION` is over 1.10.0. |
 
 Note:

data/lib/ember/rails/engine.rb

@@ -5,13 +5,15 @@ require 'sprockets/railtie'
 module Ember
   module Rails
     class Engine < ::Rails::Engine
-      config.handlebars = ActiveSupport::OrderedOptions.new
+      Ember::Handlebars::Template.configure do |handlebars_config|
+        config.handlebars = handlebars_config
 
-      config.handlebars.precompile = true
-      config.handlebars.templates_root = "templates"
-      config.handlebars.templates_path_separator = '/'
-      config.handlebars.output_type = :global
-      config.handlebars.ember_template = Ember::VERSION =~ /\A1.[0-9]\./ ? 'Handlebars' : 'HTMLBars'
+        config.handlebars.precompile = true
+        config.handlebars.templates_root = 'templates'
+        config.handlebars.templates_path_separator = '/'
+        config.handlebars.output_type = :global
+        config.handlebars.ember_template = Ember::VERSION =~ /\A1.[0-9]\./ ? 'Handlebars' : 'HTMLBars'
+      end
 
       config.before_initialize do |app|
         Sprockets::Engines #force autoloading

data/lib/ember/rails/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module Rails
-    VERSION = '0.17.0'
+    VERSION = '0.18.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-rails
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Keith Pitt
@@ -11,22 +11,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: execjs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -56,61 +42,67 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: barber
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.0.17
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: ember-source
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.17
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.17
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: ember-source
+  name: ember-data-source
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.0.0.beta.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.0.0.beta.5
 - !ruby/object:Gem::Dependency
-  name: ember-data-source
+  name: ember-handlebars-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.5
+        version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.5
+        version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +218,6 @@ files:
 - LICENSE
 - README.md
 - lib/ember-rails.rb
-- lib/ember/handlebars/template.rb
 - lib/ember/rails/engine.rb
 - lib/ember/rails/version.rb
 - lib/ember_rails.rb

data/lib/ember/handlebars/template.rb

@@ -1,113 +0,0 @@
-require 'sprockets'
-require 'sprockets/engines'
-require 'barber'
-
-module Ember
-  module Handlebars
-    class Template < Tilt::Template
-      def self.default_mime_type
-        'application/javascript'
-      end
-
-      def prepare; end
-
-      def evaluate(scope, locals, &block)
-        raw = handlebars?(scope)
-
-        if raw
-          template = data
-        else
-          template = mustache_to_handlebars(scope, data)
-        end
-
-        if configuration.precompile
-          if raw
-            template = precompile_handlebars(template)
-          else
-            template = precompile_ember_handlebars(template, configuration.ember_template)
-          end
-        else
-          if raw
-            template = compile_handlebars(data)
-          else
-            template = compile_ember_handlebars(template, configuration.ember_template)
-          end
-        end
-
-        if configuration.output_type == :amd
-          target = amd_template_target(scope)
-
-          "define('#{target}', ['exports'], function(__exports__){ __exports__['default'] = #{template} });"
-        else
-          target = global_template_target(scope)
-
-          "#{target} = #{template}\n"
-        end
-      end
-
-      private
-
-      def handlebars?(scope)
-        scope.pathname.to_s =~ /\.raw\.(handlebars|hjs|hbs)/
-      end
-
-      def amd_template_target(scope)
-        [configuration.amd_namespace, scope.logical_path.split(".").first].compact.join('/')
-      end
-
-      def global_template_target(scope)
-        "Ember.TEMPLATES[#{template_path(scope.logical_path).inspect}]"
-      end
-
-      def compile_handlebars(string)
-        "Handlebars.compile(#{indent(string).inspect});"
-      end
-
-      def precompile_handlebars(string)
-        "Handlebars.template(#{Barber::Precompiler.compile(string)});"
-      end
-
-      def compile_ember_handlebars(string, ember_template = 'Handlebars')
-        "Ember.#{ember_template}.compile(#{indent(string).inspect});"
-      end
-
-      def precompile_ember_handlebars(string, ember_template = 'Handlebars')
-        "Ember.#{ember_template}.template(#{Barber::Ember::Precompiler.compile(string)});"
-      end
-
-      def mustache_to_handlebars(scope, template)
-        if scope.pathname.to_s =~ /\.mustache\.(handlebars|hjs|hbs)/
-          template.gsub(/\{\{(\w[^\}\}]+)\}\}/){ |x| "{{unbound #{$1}}}" }
-        else
-          template
-        end
-      end
-
-      def template_path(path)
-        root = configuration.templates_root
-
-        if root.kind_of? Array
-          root.each do |root|
-            path.sub!(/#{Regexp.quote(root)}\//, '')
-          end
-        else
-          unless root.empty?
-            path.sub!(/#{Regexp.quote(root)}\/?/, '')
-          end
-        end
-
-        path = path.split('/')
-
-        path.join(configuration.templates_path_separator)
-      end
-
-      def configuration
-        ::Rails.configuration.handlebars
-      end
-
-      def indent(string)
-        string.gsub(/$(.)/m, "\\1  ").strip
-      end
-    end
-  end
-end