kitestrings 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbe25d2970bba5ce75054165c911485a02b2133c
-  data.tar.gz: 404bb3f6a631c64651a2dc7467e98f26d2ca519d
+  metadata.gz: 09a1d7d5265a7012cea917f77889c82ee15d3735
+  data.tar.gz: 27aeeb8c04ef9a59318dee5f57962fbc812c99d9
 SHA512:
-  metadata.gz: f9120863220ddf55e5360113153ed3628c596b398c9ba29a4e9a04d6fcc73cc1df22a1875da863c9006f0997ae9b31dd1967899d3f8125412f360eea2f1d2bf0
-  data.tar.gz: 3c6df627e4878a585cae84e4512a1b8be27267efe6bcb88cca799a0a5e9a2a0e05ce01911f14a9023fd4b4169909923e103cb7aab23ab781522a492b5ec6c338
+  metadata.gz: 2de52f0b07968416e93b1a1e20ca4206018d96f02f25690317cc6cd892fb81f9971cd6aefd5b186ff300e9b021f817406ab3dc8f82c0c693d65ad43ab82c182d
+  data.tar.gz: 9136bbdc03df7fac3b93973dc555d24dcb340feee6b228b4218035fba4b14cccafaaf509969480f70ef830298b7a4bbf2d496502b6e76c44bf5638b0b147c21b

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Version history:
 
+## 1.2.0
+* reformatting for rubocop
+
 ## Next
 
 * Added Kitestrings::Menu classes/modules to assist with rendering menus in web pages.

data/lib/generators/kitestrings/install_generator.rb

@@ -14,6 +14,14 @@ module Kitestrings
         directory "config/environments", "config/environments"
       end
 
+      def copy_seeds_file
+        copy_file "db/seeds.rb", "db/seeds.rb"
+      end
+
+      def copy_rubocop_file
+        copy_file "rubocop/.rubocop.yml", ".rubocop.yml"
+      end
+
       def copy_haml_files
         directory "haml", "lib/templates/haml"
       end
@@ -44,6 +52,7 @@ module Kitestrings
         inject_into_file "app/controllers/application_controller.rb", :after => /protect_from_forgery.*$/ do
           <<-EOF
 
+  respond_to :html
 
   unless Rails.application.config.consider_all_requests_local
     rescue_from CanCan::AccessDenied do |exception|
@@ -52,10 +61,25 @@ module Kitestrings
       render 'public/403', status: 403, layout: 'none'
     end
   end
-          EOF
+EOF
         end
       end
 
+
+      def setup_application_config
+        generators_configuration = <<-END
+config.generators do |g|
+      g.view_specs false
+    end
+
+    config.app_generators do |g|
+      g.templates.unshift File.expand_path('../lib/templates', __FILE__)
+    end
+        END
+
+        environment generators_configuration
+      end
+
     end
   end
 end

data/lib/generators/templates/config/environments/integ.rb

@@ -1,7 +1,6 @@
-load File.expand_path("../production.rb", __FILE__)
+load File.expand_path('../production.rb', __FILE__)
 
 Rails.application.configure do
-
   config.loglevel = :debug
 
   # config.airbrake_api_key = 'AIRBRAKE_KEY'

data/lib/generators/templates/config/environments/uat.rb

@@ -1,7 +1,6 @@
-load File.expand_path("../production.rb", __FILE__)
+load File.expand_path('../production.rb', __FILE__)
 
 Rails.application.configure do
-
   config.log_level = :info
 
   # config.airbrake_api_key = 'AIRBRAKE_KEY'

data/lib/generators/templates/db/seeds.rb

@@ -0,0 +1,2 @@
+Rake::Task['db:fixtures:load'].invoke
+Rake::Task['tmp:clear'].invoke unless ENV['RAILS_ENV'] == 'test'

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

@@ -44,18 +44,19 @@ class <%= controller_class_name %>Controller < ApplicationController
   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
 
-    # Only allow a trusted parameter "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
+  # 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
+
+  # Only allow a trusted parameter "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
 <% end -%>

data/lib/generators/templates/rspec/helper/helper_spec.rb

@@ -12,6 +12,5 @@ require 'rails_helper'
 # end
 <% module_namespacing do -%>
 describe <%= class_name %>Helper do
-
 end
 <% end -%>

data/lib/generators/templates/rspec/integration/request_spec.rb

@@ -0,0 +1,10 @@
+require 'rails_helper'
+
+RSpec.describe '<%= class_name.pluralize %>', <%= type_metatag(:request) %> do
+  describe 'GET /<%= table_name %>' do
+    it 'works! (now write some real specs)' do
+      get <%= index_helper %>_path
+      expect(response).to have_http_status(200)
+    end
+  end
+end

data/lib/generators/templates/rspec/model/model_spec.rb

@@ -2,13 +2,11 @@ require 'rails_helper'
 
 <% module_namespacing do -%>
 describe <%= class_name %> do
-
   common_lets
 
   # define the <%= file_name %>, <%= file_name %>_other,... instances in
   # spec/support/common_lets.rb
   it { expect(<%= file_name %>).to be_valid }
-#  it { expect(<%= file_name %>_other).to be_valid }
-
+  #  it { expect(<%= file_name %>_other).to be_valid }
 end
 <% end -%>

data/lib/generators/templates/rspec/scaffold/controller_spec.rb

@@ -12,16 +12,17 @@ describe <%= controller_class_name %>Controller do
   end
 
   # stub strong params
-  before { controller.stub(<%= file_name %>_params: {}) }
+  before { allow(controller).to receive(:<%= file_name %>_params).and_return({}) }
 
   context 'not logged in' do
     before do
       sign_out :user
     end
 
-    {index: :get, show: :get, new: :get, create: :post, edit: :get, update: :put, destroy: :delete}.each do |v, m|
+    { index: :get, show: :get, new: :get, create: :post, edit: :get, update: :put,
+      destroy: :delete }.each do |v, m|
       it "#{m} #{v} should logout" do
-        self.send(m, v, id: <%= file_name %>)
+        send(m, v, id: <%= file_name %>)
         expect(response).to redirect_to new_user_session_path
       end
     end
@@ -40,9 +41,9 @@ describe <%= controller_class_name %>Controller do
       it { expect(response).to assign_to(:<%= table_name %>).with_items([<%= file_name %>]) }
       it { expect(response).to render_template :index }
       it { expect(response).to have_only_fractures(:new_<%= file_name %>_link) }
-      end
+    end
+<% end -%>
 
-      <% end -%>
     describe 'GET show' do
       before { get :show, id: <%= file_name %> }
 
@@ -55,10 +56,10 @@ describe <%= controller_class_name %>Controller do
       before { get :new }
 
       it { expect(response).to assign_to(:<%= file_name %>).with_kind_of(<%= class_name %>) }
-      #it { expect(response).to assign_to('<%= file_name %>.parent').with(parent) }
+      # it { expect(response).to assign_to('<%= file_name %>.parent').with(parent) }
       it { expect(response).to render_template :new }
       it { expect(response).to have_only_fractures :cancel_new_<%= file_name %>_link }
-      it { expect(response).to have_a_form.that_is_new.with_path_of(<%= table_name %>_path)}
+      it { expect(response).to have_a_form.that_is_new.with_path_of(<%= table_name %>_path) }
     end
 
     describe 'POST create' do
@@ -70,7 +71,7 @@ describe <%= controller_class_name %>Controller do
 
         it { expect(response).to redirect_to <%= file_name %>_path(<%= class_name %>.last) }
         it { expect(response).to assign_to(:<%= file_name %>).with(<%= class_name %>.last) }
-        #it { expect(response).to assign_to('<%= file_name %>.parent').with(parent) }
+        # it { expect(response).to assign_to('<%= file_name %>.parent').with(parent) }
       end
 
       context 'invalid' do
@@ -79,10 +80,10 @@ describe <%= controller_class_name %>Controller do
           post :create
         end
         it { expect(response).to assign_to(:<%= file_name %>).with_kind_of(<%= class_name %>) }
-        #it { expect(response).to assign_to('<%= file_name %>.parent').with(parent) }
+        # it { expect(response).to assign_to('<%= file_name %>.parent').with(parent) }
         it { expect(response).to render_template :new }
         it { expect(response).to have_only_fractures :cancel_new_<%= file_name %>_link }
-        it { expect(response).to have_a_form.that_is_new.with_path_of(<%= table_name %>_path)}
+        it { expect(response).to have_a_form.that_is_new.with_path_of(<%= table_name %>_path) }
       end
     end
 

data/lib/generators/templates/rspec/scaffold/routing_spec.rb

@@ -3,7 +3,6 @@ require 'rails_helper'
 <% module_namespacing do -%>
 describe <%= controller_class_name %>Controller do
   describe 'routing' do
-
 <% unless options[:singleton] -%>
     it('routes to #index') { expect(get('/<%= ns_table_name %>')).to route_to('<%= ns_table_name %>#index') }
 <% end -%>

data/lib/generators/templates/rubocop/.rubocop.yml

@@ -0,0 +1,57 @@
+AllCops:
+  Exclude:
+    - 'db/schema.rb'
+    - '**/db/schema.rb'
+    - 'config/**/*'
+    - 'db/migrate/*'
+    - '**/db/migrate/*'
+    - 'lib/templates/**/*'
+    - 'bin/*'
+  RunRailsCops: true
+
+Style/Documentation:
+  Description: Document classes and non-namespace modules.
+  Enabled: false
+
+Style/StringLiterals:
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-string-literals
+  Enabled: true
+  EnforcedStyle: single_quotes
+  SupportedStyles:
+  - single_quotes
+  - double_quotes
+
+Style/CaseIndentation:
+  Description: Indentation of when in a case/when/[else/]end.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#indent-when-to-case
+  Enabled: true
+  IndentWhenRelativeTo: case
+  SupportedStyles:
+  - case
+  - end
+  IndentOneStep: true
+
+#LineLength:
+#  Max: 100
+Metrics/LineLength:
+  Description: Limit lines to 100 characters.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#80-character-limits
+  Enabled: true
+  Max: 100
+  AllowURI: true
+  URISchemes:
+  - http
+  - https
+
+Style/SymbolProc:
+  Description: Use symbols as procs instead of blocks when possible.
+  Enabled: true
+  IgnoredMethods:
+  - respond_to
+#  - configure
+
+Style/Semicolon:
+  Description: Don't use semicolons to terminate expressions.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-semicolon
+  Enabled: true
+  AllowAsExpressionSeparator: true

data/lib/generators/templates/spec/rails_helper.rb

@@ -1,13 +1,13 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
+ENV['RAILS_ENV'] ||= 'test'
 require 'spec_helper'
-require File.expand_path("../../config/environment", __FILE__)
+require File.expand_path('../../config/environment', __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
+# require 'rspec/autorun'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
@@ -15,7 +15,7 @@ ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
 
 RSpec.configure do |config|
   # clear the test log file before we start.
-  log_file = Rails.root.join("log/test.log")
+  log_file = Rails.root.join('log/test.log')
   File.truncate(log_file, 0) if File.exist?(log_file)
 
   config.include Devise::TestHelpers, type: :controller
@@ -47,8 +47,7 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = "random"
-
+  config.order = 'random'
 
   # RSpec Rails can automatically mix in different behaviours to your tests
   # based on their file location, for example enabling you to call `get` and
@@ -64,4 +63,4 @@ RSpec.configure do |config|
   # The different available types are documented in the features, such as in
   # https://relishapp.com/rspec/rspec-rails/docs
   config.infer_spec_type_from_file_location!
-end
+end

data/lib/generators/templates/support/common_lets.rb

@@ -0,0 +1,2 @@
+def common_lets
+end

data/lib/generators/templates/support/database_cleaner.rb

@@ -1,21 +1,21 @@
 RSpec.configure do |config|
-  config.before(:suite) do
-    DatabaseCleaner.clean_with(:truncation)
-  end
-
-  config.before(:each) do
-    DatabaseCleaner.strategy = :transaction
-  end
-
-  config.before(:each, :js => true) do
+  # config.before(:suite) do
+  #   DatabaseCleaner.clean_with(:truncation)
+  # end
+  #
+  # config.before(:each) do
+  #   DatabaseCleaner.strategy = :transaction
+  # end
+  #
+  config.before(:each, js: true) do
     DatabaseCleaner.strategy = :truncation
   end
-
-  config.before(:each) do
-    DatabaseCleaner.start
-  end
-
-  config.after(:each) do
-    DatabaseCleaner.clean
-  end
-end
+  #
+  # config.before(:each) do
+  #   DatabaseCleaner.start
+  # end
+  #
+  # config.after(:each) do
+  #   DatabaseCleaner.clean
+  # end
+end

data/lib/generators/templates/support/fracture.rb

@@ -2,4 +2,4 @@ RSpec.configure do |config|
   config.after(:all) do
     Fracture.clear
   end
-end
+end

data/lib/generators/templates/support/render_views.rb

@@ -1,3 +1 @@
-RSpec.configure do |config|
-  config.render_views
-end
+RSpec.configure(&:render_views)

data/lib/kitestrings/version.rb

@@ -1,3 +1,3 @@
 module Kitestrings
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/lib/generators/kitestrings/install_generator_spec.rb

@@ -18,6 +18,7 @@ describe Kitestrings::Generators::InstallGenerator do
   context "check files" do
     %w[
         spec/rails_helper.rb
+        .rubocop.yml
         config/deploy.rb
         config/deploy/integ.rb
         config/deploy/uat.rb
@@ -31,7 +32,7 @@ describe Kitestrings::Generators::InstallGenerator do
         lib/templates/haml/scaffold/show.html.haml
         lib/templates/rails/scaffold_controller/controller.rb
         lib/templates/rspec/helper/helper_spec.rb
-        lib/templates/rspec/integration/request.rb
+        lib/templates/rspec/integration/request_spec.rb
         lib/templates/rspec/model/model_spec.rb
         lib/templates/rspec/scaffold/controller_spec.rb
         lib/templates/rspec/scaffold/routing_spec.rb
@@ -49,6 +50,9 @@ describe Kitestrings::Generators::InstallGenerator do
   it "inserted into application_controller" do
     file_contents("app/controllers/application_controller.rb").should match(/rescue_from CanCan::AccessDenied/)
   end
+  it "appended to db/seeds" do
+    file_contents("db/seeds.rb").should match(/Rake::Task/)
+  end
 
   # otherwise it wants to run the specs in the tmp/spec directory
   after(:all) { rm_rf(destination_root) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitestrings
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tom Ridge
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -135,6 +135,7 @@ files:
 - lib/generators/templates/config/deploy/uat.rb
 - lib/generators/templates/config/environments/integ.rb
 - lib/generators/templates/config/environments/uat.rb
+- lib/generators/templates/db/seeds.rb
 - lib/generators/templates/haml/scaffold/_form.html.haml
 - lib/generators/templates/haml/scaffold/edit.html.haml
 - lib/generators/templates/haml/scaffold/index.html.haml
@@ -142,11 +143,13 @@ files:
 - lib/generators/templates/haml/scaffold/show.html.haml
 - lib/generators/templates/rails/scaffold_controller/controller.rb
 - lib/generators/templates/rspec/helper/helper_spec.rb
-- lib/generators/templates/rspec/integration/request.rb
+- lib/generators/templates/rspec/integration/request_spec.rb
 - lib/generators/templates/rspec/model/model_spec.rb
 - lib/generators/templates/rspec/scaffold/controller_spec.rb
 - lib/generators/templates/rspec/scaffold/routing_spec.rb
+- lib/generators/templates/rubocop/.rubocop.yml
 - lib/generators/templates/spec/rails_helper.rb
+- lib/generators/templates/support/common_lets.rb
 - lib/generators/templates/support/database_cleaner.rb
 - lib/generators/templates/support/fracture.rb
 - lib/generators/templates/support/render_views.rb
@@ -196,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: For all the 2rk goodness

data/lib/generators/templates/rspec/integration/request.rb

@@ -1,4 +0,0 @@
-require 'rails_helper'
-
-describe "<%= class_name.pluralize %>" do
-end