ember-rails 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 916d617e38b6defe34e9a4fda6e864399d699a44
-  data.tar.gz: f4cf0a357c14a700944c601a5ef20b433a471b46
+  metadata.gz: 0cf471e302779ef5b339f0ec11f3203c87175618
+  data.tar.gz: caacf1625d1b51543d5a6a3bb9d48e6b11574a91
 SHA512:
-  metadata.gz: 3f1dd4bc588c9fe62bd10e04d19424cab5a28ed601e890d965f2be2b5a18b010113601e1f2058d688e71c49e20cd56b21ec302c6965040fb2ce01687b73fa9b6
-  data.tar.gz: d9614b02448d13537139e0f2bcbaec40dc7f7857252a6181ddcdd2cc40993a1e38a215f1fd66458c3a8c33e352a0466842501fb705fd92ca45cfb83dc58d95de
+  metadata.gz: bc8dbdc727b58571d73433c900faa99bd84987f0445e6db9a7850e31db9a17efd8d2aa2c2550f01cb7643be22e131794c842a156278b753aeb03535e0134102c
+  data.tar.gz: bf42e6518eaf4028fe9656b977fd96103bae9f7ab450942edef13f9ac64d12c7ca65784d84cbce2b27fab34fb65a9a61510bbe2dd2217f7880c39db8cd8fb5eb

data/README.md

@@ -14,10 +14,7 @@ You can see an example of how to use the gem [here](https://github.com/keithpitt
 
 ```ruby
 gem 'ember-rails'
-gem 'ember-source', '1.1.2' # or the version you need
-
-# optional since Handlebars 1.0.0 was released
-#gem 'handlebars-source', '~> 1.0.12' # or the version you need
+gem 'ember-source', '1.2.0' # or the version you need
 ```
 
 * Run `bundle install`

data/lib/ember/rails/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module Rails
-    VERSION = '0.14.0'
+    VERSION = '0.14.1'
   end
 end

data/lib/generators/ember/generator_helpers.rb

@@ -49,7 +49,9 @@ module Ember
       end
 
       def configuration
-        ::Rails.configuration.ember
+        if defined?(::Rails) && ::Rails.configuration
+          ::Rails.configuration.ember
+        end
       end
     end
   end

data/lib/generators/ember/install_generator.rb

@@ -20,27 +20,27 @@ module Ember
 
       desc "Install Ember.js into your vendor folder"
       class_option :head,
-        :type => :boolean, 
-        :default => false, 
+        :type => :boolean,
+        :default => false,
         :desc => "Download Ember.js & Ember data from canary channel. This is deprecated. Use channel instead."
       class_option :channel,
         :type => :string,
         :required => false,
         :desc => "Ember release channel Choose between 'release', 'beta' or 'canary'"
-      class_option :ember_only, 
-        :type => :boolean, 
-        :required => false, 
+      class_option :ember_only,
+        :type => :boolean,
+        :required => false,
         :desc => "Only download Ember.",
         :aliases => '--ember'
       class_option :ember_data_only,
-        :type => :boolean, 
-        :required => false, 
-        :desc => "Only download ember-data", 
+        :type => :boolean,
+        :required => false,
+        :desc => "Only download ember-data",
         :aliases => '--ember-data'
       class_option :tag,
         :type => :string,
-        :required => false, 
-        :desc => "Download taged release use syntax v1.0.0-beta.3/ember-data & v1.0.0-rc.8/ember"
+        :required => false,
+        :desc => "Download tagged release use syntax v1.0.0-beta.3/ember-data & v1.0.0-rc.8/ember"
 
       def initialize(args = [], options = {}, config = {})
         super(args, options, config)
@@ -75,8 +75,17 @@ module Ember
 
 
       def get_ember_data_for(environment)
+        # temporarily using a variable here until a stable release of
+        # ember-data is released so that installing with ember-data
+        # *just works*.
+        chan = if channel == :release
+          say_status("warning:", 'Ember Data is not available on the :release channel. Falling back to beta channel.' , :yellow)
+          :beta
+        else
+          channel
+        end
         create_file "vendor/assets/ember/#{environment}/ember-data.js" do
-          fetch "#{base_url}/#{channel}/#{file_name_for('ember-data', environment)}", "vendor/assets/ember/#{environment}/ember-data.js"
+          fetch "#{base_url}/#{chan}/#{file_name_for('ember-data', environment)}", "vendor/assets/ember/#{environment}/ember-data.js"
         end
       end
 
@@ -97,8 +106,8 @@ module Ember
       end
 
       def check_options
-        if options.head? 
-          say('WARNING: --head option is deprecated in favor of --channel=cannary' , :yellow)
+        if options.head?
+          say('WARNING: --head option is deprecated in favor of --channel=canary' , :yellow)
         end
         if options.head? && options.channel?
           say 'ERROR: conflicting options. --head and --channel. Use either --head or --channel=<channel>', :red
@@ -123,7 +132,7 @@ module Ember
       end
 
       def process_options
-        if options.head? 
+        if options.head?
           @channel = :canary
         end
         if options.tag?
@@ -143,23 +152,27 @@ module Ember
         end
       end
 
-
       def fetch(from, to)
         message = "#{from} -> #{to}"
         say_status("downloading:", message , :green)
 
         uri = URI(from)
         output = StringIO.new
-        output.puts "// Fetched from: " + uri.to_s
+        output.puts "// Fetched from channel: #{channel}, with url " + uri.to_s
         output.puts "// Fetched on: " + Time.now.utc.iso8601.to_s
-        output.puts Net::HTTP.get(uri).force_encoding("UTF-8")
+        response = Net::HTTP.get_response(uri)
+        case response.code
+        when '404'
+          say "ERROR: Error reading the content from the channel with url #{from}. File not found" , :red
+          raise Thor::Error
+        when '200'
+          output.puts response.body.force_encoding("UTF-8")
+        else
+          say "ERROR: Unexpected error with status #{response.code} reading the content from the channel with url #{from}." , :red
+          raise Thor::Error
+        end
         output.rewind
         content = output.read
-        if content.include?('404')
-          say "ERROR: Error reading the content from the channel with url #{from}." , :red
-          raise raise Thor::Error
-        end
-        content
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-rails
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Keith Pitt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -173,28 +173,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: handlebars-source
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -318,8 +318,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Ember for Rails 3.1+
 test_files: []
+has_rdoc: