middleman-ember 0.1.1 → 0.2.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.2.0
+===
+
+* Allow for not using ember-data [mrship]
+
 0.1.1
 ===
 

data/README.md

@@ -30,12 +30,12 @@ configure :build do
 end
 ```
 
-By default, the gem uses handlebars-source, ember-source and ember-data-source for the Ember assets. If you want to have specific gem versions of ember, ember-data or handlebars specify those in your Gemfile, e.g:
+By default, the gem uses handlebars-source and ember-source for the Ember assets. If you want to have specific gem versions of ember or handlebars or to add ember-data specify those in your Gemfile, e.g:
 
 ```ruby
-gem "handlebars-source", "~> 1.0.0.rc3"
-gem "ember-source", "~>1.0.0.rc3"
-gem "ember-data-source", "~> 0.0.5"
+gem "handlebars-source", "~> 1.0.0.rc6"
+gem "ember-source", "~>1.0.0.rc6"
+gem "ember-data-source", "~> 0.13"
 
 ```
 

data/lib/middleman/ember/extension.rb

@@ -21,7 +21,10 @@ module Middleman
           # copy in the relevant version of Ember
           FileUtils.mkdir_p(ember_asset_path)
           FileUtils.cp("#{@@options.ember_path}/ember.#{ember_version}js", ember_asset_path.join("ember.js"))
-          FileUtils.cp("#{@@options.ember_data_path}/ember-data.#{ember_version}js", ember_asset_path.join("ember-data.js"))
+          # only copy ember_data_path if defined. Allows you to just use Ember.
+          if @@options.ember_data_path
+            FileUtils.cp("#{@@options.ember_data_path}/ember-data.#{ember_version}js", ember_asset_path.join("ember-data.js")) 
+          end
           sprockets.append_path(ember_asset_path)
 
           # add in Handlebars path
@@ -36,9 +39,10 @@ module Middleman
       private
 
       def default_options
+        ember_data_path = defined?(::Ember::Data) ? ::Ember::Data::Source.bundled_path_for("") : nil
         {
           ember_path: ::Ember::Source.bundled_path_for(""),
-          ember_data_path: ::Ember::Data::Source.bundled_path_for(""),
+          ember_data_path: ember_data_path,
           handlebars_path: File.dirname(::Handlebars::Source.bundled_path)
         }
       end

data/lib/middleman/ember/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Ember
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/middleman-ember.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'middleman-core'
   spec.add_dependency 'ember-source'
-  spec.add_dependency 'ember-data-source'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-ember
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ember-data-source
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,15 +106,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3196256920466423757
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3196256920466423757
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Add Ember assets to a Middleman project. Support for production version of