From e2317b1a6302570b22d1a8ddeda60bd0c547a6da Mon Sep 17 00:00:00 2001 From: minusfive Date: Sun, 19 Oct 2014 15:04:48 -0400 Subject: [PATCH] Updated Ember + Ember Data versions to latest betas, bumped Gem version --- CHANGELOG.md | 25 ++++++++++++++----------- README.md | 8 ++++---- emberman.gemspec | 4 ++-- lib/emberman/version.rb | 2 +- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0a4e45..dec0c4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,21 @@ # Emberman Changelog [![Gem Version](https://badge.fury.io/rb/emberman.svg)](http://badge.fury.io/rb/emberman) +### 0.0.4 (2014/10/19) +- Upgrade default [Ember to v1.8.0.beta.5](https://github.com/emberjs/ember.js/blob/v1.8.0-beta.5/CHANGELOG.md) +- Upgrade default [Ember Data to v1.0.0.beta.11](https://github.com/emberjs/data/blob/v1.0.0-beta.11/CHANGELOG.md) + ### 0.0.3 (2014/09/29) -Upgrade default [Ember to v1.8.0.beta.3](https://github.com/emberjs/ember.js/blob/v1.8.0-beta.3/CHANGELOG.md) +- Upgrade default [Ember to v1.8.0.beta.3](https://github.com/emberjs/ember.js/blob/v1.8.0-beta.3/CHANGELOG.md) ### 0.0.2 (2014/09/24) -Minor cleanup +- Minor cleanup ### 0.0.1 (2014/09/23) -Initial gem release, with: - - Auto-load: - + [Ember 1.8.0.beta.2](https://github.com/emberjs/ember.js/releases/tag/v1.8.0-beta.2) - + [Ember Data 1.0.0.beta.10](https://github.com/emberjs/data/releases/tag/v1.0.0-beta.10) - + [Handlebars 1.3.0](https://github.com/wycats/handlebars.js/releases/tag/v1.3.0) - - `:app_dir` option allows you to set a custom Ember app directory (relative to Middleman's `:js_dir`) - - Pre-compile handlebars templates (from `templates` directory inside the Ember app directory (`:app_dir`)) - - Use production versions of Ember + Ember Data on `build` - - Ignore ingredient files on `build` +- Auto-load: + + [Ember 1.8.0.beta.2](https://github.com/emberjs/ember.js/releases/tag/v1.8.0-beta.2) + + [Ember Data 1.0.0.beta.10](https://github.com/emberjs/data/releases/tag/v1.0.0-beta.10) + + [Handlebars 1.3.0](https://github.com/wycats/handlebars.js/releases/tag/v1.3.0) +- `:app_dir` option allows you to set a custom Ember app directory (relative to Middleman's `:js_dir`) +- Pre-compile handlebars templates (from `templates` directory inside the Ember app directory (`:app_dir`)) +- Use production versions of Ember + Ember Data on `build` +- Ignore ingredient files on `build` diff --git a/README.md b/README.md index e80dc1e..adb4182 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ Emberman is a simple [extension](http://middlemanapp.com/advanced/custom/) which ## Features - Auto-loads into [Middleman's Asset Pipeline](http://middlemanapp.com/basics/asset-pipeline/): - + [Ember 1.8.0.beta.3](https://github.com/emberjs/ember.js/releases/tag/v1.8.0-beta.3) - + [Ember Data 1.0.0.beta.10](https://github.com/emberjs/data/releases/tag/v1.0.0-beta.10) + + [Ember 1.8.0.beta.5](https://github.com/emberjs/ember.js/releases/tag/v1.8.0-beta.5) + + [Ember Data 1.0.0.beta.11](https://github.com/emberjs/data/releases/tag/v1.0.0-beta.11) + [Handlebars 1.3.0](https://github.com/wycats/handlebars.js/releases/tag/v1.3.0) - Pre-compiles handlebars templates - Uses production versions of Ember + Ember Data on `build` @@ -23,7 +23,7 @@ Add this line to your Middleman application's `Gemfile`: ```ruby # Gemfile -gem 'emberman', '~> 0.0.3' +gem 'emberman', '~> 0.0.4' ``` Then run: @@ -165,7 +165,7 @@ If you'd prefer to use different versions of Ember, Ember Data or Handlebars, ad gem 'ember-source', '1.7.0' gem 'ember-data-source', '0.14' gem 'handlebars-source', '1.2.1' -gem 'emberman', '~> 0.0.3' +gem 'emberman', '~> 0.0.4' ``` ## Contributing diff --git a/emberman.gemspec b/emberman.gemspec index 605f156..8592a1d 100644 --- a/emberman.gemspec +++ b/emberman.gemspec @@ -22,8 +22,8 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'middleman-ember', '~> 0.2.3' spec.add_runtime_dependency 'sprockets-handlebars_template', '~> 1.0.0' spec.add_runtime_dependency 'handlebars-source', '1.3' - spec.add_runtime_dependency 'ember-source', '1.8.0.beta.3' - spec.add_runtime_dependency 'ember-data-source', '1.0.0.beta.10' + spec.add_runtime_dependency 'ember-source', '1.8.0.beta.5' + spec.add_runtime_dependency 'ember-data-source', '1.0.0.beta.11' spec.add_development_dependency 'bundler', '~> 1.7' spec.add_development_dependency 'rake', '~> 10.0' diff --git a/lib/emberman/version.rb b/lib/emberman/version.rb index 2580c3a..20f1fb7 100644 --- a/lib/emberman/version.rb +++ b/lib/emberman/version.rb @@ -1,5 +1,5 @@ module Middleman class Emberman - VERSION = "0.0.3" + VERSION = "0.0.4" end end