rspec-kickstarter 0.2.7 → 0.3.0

data/lib/rspec_kickstarter.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
-require "rspec_kickstarter/generator"
-require "rspec_kickstarter/version"
+require 'rspec_kickstarter/generator'
+require 'rspec_kickstarter/version'
 
 #
 # RSpecKickstarter Facade

data/lib/rspec_kickstarter/erb_factory.rb

@@ -17,14 +17,16 @@ class RSpecKickstarter::ERBFactory
   # Returns ERB instance for creating new spec
   #
   def get_instance_for_new_spec(rails_mode, target_path)
-    ERB.new(get_erb_template(@custom_template, true, rails_mode, target_path), nil, '-', '_new_spec_code')
+    template = get_erb_template(@custom_template, true, rails_mode, target_path)
+    ERB.new(template, nil, '-', '_new_spec_code')
   end
 
   #
   # Returns ERB instance for appeding lacking tests
   #
   def get_instance_for_appending(rails_mode, target_path)
-    ERB.new(get_erb_template(@custom_template, false, rails_mode, target_path), nil, '-', '_additional_spec_code')
+    template = get_erb_template(@custom_template, false, rails_mode, target_path)
+    ERB.new(template, nil, '-', '_additional_spec_code')
   end
 
   private
@@ -36,15 +38,15 @@ class RSpecKickstarter::ERBFactory
     if custom_template
       custom_template
     elsif rails_mode && target_path.match(/controllers/)
-      if is_full then RSpecKickstarter::ERBTemplates::RAILS_CONTROLLER_NEW_SPEC_TEMPLATE 
+      if is_full then RSpecKickstarter::ERBTemplates::RAILS_CONTROLLER_NEW_SPEC_TEMPLATE
       else            RSpecKickstarter::ERBTemplates::RAILS_CONTROLLER_METHODS_PART_TEMPLATE
       end
     elsif rails_mode && target_path.match(/helpers/)
-      if is_full then RSpecKickstarter::ERBTemplates::RAILS_HELPER_NEW_SPEC_TEMPLATE 
+      if is_full then RSpecKickstarter::ERBTemplates::RAILS_HELPER_NEW_SPEC_TEMPLATE
       else            RSpecKickstarter::ERBTemplates::RAILS_HELPER_METHODS_PART_TEMPLATE
       end
     else
-      if is_full then RSpecKickstarter::ERBTemplates::BASIC_NEW_SPEC_TEMPLATE 
+      if is_full then RSpecKickstarter::ERBTemplates::BASIC_NEW_SPEC_TEMPLATE
       else            RSpecKickstarter::ERBTemplates::BASIC_METHODS_PART_TEMPLATE
       end
     end

data/lib/rspec_kickstarter/generator.rb

@@ -24,7 +24,7 @@ class RSpecKickstarter::Generator
   # Writes new spec or appends to the existing spec.
   #
   def write_spec(file_path, force_write = false, dry_run = false, rails_mode = false)
-    class_or_module = RSpecKickstarter::RDocFactory::get_rdoc_class_or_module(file_path)
+    class_or_module = RSpecKickstarter::RDocFactory.get_rdoc_class_or_module(file_path)
     if class_or_module
       spec_path = get_spec_path(file_path)
       if force_write && File.exist?(spec_path)
@@ -53,7 +53,7 @@ class RSpecKickstarter::Generator
   # 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(/^(lib\/)|(app\/)/, '').gsub(/\.rb$/, '_spec.rb')
+    spec_dir + '/' + file_path.gsub(/^\.\//, '').gsub(%r{^(lib/)|(app/)}, '').gsub(/\.rb$/, '_spec.rb')
   end
 
   #
@@ -61,19 +61,19 @@ class RSpecKickstarter::Generator
   # e.g. "lib/foo/bar_baz.rb" -> "foo/bar_baz"
   #
   def to_string_value_to_require(file_path)
-    file_path.gsub(/^(lib\/)|(app\/)/, '').gsub(/\.rb$/, '')
+    file_path.gsub(%r{^(lib/)|(app/)}, '').gsub(/\.rb$/, '')
   end
 
-  # 
+  #
   # Returns snake_case name.
   # e.g. FooBar -> "foo_bar"
   #
   def instance_name(c)
     c.name
       .gsub(/::/, '/')
-      .gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-      .gsub(/([a-z\d])([A-Z])/,'\1_\2')
-      .tr("-", "_")
+      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+      .tr('-', '_')
       .downcase
   end
 
@@ -93,7 +93,7 @@ class RSpecKickstarter::Generator
   #
   def to_params_part(params)
     param_csv = to_param_names_array(params).join(', ')
-    param_csv.empty? ? "" : "(#{param_csv})"
+    param_csv.empty? ? '' : "(#{param_csv})"
   end
 
   #
@@ -141,15 +141,14 @@ class RSpecKickstarter::Generator
 
       erb = RSpecKickstarter::ERBFactory.new(@delta_template).get_instance_for_appending(rails_mode, spec_path)
       additional_spec = erb.result(binding)
+
       last_end_not_found = true
       code = existing_spec.split("\n").reverse.reject { |line|
-        if last_end_not_found
-          last_end_not_found = line.gsub(/#.+$/, '').strip != "end"
-          true
-        else
-          false
-        end
+        before_modified = last_end_not_found
+        last_end_not_found = line.gsub(/#.+$/, '').strip != 'end' if before_modified
+        before_modified
       }.reverse.join("\n") + "\n" + additional_spec + "\nend\n"
+
       if dry_run
         puts "----- #{spec_path} -----"
         puts code
@@ -166,13 +165,13 @@ class RSpecKickstarter::Generator
 
   #
   # e.g.
-  #     a = stub('a')
-  #     b = stub('b')
+  #     a = double('a')
+  #     b = double('b')
   #     bar_baz = BarBaz.new(a, b)
   #
   def get_instantiation_code(c, method)
     if method.singleton
-      ""
+     ''
     else
       constructor = c.method_list.find { |m| m.name == 'new' }
       if constructor.nil?
@@ -186,12 +185,12 @@ class RSpecKickstarter::Generator
 
   #
   # e.g.
-  #     a = stub('a')
-  #     b = stub('b')
+  #     a = double('a')
+  #     b = double('b')
   #
   def get_params_initialization_code(method)
-    code = to_param_names_array(method.params).map { |p| "      #{p} = stub('#{p}')" }.join("\n") 
-    code.empty? ? "" : "#{code}\n"
+    code = to_param_names_array(method.params).map { |p| "      #{p} = double('#{p}')" }.join("\n")
+    code.empty? ? '' : "#{code}\n"
   end
 
   #
@@ -214,7 +213,7 @@ class RSpecKickstarter::Generator
   #
   def get_block_code(method)
     if method.block_params.nil? || method.block_params.empty?
-      ""
+     ''
     else
       " { |#{method.block_params}| }"
     end

data/lib/rspec_kickstarter/rdoc_factory.rb

@@ -30,7 +30,7 @@ class RSpecKickstarter::RDocFactory
     top_level = RDoc::TopLevel.new(file_path)
     if RUBY_VERSION.to_f < 2.0
       # reset is removed since 2.0
-      RDoc::TopLevel.reset()
+      RDoc::TopLevel.reset
     end
 
     # RDoc::Stats initialization

data/lib/rspec_kickstarter/version.rb

@@ -1,3 +1,8 @@
+# -*- encoding: utf-8 -*-
+
+#
+# Gem version
+#
 module RSpecKickstarter
-  VERSION = "0.2.7"
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-kickstarter
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies: []
 description: rspec-kickstarter supports you writing tests for existing code.
 email: