active_generator 3.0.0 → 4.0.0

data/lib/generators/rails/base.rb

@@ -0,0 +1,11 @@
+module Rails
+  module Base
+
+    private
+
+    def configuration
+      ActiveGenerator::Settings.config
+    end
+
+  end
+end

data/lib/generators/rails/controller_generator.rb

@@ -1,18 +1,21 @@
-require "rails/generators/erb/controller/controller_generator"
-require "rails/generators/rails/controller/controller_generator"
+require 'rails/generators/erb/controller/controller_generator'
+require 'rails/generators/rails/controller/controller_generator'
+require 'generators/rails/base'
 
 module Erb
   module Generators
     class ControllerGenerator
+      include Rails::Base
 
       def generate_locale_file
-        invoke("locale:view", [name]) if ActiveGenerator.configuration.autoload_view_generator_locale
+        invoke('locale:view', [name]) if configuration.autoload_view_generator_locale
       end
 
       def generate_test_file
-        unless ActiveGenerator.configuration.test_framework.nil?
-          invoke("#{ActiveGenerator.configuration.test_framework}:view", [name]) rescue nil
-        end
+        framework = configuration.test_framework
+
+        return if framework.nil?
+        invoke("#{framework}:view", [name]) rescue nil
       end
 
     end
@@ -22,15 +25,17 @@ end
 module Rails
   module Generators
     class ControllerGenerator
+      include Rails::Base
 
       def generate_locale_file
-        invoke("locale:controller", [name]) if ActiveGenerator.configuration.autoload_controller_generator_locale
+        invoke('locale:controller', [name]) if configuration.autoload_controller_generator_locale
       end
 
       def generate_test_file
-        unless ActiveGenerator.configuration.test_framework.nil?
-          invoke("#{ActiveGenerator.configuration.test_framework}:controller", [name]) rescue nil
-        end
+        framework = configuration.test_framework
+
+        return if framework.nil?
+        invoke("#{framework}:controller", [name]) rescue nil
       end
 
     end

data/lib/generators/rails/helper_generator.rb

@@ -1,17 +1,20 @@
-require "rails/generators/rails/helper/helper_generator"
+require 'rails/generators/rails/helper/helper_generator'
+require 'generators/rails/base'
 
 module Rails
   module Generators
     class HelperGenerator
+      include Rails::Base
 
       def generate_locale_file
-        invoke("locale:helper", [name]) if ActiveGenerator.configuration.autoload_helper_generator_locale
+        invoke('locale:helper', [name]) if configuration.autoload_helper_generator_locale
       end
 
       def generate_test_file
-        unless ActiveGenerator.configuration.test_framework.nil?
-          invoke("#{ActiveGenerator.configuration.test_framework}:helper", [name]) rescue nil
-        end
+        framework = configuration.test_framework
+
+        return if framework.nil?
+        invoke("#{framework}:helper", [name]) rescue nil
       end
 
     end

data/lib/generators/rails/job_generator.rb

@@ -1,17 +1,20 @@
-require "rails/generators/job/job_generator"
+require 'rails/generators/job/job_generator'
+require 'generators/rails/base'
 
 module Rails
   module Generators
     class JobGenerator
+      include Rails::Base
 
       def generate_locale_file
-        invoke("locale:job", [name]) if ActiveGenerator.configuration.autoload_job_generator_locale
+        invoke('locale:job', [name]) if configuration.autoload_job_generator_locale
       end
 
       def generate_test_file
-        unless ActiveGenerator.configuration.test_framework.nil?
-          invoke("#{ActiveGenerator.configuration.test_framework}:job", [name]) rescue nil
-        end
+        framework = configuration.test_framework
+
+        return if framework.nil?
+        invoke("#{framework}:job", [name]) rescue nil
       end
 
     end

data/lib/generators/rails/mailer_generator.rb

@@ -1,18 +1,21 @@
-require "rails/generators/erb/mailer/mailer_generator"
-require "rails/generators/mailer/mailer_generator"
+require 'rails/generators/erb/mailer/mailer_generator'
+require 'rails/generators/mailer/mailer_generator'
+require 'generators/rails/base'
 
 module Erb
   module Generators
     class MailerGenerator
+      include Rails::Base
 
       def generate_locale_file
-        invoke("locale:view", [name]) if ActiveGenerator.configuration.autoload_view_generator_locale
+        invoke('locale:view', [name]) if configuration.autoload_view_generator_locale
       end
 
       def generate_test_file
-        unless ActiveGenerator.configuration.test_framework.nil?
-          invoke("#{ActiveGenerator.configuration.test_framework}:view", [name]) rescue nil
-        end
+        framework = configuration.test_framework
+
+        return if framework.nil?
+        invoke("#{framework}:view", [name]) rescue nil
       end
 
     end
@@ -22,15 +25,17 @@ end
 module Rails
   module Generators
     class MailerGenerator
+      include Rails::Base
 
       def generate_locale_file
-        invoke("locale:mailer", [name]) if ActiveGenerator.configuration.autoload_mailer_generator_locale
+        invoke('locale:mailer', [name]) if configuration.autoload_mailer_generator_locale
       end
 
       def generate_test_file
-        unless ActiveGenerator.configuration.test_framework.nil?
-          invoke("#{ActiveGenerator.configuration.test_framework}:mailer", [name]) rescue nil
-        end
+        framework = configuration.test_framework
+
+        return if framework.nil?
+        invoke("#{framework}:mailer", [name]) rescue nil
       end
 
     end

data/lib/generators/rails/model_generator.rb

@@ -1,23 +1,30 @@
-require "rails/generators/active_record/model/model_generator"
+require 'rails/generators/active_record/model/model_generator'
+require 'generators/rails/base'
 
 module ActiveRecord
   module Generators
     class ModelGenerator
+      include Rails::Base
 
       def create_migration_file
         # return unless options[:migration] && options[:parent].nil?
-        attributes.each { |a| a.attr_options.delete(:index) if a.reference? && !a.has_index? } if options[:indexes] == false
-        migration_template "../../migration/templates/create_table_migration.rb", "db/migrate/create_#{table_name}.rb"
+
+        if options[:indexes] == false
+          attributes.each { |attr| attr.attr_options.delete(:index) if attr.reference? && !attr.has_index? }
+        end
+
+        migration_template('../../migration/templates/create_table_migration.rb', "db/migrate/create_#{table_name}.rb")
       end
 
       def generate_locale_file
-        invoke("locale:model", [name]) if ActiveGenerator.configuration.autoload_model_generator_locale
+        invoke('locale:model', [name]) if configuration.autoload_model_generator_locale
       end
 
       def generate_test_file
-        unless ActiveGenerator.configuration.test_framework.nil?
-          invoke("#{ActiveGenerator.configuration.test_framework}:model", [name]) rescue nil
-        end
+        framework = configuration.test_framework
+
+        return if framework.nil?
+        invoke("#{framework}:model", [name]) rescue nil
       end
 
     end

data/lib/generators/rails/scaffold_generator.rb

@@ -1,17 +1,20 @@
-require "rails/generators/erb/scaffold/scaffold_generator"
+require 'rails/generators/erb/scaffold/scaffold_generator'
+require 'generators/rails/base'
 
 module Erb
   module Generators
     class ScaffoldGenerator
+      include Rails::Base
 
       def generate_locale_file
-        invoke("locale:view", [name]) if ActiveGenerator.configuration.autoload_view_generator_locale
+        invoke('locale:view', [name]) if configuration.autoload_view_generator_locale
       end
 
       def generate_test_file
-        unless ActiveGenerator.configuration.test_framework.nil?
-          invoke("#{ActiveGenerator.configuration.test_framework}:view", [name]) rescue nil
-        end
+        framework = configuration.test_framework
+
+        return if framework.nil?
+        invoke("#{framework}:view", [name]) rescue nil
       end
 
     end

data/lib/generators/rails/task_generator.rb

@@ -1,11 +1,11 @@
-require "rails/generators/rails/task/task_generator"
+require 'rails/generators/rails/task/task_generator'
 
 module Rails
   module Generators
     class TaskGenerator
 
       def generate_locale_file
-        invoke("locale:task", [name]) if ActiveGenerator.configuration.autoload_task_generator_locale
+        invoke('locale:task', [name]) if ActiveGenerator::Settings.config.autoload_task_generator_locale
       end
 
     end

data/lib/generators/service/service_generator.rb

@@ -1,12 +1,12 @@
 class ServiceGenerator < Rails::Generators::NamedBase
-  source_root File.expand_path("../templates", __FILE__)
+  source_root File.expand_path('../templates', __FILE__)
 
   def create_service_file
-    template("service.rb", File.join("app/services", class_path, "#{file_name}.rb"))
+    template('service.rb', File.join('app/services', class_path, "#{file_name}.rb"))
   end
 
   def generate_locale_file
-    invoke("locale:service", [name]) if ActiveGenerator.configuration.autoload_service_generator_locale
+    invoke('locale:service', [name]) if ActiveGenerator::Settings.config.autoload_service_generator_locale
   end
 
 end

data/lib/generators/view/view_generator.rb

@@ -1,29 +1,36 @@
-require "fileutils"
+require 'fileutils'
 
 class ViewGenerator < Rails::Generators::NamedBase
-  source_root File.expand_path("../templates", __FILE__)
-  argument :actions, type: :array, required: false, default: [], desc: "The pages to generate"
+  source_root File.expand_path('../templates', __FILE__)
+  argument :actions, type: :array, required: false, default: [], desc: 'The pages to generate'
 
   def create_root_directory
-    empty_directory(File.join("app/views", file_name)) if actions.empty?
+    empty_directory(File.join('app/views', file_name)) if actions.empty?
   end
 
   def create_view_file
     unless actions.empty?
       actions.each do |filename|
-        template("view.html.erb", File.join("app/views", class_path, file_name, "#{filename}.html.erb"))
+        template('view.html.erb', File.join('app/views', class_path, file_name, "#{filename}.html.erb"))
       end
     end
   end
 
   def generate_locale_file
-    invoke("locale:view", [name]) if ActiveGenerator.configuration.autoload_view_generator_locale
+    invoke('locale:view', [name]) if configuration.autoload_view_generator_locale
   end
 
   def generate_test_file
-    unless ActiveGenerator.configuration.test_framework.nil?
-      invoke("#{ActiveGenerator.configuration.test_framework}:view", [name]) rescue nil
-    end
+    framework = configuration.test_framework
+
+    return if framework.nil?
+    invoke("#{framework}:view", [name]) rescue nil
+  end
+
+  private
+
+  def configuration
+    ActiveGenerator::Settings.config
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_generator
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fasterer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: flay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: reek
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Extend the base rails generators with commonly used generators.
 email:
 - j.gomez@drexed.com
@@ -102,8 +158,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".fasterer.yml"
+- ".flayignore"
 - ".gitignore"
+- ".reek"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -115,7 +175,7 @@ files:
 - bin/setup
 - lib/active_generator.rb
 - lib/active_generator/base.rb
-- lib/active_generator/configuration.rb
+- lib/active_generator/settings.rb
 - lib/active_generator/version.rb
 - lib/generators/active_generator/install/install_generator.rb
 - lib/generators/active_generator/install/templates/install.rb
@@ -156,6 +216,7 @@ files:
 - lib/generators/locale/view/USAGE
 - lib/generators/locale/view/templates/view.yml
 - lib/generators/locale/view/view_generator.rb
+- lib/generators/rails/base.rb
 - lib/generators/rails/controller_generator.rb
 - lib/generators/rails/helper_generator.rb
 - lib/generators/rails/job_generator.rb

data/lib/active_generator/configuration.rb

@@ -1,25 +0,0 @@
-class ActiveGenerator::Configuration
-
-  attr_accessor :autoload_controller_generator_locale,
-                :autoload_helper_generator_locale,
-                :autoload_job_generator_locale,
-                :autoload_mailer_generator_locale,
-                :autoload_model_generator_locale,
-                :autoload_service_generator_locale,
-                :autoload_task_generator_locale,
-                :autoload_view_generator_locale,
-                :test_framework
-
-  def initialize
-    @autoload_controller_generator_locale = true
-    @autoload_helper_generator_locale = true
-    @autoload_job_generator_locale = true
-    @autoload_mailer_generator_locale = true
-    @autoload_model_generator_locale = true
-    @autoload_service_generator_locale = true
-    @autoload_task_generator_locale = true
-    @autoload_view_generator_locale = true
-    @test_framework = "test_unit"
-  end
-
-end