oracle-model-generator 0.3.0 → 0.3.1

data/CHANGES

@@ -1,3 +1,7 @@
+= 0.3.1 - 3-Apr-2012
+* Added the --class option that allows you to specify the model name on the
+  command line. Thanks go to Daniel Luna for the patch (plus some minor fixes).
+
 = 0.3.0 - 12-May-2011
 * Added automatic test generation. In addition to the active record model file,
   a test file will be generated that includes a series of stock tests that

data/README

@@ -7,11 +7,11 @@ Using the command line tool:
 
   omg -d your_database -t locations -u some_user -p some_password
 
-Results in a file called "locations.rb". This is an ActiveRecord model
-declaration, with all validations, primary keys, table name and belongs_to
-relationships defined.
+The above command results in a file called "location.rb". This is an
+ActiveRecord model declaration, with all validations, primary keys,
+table name and belongs_to relationships defined.
 
-If your locations table looks like this:
+If your LOCATIONS table looks like this:
 
   create table locations(
     location_id number(4,0) primary key,
@@ -26,7 +26,7 @@ If your locations table looks like this:
 
 The omg library will generate this:
 
-  class Locations < ActiveRecord::Base
+  class Location < ActiveRecord::Base
     set_table_name :locations
     set_primary_key :location_id
 
@@ -111,7 +111,8 @@ application.
 I also do not go out of my way to get the model name correct with regards
 to singular vs plural. I do a simple guess that covers most cases, but
 complex cases will break it. It's much easier for you to rename a class or
-file name than it is for me to get this 100% correct.
+file name than it is for me to get this 100% correct. As of 0.3.1 there's
+also the --class option that let's you eplicitly set it if you like.
 
 = Author's Comments
 I chose not to patch legacy_data because I have no interest in supporting
@@ -126,6 +127,9 @@ Add automatic test suite generation for rspec.
 Explicitly set :foreign_key if using CPK in belongs_to relationships.
 The output could use a little formatting love.
 
+= Acknowlegements
+Thanks go to Daniel Luna for his --class patch.
+
 = Known Issues
 None known. If you find any issues, please report them on the github project
 page at http://www.github.com/djberg96/oracle-model-generator.
@@ -136,7 +140,7 @@ implied warranties, including, without limitation, the implied
 warranties of merchantability and fitness for a particular purpose.
 
 = Copyright
-(C) 2010, 2011 Daniel J. Berger
+(C) 2010-2012 Daniel J. Berger
 All Rights Reserved
 
 = License

data/bin/omg

@@ -11,6 +11,7 @@ rescue LoadError
 end
 
 opts = Getopt::Long.getopts(
+
   ['--help',     '-h'],
   ['--table',    '-t', Getopt::REQUIRED],
   ['--view',     '-v', Getopt::REQUIRED],
@@ -19,7 +20,8 @@ opts = Getopt::Long.getopts(
   ['--database', '-d', Getopt::REQUIRED],
   ['--output',   '-o', Getopt::REQUIRED],
   ['--rails',    '-r', Getopt::REQUIRED],
-  ['--tests',     '-x', Getopt::OPTIONAL]
+  ['--tests',    '-x', Getopt::OPTIONAL],
+  ['--class',    '-c', Getopt::OPTIONAL]
 )
 
 def help
@@ -35,6 +37,7 @@ def help
     -p, --password => The password used to establish a connection to the database.
     -r, --rails    => The version of rails you're using (2 or 3).
     -x, --tests    => Generate tests (the default).
+    -c, --class    => Class name for the generated table (optional)
 
     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.
@@ -130,16 +133,18 @@ if rails < 2 || rails > 3
   puts "Invalid version of Rails. Specify either 2 or 3."
   exit!
 end
+  
+omg.instance_eval { @model = opts['class'] } if opts['class'] # dirty fix
 
 File.open(ofile, 'w') do |fh|
   fh.puts "class #{omg.model} < ActiveRecord::Base"
-  fh.puts "  set_table_name :#{table}"
+  fh.puts "  set_table_name :\"#{table}\""
 
   if omg.primary_keys.size > 1
     fh.puts "\n  # Requires the composite-primary-keys library"
     fh.puts "  set_primary_keys " + omg.primary_keys.inspect
   else
-    fh.puts "\n  set_primary_key " + omg.primary_keys.first.to_sym.inspect
+    fh.puts "\n  set_primary_key " + omg.primary_keys.first.to_sym.inspect unless omg.primary_keys.first.nil?
   end
 
   fh.puts "\n  # Table relationships\n\n"
@@ -213,21 +218,24 @@ File.open(ofile, 'w') do |fh|
           max = "9" * col.precision
           max.insert(col.precision - col.scale, ".") if col.scale > 0
 
-          validation = "\n  validates :#{col.name.downcase}, "
+          validation = "\n  validates :#{col.name.downcase}"
 
           unless col.nullable?
-            validation << ":presence => #{!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}"
+          unless max.empty?
+            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
 
-          if col.scale == 0
-            validation << ",\n    :only_integer => true"
+            validation << "\n  }\n\n"
           end
 
-          validation << "\n  }\n\n"
       end
 
       fh.puts "  #{validation}"

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.0'
+      VERSION = '0.3.1'
 
       # 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.0'
+  gem.version    = '0.3.1'
   gem.author     = 'Daniel J. Berger'
   gem.license    = 'Artistic 2.0'
   gem.email      = 'djberg96@gmail.com'

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.0', Oracle::Model::Generator::VERSION)
+    assert_equal('0.3.1', 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: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -06:00
-default_executable: 
+date: 2012-04-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-oci8
@@ -75,16 +74,15 @@ extra_rdoc_files:
 - README
 - MANIFEST
 files: 
-- Rakefile
-- README
-- oracle-model-generator.gemspec
+- bin/omg
+- CHANGES
 - lib/oracle/model/generator.rb
 - lib/oracle_model_generator.rb
-- CHANGES
-- test/test_oracle_model_generator.rb
 - MANIFEST
-- bin/omg
-has_rdoc: true
+- oracle-model-generator.gemspec
+- Rakefile
+- README
+- test/test_oracle_model_generator.rb
 homepage: http://www.github.com/djberg96/oracle-model-generator
 licenses: 
 - Artistic 2.0
@@ -114,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: N/A
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Ruby interface for determining protocol information