oracle-model-generator 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b08bfd1eb4571ecdbbf5cc02f216581514367d88
-  data.tar.gz: cfeb424ff1b19a26f265b3e8a04969931973ef8b
+  metadata.gz: 88af1ec7da51ae892d01e8115190a2ea950304bd
+  data.tar.gz: 3e2baf456b61aa2f2ac34ca76cb20f7da51b690c
 SHA512:
-  metadata.gz: a284019c0512deb281022efda26bfa11b04264e1eb7f4767862cd88fb661567ef1464ba0cc4bf4416312907c739a8e0248d7c649dd7f2253b9cb33e3be00dfee
-  data.tar.gz: f9fd0d86eddafb2417c4d6ca4a1b077e57742cd5a9fe9e29eacfad6e6d420aa94fc006a07ec3ac1f650dc6927899a36d07bf052620884f8dac859c841915923e
+  metadata.gz: 32f50b665bc2e1756858fee86362a4cccf4d307fc30cd11cc78f7809418da77cfb8e6e8eb1eac7da81d72d2b21cd3a9b88f9ff9e7ee12e4ba224451bfd520482
+  data.tar.gz: 3dff9390c919127c9aa95300b883d3bf69f8b3caa599f5f47912d62ae9ef0795a98084dea7674103ce53d09ef91e5173b1233220998a6a3f22b2c612785353bd

data/CHANGES

@@ -1,3 +1,6 @@
+= 0.4.0 - 7-Nov-2014
+* Added support for minitest test file output.
+
 = 0.3.2 - 6-Nov-2014
 * Removed explicit references to Rails 3 in documentation. It's now simply
   Rails 2, or Rails 3 or higher.

data/bin/omg

@@ -36,7 +36,7 @@ def help
     -u, --user     => The user used to establish a connection to the database.
     -p, --password => The password used to establish a connection to the database.
     -r, --rails    => The version of rails you're using (2 or higher).
-    -x, --tests    => Generate tests (the default).
+    -x, --tests    => Generate tests using testunit, minitest or rspec.
     -c, --class    => Class name for the generated table (optional)
 
     If no user or password are supplied, then OMG will attempt to glean that
@@ -51,7 +51,8 @@ def help
 
     If no tests option is specified then a test file, using test-unit 2, will
     be generated that includes some basic tests to backup the builtin
-    validations. Legal options are 'testunit', 'rspec', or 'none'.
+    validations. Legal options are 'testunit', 'minitest', 'rspec', or 'none'.
+    If you specify 'none', then no test file is generated.
 
     Examples:
 
@@ -269,30 +270,57 @@ File.open(ofile, 'w') do |fh|
   fh.puts "end"
 end
 
-if opts['x'].nil? || opts['x'] == 'testunit'
+opts['x'] ||= 'testunit' # Default
+
+testunit = opts['x'] == 'testunit'
+minitest = opts['x'] == 'minitest'
+
+if testunit || minitest
   test_file = "test_#{ofile}"
+
   File.open(test_file, "w") do |fh|
     setup_var = omg.table.downcase
     setup_var.chop! if setup_var[-1].chr.downcase == 's'  
     instance_var = "@#{setup_var}"
 
-    fh.puts "require 'test-unit'\n\n"
+    if testunit
+      fh.puts "require 'test-unit'\n\n"
+    else
+      fh.puts "require 'minitest/autorun'\n\n"
+    end
+
+    if testunit
+      fh.puts "class TC_#{omg.model} < Test::Unit::TestCase\n"
+    else
+      fh.puts "class TC_#{omg.model} < Minitest::Unit::TestCase\n"
+    end
 
-    fh.puts "class TC_#{omg.model} < Test::Unit::TestCase\n"
     fh.puts "  def setup"
     fh.puts "    #{instance_var} = #{omg.model}.new"
     fh.puts "  end\n\n"
 
-    fh.puts "  test 'table name is #{omg.table.downcase}' do"
+    if testunit
+      fh.puts "  test 'table name is #{omg.table.downcase}' do"
+    else
+      fh.puts "  def table_name_is_#{omg.table.downcase}"
+    end
     fh.puts "    assert_equal('#{omg.table.downcase}', #{omg.model}.table_name)"
     fh.puts "  end\n\n"
 
     if omg.primary_keys.size > 1
-      test_string = "  test 'primary keys are #{omg.primary_keys.join(', ')}' do"
+      if testunit
+        test_string = "  test 'primary keys are #{omg.primary_keys.join(', ')}' do"
+      else
+        test_string = "  def test_primary_keys_are_#{omg.primary_keys.join('_')}"
+      end
       fh.puts test_string
       fh.puts "    assert_equal('#{omg.primary_keys.join(', ')}', #{omg.model}.primary_keys)"
     else
-      test_string = "  test 'primary key is #{omg.primary_keys.first}' do"
+      if testunit
+        test_string = "  test 'primary key is #{omg.primary_keys.first}' do"
+      else
+        test_string = "  def test_primary_key_is_#{omg.primary_keys.first}"
+      end
       fh.puts test_string
       fh.puts "    assert_equal('#{omg.primary_keys.first}', #{omg.model}.primary_key)"
     end
@@ -303,28 +331,48 @@ if opts['x'].nil? || opts['x'] == 'testunit'
       data_type = col.data_type.to_s
       column    = col.name.downcase
 
-      fh.puts "\n  test '#{column} basic functionality' do"
+      if testunit
+        fh.puts "\n  test '#{column} basic functionality' do"
+      else
+        fh.puts "\n  def test_#{column}_basic_functionality"
+      end
       fh.puts "    assert_respond_to(#{instance_var}, :#{column})"
-      fh.puts "    assert_nothing_raised{ #{instance_var}.#{column} }"
+      fh.puts "    assert_nothing_raised{ #{instance_var}.#{column} }" if testunit
 
       case data_type
         when 'char', 'varchar', 'varchar2'
           if col.nullable?
-            fh.puts "    assert_kind_of([NilClass, String], #{instance_var}.#{column})"
+            if testunit
+              fh.puts "    assert_kind_of([NilClass, String], #{instance_var}.#{column})"
+            else
+              fh.puts "    assert([NilClass, String].include?(#{instance_var}.#{column}.class))"
+            end
           else
             fh.puts "    assert_kind_of(String, #{instance_var}.#{column})"
           end
         when 'number'
           if col.nullable?
-            fh.puts "    assert_kind_of([NilClass, Numeric], #{instance_var}.#{column})"
+            if testunit
+              fh.puts "    assert_kind_of([NilClass, Numeric], #{instance_var}.#{column})"
+            else
+              fh.puts "    assert([NilClass, Numeric].include?(#{instance_var}.#{column}.class))"
+            end
           else
             fh.puts "    assert_kind_of(Numeric, #{instance_var}.#{column})"
           end
         when 'date'
-          if col.nullable?
-            fh.puts "    assert_kind_of([NilClass, DateTime, Time], #{instance_var}.#{column})"
+          if testunit
+            if col.nullable?
+              fh.puts "    assert_kind_of([NilClass, DateTime, Time], #{instance_var}.#{column})"
+            else
+              fh.puts "    assert_kind_of([DateTime, Time], #{instance_var}.#{column})"
+            end
           else
-            fh.puts "    assert_kind_of([DateTime, Time], #{instance_var}.#{column})"
+            if col.nullable?
+              fh.puts "    assert([NilClass, DateTime, Time].include?(#{instance_var}.#{column}.class))"
+            else
+              fh.puts "    assert([DateTime, Time].include?(#{instance_var}.#{column}.class))"
+            end
           end
       end
 
@@ -332,40 +380,77 @@ if opts['x'].nil? || opts['x'] == 'testunit'
 
       case data_type
         when 'char', 'varchar', 'varchar2'
-          test_title = "\n  test '#{column} must be a string"
-          test_title += " if present" if col.nullable?
-          test_title += "' do"
+          if testunit
+            test_title = "\n  test '#{column} must be a string"
+            test_title += " if present" if col.nullable?
+            test_title += "' do"
+          else
+            test_title = "\n  def test_#{column}_must_be_a_string"
+            test_title += "_if_present" if col.nullable?
+          end
 
           fh.puts test_title
           fh.puts "    #{instance_var}.#{column} = #{rand(100)}"
-          fh.puts "    assert_false(#{instance_var}.valid?)"
-          fh.puts "    assert_true(#{instance_var}.errors[:#{column}].include?('is not a string'))"
+          if testunit
+            fh.puts "    assert_false(#{instance_var}.valid?)"
+            fh.puts "    assert_true(#{instance_var}.errors[:#{column}].include?('is not a string'))"
+          else
+            fh.puts "    assert(!#{instance_var}.valid?)"
+            fh.puts "    assert(#{instance_var}.errors[:#{column}].include?('is not a string'))"
+          end
           fh.puts "  end\n"
 
           max_len = col.data_size
           err_msg = "is too long (maximum is #{max_len} characters)"
 
-          fh.puts "\n  test '#{column} cannot exceed #{max_len} characters' do"
+          if testunit
+            fh.puts "\n  test '#{column} cannot exceed #{max_len} characters' do"
+          else
+            fh.puts "\n  def test_#{column}_cannot_exceed_#{max_len}_characters"
+          end
+
           fh.puts "    #{instance_var}.#{column} = 'a' * #{max_len + 1}"
-          fh.puts "    assert_false(#{instance_var}.valid?)"
-          fh.puts "    assert_true(#{instance_var}.errors[:#{column}].include?('#{err_msg}'))"
+
+          if testunit
+            fh.puts "    assert_false(#{instance_var}.valid?)"
+            fh.puts "    assert_true(#{instance_var}.errors[:#{column}].include?('#{err_msg}'))"
+          else
+            fh.puts "    assert(!#{instance_var}.valid?)"
+            fh.puts "    assert(#{instance_var}.errors[:#{column}].include?('#{err_msg}'))"
+          end
           fh.puts "  end\n"
         when 'number'
-          test_title = "\n  test '#{column} must be a number"
-          test_title += " if present" if col.nullable?
-          test_title += "' do"
+          if testunit
+            test_title = "\n  test '#{column} must be a number"
+            test_title += " if present" if col.nullable?
+            test_title += "' do"
+          else
+            test_title = "\n  def test_#{column}_must_be_a_number"
+            test_title += "_if_present" if col.nullable?
+          end
 
           fh.puts test_title
           fh.puts "    #{instance_var}.#{column} = 'test_string'"
-          fh.puts "    assert_false(#{instance_var}.valid?)"
-          fh.puts "    assert_true(#{instance_var}.errors[:#{column}].include?('is not a number'))"
+
+          if testunit
+            fh.puts "    assert_false(#{instance_var}.valid?)"
+            fh.puts "    assert_true(#{instance_var}.errors[:#{column}].include?('is not a number'))"
+          else
+            fh.puts "    assert(!#{instance_var}.valid?)"
+            fh.puts "    assert(#{instance_var}.errors[:#{column}].include?('is not a number'))"
+          end
+
           fh.puts "  end\n"
 
           max = "9" * col.precision
           max.insert(col.precision - col.scale, ".") if col.scale > 0
           err_msg = "must be less than or equal to #{max}"
 
-          fh.puts "\n  test '#{column} cannot exceed the value #{max}' do"
+          if testunit
+            fh.puts "\n  test '#{column} cannot exceed the value #{max}' do"
+          else
+            fh.puts "\n  def test_#{column}_cannot_exceed_the_value_#{max.sub('.', '_')}"
+          end
 
           if col.scale > 0
             fh.puts "    #{instance_var}.#{column} = #{max.to_f.round}"
@@ -373,13 +458,23 @@ if opts['x'].nil? || opts['x'] == 'testunit'
             fh.puts "    #{instance_var}.#{column} = #{max.to_i + 1}"
           end
 
-          fh.puts "    assert_false(#{instance_var}.valid?)"
-          fh.puts "    assert_true(#{instance_var}.errors[:#{column}].include?('#{err_msg}'))"
+          if testunit
+            fh.puts "    assert_false(#{instance_var}.valid?)"
+            fh.puts "    assert_true(#{instance_var}.errors[:#{column}].include?('#{err_msg}'))"
+          else
+            fh.puts "    assert(!#{instance_var}.valid?)"
+            fh.puts "    assert(#{instance_var}.errors[:#{column}].include?('#{err_msg}'))"
+          end
+
           fh.puts "  end\n"
 
           err_msg = "must be greater than or equal to -#{max}"
 
-          fh.puts "\n  test '#{column} cannot be less than the value -#{max}' do"
+          if testunit
+            fh.puts "\n  test '#{column} cannot be less than the value -#{max}' do"
+          else
+            fh.puts "\n  def test_#{column}_cannot_be_less_than_the_value_#{max.sub('.', '_')}"
+          end
 
           if col.scale > 0
             fh.puts "    #{instance_var}.#{column} = -#{max.to_f.round}"
@@ -387,17 +482,31 @@ if opts['x'].nil? || opts['x'] == 'testunit'
             fh.puts "    #{instance_var}.#{column} = -#{max.to_i + 1}"
           end
 
-          fh.puts "    assert_false(#{instance_var}.valid?)"
-          fh.puts "    assert_true(#{instance_var}.errors[:#{column}].include?('#{err_msg}'))"
+          if testunit
+            fh.puts "    assert_false(#{instance_var}.valid?)"
+            fh.puts "    assert_true(#{instance_var}.errors[:#{column}].include?('#{err_msg}'))"
+          else
+            fh.puts "    assert(!#{instance_var}.valid?)"
+            fh.puts "    assert(#{instance_var}.errors[:#{column}].include?('#{err_msg}'))"
+          end
           fh.puts "  end\n"
       end
 
       unless col.nullable?
         err_msg = "can't be blank"
-        fh.puts "\n  test '#{column} cannot be nil' do"
+        if testunit
+          fh.puts "\n  test '#{column} cannot be nil' do"
+        else
+          fh.puts "\n  def test_#{column}_cannot_be_nil"
+        end
           fh.puts "    #{instance_var}.#{column} = nil"
-          fh.puts "    assert_false(#{instance_var}.valid?)"
-          fh.puts "    assert_true(#{instance_var}.errors[:#{column}].include?(\"#{err_msg}\"))"
+          if testunit
+            fh.puts "    assert_false(#{instance_var}.valid?)"
+            fh.puts "    assert_true(#{instance_var}.errors[:#{column}].include?(\"#{err_msg}\"))"
+          else
+            fh.puts "    assert(!#{instance_var}.valid?)"
+            fh.puts "    assert(#{instance_var}.errors[:#{column}].include?(\"#{err_msg}\"))"
+          end
         fh.puts "  end\n"
       end
     }

data/lib/oracle/model/generator.rb

@@ -4,7 +4,7 @@ module Oracle
   module Model
     class Generator
       # The version of the oracle-model-generator library
-      VERSION = '0.3.2'
+      VERSION = '0.4.0'
 
       # The raw OCI8 connection.
       attr_reader :connection

data/oracle-model-generator.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |gem|
   gem.name       = 'oracle-model-generator'
-  gem.version    = '0.3.2'
+  gem.version    = '0.4.0'
   gem.author     = 'Daniel J. Berger'
   gem.license    = 'Artistic 2.0'
   gem.email      = 'djberg96@gmail.com'
@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.description = <<-EOF
     The oracle-model-generator library allows you to generate an ActiveRecord
-    model from an existing Oracle table or view.
+    model from an existing Oracle table or view, as well as automatically
+    generate a baseline test file for test-unit or minitest.
   EOF
 end

data/test/test_oracle_model_generator.rb

@@ -20,7 +20,7 @@ class TC_Oracle_Model_Generator < Test::Unit::TestCase
   end
 
   test "version number is correct" do
-    assert_equal('0.3.2', Oracle::Model::Generator::VERSION)
+    assert_equal('0.4.0', Oracle::Model::Generator::VERSION)
   end
 
   test "constructor accepts an oci8 connection object" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oracle-model-generator
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-oci8
@@ -54,7 +54,8 @@ dependencies:
         version: '0'
 description: |2
       The oracle-model-generator library allows you to generate an ActiveRecord
-      model from an existing Oracle table or view.
+      model from an existing Oracle table or view, as well as automatically
+      generate a baseline test file for test-unit or minitest.
 email: djberg96@gmail.com
 executables:
 - omg