middleman-ember 0.1.1 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ 0.2.0
2
+ ===
3
+
4
+ * Allow for not using ember-data [mrship]
5
+
1
6
  0.1.1
2
7
  ===
3
8
 
data/README.md CHANGED
@@ -30,12 +30,12 @@ configure :build do
30
30
  end
31
31
  ```
32
32
 
33
- 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:
33
+ 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:
34
34
 
35
35
  ```ruby
36
- gem "handlebars-source", "~> 1.0.0.rc3"
37
- gem "ember-source", "~>1.0.0.rc3"
38
- gem "ember-data-source", "~> 0.0.5"
36
+ gem "handlebars-source", "~> 1.0.0.rc6"
37
+ gem "ember-source", "~>1.0.0.rc6"
38
+ gem "ember-data-source", "~> 0.13"
39
39
 
40
40
  ```
41
41
 
@@ -21,7 +21,10 @@ module Middleman
21
21
  # copy in the relevant version of Ember
22
22
  FileUtils.mkdir_p(ember_asset_path)
23
23
  FileUtils.cp("#{@@options.ember_path}/ember.#{ember_version}js", ember_asset_path.join("ember.js"))
24
- FileUtils.cp("#{@@options.ember_data_path}/ember-data.#{ember_version}js", ember_asset_path.join("ember-data.js"))
24
+ # only copy ember_data_path if defined. Allows you to just use Ember.
25
+ if @@options.ember_data_path
26
+ FileUtils.cp("#{@@options.ember_data_path}/ember-data.#{ember_version}js", ember_asset_path.join("ember-data.js"))
27
+ end
25
28
  sprockets.append_path(ember_asset_path)
26
29
 
27
30
  # add in Handlebars path
@@ -36,9 +39,10 @@ module Middleman
36
39
  private
37
40
 
38
41
  def default_options
42
+ ember_data_path = defined?(::Ember::Data) ? ::Ember::Data::Source.bundled_path_for("") : nil
39
43
  {
40
44
  ember_path: ::Ember::Source.bundled_path_for(""),
41
- ember_data_path: ::Ember::Data::Source.bundled_path_for(""),
45
+ ember_data_path: ember_data_path,
42
46
  handlebars_path: File.dirname(::Handlebars::Source.bundled_path)
43
47
  }
44
48
  end
@@ -1,5 +1,5 @@
1
1
  module Middleman
2
2
  module Ember
3
- VERSION = "0.1.1"
3
+ VERSION = "0.2.0"
4
4
  end
5
5
  end
@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
20
20
 
21
21
  spec.add_dependency 'middleman-core'
22
22
  spec.add_dependency 'ember-source'
23
- spec.add_dependency 'ember-data-source'
24
23
 
25
24
  spec.add_development_dependency "bundler", "~> 1.3"
26
25
  spec.add_development_dependency "rake"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman-ember
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.2.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-05-10 00:00:00.000000000 Z
12
+ date: 2013-07-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: middleman-core
@@ -43,22 +43,6 @@ dependencies:
43
43
  - - ! '>='
44
44
  - !ruby/object:Gem::Version
45
45
  version: '0'
46
- - !ruby/object:Gem::Dependency
47
- name: ember-data-source
48
- requirement: !ruby/object:Gem::Requirement
49
- none: false
50
- requirements:
51
- - - ! '>='
52
- - !ruby/object:Gem::Version
53
- version: '0'
54
- type: :runtime
55
- prerelease: false
56
- version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
- requirements:
59
- - - ! '>='
60
- - !ruby/object:Gem::Version
61
- version: '0'
62
46
  - !ruby/object:Gem::Dependency
63
47
  name: bundler
64
48
  requirement: !ruby/object:Gem::Requirement
@@ -122,15 +106,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
122
106
  - - ! '>='
123
107
  - !ruby/object:Gem::Version
124
108
  version: '0'
109
+ segments:
110
+ - 0
111
+ hash: 3196256920466423757
125
112
  required_rubygems_version: !ruby/object:Gem::Requirement
126
113
  none: false
127
114
  requirements:
128
115
  - - ! '>='
129
116
  - !ruby/object:Gem::Version
130
117
  version: '0'
118
+ segments:
119
+ - 0
120
+ hash: 3196256920466423757
131
121
  requirements: []
132
122
  rubyforge_project:
133
- rubygems_version: 1.8.24
123
+ rubygems_version: 1.8.25
134
124
  signing_key:
135
125
  specification_version: 3
136
126
  summary: Add Ember assets to a Middleman project. Support for production version of