rspec-kickstarter 0.2.4 → 0.2.6

data/lib/rspec_kickstarter/generator.rb

@@ -40,18 +40,9 @@ class RSpecKickstarter::Generator
         if lacking_methods.empty? 
           puts "#{spec_path} skipped."
         else
+          # Since 'methods_to_generate' is used in ERB template, don't delete.
           methods_to_generate = lacking_methods
-
-          if ! @delta_template.nil? 
-            additional_spec = ERB.new(@delta_template, nil, '-', '_additional_spec_code').result(binding)
-          elsif rails_mode && spec_path.match(/controllers/)
-            additional_spec = ERB.new(RAILS_CONTROLLER_METHODS_PART_TEMPLATE, nil, '-', '_additional_spec_code').result(binding)
-          elsif rails_mode && spec_path.match(/helpers/)
-            additional_spec = ERB.new(RAILS_HELPER_METHODS_PART_TEMPLATE, nil, '-', '_additional_spec_code').result(binding)
-          else
-            additional_spec = ERB.new(BASIC_METHODS_PART_TEMPLATE, nil, '-', '_additional_spec_code').result(binding)
-          end
-
+          additional_spec = create_erb_instance_for_appending(rails_mode, spec_path).result(binding)
           last_end_not_found = true
           code = existing_spec.split("\n").reverse.reject { |line| 
             if last_end_not_found 
@@ -72,18 +63,11 @@ class RSpecKickstarter::Generator
 
       else
         # Create a new spec 
-        self_path = to_string_value_to_require(file_path)
-        methods_to_generate = c.method_list.select { |m| m.visibility == :public }
 
-        if ! @full_template.nil?
-          code = ERB.new(@full_template, nil, '-', '_new_spec_code').result(binding)
-        elsif rails_mode && self_path.match(/controllers/) 
-          code = ERB.new(RAILS_CONTROLLER_NEW_SPEC_TEMPLATE, nil, '-', '_new_spec_code').result(binding)
-        elsif rails_mode && self_path.match(/helpers/) 
-          code = ERB.new(RAILS_HELPER_NEW_SPEC_TEMPLATE, nil, '-', '_new_spec_code').result(binding)
-        else
-          code = ERB.new(BASIC_NEW_SPEC_TEMPLATE, nil, '-', '_new_spec_code').result(binding)
-        end
+        # Since 'methods_to_generate' is used in ERB template, don't delete.
+        methods_to_generate = c.method_list.select { |m| m.visibility == :public }
+        self_path = to_string_value_to_require(file_path)
+        code = create_erb_instance_for_new_spec(rails_mode, self_path).result(binding)
 
         if dry_run
           puts "----- #{spec_path} -----"
@@ -113,8 +97,8 @@ class RSpecKickstarter::Generator
     end
 
     # RDoc::Stats initialization
-    if RUBY_VERSION.to_f >= 2.0
-      # Ruby 2.0 requires RDoc::Store internally.
+    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)
@@ -207,6 +191,36 @@ class RSpecKickstarter::Generator
     param_csv.empty? ? "" : "(#{param_csv})"
   end
 
+  #
+  # Returns ERB instance for creating new spec
+  #
+  def create_erb_instance_for_new_spec(rails_mode, target_path)
+    if ! @full_template.nil? 
+      ERB.new(@full_template, nil, '-', '_new_spec_code')
+    elsif rails_mode && target_path.match(/controllers/)
+      ERB.new(RAILS_CONTROLLER_NEW_SPEC_TEMPLATE, nil, '-', '_new_spec_code')
+    elsif rails_mode && target_path.match(/helpers/)
+      ERB.new(RAILS_HELPER_NEW_SPEC_TEMPLATE, nil, '-', '_new_spec_code')
+    else
+      ERB.new(BASIC_NEW_SPEC_TEMPLATE, nil, '-', '_new_spec_code')
+    end
+  end
+
+  #
+  # Returns ERB instance for appeding lacking tests
+  #
+  def create_erb_instance_for_appending(rails_mode, target_path)
+    if ! @delta_template.nil?
+      ERB.new(@delta_template, nil, '-', '_additional_spec_code')
+    elsif rails_mode && target_path.match(/controllers/)
+      ERB.new(RAILS_CONTROLLER_METHODS_PART_TEMPLATE, nil, '-', '_additional_spec_code')
+    elsif rails_mode && target_path.match(/helpers/)
+      ERB.new(RAILS_HELPER_METHODS_PART_TEMPLATE, nil, '-', '_additional_spec_code')
+    else
+      ERB.new(BASIC_METHODS_PART_TEMPLATE, nil, '-', '_additional_spec_code')
+    end
+  end
+
   # 
   # Code generation
   #

data/lib/rspec_kickstarter/version.rb

@@ -1,3 +1,3 @@
 module RSpecKickstarter
-  VERSION = "0.2.4"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-kickstarter
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies: []
 description: rspec-kickstarter supports you writing tests for existing code.
 email:
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: rspec-kickstarter supports you writing tests for existing code.