i18n_scaffold_controller_template 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe8c303ef97d8e2d23c367bdfa4ce990fd8dc194
-  data.tar.gz: 3fba8a83e037e3d4030156b58ffa4ccb4014d435
+  metadata.gz: 1020ef55cf2e9ad5ab3fbd5953d46172f2b8be90
+  data.tar.gz: a286745cf662822dd884c3fba93c988f39fb0f4b
 SHA512:
-  metadata.gz: 387303d51d924600f30c7e5794e3715a418b7f2f72a1bb21ab964267ba140930d468da6b5f0d6b4a7b026b1f583f5c3030abc7f1b45ef6e5e6410fa2875194a6
-  data.tar.gz: df80ea6c9efe80151b4d2a3bb92b243a0d58c07ecf5119d5a5354772e15bb027d7421d05c40a4b272115825794777c75f71926f7eec80d5c9d495750fb7c6dc6
+  metadata.gz: 625f55dd5beb3af5f8e3bb5b91bf99ca172fdecb212ea6181c499f5ee94b86132b023851a2dc7c5a8289ccda81748f4424237fe109ad80b4525413c6b7db44de
+  data.tar.gz: 4e5965a5ffddaabaa786b549a0fda4f45faf4ca1d12790d0bab325752c1251cd1dbdfd092de6c89b5d110399d8f59f3c9d91fbd82db4dd7464d3027310d4a8ce

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.1.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.0.7 ruby lib
+# stub: i18n_scaffold_controller_template 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "i18n_scaffold_controller_template"
-  s.version = "1.0.7"
+  s.version = "1.1.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-02-25"
+  s.date = "2015-06-15"
   s.description = "Scaffold controller template expoiting i18n and aware of cancan and WiceGrid"
   s.email = "dima@koulikoff.ru"
   s.extra_rdoc_files = [
@@ -28,13 +28,15 @@ Gem::Specification.new do |s|
     "VERSION",
     "i18n_scaffold_controller_template.gemspec",
     "lib/i18n_scaffold_controller_template.rb",
-    "lib/templates/rails/scaffold_controller/controller.rb",
+    "lib/i18n_scaffold_controller_template/generators/rails/scaffold_controller_generator.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",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/dima4p/i18n_scaffold_controller_template"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5"
+  s.rubygems_version = "2.2.2"
   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.rb

@@ -1,7 +1 @@
-module I18nScaffoldControllerTemplate
-  class Railtie < Rails::Railtie
-    config.app_generators do |g|
-      g.templates.unshift File::expand_path('../templates', __FILE__)
-    end 
-  end
-end
+require 'i18n_scaffold_controller_template/railtie' if defined?(Rails)

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

@@ -0,0 +1,10 @@
+require 'rails/generators'
+require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
+
+module Rails
+  module Generators
+    class ScaffoldControllerGenerator
+      source_paths.unshift File.expand_path('../templates', __FILE__)
+    end
+  end
+end

data/lib/{templates/rails/scaffold_controller → i18n_scaffold_controller_template/generators/rails/templates}/controller.rb

@@ -17,7 +17,12 @@ class <%= controller_class_name %>Controller < ApplicationController
   # 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 -%>
+    @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
+<% end -%>
+<% if defined?(Wice::WiceGrid) or defined?(Kaminari) -%>
     respond_to do |format|
       format.html do
 <% if defined? Wice::WiceGrid -%>
@@ -30,6 +35,7 @@ class <%= controller_class_name %>Controller < ApplicationController
         @<%= plural_table_name %> = @<%= plural_table_name %>.per(params[:per_page]) if params[:per_page].present?
 <% end -%>
       end
+<% end -%>
     end
   end
 
@@ -66,7 +72,7 @@ class <%= controller_class_name %>Controller < ApplicationController
         format.json { render :show, status: :created, location: @<%= singular_table_name %> }
       else
         format.html { render :new }
-        format.json { render json: @<%= singular_table_name %>.errors, status: :unprocessable_entity }
+        format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
       end
     end
   end
@@ -80,7 +86,7 @@ class <%= controller_class_name %>Controller < ApplicationController
         format.json { render :show, status: :ok, location: @<%= singular_table_name %> }
       else
         format.html { render :edit }
-        format.json { render json: @<%= singular_table_name %>.errors, status: :unprocessable_entity }
+        format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
       end
     end
   end

data/lib/i18n_scaffold_controller_template/railtie.rb

@@ -0,0 +1,13 @@
+require 'rails/railtie'
+
+class I18nScaffoldControllerTemplate
+  class Railtie < ::Rails::Railtie
+    if Rails::VERSION::MAJOR >= 4
+      generators do |app|
+        Rails::Generators.configure! app.config.generators
+        Rails::Generators.hidden_namespaces.uniq!
+        require 'i18n_scaffold_controller_template/generators/rails/scaffold_controller_generator'
+      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.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Dmitri Koulikoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -97,7 +97,9 @@ files:
 - VERSION
 - i18n_scaffold_controller_template.gemspec
 - lib/i18n_scaffold_controller_template.rb
-- lib/templates/rails/scaffold_controller/controller.rb
+- lib/i18n_scaffold_controller_template/generators/rails/scaffold_controller_generator.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
 - spec/spec_helper.rb
 homepage: http://github.com/dima4p/i18n_scaffold_controller_template
@@ -120,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Scaffold controller template expoiting i18n and aware of cancan and WiceGrid