ember-cli-rails 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aedcf213d342ba10d97aeb8f2ba9aa752eb19e48
-  data.tar.gz: 31e23c9feeeab7cb015944ececced0ae806cd389
+  metadata.gz: 0f1c285912cf8c63f40ff4d60c1849228451a46f
+  data.tar.gz: 853262662f45b8e71ac20318f73366f132643b75
 SHA512:
-  metadata.gz: 86014b0152b362aad864711e021b3949c32ff63de53dc3661432fdf6476d50cda94a472f61934f407ae3cdeb9acb0fb58088ad256b5e76c5397b49fd62739d9e
-  data.tar.gz: 5d7739c42282297405ce624dc076f3373195542e3b381c4cb2dbff7df2064ff48ecb1844ccdcec2f05f273698cdcd884f577baa1cf7709f958bfa102e477e5bc
+  metadata.gz: f834f53ae8acda2f5cb5a330f3c9ca99df08b1633d7027eb0d3b2dec18779c4e2d345a1b2f427e8347fe1f291605a231e3f4ef993b0dc92e5a00df19a1dbfd80
+  data.tar.gz: 5adb96c7232ea843a72911c62b82e831299881edc476490f2c2a76addc029ff993cb47460a9f9946c2f1947365dbb9ab2138ab2615ab740b7a8749ff780d0ca4

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+0.0.14
+------
+
+* Do not include jQuery into vendor.js when jquery-rails is available [#32](https://github.com/rwz/ember-cli-rails/issues/32)
+
+0.0.13
+------
+
+* Fix assets:precompile in production environment. [#38](https://github.com/rwz/ember-cli-rails/issues/38)
+
 0.0.12
 ------
 

data/README.md

@@ -64,7 +64,7 @@ Once you've updated your initializer to taste, you need to install the
 For each of your EmberCLI applications install the addon with:
 
 ```sh
-npm install --save-dev ember-cli-rails-addon@0.0.6
+npm install --save-dev ember-cli-rails-addon@0.0.7
 ```
 
 And that's it!

data/lib/ember-cli/app.rb

@@ -4,6 +4,7 @@ module EmberCLI
   class App
     ADDON_VERSION = "0.0.7"
     EMBER_CLI_VERSION = "~> 0.1.3"
+    JQUERY_VERSIONS = ["~> 1.7", "~> 2.1"].freeze
 
     attr_reader :name, :options, :pid
 
@@ -70,6 +71,7 @@ module EmberCLI
     private
 
     delegate :ember_path, to: :configuration
+    delegate :match_version?, :non_production?, to: Helpers
     delegate :tee_path, to: :configuration
     delegate :configuration, to: :EmberCLI
 
@@ -92,12 +94,18 @@ module EmberCLI
       end
     end
 
+    def suppress_jquery?
+      return false unless defined?(Jquery::Rails::JQUERY_VERSION)
+
+      JQUERY_VERSIONS.any? do |requirement|
+        match_version?(Jquery::Rails::JQUERY_VERSION, requirement)
+      end
+    end
+
     def check_ember_cli_version!
       version = dev_dependencies.fetch("ember-cli").split("-").first
-      version = Gem::Version.new(version)
-      requirement = Gem::Requirement.new(EMBER_CLI_VERSION)
 
-      unless requirement.satisfied_by?(version)
+      unless match_version?(version, EMBER_CLI_VERSION)
         fail <<-MSG.strip_heredoc
           EmberCLI Rails require ember-cli NPM package version to be
           #{requirement} to work properly. From within your EmberCLI directory
@@ -173,7 +181,7 @@ module EmberCLI
     end
 
     def environment
-      Helpers.non_production?? "development" : "production"
+      non_production?? "development" : "production"
     end
 
     def package_json
@@ -192,6 +200,7 @@ module EmberCLI
     def env_hash
       ENV.clone.tap do |vars|
         vars.store "DISABLE_FINGERPRINTING", "true"
+        vars.store "SUPPRESS_JQUERY", "true" if suppress_jquery?
       end
     end
   end

data/lib/ember-cli/helpers.rb

@@ -2,6 +2,12 @@ module EmberCLI
   module Helpers
     extend self
 
+    def match_version?(version, requirement)
+      version = Gem::Version.new(version)
+      requirement = Gem::Requirement.new(requirement)
+      requirement.satisfied_by?(version)
+    end
+
     def which(cmd)
       exts = ENV.fetch("PATHEXT", ?;).split(?;, -1).uniq
 

data/lib/ember-cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCLI
-  VERSION = "0.0.13".freeze
+  VERSION = "0.0.14".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-26 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties