ember-appkit-rails 0.4.0 → 0.5.0

data/lib/generators/ember/view_generator.rb

@@ -11,8 +11,8 @@ module Ember
       class_option :without_template, :type => :boolean, :default => false, :desc => "Create template for this view"
 
       def create_view_files
-        file_path = File.join(app_path, 'views', class_path, "#{file_name}.js.es6")
-        template "view.js.es6", file_path
+        file_path = File.join(app_path, 'views', class_path, "#{file_name}.es6")
+        template "view.es6", file_path
         invoke('ember:template', [ name ], options) unless options[:without_template]
       end
     end

data/lib/generators/templates/application.js.erb

@@ -3,6 +3,7 @@
 //= require ember-appkit
 //= require_self
 //= require_tree ./adapters
+//= require_tree ./serializers
 //= require router
 //= require_tree ../<%= app_path %>
 //= require_tree ./initializers

data/lib/generators/templates/environment.js.erb

@@ -4,6 +4,8 @@
  This is useful when using canary versions of Ember to enable
  feature flags before Ember itself is loaded.
 
+ Example: ENV = { FEATURES: { 'query-params-new': true } };
+
  See the feature flags guide for details:
 
  http://emberjs.com/guides/configuring-ember/feature-flags/

data/lib/generators/templates/environments/development.js.erb

@@ -2,8 +2,8 @@
 //= require ember
 //= require ember-data
 
-config.LOG_ACTIVE_GENERATION = true
-config.LOG_MODULE_RESOLVER = true
-config.LOG_TRANSITIONS = true
-config.LOG_TRANSITIONS_INTERNAL = true
-config.LOG_VIEW_LOOKUPS = true
+config.LOG_ACTIVE_GENERATION = true;
+config.LOG_MODULE_RESOLVER = true;
+config.LOG_TRANSITIONS = true;
+config.LOG_TRANSITIONS_INTERNAL = true;
+config.LOG_VIEW_LOOKUPS = true;

data/lib/generators/templates/environments/production.js.erb

@@ -5,10 +5,10 @@
 // For some configuration settings such as API keys,
 // you should read them from the environment rather
 // than checking them into version control. See also
-// the Figaro gem. 
+// the Figaro gem.
 // Keep in mind that API keys in js are visible to
 // someone poking in the browser, so never expose
 // a truly private API key in javascript.
 // my_api_key = <%= ENV['MY_API_KEY'] %>
 
-Ember.LOG_VERSION = false
+Ember.LOG_VERSION = false;

data/lib/generators/templates/environments/test.js.erb

@@ -2,4 +2,4 @@
 //= require ember
 //= require ember-data
 
-Ember.LOG_VERSION = false
+Ember.LOG_VERSION = false;

data/lib/generators/templates/initializers/teaspoon.rb

@@ -0,0 +1,63 @@
+Teaspoon.setup do |config|
+  # This determines where the Teaspoon routes will be mounted. Changing this to "/jasmine" would allow you to browse to
+  # http://localhost:3000/jasmine to run your tests.
+  config.mount_at = "/teaspoon"
+
+  # This defaults to Rails.root if left nil. If you're testing an engine using a dummy application it can be useful to
+  # set this to your engines root.. E.g. `Teaspoon::Engine.root`
+  config.root = nil
+
+  # These paths are appended to the Rails assets paths (relative to config.root), and by default is an array that you
+  # can replace or add to.
+  config.asset_paths = ["test", "test/stylesheets"]
+
+  # Fixtures are rendered through a standard controller. This means you can use things like HAML or RABL/JBuilder, etc.
+  # to generate fixtures within this path.
+  config.fixture_path = "test/fixtures"
+
+  # You can modify the default suite configuration and create new suites here. Suites can be isolated from one another.
+  # When defining a suite you can provide a name and a block. If the name is left blank, :default is assumed. You can
+  # omit various directives and the defaults will be used.
+  #
+  # To run a specific suite
+  #   - in the browser: http://localhost/teaspoon/[suite_name]
+  #   - from the command line: rake teaspoon suite=[suite_name]
+  config.suite do |suite|
+    suite.boot_partial = 'eak_rails'
+
+    # You can specify a file matcher and all matching files will be loaded when the suite is run. It's important that these files are serve-able from sprockets.
+    #
+    # Note: Can also be set to nil.
+    suite.matcher = "test/**/*_test.{js,js.coffee,es6,coffee}"
+
+    # Each suite can load a different helper, which can in turn require additional files. This file is loaded before
+    # your tests are loaded, and can be used as a manifest.
+    suite.helper = "test_helper"
+
+    # These are the core Teaspoon javascripts. It's strongly encouraged to include only the base files here. You can
+    # require other support libraries in your test helper, which allows you to change them without having to restart the
+    # server.
+    #
+    # Available frameworks: teaspoon-jasmine, teaspoon-mocha, teaspoon-qunit
+    #
+    # Note: To use the CoffeeScript source files use `"teaspoon/qunit"` etc.
+    suite.javascripts = ["teaspoon-qunit"]
+
+    # If you want to change how Teaspoon looks, or include your own stylesheets you can do that here. The default is the
+    # stylesheet for the HTML reporter.
+    suite.stylesheets = ["teaspoon"]
+
+    # When running coverage reports, you probably want to exclude libraries that you're not <testing.
+    # Accepts an array of filenames or regular expressions. The default is to exclude assets from vendors or gems.
+    suite.no_coverage = [%r{/lib/ruby/gems/}, %r{/vendor/assets/}, %r{/support/}, %r{/(.+)_helper.}]
+    # suite.no_coverage << "jquery.min.js" # excludes jquery from coverage reports
+
+  end
+
+  # Example suite. Since we're just filtering to files already within the root test/javascripts, these files will also
+  # be run in the default suite -- but can be focused into a more specific suite.
+  #config.suite :targeted do |suite|
+  #  suite.matcher = "test/javascripts/targeted/*_test.{js,js.coffee,coffee}"
+  #end
+
+end if defined?(Teaspoon) && Teaspoon.respond_to?(:setup) # let Teaspoon be undefined outside of development/test/asset groups

data/lib/generators/templates/scaffold/route/{edit.js.es6 → edit.es6}

@@ -1,6 +1,6 @@
 export default Ember.Route.extend({
   model: function(params) {
-    return this.store.find('<%= file_name.singularize -%>', params.<%= file_name.singularize -%>_id);
+    return this.store.find('<%= require_name.singularize -%>', params.<%= file_name.singularize -%>_id);
   },
   deactivate: function() {
     var model = this.get('controller.model');

data/lib/generators/templates/scaffold/route/{index.js.es6 → index.es6}

@@ -1,5 +1,5 @@
 export default Ember.Route.extend({
   model: function() {
-    return this.store.find('<%= file_name.singularize -%>');
+    return this.store.find('<%= require_name.singularize -%>');
   }
 });

data/lib/generators/templates/scaffold/route/{new.js.es6 → new.es6}

@@ -1,6 +1,6 @@
 export default Ember.Route.extend({
   model: function() {
-    return this.store.createRecord('<%= file_name.singularize -%>');
+    return this.store.createRecord('<%= require_name.singularize -%>');
   },
   deactivate: function() {
     var model = this.get('controller.model');

data/lib/generators/templates/scaffold/route/{show.js.es6 → show.es6}

@@ -1,6 +1,6 @@
 export default Ember.Route.extend({
   model: function(params) {
-    return this.store.find('<%= file_name.singularize -%>', params.<%= file_name.singularize -%>_id);
+    return this.store.find('<%= require_name.singularize -%>', params.<%= file_name.singularize -%>_id);
   },
   actions: {
     destroyRecord: function(model) {

data/lib/generators/templates/scaffold/template/form.hbs

@@ -1,9 +1,8 @@
 <% attributes.each do |attribute| -%>
 <div>
-  <label for=""><%= attribute[:name].titleize -%></label>
-  {{input value=<%= attribute[:name].camelize(:lower) -%>}}
+  <label><%= attribute[:name].titleize -%> {{input value=<%= attribute[:name].camelize(:lower) -%> class='<%= file_name.dasherize -%>-<%= attribute[:name].dasherize -%>'}}</label>
 </div>
 <% end -%>
 
-<button type="submit" {{action save this}}>Save</button>
-<button type="submit" {{action cancel this}}>Cancel</button>
+<button type="submit" {{action 'save' this}}>Save</button>
+<button type="submit" {{action 'cancel' this}}>Cancel</button>

data/lib/generators/templates/scaffold/template/index.hbs

@@ -10,10 +10,10 @@
 <% end -%>
   </tr>
   {{#each}}
-    <tr>
+    <tr class='<%= file_name.dasherize -%>'>
       <td>{{link-to id '<%= file_name.pluralize -%>.show' this}}</td>
 <% attributes.each do |attribute| -%>
-      <td>{{<%= attribute[:name] -%>}}</td>
+      <td>{{<%= attribute[:name].camelize(:lower) -%>}}</td>
 <% end -%>
     </tr>
   {{/each}}

data/lib/generators/templates/scaffold/template/show.hbs

@@ -1,9 +1,9 @@
 <h3>{{id}}</h3>
 
-<p>{{link-to 'Edit' '<%= file_name.pluralize -%>.edit' this}} <button {{action destroyRecord this}}>Destroy</button></p>
+<p>{{link-to 'Edit' '<%= file_name.pluralize -%>.edit' this}} <button {{action 'destroyRecord' this}}>Destroy</button></p>
 
 <ul>
 <% attributes.each do |attribute| -%>
-  <li><%= attribute[:name].titleize -%>: {{<%= attribute[:name] -%>}}</li>
+  <li class='<%= file_name.dasherize -%>-<%= attribute[:name].dasherize -%>'><%= attribute[:name].titleize -%>: {{<%= attribute[:name].camelize(:lower) -%>}}</li>
 <% end -%>
 </ul>

data/lib/generators/templates/scaffold_controller/controller.rb

@@ -20,7 +20,7 @@ class Api::V<%= api_version %>::<%= controller_class_name %>Controller < Applica
     if @<%= orm_instance.save %>
       respond_with <%= "@#{singular_table_name}" %>, status: :created, location: [:api, :v<%= api_version %>, <%= "@#{singular_table_name}" %>]
     else
-      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+      render json: { errors: <%= "@#{orm_instance.errors}" %> }, status: :unprocessable_entity
     end
   end
 
@@ -29,7 +29,7 @@ class Api::V<%= api_version %>::<%= controller_class_name %>Controller < Applica
     if @<%= orm_instance.update("#{singular_table_name}_params") %>
       respond_with <%= "@#{singular_table_name}" %>, status: :ok, location: [:api, :v<%= api_version %>, <%= "@#{singular_table_name}" %>]
     else
-      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+      render json: { errors: <%= "@#{orm_instance.errors}" %> }, status: :unprocessable_entity
     end
   end
 

data/lib/generators/templates/test/model.es6

@@ -0,0 +1,7 @@
+import <%= file_name.camelize -%> from '<%= app_path -%>/models/<%= require_name.dasherize -%>';
+
+module('Unit - <%= file_name.camelize -%>');
+
+test('exists', function(){
+  ok( <%= file_name.camelize -%>, 'Expected <%= file_name.camelize -%> to exist.');
+});

data/lib/generators/templates/test/route.es6

@@ -0,0 +1,23 @@
+import <%= config[:object] -%> from '<%= app_path -%>/routes/<%= require_name.dasherize.pluralize -%>/<%= config[:action] -%>';
+
+var route, store;
+
+module('Unit - <%= config[:object] -%>', {
+  setup: function(){
+    store = {};
+
+    route = <%= config[:object] -%>.create({
+      store: store
+    });
+  },
+  teardown: function(){
+    Ember.run(route, 'destroy');
+  }
+});
+
+test('it exist', function(){
+  expect(2);
+
+  ok(route);
+  ok(route instanceof Ember.Route);
+});

data/lib/generators/templates/test/teaspoon_env.rb

@@ -0,0 +1,38 @@
+# This file allows you to override various Teaspoon configuration directives when running from the command line. It is not
+# required from within the Rails environment, so overriding directives that have been defined within the initializer
+# is not possible.
+#
+# Set RAILS_ROOT and load the environment.
+ENV["RAILS_ROOT"] = File.expand_path("../../", __FILE__)
+require File.expand_path("../../config/environment", __FILE__)
+
+# Provide default configuration.
+#
+# You can override various configuration directives defined here by using arguments with the teaspoon command.
+#
+# teaspoon --driver=selenium --suppress-log
+# rake teaspoon DRIVER=selenium SUPPRESS_LOG=false
+Teaspoon.setup do |config|
+  # Driver / Server
+  #config.driver              = "phantomjs" # available: phantomjs, selenium
+  #config.server              = nil # defaults to Rack::Server
+
+  # Behaviors
+  #config.server_timeout      = 20 # timeout for starting the server
+  #config.server_port         = nil # defaults to any open port unless specified
+  #config.fail_fast           = true # abort after the first failing suite
+
+  # Output
+  #config.formatters          = "dot" # available: dot, tap, tap_y, swayze_or_oprah
+  #config.suppress_log        = false # suppress logs coming from console[log/error/debug]
+  #config.color               = true
+
+  # Coverage (requires istanbul -- https://github.com/gotwarlost/istanbul)
+  #config.coverage                      = true
+  #config.coverage_reports              = "text,html,cobertura"
+  #config.coverage_output_dir           = "coverage"
+  #config.statements_coverage_threshold = 50
+  #config.functions_coverage_threshold  = 50
+  #config.branches_coverage_threshold   = 50
+  #config.lines_coverage_threshold      = 50
+end

data/lib/generators/templates/test/test_helper.js

@@ -0,0 +1,55 @@
+// Teaspoon includes some support files, but you can use anything from your own support path too.
+// require support/sinon
+// require support/your-support-file
+//
+// Deferring execution
+// If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call Teaspoon.execute()
+// after everything has been loaded. Simple example of a timeout:
+//
+// Teaspoon.defer = true
+// setTimeout(Teaspoon.execute, 1000)
+//
+// Manifest
+// If you'd rather require your test files manually (to control order for instance) you can disable the suite matcher in
+// the configuration and use this file as a manifest.
+//
+// For more information: http://github.com/modeset/teaspoon
+//
+// You can require javascript files here. A good place to start is by
+// requiring your application.js.
+//= require application
+//= require fake_xml_http_request
+//= require fakehr
+//= require httpRespond
+
+Ember.testing = true;
+
+function exists(selector) {
+  return !!find(selector).length;
+}
+
+function getAssertionMessage(actual, expected, message) {
+  return message || QUnit.jsDump.parse(expected) + " expected but was " + QUnit.jsDump.parse(actual);
+}
+
+function equal(actual, expected, message) {
+  message = getAssertionMessage(actual, expected, message);
+  QUnit.equal.call(this, actual, expected, message);
+}
+
+function strictEqual(actual, expected, message) {
+  message = getAssertionMessage(actual, expected, message);
+  QUnit.strictEqual.call(this, actual, expected, message);
+}
+
+window.exists = exists;
+window.equal = equal;
+window.strictEqual = strictEqual;
+
+Ember.Test.registerHelper('shouldHaveElementWithCount',
+  function(app, selector, n, context) {
+    var el = findWithAssert(selector, context);
+    var count = el.length;
+    equal(n, count, "found " + count + " times");
+  }
+);

data/test/dummy/config/adapters/application.es6.erb

@@ -0,0 +1,3 @@
+export default DS.ActiveModelAdapter.extend({
+  namespace: 'api/v<%= Rails.application.config.ember.api_version %>'
+});

data/test/dummy/config/application.js

@@ -3,6 +3,7 @@
 //= require ember-appkit
 //= require_self
 //= require_tree ./adapters
+//= require_tree ./serializers
 //= require router
 //= require_tree ../app
 //= require_tree ./initializers

data/test/dummy/config/environment.js.erb

@@ -4,6 +4,8 @@
  This is useful when using canary versions of Ember to enable
  feature flags before Ember itself is loaded.
 
+ Example: ENV = { FEATURES: { 'query-params-new': true } };
+
  See the feature flags guide for details:
 
  http://emberjs.com/guides/configuring-ember/feature-flags/

data/test/dummy/config/environments/development.js.erb

@@ -2,8 +2,8 @@
 //= require ember
 //= require ember-data
 
-config.LOG_ACTIVE_GENERATION = true
-config.LOG_MODULE_RESOLVER = true
-config.LOG_TRANSITIONS = true
-config.LOG_TRANSITIONS_INTERNAL = true
-config.LOG_VIEW_LOOKUPS = true
+config.LOG_ACTIVE_GENERATION = true;
+config.LOG_MODULE_RESOLVER = true;
+config.LOG_TRANSITIONS = true;
+config.LOG_TRANSITIONS_INTERNAL = true;
+config.LOG_VIEW_LOOKUPS = true;

data/test/dummy/config/environments/production.js.erb

@@ -5,10 +5,10 @@
 // For some configuration settings such as API keys,
 // you should read them from the environment rather
 // than checking them into version control. See also
-// the Figaro gem. 
+// the Figaro gem.
 // Keep in mind that API keys in js are visible to
 // someone poking in the browser, so never expose
 // a truly private API key in javascript.
 // my_api_key = <%= ENV['MY_API_KEY'] %>
 
-Ember.LOG_VERSION = false
+Ember.LOG_VERSION = false;

data/test/dummy/config/environments/test.js.erb

@@ -2,4 +2,4 @@
 //= require ember
 //= require ember-data
 
-Ember.LOG_VERSION = false
+Ember.LOG_VERSION = false;

data/test/dummy/config/initializers/secret_token.rb

@@ -9,4 +9,4 @@
 
 # Make sure your secret_key_base is kept private
 # if you're sharing your code publicly.
-Dummy::Application.config.secret_key_base = 'd20399e714b77996a5e66f97d4b2ab403a360272f5e17b7e6a7672745e00601faac711f88db3b0d0297ecf9986526068388b4ee6e9fe3017c2f442a0bb75721b'
+Dummy::Application.config.secret_key_base = '18e06c38c91b6ee15b29a6c2d6425df7b6cccc922b38927f832e784bafeb51e87e24c6322f68be0df79b5fc4e3192ef72f6bf4e0efb0f2c5aa076618d62a0d2f'

data/test/dummy/config/initializers/teaspoon.rb

@@ -0,0 +1,63 @@
+Teaspoon.setup do |config|
+  # This determines where the Teaspoon routes will be mounted. Changing this to "/jasmine" would allow you to browse to
+  # http://localhost:3000/jasmine to run your tests.
+  config.mount_at = "/teaspoon"
+
+  # This defaults to Rails.root if left nil. If you're testing an engine using a dummy application it can be useful to
+  # set this to your engines root.. E.g. `Teaspoon::Engine.root`
+  config.root = nil
+
+  # These paths are appended to the Rails assets paths (relative to config.root), and by default is an array that you
+  # can replace or add to.
+  config.asset_paths = ["test", "test/stylesheets"]
+
+  # Fixtures are rendered through a standard controller. This means you can use things like HAML or RABL/JBuilder, etc.
+  # to generate fixtures within this path.
+  config.fixture_path = "test/fixtures"
+
+  # You can modify the default suite configuration and create new suites here. Suites can be isolated from one another.
+  # When defining a suite you can provide a name and a block. If the name is left blank, :default is assumed. You can
+  # omit various directives and the defaults will be used.
+  #
+  # To run a specific suite
+  #   - in the browser: http://localhost/teaspoon/[suite_name]
+  #   - from the command line: rake teaspoon suite=[suite_name]
+  config.suite do |suite|
+    suite.boot_partial = 'eak_rails'
+
+    # You can specify a file matcher and all matching files will be loaded when the suite is run. It's important that these files are serve-able from sprockets.
+    #
+    # Note: Can also be set to nil.
+    suite.matcher = "test/**/*_test.{js,js.coffee,es6,coffee}"
+
+    # Each suite can load a different helper, which can in turn require additional files. This file is loaded before
+    # your tests are loaded, and can be used as a manifest.
+    suite.helper = "test_helper"
+
+    # These are the core Teaspoon javascripts. It's strongly encouraged to include only the base files here. You can
+    # require other support libraries in your test helper, which allows you to change them without having to restart the
+    # server.
+    #
+    # Available frameworks: teaspoon-jasmine, teaspoon-mocha, teaspoon-qunit
+    #
+    # Note: To use the CoffeeScript source files use `"teaspoon/qunit"` etc.
+    suite.javascripts = ["teaspoon-qunit"]
+
+    # If you want to change how Teaspoon looks, or include your own stylesheets you can do that here. The default is the
+    # stylesheet for the HTML reporter.
+    suite.stylesheets = ["teaspoon"]
+
+    # When running coverage reports, you probably want to exclude libraries that you're not <testing.
+    # Accepts an array of filenames or regular expressions. The default is to exclude assets from vendors or gems.
+    suite.no_coverage = [%r{/lib/ruby/gems/}, %r{/vendor/assets/}, %r{/support/}, %r{/(.+)_helper.}]
+    # suite.no_coverage << "jquery.min.js" # excludes jquery from coverage reports
+
+  end
+
+  # Example suite. Since we're just filtering to files already within the root test/javascripts, these files will also
+  # be run in the default suite -- but can be focused into a more specific suite.
+  #config.suite :targeted do |suite|
+  #  suite.matcher = "test/javascripts/targeted/*_test.{js,js.coffee,coffee}"
+  #end
+
+end if defined?(Teaspoon) && Teaspoon.respond_to?(:setup) # let Teaspoon be undefined outside of development/test/asset groups