i18n_scaffold_controller_template 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5be1d0c48add774430a147307a864bb0ad4c15c
-  data.tar.gz: 65dfa105d73484845b64901b45ad32a5f9d01b31
+  metadata.gz: 9f118a618d5b47e4c01fccfaf491f516234e25d5
+  data.tar.gz: 4dc88ed2b056b835b168128f63b500ece0e869f5
 SHA512:
-  metadata.gz: 2d20bab09bd53cd99725a7ebb2b080d2e28530882db9f2edbcd788fdb8d51c15781a54d2285fe092184247c5ef1f0221ad8af209d14ddd8a1ab393e7cd50bb26
-  data.tar.gz: 829800401b1aaa21e114c86bdb5479ac59839888f6b15e9af05dcae5ae8a3a048dab56e90b5ab214b656908a540d2fae574b4a7e2a00f97faa3837762bc5c70b
+  metadata.gz: 0f1ec0a3a8ac5ca0d8f8a8673bdc154a158e5aa8f43d2e689984eed0b95537cfb030e585aaaff0ed54185d5fc3fb1926af0d230883d905f4438dd17fcadc0091
+  data.tar.gz: df46539e5f336a2c1fa982a9ed4ea709d7e297101d0ec4005ded5113bc68d46f1be876303194f81e0dddbaafc4c2da2303a38887ef3d513ca901c58fe04c3f28

data/README.rdoc

@@ -21,6 +21,12 @@ Next time you run
 
 you will get the controller with the named functionalities.
 
+== New options
+
+[with_api]  adding --with_api will generate one additional controller in the namespace `Api::`
+
+[api_version]  this parameter adds an additional namespace specified after `Api::`
+
 == Contributing to i18n_scaffold_controller_template
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-1.1.1
+2.0.0

data/i18n_scaffold_controller_template.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: i18n_scaffold_controller_template 1.1.1 ruby lib
+# stub: i18n_scaffold_controller_template 2.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "i18n_scaffold_controller_template"
-  s.version = "1.1.1"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Dmitri Koulikoff"]
-  s.date = "2015-09-25"
+  s.date = "2016-09-16"
   s.description = "Scaffold controller template expoiting i18n and aware of cancan and WiceGrid"
   s.email = "dima@koulikoff.ru"
   s.extra_rdoc_files = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "i18n_scaffold_controller_template.gemspec",
     "lib/i18n_scaffold_controller_template.rb",
     "lib/i18n_scaffold_controller_template/generators/rails/scaffold_controller_generator.rb",
+    "lib/i18n_scaffold_controller_template/generators/rails/templates/api_controller.rb",
     "lib/i18n_scaffold_controller_template/generators/rails/templates/controller.rb",
     "lib/i18n_scaffold_controller_template/railtie.rb",
     "spec/i18n_scaffold_controller_template_spec.rb",
@@ -36,7 +37,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/dima4p/i18n_scaffold_controller_template"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5"
+  s.rubygems_version = "2.5.1"
   s.summary = "Scaffold controller template expoiting i18n and aware of cancan and WiceGrid"
 
   if s.respond_to? :specification_version then

data/lib/i18n_scaffold_controller_template/generators/rails/scaffold_controller_generator.rb

@@ -3,8 +3,22 @@ require 'rails/generators/rails/scaffold_controller/scaffold_controller_generato
 
 module Rails
   module Generators
-    class ScaffoldControllerGenerator
+    class ScaffoldControllerGenerator < NamedBase
+      class_option :with_api, type: :boolean,
+                         desc: "Generates also API controller in 'app/contorllers/api'"
+      class_option :api_version, type: :string,
+                         desc: "Adds specified path as version to 'app/contorllers/api'"
+
       source_paths.unshift File.expand_path('../templates', __FILE__)
+
+      def create_api_controller_with_namespace
+        return unless options.with_api?
+        path = ['app/controllers/api']
+        path << options[:api_version].underscore if options[:api_version].present?
+        path << controller_class_path << "#{controller_file_name}_controller.rb"
+        template 'api_controller.rb', File.join(*path)
+      end
+
     end
   end
 end

data/lib/i18n_scaffold_controller_template/generators/rails/templates/api_controller.rb

@@ -0,0 +1,96 @@
+<% if namespaced? -%>
+require_dependency "<%= namespaced_path %>/application_controller"
+
+<% end -%>
+<% module_namespacing do -%>
+class Api::<%= options[:api_version].camelcase + '::' if options[:api_version].present? %><%= controller_class_name %>Controller < ApiController
+<% if defined? CanCan -%>
+  # before_action :set_<%= singular_table_name %>, only: [:show, :update, :destroy]
+  load_and_authorize_resource
+<% else -%>
+  before_action :set_<%= singular_table_name %>, only: [:show, :update, :destroy]
+<% end -%>
+
+  # GET <%= route_url %>
+  def index
+<% unless defined? CanCan -%>
+    @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
+
+<% end -%>
+<% if defined? Kaminari -%>
+    @<%= plural_table_name %> = @<%= plural_table_name %>.page(params[:page]) if params[:page].present?
+    @<%= plural_table_name %> = @<%= plural_table_name %>.per(params[:per_page]) if params[:per_page].present?
+<% end -%>
+<% if options.jbuilder? -%>
+    render '<%= "/#{plural_table_name}/index.json" %>'
+<% else -%>
+    render json: <%= "@#{plural_table_name}" %>
+<% end -%>
+  end
+
+  # GET <%= route_url %>/1
+  def show
+<% if options.jbuilder? -%>
+    render '<%= "/#{plural_table_name}/show.json" %>'
+<% else -%>
+    render json: <%= "@#{singular_table_name}" %>
+<% end -%>
+  end
+
+  # POST <%= route_url %>
+  def create
+<% unless defined? CanCan -%>
+    @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
+
+<% end -%>
+    if @<%= orm_instance.save %>
+<% if options.jbuilder? -%>
+      render '<%= "/#{plural_table_name}/show.json" %>', status: :created, location: <%= "@#{singular_table_name}" %>
+<% else -%>
+      render json: <%= "@#{singular_table_name}" %>, status: :created, location: <%= "@#{singular_table_name}" %>
+<% end -%>
+    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") %>
+<% if options.jbuilder? -%>
+      render '<%= "/#{plural_table_name}/show.json" %>'
+<% else -%>
+      render json: <%= "@#{singular_table_name}" %>
+<% end -%>
+    else
+      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+    end
+  end
+
+  # DELETE <%= route_url %>/1
+  def destroy
+    @<%= orm_instance.destroy %>
+  end
+
+  private
+
+<% unless defined? CanCan -%>
+  # 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
+
+<% end -%>
+  # Only allow a trusted parameter "white list" through.
+  def <%= "#{singular_table_name}_params" %>
+<%- if attributes_names.empty? -%>
+    params.fetch(:<%= singular_table_name %>, {})
+<%- else -%>
+    list = [
+      <%= attributes_names.map { |name| ":#{name}" }.join(', ') %>
+    ]
+    params.require(:<%= singular_table_name %>).permit(*list)
+<%- end -%>
+  end
+end
+<% end -%>

data/lib/i18n_scaffold_controller_template/generators/rails/templates/controller.rb

@@ -7,22 +7,22 @@ require_dependency "<%= namespaced_file_path %>/application_controller"
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
 
-<% if Rails.application.config.generators.options[:rails][:cancan] -%>
-  # before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
+<% if defined? CanCan -%>
   load_and_authorize_resource
 <% else -%>
   before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
 <% end -%>
 
   # GET <%= route_url %>
-  # GET <%= route_url %>.json
   def index
-<% if Rails.application.config.generators.options[:rails][:cancan] -%>
-    # @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
-<% else -%>
+<% unless defined? CanCan -%>
     @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
 <% end -%>
-<% if defined?(Wice::WiceGrid) or defined?(Kaminari) -%>
+<% if options.with_api? -%>
+<% if defined? Wice::WiceGrid -%>
+    @grid = initialize_grid @<%= plural_table_name %>
+<% end -%>
+<% elsif defined?(Wice::WiceGrid) or defined?(Kaminari) -%>
     respond_to do |format|
       format.html do
 <% if defined? Wice::WiceGrid -%>
@@ -40,15 +40,12 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
   # GET <%= route_url %>/1
-  # GET <%= route_url %>/1.json
   def show
   end
 
   # GET <%= route_url %>/new
   def new
-<% if Rails.application.config.generators.options[:rails][:cancan] -%>
-    # @<%= singular_table_name %> = <%= orm_class.build(class_name) %>
-<% else -%>
+<% unless defined? CanCan -%>
     @<%= singular_table_name %> = <%= orm_class.build(class_name) %>
 <% end -%>
   end
@@ -58,14 +55,17 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
   # POST <%= route_url %>
-  # POST <%= route_url %>.json
   def create
-<% if Rails.application.config.generators.options[:rails][:cancan] -%>
-    # @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
-<% else -%>
+<% unless defined? CanCan -%>
     @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
-<% end -%>
 
+<% end -%>
+<% if options.with_api? -%>
+    if @<%= orm_instance.save %>
+      redirect_to @<%= singular_table_name %>, notice: t('<%= table_name %>.was_created')
+    else
+      render :new
+<% else -%>
     respond_to do |format|
       if @<%= orm_instance.save %>
         format.html { redirect_to @<%= singular_table_name %>, notice: t('<%= table_name %>.was_created') }
@@ -74,12 +74,18 @@ class <%= controller_class_name %>Controller < ApplicationController
         format.html { render :new }
         format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
       end
+<% end -%>
     end
   end
 
   # PATCH/PUT <%= route_url %>/1
-  # PATCH/PUT <%= route_url %>/1.json
   def update
+<% if options.with_api? -%>
+    if @<%= orm_instance.update("#{singular_table_name}_params") %>
+      redirect_to @<%= singular_table_name %>, notice: t('<%= table_name %>.was_updated')
+    else
+      render :edit
+<% else -%>
     respond_to do |format|
       if @<%= orm_instance.update("#{singular_table_name}_params") %>
         format.html { redirect_to @<%= singular_table_name %>, notice: t('<%= table_name %>.was_updated') }
@@ -88,22 +94,26 @@ class <%= controller_class_name %>Controller < ApplicationController
         format.html { render :edit }
         format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
       end
+<% end -%>
     end
   end
 
   # DELETE <%= route_url %>/1
-  # DELETE <%= route_url %>/1.json
   def destroy
     @<%= orm_instance.destroy %>
+<% if options.with_api? -%>
+    redirect_to <%= index_helper %>_url, notice: t('<%= table_name %>.was_deleted')
+<% else -%>
     respond_to do |format|
       format.html { redirect_to <%= index_helper %>_url, notice: t('<%= table_name %>.was_deleted') }
       format.json { head :no_content }
     end
+<% end -%>
   end
 
   private
 
-<% if Rails.application.config.generators.options[:rails][:cancan] -%>
+<% if defined? CanCan -%>
   # 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]") %>
@@ -117,14 +127,14 @@ class <%= controller_class_name %>Controller < ApplicationController
 
   # 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 -%>
+<%- if attributes_names.empty? -%>
+    params.fetch(:<%= singular_table_name %>, {})
+<%- else -%>
     list = [
       <%= attributes_names.map { |name| ":#{name}" }.join(', ') %>
     ]
-    params.require(<%= ":#{singular_table_name}" %>).permit(*list)
-    <%- end -%>
+    params.require(:<%= singular_table_name %>).permit(*list)
+<%- end -%>
   end
 end
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n_scaffold_controller_template
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Dmitri Koulikoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -98,6 +98,7 @@ files:
 - i18n_scaffold_controller_template.gemspec
 - lib/i18n_scaffold_controller_template.rb
 - lib/i18n_scaffold_controller_template/generators/rails/scaffold_controller_generator.rb
+- lib/i18n_scaffold_controller_template/generators/rails/templates/api_controller.rb
 - lib/i18n_scaffold_controller_template/generators/rails/templates/controller.rb
 - lib/i18n_scaffold_controller_template/railtie.rb
 - spec/i18n_scaffold_controller_template_spec.rb
@@ -122,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Scaffold controller template expoiting i18n and aware of cancan and WiceGrid