rspecify 0.1.5 → 0.1.6

data/Gemfile.lock

@@ -1,20 +1,24 @@
 PATH
   remote: .
   specs:
-    rspecify (0.1.2)
-      activesupport (~> 3.0.10)
+    rspecify (0.1.5)
+      activesupport (~> 3.0)
       i18n (~> 0.6.0)
       ruby_parser (~> 2.3.1)
-      ruby_scribe (~> 0.1.0)
-      ruby_transform (~> 0.1.0)
+      ruby_scribe (~> 0.1.4)
+      ruby_transform (~> 0.1.4)
       thor (~> 0.13)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.10)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     diff-lcs (1.1.3)
     i18n (0.6.0)
+    multi_json (1.2.0)
+    rake (0.9.2.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -25,23 +29,24 @@ GEM
     rspec-mocks (2.6.0)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    ruby_scribe (0.1.2)
-      activesupport (~> 3.0.10)
+    ruby_scribe (0.1.5)
+      activesupport (~> 3.0)
       i18n (~> 0.6.0)
       ruby_parser (~> 2.3.1)
       thor (~> 0.13)
-    ruby_transform (0.1.1)
-      activesupport (~> 3.0.10)
+    ruby_transform (0.1.4)
+      activesupport (~> 3.0)
       i18n (~> 0.6.0)
       ruby_parser (~> 2.3.1)
-      ruby_scribe (~> 0.1.0)
+      ruby_scribe (~> 0.1.4)
       thor (~> 0.13)
-    sexp_processor (3.0.7)
+    sexp_processor (3.1.0)
     thor (0.14.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  rake
   rspec (~> 2.0)
   rspecify!

data/README.rdoc

@@ -1,3 +1,5 @@
+{<img src="https://secure.travis-ci.org/rubiety/rspecify.png?branch=master" alt="Build Status" />}[http://travis-ci.org/rubiety/rspecify]
+
 = RSpecify
 
 Converting your tests from Test::Unit to RSpec is a drag when done by hand.  This utility intelligently converts them to get you (hopefully) 90% of the way there.  

data/Rakefile

@@ -0,0 +1,23 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'rake'
+require 'rspec/core/rake_task'
+
+Bundler::GemHelper.install_tasks
+
+desc 'Default: run unit tests.'
+task :default => [:clean, :test]
+
+desc "Run Specs"
+RSpec::Core::RakeTask.new(:spec) do |t|
+end
+
+task :test => :spec
+
+desc "Clean up files."
+task :clean do |t|
+  FileUtils.rm_rf "tmp"
+  Dir.glob("spec/db/*.sqlite3").each {|f| FileUtils.rm f }
+  Dir.glob("validates_lengths_from_database-*.gem").each {|f| FileUtils.rm f }
+end

data/lib/rspecify/transformers/test_class_and_methods.rb

@@ -20,31 +20,37 @@ module RSpecify
       end
       
       def transform_test_class(e)
+        name = e.body[0].to_s.gsub /Test$/, ""
+        class_body = e.body[2].body[0]
+        if class_body.kind == :block
+          new_block = Sexp.from_array([:block] + class_body.body.map {|e| transform_test_class_method_definition e })
+        else
+          new_block = transform_test_class_method_definition class_body
+        end
         s(:iter, 
-          s(:call, nil, :describe, s(:arglist, s(:const, e.body[0]))),
+          s(:call, nil, :describe, s(:arglist, s(:const, name.to_sym))),
           nil,
-          transform_test_class_method_definitions(e.body[2].body[0])
+          new_block
         )
       end
       
-      def transform_test_class_method_definitions(e)
-        Sexp.from_array([e.kind] + e.body.map do |child|
-          if child.kind == :defn && child.body[0].to_s.starts_with?("test_") && child.body[1].body.empty?
-            transform_test_class_method_definition(child)
-          else
-            child
-          end
-        end)
-      end
-      
       def transform_test_class_method_definition(e)
-        test_name = e.body[0].to_s.gsub(/^test_/, "").gsub("_", " ")
-        
-        s(:iter,
-          s(:call, nil, :it, s(:arglist, s(:str, test_name))),
-          nil,
-          e.body[2].body[0]
-        )
+        if e.kind == :defn && e.body[0].to_s.starts_with?("test_") && e.body[1].body.empty?
+          test_name = e.body[0].to_s.gsub(/^test_/, "").gsub("_", " ")
+
+          s(:iter,
+            s(:call, nil, :it, s(:arglist, s(:str, test_name))),
+            nil,
+            e.body[2].body[0]
+          )
+        elsif e.kind == :iter && e.body[0].kind == :call && e.body[0].body[1] == :test
+          # All we need to do is change the name of the invoked method
+          e.clone.tap do |e|
+            e.body[0][2] = :it
+          end
+        else
+          e
+        end
       end
     end
     

data/lib/rspecify/transformers/test_unit_assertions.rb

@@ -12,10 +12,10 @@ module RSpecify
       
       def transform_test_unit_assertions(e)
         case
-        when assert_equals_call?(e)
-          transform_assert_equals_call(e)
-        when assert_not_equals_call?(e)
-          transform_assert_not_equals_call(e)
+        when assert_equal_call?(e)
+          transform_assert_equal_call(e)
+        when assert_not_equal_call?(e)
+          transform_assert_not_equal_call(e)
         when assert_not_nil_call?(e)
           transform_assert_not_nil_call(e)
         else
@@ -23,31 +23,31 @@ module RSpecify
         end
       end
       
-      # assert_equals:
-      def assert_equals_call?(e)
-        e.kind == :call && e.body[0].nil? && e.body[1] == :assert_equals
+      # assert_equal:
+      def assert_equal_call?(e)
+        e.kind == :call && e.body[0].nil? && e.body[1] == :assert_equal
       end
-      def transform_assert_equals_call(e)
+      def transform_assert_equal_call(e)
         method_arguments = e.body[2].body
 
         s(:call,
-          s(:call, method_arguments[0], :should, s(:arglist)),
+          s(:call, method_arguments[1], :should, s(:arglist)),
           :==,
-          s(:arglist, method_arguments[1])
+          s(:arglist, method_arguments[0])
         )
       end
 
-      # assert_not_equals:
-      def assert_not_equals_call?(e)
-        e.kind == :call && e.body[0].nil? && e.body[1] == :assert_not_equals
+      # assert_not_equal:
+      def assert_not_equal_call?(e)
+        e.kind == :call && e.body[0].nil? && e.body[1] == :assert_not_equal
       end
-      def transform_assert_not_equals_call(e)
+      def transform_assert_not_equal_call(e)
         method_arguments = e.body[2].body
 
         s(:call,
-          s(:call, method_arguments[0], :should_not, s(:arglist)),
+          s(:call, method_arguments[1], :should_not, s(:arglist)),
           :==,
-          s(:arglist, method_arguments[1])
+          s(:arglist, method_arguments[0])
         )
       end
 

data/lib/rspecify/version.rb

@@ -1,3 +1,3 @@
 module RSpecify
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/rspecify/transformers/test_class_and_methods_spec.rb

@@ -18,6 +18,22 @@ describe RSpecify::Transformers::TestClassAndMethods do
     }) }
   end
   
+  describe "class extending ActiveSupport::TestCase with Test naming convention" do
+    subject { %{
+      class MyClassTest < ActiveSupport::TestCase
+        do_something
+        something_else
+      end
+    } }
+
+    it { should transform_to("describe block", %{
+      describe MyClass do
+        do_something
+        something_else
+      end
+    }) }
+  end
+
   describe "class extending ActiveSupport::TestCase with methods" do
     subject { %{
       class MyClass < ActiveSupport::TestCase
@@ -47,5 +63,73 @@ describe RSpecify::Transformers::TestClassAndMethods do
       end
     }) }
   end
+
+  describe "class extending ActiveSupport::TestCase with single method" do
+    subject { %{
+      class MyClass < ActiveSupport::TestCase
+        def test_should_be_valid
+          something
+          1
+        end
+      end
+    } }
+
+    it { should transform_to("describe block", %{
+      describe MyClass do
+        it "should be valid" do
+          something
+          1
+        end
+      end
+    }) }
+  end
+
+  describe "class extending ActiveSupport::TestCase with alternate methods naming" do
+    subject { %{
+      class MyClass < ActiveSupport::TestCase
+        test "should be valid" do
+          something
+          1
+        end
+        test "should not be valid" do
+          something
+          1
+        end
+      end
+    } }
+
+    it { should transform_to("describe block", %{
+      describe MyClass do
+        it "should be valid" do
+          something
+          1
+        end
+        it "should not be valid" do
+          something
+          1
+        end
+      end
+    }) }
+  end
+
+  describe "class extending ActiveSupport::TestCase with single alternate method naming" do
+    subject { %{
+      class MyClass < ActiveSupport::TestCase
+        test "should be valid" do
+          something
+          1
+        end
+      end
+    } }
+
+    it { should transform_to("describe block", %{
+      describe MyClass do
+        it "should be valid" do
+          something
+          1
+        end
+      end
+    }) }
+  end
   
 end

data/spec/rspecify/transformers/test_unit_assertions_spec.rb

@@ -2,24 +2,24 @@ require "spec_helper"
 
 describe RSpecify::Transformers::TestUnitAssertions do
   
-  describe "short assert equals" do
-    subject { %{assert_equals @one, "One"} }
+  describe "short assert equal" do
+    subject { %{assert_equal "One", @one} }
     it { should transform_to("should ==", %{@one.should == "One"}) }
   end
   
-  describe "long assert equals" do
+  describe "long assert equal" do
     subject { %{
-      assert_equals @organization.people.first, Person.find_by_name_and_organization(
+      assert_equal @organization.people.first, Person.find_by_name_and_organization(
         "Ben, Hughes",
         "RailsGarden"
       )
     } }
     
-    it { should transform_to("should == ", %{@organization.people.first.should == Person.find_by_name_and_organization("Ben, Hughes", "RailsGarden")}) }
+    it { should transform_to("should == ", %{Person.find_by_name_and_organization("Ben, Hughes", "RailsGarden").should == @organization.people.first}) }
   end
   
-  describe "short assert not equals" do
-    subject { %{assert_not_equals @one, "One"} }
+  describe "short assert not equal" do
+    subject { %{assert_not_equal "One", @one} }
     it { should transform_to("should_not ==", %{@one.should_not == "One"}) }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspecify
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2012-04-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70240573097680 !ruby/object:Gem::Requirement
+  requirement: &70277469049040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.13'
   type: :runtime
   prerelease: false
-  version_requirements: *70240573097680
+  version_requirements: *70277469049040
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70240573096780 !ruby/object:Gem::Requirement
+  requirement: &70277469048560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70240573096780
+  version_requirements: *70277469048560
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70240573096000 !ruby/object:Gem::Requirement
+  requirement: &70277469048080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70240573096000
+  version_requirements: *70277469048080
 - !ruby/object:Gem::Dependency
   name: ruby_parser
-  requirement: &70240573095360 !ruby/object:Gem::Requirement
+  requirement: &70277469047600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70240573095360
+  version_requirements: *70277469047600
 - !ruby/object:Gem::Dependency
   name: ruby_scribe
-  requirement: &70240573088160 !ruby/object:Gem::Requirement
+  requirement: &70277469047120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,21 +65,21 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70240573088160
+  version_requirements: *70277469047120
 - !ruby/object:Gem::Dependency
   name: ruby_transform
-  requirement: &70240573087380 !ruby/object:Gem::Requirement
+  requirement: &70277469046640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70240573087380
+  version_requirements: *70277469046640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70240573086720 !ruby/object:Gem::Requirement
+  requirement: &70277469046160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,18 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70240573086720
+  version_requirements: *70277469046160
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70277469045780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70277469045780
 description: Provides some automation to attempt to convert your Ruby Test::Unit tests
   into RSpec.
 email: ben@railsgarden.com
@@ -110,6 +121,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
+- Rakefile
 - README.rdoc
 - bin/rspecify
 homepage: http://github.com/rubiety/rspecify