ember-appkit-rails 0.2.2 → 0.3.0

data/lib/generators/ember/generator_helpers.rb

@@ -53,7 +53,7 @@ module Ember
       end
 
       def configuration
-        ::Rails.configuration.ember.appkit
+        ::Rails.configuration.ember
       end
     end
   end

data/lib/generators/ember/model_generator.rb

@@ -10,7 +10,7 @@ module Ember
       argument :attributes, :type => :array, :default => [], :banner => "field[:type] field[:type] ..."
 
       def create_model_files
-        file_path = File.join(app_path, 'models', class_path, "#{file_name}.js.es6")
+        file_path = File.join(app_path, 'models', class_path, "#{file_name.singularize}.js.es6")
         template "model.js.es6", file_path
       end
 

data/lib/generators/ember/resource_generator.rb

@@ -1,4 +1,3 @@
-require 'ember/appkit/rails/resource_override'
 require 'generators/ember/generator_helpers'
 
 module Ember
@@ -16,11 +15,11 @@ module Ember
 
       def create_resource_files
         unless options[:skip_route]
-          invoke('ember:route', [ name ], options)
+          invoke('ember:route', [ name.pluralize ], options)
           inject_into_router_file(name)
         end
-        invoke('ember:controller', [ name ], options)
-        invoke('ember:template', [ name ], options)
+        invoke('ember:controller', [ name.pluralize ], options)
+        invoke('ember:template', [ name.pluralize ], options)
       end
 
       private

data/lib/generators/ember/resource_override.rb

@@ -0,0 +1,21 @@
+require "rails/generators"
+require "rails/generators/rails/resource/resource_generator"
+require "generators/ember/controller_generator"
+require "generators/ember/view_generator"
+
+module Rails
+  module Generators
+    ResourceGenerator.class_eval do
+      class_option :ember, aliases: '-e', desc: 'force ember resource to generate', optional: true, type: 'boolean', default: false, banner: '--ember'
+
+      def add_ember
+        if options.ember
+          say_status :invoke, "ember:resource", :white
+          with_padding do
+            invoke "ember:resource", [singular_name, attributes.map { |a| "#{a.name}:#{a.type}" }].flatten
+          end
+        end
+      end
+    end
+  end
+end

data/lib/generators/ember/scaffold_controller_override.rb

@@ -0,0 +1,14 @@
+require 'rails/generators'
+require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
+
+module Rails
+  module Generators
+    class ScaffoldControllerGenerator
+      source_root File.expand_path('../../templates/scaffold_controller', __FILE__)
+
+    def create_controller_files
+      template "controller.rb", File.join("app/controllers/api/v#{::Rails.application.config.ember.api_version}", class_path, "#{controller_file_name}_controller.rb")
+    end
+    end
+  end
+end

data/lib/generators/ember/scaffold_override.rb

@@ -0,0 +1,25 @@
+require 'rails/generators'
+require 'rails/generators/rails/scaffold/scaffold_generator'
+require 'ember/appkit/rails/walker'
+
+module Rails
+  module Generators
+    class ScaffoldGenerator
+      class_option :ember, aliases: '-e', desc: 'force ember resource to generate', optional: true, type: 'boolean', default: false, banner: '--ember'
+      remove_hook_for :resource_route
+
+      def add_ember
+        if options.ember
+          say_status :invoke, "ember:resource", :white
+          with_padding do
+            invoke "ember:scaffold", [singular_name, attributes.map { |a| "#{a.name}:#{a.type}" }].flatten
+          end
+        end
+      end
+
+      def write_resource
+        Walker.new(file_path.pluralize, File.join(destination_root, 'config/routes.rb'), ::Rails.application.config.ember.api_version).run
+      end
+    end
+  end
+end

data/lib/generators/templates/{adapter.js → adapter.js.erb}

@@ -1,3 +1,3 @@
 window.<%= application_name.camelize %>.ApplicationAdapter = DS.ActiveModelAdapter.extend({
-  namespace: 'api/v1'
+  namespace: 'api/v<%%= Rails.application.config.ember.api_version %>'
 });

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

@@ -1,7 +1,6 @@
 //= require jquery
 //= require environment
 //= require ember-appkit
-//= require ember-data
 //= require_self
 //= require adapter
 //= require router

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

@@ -0,0 +1,3 @@
+//= require handlebars
+//= require ember
+//= require ember-data

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

@@ -0,0 +1,3 @@
+//= require handlebars.runtime
+//= require ember.prod
+//= require ember-data.prod

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

@@ -0,0 +1,3 @@
+//= require handlebars
+//= require ember
+//= require ember-data

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

@@ -1,6 +1,6 @@
 <h3>Index</h3>
 
-<p>{{#link-to '<%= file_name.pluralize -%>.new'}}New <%= file_name.singularize -%>{{/link-to}}</p>
+<p>{{link-to 'New <%= file_name.singularize -%>' '<%= file_name.pluralize -%>.new'}}</p>
 
 <table>
   <tr>
@@ -11,7 +11,7 @@
   </tr>
   {{#each}}
     <tr>
-      <td>{{#link-to '<%= file_name.pluralize -%>.show' this}}{{id}}{{/link-to}}</td>
+      <td>{{link-to id '<%= file_name.pluralize -%>.show' this}}</td>
 <% attributes.each do |attribute| -%>
       <td>{{<%= attribute[:name] -%>}}</td>
 <% end -%>

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

@@ -1,6 +1,6 @@
 <h3>{{id}}</h3>
 
-<p>{{#link-to '<%= file_name.pluralize -%>.edit' this}}Edit{{/link-to}} <button {{action destroyRecord}}>Destroy</button></p>
+<p>{{link-to 'Edit' '<%= file_name.pluralize -%>.edit' this}} <button {{action destroyRecord}}>Destroy</button></p>
 
 <ul>
 <% attributes.each do |attribute| -%>

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

@@ -0,0 +1,56 @@
+<% api_version = Rails.application.config.ember.api_version -%>
+class Api::V<%= api_version %>::<%= controller_class_name %>Controller < ApplicationController
+  before_action :set_<%= singular_table_name %>, only: [:show, :update, :destroy]
+
+  # GET <%= route_url %>
+  def index
+    render json: <%= orm_class.all(class_name) %>
+  end
+
+  # GET <%= route_url %>/1
+  def show
+    render json: <%= "@#{singular_table_name}" %>
+  end
+
+  # POST <%= route_url %>
+  def create
+    @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
+
+    if @<%= orm_instance.save %>
+      render json: <%= "@#{singular_table_name}" %>, status: :created, location: [:api, :v<%= api_version %>, <%= "@#{singular_table_name}" %>]
+    else
+      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+    end
+  end
+
+  # PATCH/PUT <%= route_url %>/1
+  def update
+    if @<%= orm_instance.update("#{singular_table_name}_params") %>
+      render json: <%= "@#{singular_table_name}" %>, status: :ok, location: [:api, :v<%= api_version %>, <%= "@#{singular_table_name}" %>]
+    else
+      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+    end
+  end
+
+  # DELETE <%= route_url %>/1
+  def destroy
+    @<%= orm_instance.destroy %>
+    head :no_content
+  end
+
+  private
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_<%= singular_table_name %>
+    @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
+  end
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def <%= "#{singular_table_name}_params" %>
+    <%- if attributes_names.empty? -%>
+    params[<%= ":#{singular_table_name}" %>]
+    <%- else -%>
+    params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
+    <%- end -%>
+  end
+end

data/test/dummy/Gemfile

@@ -19,9 +19,6 @@ gem 'coffee-rails', '~> 4.0.0'
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 1.2'
-
 group :doc do
   # bundle exec rake doc:rails generates the API under doc/api.
   gem 'sdoc', require: false

data/test/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,16 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require jquery
+//= require jquery_ujs
+//= require turbolinks
+//= require_tree .

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

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

data/test/dummy/config/application.js

@@ -1,7 +1,6 @@
 //= require jquery
 //= require environment
 //= require ember-appkit
-//= require ember-data
 //= require_self
 //= require adapter
 //= require router

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

@@ -0,0 +1,3 @@
+//= require handlebars
+//= require ember
+//= require ember-data

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

@@ -0,0 +1,3 @@
+//= require handlebars.runtime
+//= require ember.prod
+//= require ember-data.prod

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

@@ -0,0 +1,3 @@
+//= require handlebars
+//= require ember
+//= require ember-data

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 = '4b4d7fb6c5c5bb1fbbdc8599a13db9cb1f554f025593b17276329db151252d373a5679452021e951c41b93bced489a5856d8389054f2af5e4b3478aec25d3248'
+Dummy::Application.config.secret_key_base = '25ca68e76606eba7170ecf1af9f59d9fb104130250f61a76725b9fa54054d439b43eb6901044570baed491c7ac0f2b080571ba44c516262102c37471bcb4ed37'

data/test/dummy/log/test.log

@@ -4,9 +4,9 @@ BootstrapGeneratorTest: test_Assert_folder_layout_and_.gitkeep_files_are_properl
 -----------------------------------------------------------------
 BootstrapGeneratorTest: test_Does_not_error_if_Gemfile_is_missing
 -----------------------------------------------------------------
---------------------------------------------------------------------
-BootstrapGeneratorTest: test_Removed_app/assets/javascript_directory
---------------------------------------------------------------------
+---------------------------------------------
+BootstrapGeneratorTest: test_Removed_jbuilder
+---------------------------------------------
 -----------------------------------------------
 BootstrapGeneratorTest: test_Removes_turbolinks
 -----------------------------------------------
@@ -76,6 +76,9 @@ ModelGeneratorTest: test_create_model
 ------------------------------------------------
 ModelGeneratorTest: test_create_namespaced_model
 ------------------------------------------------
+--------------------------------------------------------
+ModelGeneratorTest: test_forces_pluarl_names_to_singular
+--------------------------------------------------------
 ---------------------------------------------------------------------------
 ModelGeneratorTest: test_leave_parentheses_when_create_model_w/o_attributes
 ---------------------------------------------------------------------------
@@ -100,12 +103,39 @@ ResourceOverrideTest: test_create_template_with_ember
 --------------------------------------------------------
 ResourceOverrideTest: test_create_template_without_ember
 --------------------------------------------------------
+-----------------------------------------------------------------------------
+ResourceOverrideTest: test_does_not_create_non-essential_files_for_ember_apps
+-----------------------------------------------------------------------------
 ----------------------------------------------------------
 RouteGeneratorTest: test_Assert_files_are_properly_created
 ----------------------------------------------------------
 -------------------------------------------
 ScaffoldGeneratorTest: test_create_template
 -------------------------------------------
+-----------------------------------------------------
+ScaffoldOverrideTest: test_create_template_with_ember
+-----------------------------------------------------
+--------------------------------------------------------
+ScaffoldOverrideTest: test_create_template_without_ember
+--------------------------------------------------------
+--------------------------------------------------------------------
+ScaffoldOverrideTest: test_creates_api_version_namespaced_controller
+--------------------------------------------------------------------
+----------------------------------------------------------------
+ScaffoldOverrideTest: test_creates_properly_namespaced_api_route
+----------------------------------------------------------------
+----------------------------------------------------------------------------------------------------------------------
+ScaffoldOverrideTest: test_creates_properly_namespaced_api_routes_when_api_and_other_version_namespaces_already_exists
+----------------------------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------------------
+ScaffoldOverrideTest: test_creates_properly_namespaced_api_routes_when_api_and_version_namespaces_already_exists
+----------------------------------------------------------------------------------------------------------------
+---------------------------------------------------------------------------------------------------
+ScaffoldOverrideTest: test_creates_properly_namespaced_api_routes_when_api_namespace_already_exists
+---------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+ScaffoldOverrideTest: test_does_not_create_non-essential_files_for_ember_apps
+-----------------------------------------------------------------------------
 --------------------------------------------------------------
 TemplateGeneratorTest: test_Uses_config.ember.appkit.paths.app
 --------------------------------------------------------------
@@ -130,20 +160,25 @@ ViewGeneratorTest: test_create_view_with_template_by_default
 ------------------------------------------------------
 ViewGeneratorTest: test_create_view_without_a_template
 ------------------------------------------------------
+----------------------------------------------------------------------------------
+AutoloadModulesTest: test_does_create_modules_for_directories_that_have_ruby_files
+----------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------
+AutoloadModulesTest: test_does_not_auto_create_modules_for_directories_that_do_not_have_ruby_files
+--------------------------------------------------------------------------------------------------
 ----------------------------------------------------
 NavigationTest: test_can_render_default_landing_page
 ----------------------------------------------------
-Started GET "/" for 127.0.0.1 at 2013-12-04 12:10:49 -0500
+Started GET "/" for 127.0.0.1 at 2014-01-01 08:12:54 -0500
 Processing by LandingController#index as HTML
-  Rendered inline template within layouts/application (1.0ms)
-Completed 200 OK in 390ms (Views: 389.5ms)
-Started GET "/assets/application.css" for 127.0.0.1 at 2013-12-04 12:10:49 -0500
-Started GET "/assets/application.js" for 127.0.0.1 at 2013-12-04 12:10:49 -0500
+Completed 200 OK in 401ms (Views: 400.8ms)
+Started GET "/assets/application.css" for 127.0.0.1 at 2014-01-01 08:12:54 -0500
+Started GET "/assets/application.js" for 127.0.0.1 at 2014-01-01 08:12:54 -0500
 ---------------------------------------------------
 NavigationTest: test_can_using_simple_"ember_magic"
 ---------------------------------------------------
-Started GET "/" for 127.0.0.1 at 2013-12-04 12:10:50 -0500
+Started GET "/" for 127.0.0.1 at 2014-01-01 08:12:55 -0500
 Processing by LandingController#index as HTML
-Completed 200 OK in 1ms (Views: 1.0ms)
-Started GET "/assets/application.js" for 127.0.0.1 at 2013-12-04 12:10:50 -0500
-Started GET "/assets/application.css" for 127.0.0.1 at 2013-12-04 12:10:50 -0500
+Completed 200 OK in 1ms (Views: 1.2ms)
+Started GET "/assets/application.js" for 127.0.0.1 at 2014-01-01 08:12:55 -0500
+Started GET "/assets/application.css" for 127.0.0.1 at 2014-01-01 08:12:55 -0500

data/test/fixtures/routes_with_api_and_version_namespaces.rb

@@ -0,0 +1,6 @@
+Dummy::Application.routes.draw do
+  namespace :api do
+    namespace :v1 do
+    end
+  end
+end