oracle-model-generator 0.1.0 → 0.2.0

data/CHANGES

@@ -1,2 +1,10 @@
+= 0.2.0 - 8-Mar-2011
+* Added the -r/--rails command line option. By default the omg binary will
+  now generate Rails 3 style validations. If you want Rails 2 validations,
+  specify "-r 2" on the command line.
+* The numericality validations are now more strict, and will match the
+  scale and precision exactly as defined instead of rounding to the nearest
+  whole number, for Rails 3 anyway.
+
 = 0.1.0 - 6-Oct-2010
 * Initial release.

data/README

@@ -47,6 +47,7 @@ primary keys.
 
 = Future Plans
 Add support for views.
+Add automatic test suite generation.
 
 = Known Issues
 None known. If you find any issues, please report them on the github project
@@ -58,7 +59,7 @@ implied warranties, including, without limitation, the implied
 warranties of merchantability and fitness for a particular purpose.
 
 = Copyright
-(C) 2010, Daniel J. Berger
+(C) 2010, 2011 Daniel J. Berger
 All Rights Reserved
 
 = License

data/Rakefile

@@ -1,14 +1,12 @@
 require 'rake'
 require 'rake/testtask'
+require 'rake/clean'
 require 'rbconfig'
 include Config
 
-namespace 'gem' do
-  desc 'Remove any old gem files'
-  task :clean do
-    Dir['*.gem'].each{ |f| File.delete(f) }
-  end
+CLEAN.include("**/*.gem", "**/*.rbc", "**/*.log")
 
+namespace 'gem' do
   desc 'Create the oracle-model-generator gem'
   task :create => :clean do
     spec = eval(IO.read('oracle-model-generator.gemspec'))

data/bin/omg

@@ -11,12 +11,14 @@ opts = Getopt::Long.getopts(
   ['--user',     '-u', Getopt::REQUIRED],
   ['--password', '-p', Getopt::REQUIRED],
   ['--database', '-d', Getopt::REQUIRED],
-  ['--output',   '-o', Getopt::REQUIRED]
+  ['--output',   '-o', Getopt::REQUIRED],
+  ['--rails',    '-r', Getopt::REQUIRED]
 )
 
 def help
+  version = Oracle::Model::Generator::VERSION
   %Q{
-    Available options for the Oracle Model Generator are:
+    Available options for the Oracle Model Generator (version #{version}) are:
 
     -h, --help     => Display the help text you're looking at now.
     -t, --table    => The name of the table you wish to model.
@@ -24,6 +26,7 @@ def help
     -o, --output   => The name of the file to create.
     -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 3).
 
     If no user or password are supplied, then OMG will attempt to glean that
     information using a combination of the database name and your .dbrc file.
@@ -37,9 +40,12 @@ def help
 
     Examples:
 
-    # Create a User model for the users table.
+    # Create a User model for the users table (rails 3)
     omg -d some_database -u scott -p tiger -t users
 
+    # Create a User model for the users table (rails 2)
+    omg -d some_database -r 2 -u scott -p tiger -t users
+
     # Same thing, using dbi-dbrc behind the scenes
     omg -d some_database -t users
 
@@ -93,6 +99,14 @@ omg.generate(table || view, view)
 
 ofile = opts['o'] || table + '.rb'
 
+# Default to Rails 3
+rails = (opts['rails'] && opts['rails'].to_i) || 3
+
+if rails < 2 || rails > 3
+  puts "Invalid version of Rails. Specify either 2 or 3."
+  exit!
+end
+
 File.open(ofile, 'w') do |fh|
   fh.puts "class #{omg.table} < ActiveRecord::Base"
   fh.puts "  set_table_name :#{table}"
@@ -111,43 +125,79 @@ File.open(ofile, 'w') do |fh|
 
   fh.puts "\n  # Validations\n\n"
 
-  # Character fields, size
-  omg.column_info.each{ |col|
-    data_type = col.data_type.to_s
-    if ['char', 'varchar', 'varchar2'].include?(data_type)
-      validation = "validates_size_of :#{col.name.downcase}, :maximum => #{col.data_size}"
-      validation << ", :allow_blank => #{col.nullable?}" if col.nullable?
-      fh.puts "  #{validation}"
-    end
-  }
+  if rails == 2
+    # Character fields, size
+    omg.column_info.each{ |col|
+      data_type = col.data_type.to_s
+      if ['char', 'varchar', 'varchar2'].include?(data_type)
+        validation = "validates_size_of :#{col.name.downcase}, :maximum => #{col.data_size}"
+        validation << ", :allow_blank => #{col.nullable?}" if col.nullable?
+        fh.puts "  #{validation}"
+      end
+    }
 
-  fh.puts # Line break
+    fh.puts # Line break
 
-  # Fields that must be present
-  omg.column_info.each{ |col|
-    unless col.nullable?
-      validation = "validates_presence_of :#{col.name.downcase}"
-      fh.puts "  #{validation}"
-    end
-  }
+    # Fields that must be present
+    omg.column_info.each{ |col|
+      unless col.nullable?
+        validation = "validates_presence_of :#{col.name.downcase}"
+        fh.puts "  #{validation}"
+      end
+    }
 
-  fh.puts # Line break
+    fh.puts # Line break
 
-  # Numeric fields
-  omg.column_info.each{ |col|
-    if col.data_type.to_s == 'number'
-      max = ("9" * (col.precision - col.scale)).to_i
+    # Numeric fields
+    omg.column_info.each{ |col|
+      if col.data_type.to_s == 'number'
+        max = ("9" * (col.precision - col.scale)).to_i
+
+        validation = "validates_numericality_of :#{col.name.downcase}"
+        validation << ", :less_than => #{max + 1}, :greater_than => -#{max + 1}"
+
+        if col.scale == 0
+          validation << ", :only_integer => true"
+        end
+
+        fh.puts "  #{validation}"
+      end
+    }
+  else
+    # Character fields, size
+    omg.column_info.each{ |col|
 
-      validation = "validates_numericality_of :#{col.name.downcase}"
-      validation << ", :less_than => #{max + 1}, :greater_than => -#{max + 1}"
+      data_type = col.data_type.to_s
 
-      if col.scale == 0
-        validation << ", :only_integer => true"
+      case data_type
+        when 'char', 'varchar', 'varchar2'
+          validation = "validates :#{col.name.downcase}, "
+          validation << ":length => {:maximum => #{col.data_size}}"
+          validation << ", :presence => #{!col.nullable?}" unless col.nullable?
+        when 'number'
+          max = "9" * col.precision
+          max.insert(col.precision - col.scale, ".") if col.scale > 0
+
+          validation = "\n  validates :#{col.name.downcase}, "
+
+          unless col.nullable?
+            validation << ":presence => #{!col.nullable?}, "
+          end
+
+          validation << ":numericality => {"
+          validation << "\n      :less_than_or_equal_to => #{max}, "
+          validation << "\n      :greater_than_or_equal_to => -#{max}"
+
+          if col.scale == 0
+            validation << ",\n      :only_integer => true"
+          end
+
+          validation << "\n    }"
       end
 
       fh.puts "  #{validation}"
-    end
-  }
+    }
+  end
 
   fh.puts # Line break
   header_printed = false

data/lib/oracle/model/generator.rb

@@ -3,7 +3,7 @@ require 'oci8'
 module Oracle
   module Model
     class Generator
-      VERSION = '0.1.0'
+      VERSION = '0.2.0'
 
       attr_reader :connection
       attr_reader :constraints
@@ -32,6 +32,13 @@ module Oracle
         @table        = nil
       end
 
+      # Generates an Oracle::Model::Generator object for +table+. If this is
+      # a view (materialized or otherwise), set the +view+ argument to true.
+      #
+      # This method does not actually generate a file of any sort. It merely
+      # sets instance variables which you can then use in your own class/file
+      # generation programs.
+      #
       def generate(table, view = false)
         @table = table.split('_').map{ |e| e.downcase.capitalize }.join
         @view  = view
@@ -58,6 +65,8 @@ module Oracle
         }
       end
 
+      # Returns an array of foreign keys.
+      #
       def get_foreign_keys
         @constraints.each{ |hash|
           if hash['CONSTRAINT_TYPE'] == 'R'
@@ -68,12 +77,17 @@ module Oracle
         get_belongs_to()
       end
 
+      # Returns an array of tables that the current table has foreign key
+      # ties to.
+      #
       def get_belongs_to
         @foreign_keys.each{ |fk|
           @belongs_to << find_fk_table(fk)
         }
       end
 
+      # Find table name based on a foreign key name.
+      #
       def find_fk_table(fk)
         sql = %Q{
           select table_name
@@ -83,12 +97,12 @@ module Oracle
 
         begin
           cursor = @connection.exec(sql)
-          fk = cursor.fetch.first
+          table = cursor.fetch.first
         ensure
           cursor.close if cursor
         end
 
-        fk
+        table
       end
 
       # Get a list of constraints for a given table.

data/oracle-model-generator.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |gem|
   gem.name       = 'oracle-model-generator'
-  gem.version    = '0.1.0'
+  gem.version    = '0.2.0'
   gem.author     = 'Daniel J. Berger'
   gem.license    = 'Artistic 2.0'
   gem.email      = 'djberg96@gmail.com'

data/test/test_oracle_model_generator.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oracle-model-generator
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -06:00
+date: 2011-03-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: N/A
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: A Ruby interface for determining protocol information