myrails 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6835e4654f3921eb1bd5e951dc1b1e9b8792af9
-  data.tar.gz: df6dbb5f9bb3cb4ee67014df715da12c44d3ac7e
+  metadata.gz: 9ed7e61ea2b40e5a344c676140da8f60af448c8e
+  data.tar.gz: d41681dca063a5c9b72fe9642754ce560725c440
 SHA512:
-  metadata.gz: 22f504e636872cea1b66f945e36759e7e6044ecbcd921cdbe25986a0de3cab4a762bd8b5fe1ec31a86f53ca5fdcb5e9a4c0fbf8327b200e36a60e97a28bd116d
-  data.tar.gz: 70a8d6cdf73948023c7a16276d32daead723a3eb5d658bc9258dc17a4e847b32ece28cc06fd55a7e1b1345d9dbbc5c87b796feb4775d0fb069d7ccc184158a35
+  metadata.gz: 5438539fcbd03f0d222086028234936d46c5e0be42d86a7f61a7688c9f91470794f569fc0a4d48d1d2ada1c4ef85f4484eac99000137055918b942a8b08b0e62
+  data.tar.gz: 3185b829a2982195df217b380496851e2c15bd1d98bea77827fe807e395c60b17ba8202821e2893623de23ef7dc320842ecf3716139295332ef4e504cc59c8ee

data/lib/myrails/templates/initializers/application_vars.rb

@@ -0,0 +1,2 @@
+# Load application ENV vars and merge with existing ENV vars. Loaded here so can use values in initializers.
+ENV.update YAML.load_file('config/application.yml')[Rails.env] rescue {}

data/lib/myrails/templates/mailer/sendgrid.rb

@@ -1,8 +1,8 @@
-# config.action_mailer.delivery_method = :smtp
-# config.action_mailer.smtp_settings = { address:              'smtp.sendgrid.net',
-#                                      port:                 587,
-#                                      domain:               'yourdomain.com',
-#                                      user_name:            'someuser',
-#                                      password:             'somepassword',
-#                                      authentication:       'plain',
-#                                      enable_starttls_auto: true }
+config.action_mailer.delivery_method = :smtp
+config.action_mailer.smtp_settings = { address:              'smtp.sendgrid.net',
+                                     port:                 587,
+                                     domain:               'yourdomain.com',
+                                     user_name:            'someuser',
+                                     password:             'somepassword',
+                                     authentication:       'plain',
+                                     enable_starttls_auto: true }

data/lib/myrails/templates/rails/application.yml

@@ -0,0 +1,19 @@
+# use: ENV['email']
+# Add code to place file in config/initializers
+# Load application ENV vars and merge with existing ENV vars. Loaded here so can use values in initializers.
+# ENV.update YAML.load_file('config/application.yml')[Rails.env] rescue {}
+defaults: &defaults
+  email: dev@example.com
+  secret: mypassword
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults
+  email: test@example.com
+
+production:
+  <<: *defaults
+  email: info@example.com
+  secret: mypassword

data/lib/myrails/templates/rails/controller.rb

@@ -1,12 +1,12 @@
-class <%= options[:name].pluralize.camelize %>Controller < ApplicationController
-  # before_action :<%= options[:name].singularize %>, only: []
+class <%= options[:name].pluralize.camelize %>Controller < <% if options[:name].include?("/")%><%= options[:name].split("/").first.camelize %>::<%= options[:name].split("/").first.camelize %><% else %>Application<% end %>Controller
+  # before_action :<%= options[:name].split("/").last.singularize %>, only: []
   private
 
-  def <%= options[:name].singularize %>
-    @<%= options[:name].singularize %> = <%= options[:name].camelize.singularize %>.find(params[:id])
+  def <%= options[:name].split("/").last.singularize %>
+    @<%= options[:name].split("/").last.singularize %> = <%= options[:name].camelize.singularize %>.find(params[:id])
   end
 
-  def <%= options[:name].singularize %>_params
-    params.require(:<%= options[:name].singularize %>).permit()
+  def <%= options[:name].split("/").last.singularize %>_params
+    params.require(:<%= options[:name].split("/").last.singularize %>).permit()
   end
 end

data/lib/myrails/templates/rails/namespace_controller.rb

@@ -1,14 +1,2 @@
-module <%= options[:namespace].camelize %>
-  class <%= options[:name].pluralize.camelize %>Controller < <%= options[:namespace].camelize %>::<%= options[:namespace].camelize %>Controller
-    # before_action :<%= options[:name].singularize %>, only: []
-    private
-
-    def <%= options[:name].singularize.downcase %>
-      @<%= options[:name].singularize %> = <%= options[:name].camelize.singularize %>.find(params[:id])
-    end
-
-    def <%= options[:name].singularize.downcase %>_params
-      params.require(:<%= options[:name.downcase].singularize %>).permit()
-    end
-  end
+class <%= options[:name].split("/").first.camelize %>::<%= options[:name].split("/").first.camelize %>Controller < ApplicationController
 end

data/lib/myrails/templates/rails/namespace_model.rb

@@ -1,4 +1,5 @@
-module <%= options[:namespace].camelize %>
-  class <%= options[:name].camelize %> < ApplicationRecord
+module <%= options[:name].split("/").first.camelize %>
+  def self.table_name_prefix
+    '<%= options[:name].split("/").first.downcase %>_'
   end
 end

data/lib/myrails/templates/rails/pundit.rb

@@ -1,26 +1,26 @@
 # @author Lovell McIlwain
 #
-# Authorization for article objects
+# Authorization for <%= options[:name] %> objects
 class <%= options[:name].camelize %>Policy < ApplicationPolicy
-  # Allow all users to access new article objects
+  # Allow all users to access new <%= options[:name] %>
   def new?
     true
   end
 
-  # Allows owner of an article to edit the article
+  # Allows owner to edit <%= options[:name].camelize %>
   def edit?
     user == record.user
   end
 
-  # Allows all users to create article objects
+  # Allows all users to create <%= options[:name].camelize %>
   alias_method :create?, :new?
 
-  # Allows all users to view article objects
+  # Allows all users to view <%= options[:name].camelize %>
   alias_method :show?, :new?
 
-  # Allows owner of an article to update an article object
+  # Allows owner to update an <%= options[:name].camelize %>
   alias_method :update?, :edit?
 
-  # Allows owner of an object to remove an object
+  # Allows owner to remove an <%= options[:name].camelize %>
   alias_method :destroy?, :edit?
 end

data/lib/myrails/templates/rspec/factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :<%= options[:name] %> do
+  factory :<%= options[:name].gsub("/", "_") %>, class: "<%= options[:name].camelize %>" do
 
   end
 end

data/lib/myrails/templates/rspec/pundit.rb

@@ -1,9 +1,9 @@
 # Use with Pundit Matches: https://github.com/chrisalley/pundit-matchers
 require 'rails_helper'
 describe <%= options[:name].camelize %>Policy do
-  subject { <%= options[:name].camelize %>Policy.new(user, <%= options[:name] %>) }
+  subject { <%= options[:name].camelize %>Policy.new(user, <%= options[:name].split("/").last %>) }
 
-  let(:<%= options[:name] %>) { create :<%= options[:name] %> }
+  let(:<%= options[:name].split("/").last %>) { create :<%= options[:name].gsub("/", "_") %> }
 
   context 'for a visitor' do
     it {is_expected.to permit_action(:new)}
@@ -16,7 +16,7 @@ describe <%= options[:name].camelize %>Policy do
 
   context "for an admin" do
 
-    let(:user) { <%= options[:name] %>.user }
+    let(:user) { <%= options[:name].split("/").last %>.user }
 
     it {is_expected.to permit_action(:new)}
     it {is_expected.to permit_action(:create)}

data/lib/myrails/version.rb

@@ -1,3 +1,3 @@
 module Myrails
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

data/lib/myrails.rb

@@ -9,55 +9,46 @@ module Myrails
     TEMPLATES = source_root
     ENVIRONMENTS = %w(development test production)
 
-    desc 'model', 'Generates and empty rails model with the given name and its related spec file Use --namespace=namespace to create a namespaced model'
+    desc 'model', "Generates a rails model with the given name along with its related spec file and namespace prefix for table creation. Use '/' to create a namespaced model"
     option :name, required: true
-    option :namespace
     def model
-      if options[:namespace]
-        template 'rails/namespace_model.rb', "app/models/#{options[:namespace]}/#{options[:name]}.rb"
-        template 'rspec/namespace_model.rb', "spec/models/#{options[:namespace]}/#{options[:name]}_spec.rb"
-      else
-        template 'rails/model.rb', "app/models/#{options[:name]}.rb"
-        template 'rspec/model.rb', "spec/models/#{options[:name]}_spec.rb"
-      end
+      template 'rails/model.rb', "app/models/#{options[:name].downcase}.rb"
+      template 'rails/namespace_model.rb', "app/models/#{options[:name].split("/").first.singularize.downcase}.rb" if options[:name].include?("/")
+      template 'rspec/model.rb', "spec/models/#{options[:name].downcase}_spec.rb"
     end
 
-    desc 'controller', 'Generate a rails controller with the given name along with boiler plate code and related spec file. Add --namespace=NAME to create a namespaced controller'
+    desc 'controller', "Generates a rails controller with the given name along with related spec file. Use '/' to create a namespaced controller"
     option :name, required: true
-    option :namespace
     def controller
-      if options[:namespace]
-        template 'rails/namespace_controller.rb', "app/controllers/#{options[:namespace]}/#{options[:name].pluralize}_controller.rb"
-        template 'rails/parent_namespace_controller.rb', "app/controllers/#{options[:namespace]}/#{options[:namespace]}_controller.rb"
-        template 'rspec/namespace_controller.rb', "spec/controllers/#{options[:namespace]}/#{options[:name].pluralize}_controller_spec.rb"
-        run "mkdir -p app/views/#{options[:namespace]}/#{options[:name].pluralize}"
-      else
-        template 'rails/controller.rb', "app/controllers/#{options[:name].pluralize}_controller.rb"
-        template 'rspec/controller.rb', "spec/controllers/#{options[:name].pluralize}_controller_spec.rb"
-        run "mkdir -p app/views/#{options[:name].pluralize}"
+      template 'rails/controller.rb', "app/controllers/#{options[:name].downcase.pluralize}_controller.rb"
+      if options[:name].include?("/")
+        parent, child = options[:name].split("/")
+        template 'rails/namespace_controller.rb', "app/controllers/#{parent}/#{parent.downcase}_controller.rb"
       end
+      template 'rspec/controller.rb', "spec/controllers/#{options[:name].downcase.pluralize}_controller_spec.rb"
+      run "mkdir -p app/views/#{options[:name].downcase.pluralize}"
     end
 
-    desc 'policy', 'Generate a pundit policy with the given name and a related spec file'
+    desc 'policy', "Generates a pundit policy with the given name and a related spec file. Use '/' to create a namespaced policy"
     option :name, required: true
     def policy
-      template 'rails/pundit.rb', "app/policies/#{options[:name]}_policy.rb"
-      template 'rspec/pundit.rb', "spec/policies/#{options[:name]}_policy_spec.rb"
+      template 'rails/pundit.rb', "app/policies/#{options[:name].downcase}_policy.rb"
+      template 'rspec/pundit.rb', "spec/policies/#{options[:name].downcase}_policy_spec.rb"
     end
 
-    desc 'presenter', 'Generate a presenter class with the given name and a related spec file'
+    desc 'presenter', "Generates a presenter class with the given name and a related spec file. Use '/' to create a namespaced presenter"
     option :name, required: true
     def presenters
       copy_file 'presenters/base.rb', 'app/presenters/base_presenter.rb'
-      template 'presenters/presenter.rb', "app/presenters/#{options[:name]}_presenter.rb"
+      template 'presenters/presenter.rb', "app/presenters/#{options[:name].downcase}_presenter.rb"
       copy_file 'presenters/presenter_config.rb', 'spec/support/configs/presenter.rb'
-      template 'presenters/presenter_spec.rb', "spec/presenters/#{options[:name]}_presenter_spec.rb"
+      template 'presenters/presenter_spec.rb', "spec/presenters/#{options[:name].downcase}_presenter_spec.rb"
     end
 
-    desc 'factory', 'Generate a factory_girl file for use with rspec'
+    desc 'factory', "Generates a factory_girl factory in the spec/factories directory. Use '/' to create a namespaced factory"
     option :name, required: true
     def factory
-      template 'rspec/factory.rb', "spec/factories/#{options[:name]}.rb"
+      template 'rspec/factory.rb', "spec/factories/#{options[:name].downcase}.rb"
     end
 
     desc 'install_application_helper', 'Replace current application helper with one that has commonly used code'
@@ -98,15 +89,15 @@ gem 'rspec-rails', group: :test
       copy_file 'rspec/files.rb', 'spec/support/configs/files.rb'
     end
 
-    desc 'install_mailer', 'Generate sendgrid initializer and mail interceptor'
+    desc 'sendgrid', 'Generate sendgrid initializer and mail interceptor'
     option :email, required: true
-    def install_mailer
+    def sendgrid
       copy_file 'mailer/sendgrid.rb', 'config/initializers/sendgrid.rb'
       template 'mailer/dev_mail_interceptor.rb', 'app/mailers/dev_mail_interceptor.rb'
       ENVIRONMENTS.each do |environment|
         unless environment == 'production'
-          inject_into_file "config/environments/#{environment}.rb", after: "# config.action_view.raise_on_missing_translations = true\n" do <<-CODE
-    ActionMailer::Base.register_interceptor(DevMailInterceptor)
+          inject_into_file "config/environments/#{environment}.rb", after: "Rails.application.configure do\n" do <<-CODE
+  ActionMailer::Base.register_interceptor(DevMailInterceptor)
             CODE
           end
         end
@@ -518,6 +509,12 @@ require 'database_cleaner'
       install_footnotes
       git_init
     end
+
+    desc 'use_global_varables', 'creates and loads config/application.yml'
+    def use_global_variables
+      copy_file 'initializers/application_vars.rb', 'config/initializers/application_vars.rb'
+      copy_file 'rails/application.yml', 'config/application.yml'
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myrails
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Vell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,7 @@ files:
 - lib/myrails/templates/engines/rakefile
 - lib/myrails/templates/heroku/Procfile
 - lib/myrails/templates/heroku/puma.rb
+- lib/myrails/templates/initializers/application_vars.rb
 - lib/myrails/templates/layout/_error_messages.html.haml
 - lib/myrails/templates/layout/_footer.html.haml
 - lib/myrails/templates/layout/_info_messages.html.haml
@@ -142,12 +143,12 @@ files:
 - lib/myrails/templates/presenters/presenter.rb
 - lib/myrails/templates/presenters/presenter_config.rb
 - lib/myrails/templates/presenters/presenter_spec.rb
+- lib/myrails/templates/rails/application.yml
 - lib/myrails/templates/rails/application_helper.rb
 - lib/myrails/templates/rails/controller.rb
 - lib/myrails/templates/rails/model.rb
 - lib/myrails/templates/rails/namespace_controller.rb
 - lib/myrails/templates/rails/namespace_model.rb
-- lib/myrails/templates/rails/parent_namespace_controller.rb
 - lib/myrails/templates/rails/pundit.rb
 - lib/myrails/templates/rspec/controller.rb
 - lib/myrails/templates/rspec/database_cleaner.rb
@@ -158,10 +159,7 @@ files:
 - lib/myrails/templates/rspec/javascript.rb
 - lib/myrails/templates/rspec/mailer.rb
 - lib/myrails/templates/rspec/model.rb
-- lib/myrails/templates/rspec/namespace_controller.rb
-- lib/myrails/templates/rspec/namespace_model.rb
 - lib/myrails/templates/rspec/pundit.rb
-- lib/myrails/templates/rspec/pundit_matchers.rb
 - lib/myrails/templates/rspec/request.rb
 - lib/myrails/templates/rspec/request_shared_example.rb
 - lib/myrails/templates/rspec/router.rb
@@ -196,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A thor backed generator for generating rails related files based on my style

data/lib/myrails/templates/rails/parent_namespace_controller.rb

@@ -1,4 +0,0 @@
-module <%= options[:namespace].camelize %>
-  class <%= options[:namespace].camelize %>Controller < ApplicationController
-  end
-end

data/lib/myrails/templates/rspec/namespace_controller.rb

@@ -1,100 +0,0 @@
-require 'rails_helper'
-
-module <%= options[:namespace].camelize %>
-  # Does this controller require authentication?
-  describe <%= options[:name].pluralize.camelize %>Controller do
-    # let(:user) {create :user}
-    let(:<%= options[:name].pluralize %>) {[]}
-    let(:<%= options[:name].singularize %>) {create :<%= options[:name].singularize %>}
-
-    # before {sign_in user}
-
-    describe 'GET index' do
-      before do
-        3.times {<%= options[:name].pluralize %> << create(:<%= options[:name].singularize %>)}
-        get :index
-      end
-
-      it 'sets @<%= options[:name].pluralize %>' do
-        expect(assigns[:<%= options[:name].pluralize %>]).to eq <%= options[:name].pluralize %>
-      end
-    end
-
-    describe 'GET show' do
-      before {get :show, params: {id: <%= options[:name].singularize %>.id}}
-
-      it 'sets @<%= options[:name].singularize %>' do
-        expect(assigns[:<%= options[:name].singularize %>]).to eq <%= options[:name].singularize %>
-      end
-    end
-
-    describe 'GET new' do
-      before {get :new}
-
-      it 'sets @<%= options[:name].singularize %>' do
-        expect(assigns[:<%= options[:name].singularize %>]).to be_a_new <%= options[:name].singularize.camelize %>
-      end
-    end
-
-    describe 'POST create' do
-      context 'successful create' do
-        before {post :create, params: {<%= options[:name].singularize %>: attributes_for(:<%= options[:name].singularize %>)}}
-
-        subject(:<%= options[:name].first %>){assigns[:<%= options[:name].singularize %>]}
-
-        it 'redirects to :show'
-        it 'sets @<%= options[:name].singularize %>'
-        it 'sets flash[:success]'
-        it 'tags the current_user as creator'
-      end
-
-      context 'unsuccessful create' do
-        before {post :create, params: {<%= options[:name].singularize %>: attributes_for(:<%= options[:name].singularize %>, attr: nil)}}
-
-        it 'renders :new template'
-        it 'sets @<%= options[:name].singularize %>'
-        it 'sets flash[:error]'
-      end
-    end
-
-    describe 'GET edit' do
-      before {get :edit, params: {id: <%= options[:name].singularize %>.id}}
-
-      it 'sets @<%= options[:name].singularize %>' do
-        expect(assigns[:<%= options[:name].singularize %>]).to eq <%= options[:name].singularize %>
-      end
-    end
-
-    describe 'PUT/PATCH update' do
-      context 'successful update' do
-        before {put :update, params: {id: <%= options[:name].singularize %>.id, <%= options[:name].singularize %>: attributes_for(:<%= options[:name].singularize %>)}}
-
-        subject(:<%= options[:name].first %>) {assigns[:<%= options[:name].singularize %>]}
-
-        it 'redirects to :show'
-        it 'sets @<%= options[:name].singularize %>'
-        it 'sets flash[:success]'
-        it 'tags current_user as updater'
-      end
-
-      context 'unsuccessful update' do
-        before {put :update, params: {id: <%= options[:name].singularize %>.id, <%= options[:name].singularize %>: attributes_for(:<%= options[:name].singularize %>, attr: nil)}}
-
-        it 'renders :edit template'
-        it 'sets @<%= options[:name].singularize %>'
-        it 'sets flash[:error]'
-      end
-    end
-
-    describe 'DELETE destroy' do
-      before {delete :destroy, params: {id: <%= options[:name].singularize %>.id}}
-
-      it 'redirects to :index' do
-        expect(response).to redirect_to <%= options[:name].pluralize %>_path
-      end
-      it 'sets @<%= options[:name].singularize %>'
-      it 'deletes @<%= options[:name].singularize %>'
-      it 'sets flash[success]'
-    end
-  end
-end

data/lib/myrails/templates/rspec/namespace_model.rb

@@ -1,6 +0,0 @@
-require 'rails_helper'
-
-module <%= options[:namespace] %>
-  describe <%= options[:name].camelize %> do
-  end
-end

data/lib/myrails/templates/rspec/pundit_matchers.rb

@@ -1,47 +0,0 @@
-RSpec::Matchers.define :permitted_to do |action|
-  match do |policy|
-    policy.public_send("#{action}?")
-  end
-
-  failure_message do |policy|
-    "#{policy.class} does not permit #{action} on #{policy.record} for #{policy.user.inspect}."
-  end
-
-  failure_message_when_negated do |policy|
-    "#{policy.class} does not forbid #{action} on #{policy.record} for #{policy.user.inspect}."
-  end
-end
-
-def pundit_error
-  Pundit::NotAuthorizedError
-end
-
-=begin
-
-example: spec/policies/projects_policy_spec.rb
-
-require 'rails_helper'
-
-describe ProjectPolicy do
-  subject { ProjectPolicy.new(user, project) }
-  let(:project) { Fabricate :project }
-
-
-  context 'for a visitor' do
-    it { should_not permitted_to(:create)  }
-    it { should_not permitted_to(:new)     }
-    it { should_not permitted_to(:update)  }
-    it { should_not permitted_to(:edit)    }
-  end
-
-  context "for an admin" do
-    let(:user) { Fabricate(:user, admin: true) }
-
-    it { should permitted_to(:create)  }
-    it { should permitted_to(:new)     }
-    it { should permitted_to(:update)  }
-    it { should permitted_to(:edit)    }
-  end
-end
-
-=end