rspec-jumpstart 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d4a5489b963b8a167d9c35c6377e1a9b75571ae2
-  data.tar.gz: 681a1dedbbe667a7f88c53bde131603eac6269d1
+SHA256:
+  metadata.gz: 9e7fb2e27a41e53c53c809f0197079445c9dfe9c196810b11f927026fa29859e
+  data.tar.gz: 732a6779e43ea5cac52e7eef8737ae3f762f981784451c2c56ef4b2574c10234
 SHA512:
-  metadata.gz: 27160b67cc005a275f060637c521fc0cc25215421aae7a32f11876ff1d19189daa00a83cd336c481386a1eb2a7e1afa99cd5a0240b2fc5d00c123237d3193775
-  data.tar.gz: 8fd2f33404fc8c6ae21821dc69d680d72e98eb89c0f9acface84bc7da19d5a2717a84768d2098fd5d517d9c0d5e3324fe3842b4e51568fb69b562eea132c5214
+  metadata.gz: 1f6c2dfcaaae8f7be36c90af2f6635887ebd0ef04c259b74762681a83a96513430b4d11b3fb339d5dcc0f0d5716c65a5b12fa7e7bbb423a8a2df3efb1738cc3b
+  data.tar.gz: 1f37d5201e46346d07417857a5d18271e600e156fd3c760825b9480fcaa2438ccbbb6b5ee1c783264bc60823b1ba8f8a604c714e4f06e384cef1e5e4cd67fd4b

data/lib/rspec_jumpstart/erb_factory.rb

@@ -51,34 +51,34 @@ module RSpecJumpstart
 
     def get_rails_controller_template(is_full)
       if is_full
-        RSpecJumpstart::ERBTemplates::RAILS_CONTROLLER_NEW_SPEC_TEMPLATE
-      else
-        RSpecJumpstart::ERBTemplates::RAILS_CONTROLLER_METHODS_PART_TEMPLATE
+        return RSpecJumpstart::ERBTemplates::RAILS_CONTROLLER_NEW_SPEC_TEMPLATE
       end
+
+      RSpecJumpstart::ERBTemplates::RAILS_CONTROLLER_METHODS_PART_TEMPLATE
     end
 
     def get_rails_model_template(is_full)
       if is_full
-        RSpecJumpstart::ERBTemplates::RAILS_MODEL_NEW_SPEC_TEMPLATE
-      else
-        RSpecJumpstart::ERBTemplates::RAILS_MODEL_METHODS_PART_TEMPLATE
+        return RSpecJumpstart::ERBTemplates::RAILS_MODEL_NEW_SPEC_TEMPLATE
       end
+
+      RSpecJumpstart::ERBTemplates::RAILS_MODEL_METHODS_PART_TEMPLATE
     end
 
     def get_rails_helper_template(is_full)
       if is_full
-        RSpecJumpstart::ERBTemplates::RAILS_HELPER_NEW_SPEC_TEMPLATE
-      else
-        RSpecJumpstart::ERBTemplates::RAILS_HELPER_METHODS_PART_TEMPLATE
+        return RSpecJumpstart::ERBTemplates::RAILS_HELPER_NEW_SPEC_TEMPLATE
       end
+
+      RSpecJumpstart::ERBTemplates::RAILS_HELPER_METHODS_PART_TEMPLATE
     end
 
     def get_basic_template(is_full)
       if is_full
-        RSpecJumpstart::ERBTemplates::BASIC_NEW_SPEC_TEMPLATE
-      else
-        RSpecJumpstart::ERBTemplates::BASIC_METHODS_PART_TEMPLATE
+        return RSpecJumpstart::ERBTemplates::BASIC_NEW_SPEC_TEMPLATE
       end
+
+      RSpecJumpstart::ERBTemplates::BASIC_METHODS_PART_TEMPLATE
     end
 
   end

data/lib/rspec_jumpstart/erb_templates.rb

@@ -9,117 +9,117 @@ require 'rspec_jumpstart'
 module RSpecJumpstart
   module ERBTemplates
 
-    BASIC_METHODS_PART_TEMPLATE = <<~SPEC
-      <%- methods_to_generate.map { |method| %>
-        # TODO: auto-generated
-        describe '<%= decorated_name(method) %>' do
-          it '<%= method.name %>' do
-      <%- if get_instantiation_code(c, method)      -%><%= get_instantiation_code(c, method) %><%- end -%>
-      <%- if get_params_initialization_code(method) -%><%= get_params_initialization_code(method) %><%- end -%>
-            result = <%= get_method_invocation_code(c, method).sub(c.to_s,'described_class') %>
-
-            expect(result).not_to be_nil
-          end
-        end
-      <% } %>
+    BASIC_METHODS_PART_TEMPLATE = <<-SPEC
+<%- methods_to_generate.map { |method| %>
+  # TODO: auto-generated
+  describe '<%= decorated_name(method) %>' do
+    it '<%= method.name %>' do
+<%- if get_instantiation_code(c, method)      -%><%= get_instantiation_code(c, method) %><%- end -%>
+<%- if get_params_initialization_code(method) -%><%= get_params_initialization_code(method) %><%- end -%>
+      result = <%= get_method_invocation_code(c, method).sub(c.to_s,'described_class') %>
+
+      expect(result).not_to be_nil
+    end
+  end
+<% } %>
 SPEC
 
-    BASIC_NEW_SPEC_TEMPLATE = <<~SPEC
-      # frozen_string_literal: true
+    BASIC_NEW_SPEC_TEMPLATE = <<-SPEC
+# frozen_string_literal: true
 
-      <% if rails_mode then %>require 'rails_helper'
-      <% else -%>require 'spec_helper'
-      <% end -%>
-      <% unless rails_mode then %>require '<%= self_path %>'
-      <% end -%>
+<% if rails_mode then %>require 'rails_helper'
+<% else -%>require 'spec_helper'
+<% end -%>
+<% unless rails_mode then %>require '<%= self_path %>'
+<% end -%>
 
-      RSpec.describe <%= to_string_namespaced_path_whole(file_path) %> do
-      <%= ERB.new(BASIC_METHODS_PART_TEMPLATE, nil, '-').result(binding) -%>
-      end
+RSpec.describe <%= to_string_namespaced_path_whole(file_path) %> do
+<%= ERB.new(BASIC_METHODS_PART_TEMPLATE, nil, '-').result(binding) -%>
+end
 SPEC
 
-    RAILS_CONTROLLER_METHODS_PART_TEMPLATE = <<~SPEC
-      <%- methods_to_generate.map { |method| %>
-        # TODO: auto-generated
-        describe '<%= decorated_name(method) %>' do
-          it '<%= get_rails_http_method(method.name).upcase %> <%= method.name %>' do
-            <%= get_rails_http_method(method.name) %> :<%= method.name %>, {}, {}
-
-            expect(response).to have_http_status(:ok)
-          end
-        end
-      <% } %>
+    RAILS_CONTROLLER_METHODS_PART_TEMPLATE = <<-SPEC
+<%- methods_to_generate.map { |method| %>
+  # TODO: auto-generated
+  describe '<%= decorated_name(method) %>' do
+    it '<%= get_rails_http_method(method.name).upcase %> <%= method.name %>' do
+      <%= get_rails_http_method(method.name) %> :<%= method.name %>, {}, {}
+
+      expect(response).to have_http_status(:ok)
+    end
+  end
+<% } %>
 SPEC
 
-    RAILS_CONTROLLER_NEW_SPEC_TEMPLATE = <<~SPEC
-      # frozen_string_literal: true
+    RAILS_CONTROLLER_NEW_SPEC_TEMPLATE = <<-SPEC
+# frozen_string_literal: true
 
-      require 'rails_helper'
+require 'rails_helper'
 
-      RSpec.describe <%= (to_string_namespaced_path(self_path) + get_complete_class_name(c)).split('::').uniq.join('::') %>, type: :controller do
-      <%= ERB.new(RAILS_CONTROLLER_METHODS_PART_TEMPLATE, nil, '-').result(binding) -%>
-      end
+RSpec.describe <%= (to_string_namespaced_path(self_path) + get_complete_class_name(c)).split('::').uniq.join('::') %>, type: :controller do
+<%= ERB.new(RAILS_CONTROLLER_METHODS_PART_TEMPLATE, nil, '-').result(binding) -%>
+end
 SPEC
 
-    RAILS_MODEL_METHODS_PART_TEMPLATE = <<~SPEC
-      <%= ERB.new(RAILS_MODEL_SCOPE_PART_TEMPLATE, nil, '-').result(binding) -%>
-      <%- methods_to_generate.map { |method| %>
-        # TODO: auto-generated
-        describe '<%= decorated_name(method) %>' do
-          it '<%= method.name %>' do
-      <%- if get_instantiation_code(c, method)      -%><%= get_instantiation_code(c, method) %><%- end -%>
-      <%- if get_params_initialization_code(method) -%><%= get_params_initialization_code(method) %><%- end -%>
-            result = <%= get_method_invocation_code(c, method).sub(c.to_s,'described_class') %>
-
-            expect(result).not_to be_nil
-          end
-        end
-      <% } %>
+    RAILS_MODEL_METHODS_PART_TEMPLATE = <<-SPEC
+<%= ERB.new(RAILS_MODEL_SCOPE_PART_TEMPLATE, nil, '-').result(binding) -%>
+<%- methods_to_generate.map { |method| %>
+  # TODO: auto-generated
+  describe '<%= decorated_name(method) %>' do
+    it '<%= method.name %>' do
+<%- if get_instantiation_code(c, method)      -%><%= get_instantiation_code(c, method) %><%- end -%>
+<%- if get_params_initialization_code(method) -%><%= get_params_initialization_code(method) %><%- end -%>
+      result = <%= get_method_invocation_code(c, method).sub(c.to_s,'described_class') %>
+
+      expect(result).not_to be_nil
+    end
+  end
+<% } %>
 SPEC
 
-    RAILS_MODEL_SCOPE_PART_TEMPLATE = <<~SPEC
-      <%- scope_methods_to_generate.map { |method| %>
-        # TODO: auto-generated
-        describe '.<%= method %>' do # scope test
-          it 'supports named scope <%= method %>' do
-            expect(described_class.limit(3).<%= method %>).to all(be_a(described_class))
-          end
-        end<% } %>
+    RAILS_MODEL_SCOPE_PART_TEMPLATE = <<-SPEC
+<%- scope_methods_to_generate.map { |method| %>
+  # TODO: auto-generated
+  describe '.<%= method %>' do # scope test
+    it 'supports named scope <%= method %>' do
+      expect(described_class.limit(3).<%= method %>).to all(be_a(described_class))
+    end
+  end<% } %>
 SPEC
 
-    RAILS_MODEL_NEW_SPEC_TEMPLATE = <<~SPEC
-      # frozen_string_literal: true
+    RAILS_MODEL_NEW_SPEC_TEMPLATE = <<-SPEC
+# frozen_string_literal: true
 
-      require 'rails_helper'
-      require 'shared_model_stuff'
+require 'rails_helper'
+require 'shared_model_stuff'
 
-      RSpec.describe <%= (to_string_namespaced_path(self_path) + get_complete_class_name(c)).split('::').uniq.join('::') %>, type: :model do
-        it_behaves_like 'real_model'
-      <%= ERB.new(RAILS_MODEL_METHODS_PART_TEMPLATE, nil, '-').result(binding) -%>
-      end
+RSpec.describe <%= (to_string_namespaced_path(self_path) + get_complete_class_name(c)).split('::').uniq.join('::') %>, type: :model do
+  it_behaves_like 'real_model'
+<%= ERB.new(RAILS_MODEL_METHODS_PART_TEMPLATE, nil, '-').result(binding) -%>
+end
 SPEC
 
-    RAILS_HELPER_METHODS_PART_TEMPLATE = <<~SPEC
-      <%- methods_to_generate.map { |method| %>
-        # TODO: auto-generated
-        describe '<%= decorated_name(method) %>' do
-          it 'works' do
-            result = <%= get_rails_helper_method_invocation_code(method) %>
-
-            expect(result).not_to be_nil
-          end
-        end
-      <% } %>
+    RAILS_HELPER_METHODS_PART_TEMPLATE = <<-SPEC
+<%- methods_to_generate.map { |method| %>
+  # TODO: auto-generated
+  describe '<%= decorated_name(method) %>' do
+    it 'works' do
+      result = <%= get_rails_helper_method_invocation_code(method) %>
+
+      expect(result).not_to be_nil
+    end
+  end
+<% } %>
 SPEC
 
-    RAILS_HELPER_NEW_SPEC_TEMPLATE = <<~SPEC
-      # frozen_string_literal: true
+    RAILS_HELPER_NEW_SPEC_TEMPLATE = <<-SPEC
+# frozen_string_literal: true
 
-      require 'rails_helper'
+require 'rails_helper'
 
-      RSpec.describe <%= (to_string_namespaced_path(self_path) + get_complete_class_name(c)).split('::').uniq.join('::') %>, type: :helper do
-      <%= ERB.new(RAILS_HELPER_METHODS_PART_TEMPLATE, nil, '-').result(binding) -%>
-      end
+RSpec.describe <%= (to_string_namespaced_path(self_path) + get_complete_class_name(c)).split('::').uniq.join('::') %>, type: :helper do
+<%= ERB.new(RAILS_HELPER_METHODS_PART_TEMPLATE, nil, '-').result(binding) -%>
+end
 SPEC
 
   end

data/lib/rspec_jumpstart/generator.rb

@@ -39,7 +39,7 @@ module RSpecJumpstart
         else
           puts red("#{file_path} skipped (Class/Module not found).")
         end
-      rescue Exception => e
+      rescue StandardError => e
         puts red("#{file_path} aborted - #{e.message}")
       end
 
@@ -80,10 +80,11 @@ module RSpecJumpstart
     # e.g. "lib/foo/bar_baz.rb" -> "spec/foo/bar_baz_spec.rb"
     #
     def get_spec_path(file_path)
-      spec_dir + '/' + file_path.
-        gsub(/^\.\//, '').
-        gsub(%r{^(lib/)|(app/)}, '').
-        sub(/\.rb$/, '_spec.rb')
+      spec_dir + '/' +
+        file_path
+          .gsub(/^\.\//, '')
+          .gsub(%r{^(lib/)|(app/)}, '')
+          .sub(/\.rb$/, '_spec.rb')
     end
 
     #
@@ -190,14 +191,20 @@ module RSpecJumpstart
         # rubocop:enable Lint/UselessAssignment
 
         erb             = RSpecJumpstart::ERBFactory.new(@delta_template).get_instance_for_appending(rails_mode, spec_path)
-        additional_spec = erb.result(binding)
+        additional_spec = erb.result(binding).strip
 
         last_end_not_found = true
         code               = existing_spec.split("\n").reverse.reject do |line|
           before_modified    = last_end_not_found
           last_end_not_found = line.gsub(/#.+$/, '').strip != 'end' if before_modified
           before_modified
-        end.reverse.join("\n") + "\n" + additional_spec + "\nend\n"
+        end.reverse.join("\n")
+
+        unless additional_spec.empty?
+          code += "\n" + additional_spec + "\n"
+        end
+
+        code += "\nend\n"
 
         if dry_run
           puts "----- #{spec_path} -----"
@@ -213,7 +220,7 @@ module RSpecJumpstart
 
     def skip?(text)
       RSpecJumpstart.config.behaves_like_exclusions.each do |exclude_pattern|
-          return true if text.match(exclude_pattern)
+        return true if text.match(exclude_pattern)
       end
 
       false
@@ -232,16 +239,14 @@ module RSpecJumpstart
     #     bar_baz = BarBaz.new(a, b)
     #
     def get_instantiation_code(c, method)
-      if method.singleton
-        ''
+      return '' if method.singleton
+
+      constructor = c.method_list.find { |m| m.name == 'new' }
+      if constructor.nil?
+        "      #{instance_name(c)} = described_class.new\n"
       else
-        constructor = c.method_list.find { |m| m.name == 'new' }
-        if constructor.nil?
-          "      #{instance_name(c)} = described_class.new\n"
-        else
-          get_params_initialization_code(constructor) +
-            "      #{instance_name(c)} = described_class.new#{to_params_part(constructor.params)}\n"
-        end
+        get_params_initialization_code(constructor) +
+          "      #{instance_name(c)} = described_class.new#{to_params_part(constructor.params)}\n"
       end
     end
 
@@ -277,11 +282,9 @@ module RSpecJumpstart
     # e.g. { |a, b| }
     #
     def get_block_code(method)
-      if method.block_params.nil? || method.block_params.empty?
-        ''
-      else
-        " { |#{method.block_params}| }"
-      end
+      return '' if method.block_params.nil? || method.block_params.empty?
+
+      " { |#{method.block_params}| }"
     end
 
     def get_rails_http_method(method_name)

data/lib/rspec_jumpstart/rdoc_factory.rb

@@ -26,20 +26,11 @@ module RSpecJumpstart
     #
     def self.get_ruby_parser(file_path)
       top_level = RDoc::TopLevel.new(file_path)
-      if RUBY_VERSION.to_f < 2.0
-        # reset is removed since 2.0
-        RDoc::TopLevel.reset
-      end
 
-      # RDoc::Stats initialization
-      if defined?(RDoc::Store)
-        # RDoc 4.0.0 requires RDoc::Store internally.
-        store = RDoc::Store.new
-        top_level.store = store
-        stats = RDoc::Stats.new(store, 1)
-      else
-        stats = RDoc::Stats.new(1)
-      end
+      # RDoc 4.0.0 requires RDoc::Store internally.
+      store           = RDoc::Store.new
+      top_level.store = store
+      stats           = RDoc::Stats.new(store, 1)
 
       RDoc::Parser::Ruby.new(
         top_level,
@@ -55,15 +46,13 @@ module RSpecJumpstart
     #
     def self.extract_target_class_or_module(top_level)
       c = top_level.classes.first
-      if c.nil?
-        m = top_level.modules.first
-        if m.nil?
-          top_level.is_a?(RDoc::NormalModule) ? top_level : nil
-        else
-          extract_target_class_or_module(m)
-        end
+      return c if c
+
+      m = top_level.modules.first
+      if m.nil?
+        top_level.is_a?(RDoc::NormalModule) ? top_level : nil
       else
-        c
+        extract_target_class_or_module(m)
       end
     end
 

data/lib/rspec_jumpstart/version.rb

@@ -4,5 +4,5 @@
 # Gem version
 #
 module RSpecJumpstart
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-jumpstart
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Timothy Chambers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies: []
 description: rspec-jumpstart supports you writing tests for existing code.
 email:
@@ -45,8 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: rspec-jumpstart supports you writing tests for existing code.