ramen 0.4.1 → 0.4.2

data/lib/ramen/metadata/database.rb

@@ -79,8 +79,9 @@ module Ramen::Metadata
     #
     def inspect
       children = []
-      @schemas.each_by_id do |id,schema|
-        children << (id.to_s+':'+schema.schema_name)
+      @schemas.each do |schema_name,schema|
+        prefix = (schema.respond_to?:schema_id)? schema.schema_id.to_s+':' : ''
+        children << (prefix+schema_name)
       end
       to_s[0..-2]+' schema=['+children.join(', ')+']>'
     end

data/lib/ramen/metadata/schema.rb

@@ -53,8 +53,9 @@ module Ramen::Metadata
     #
     def inspect
       children = []
-      @tables.each_by_id do |id,table|
-        children << (id.to_s+':'+table.table_name)
+      @tables.each do |table_name,table|
+        prefix = (table.respond_to?:table_id) ? table.table_id.to_s+':' : ''
+        children << (prefix+table_name)
       end
       to_s[0..-2]+' schema_name=\''+ schema_name+ '\'' + ((self.respond_to?:schema_id)?' schema_id=' + schema_id.to_s : '') + ' tables=['+children.join(', ')+']>'
     end
@@ -62,7 +63,6 @@ module Ramen::Metadata
     # :section: Internal Methods
     # The following methods are for Ramen's internal use.  They
     # are not intended for clients of Ramen to use.
-    
     def initialize( record, database )
       super(record, database)
       @tables = Ramen::RamenHash.new( Table )

data/lib/ramen/metadata/table.rb

@@ -177,8 +177,9 @@ module Ramen::Metadata
     #
     def inspect
       children = []
-      @columns.each_by_id do |id,col|
-        children << (id.to_s+':'+col.column_name)
+      @columns.each do |column_name, column|
+        prefix = (column.respond_to?:column_id) ? column.column_id.to_s+':' : ''
+        children << (prefix+column_name)
       end
       to_s[0..-2]+' '+table_name+' columns=['+children.join(', ')+']>'
     end

data/lib/ramen/ramen_hash.rb

@@ -5,22 +5,20 @@
 module Ramen
   
   # A special hash that stores items of the same type.
-  # RamenHash indexes each item by its name and id.  By default, the
-  # name and id attributes are derived from the class name of the type
+  # RamenHash indexes each item by its name.  By default, the
+  # name attributes are derived from the class name of the type
   # RamenHash will collect.
   #
   # usage:
   #   def SomeClass
-  #     attr_accessor :some_class_id, :some_class_name
-  #     def initialize( id, name )
-  #       @some_class_id = id
+  #     attr_accessor :some_class_name
+  #     def initialize( name )
   #       @some_class_name = name
   #     end
   #   end
   #   hash = RamenHash.new( SomeClass )
-  #   hash.add( SomeClass.new(1,'One') )
-  #   hash['One'] #=> #<SomeClass @some_class_id=1 @some_class_name='One'>
-  #   hash[1]     #=> #<SomeClass @some_class_id=1 @some_class_name='One'>
+  #   hash.add( SomeClass.new('One') )
+  #   hash['One'] #=> #<SomeClass @some_class_name='One'>
   #
   # Links: readme.txt[link:files/readme_txt.html]; source[link:rcov/lib-ramen-ramen_hash_rb.html]
   #
@@ -33,11 +31,11 @@ module Ramen
     # [clazz] the type which RamenHash will store.
     # [prefix] (optional) the attribute prefix for indexing.
     #
-    # RamenHash indexes each obj by *prefix*_id and *prefix*_name.  Where
+    # RamenHash indexes each obj by *prefix*_name.  Where
     # prefix defaults to the clazz's name converted by String#to_delimited_words.
     #
     # For example for Ramen.new( ForeignKey ), the hash is indexed by
-    # foreign_key_id and foreign_key_name.
+    # foreign_key_name.
     #
     # RamenHash makes []= private since assignment to an index is not allowed.
     # Use add( obj ) instead.
@@ -45,9 +43,7 @@ module Ramen
     def initialize( clazz, prefix = nil )
       prefix ||= clazz.name.match( /[^:]*$/ )[0].to_delimited_words
       @clazz = clazz
-      @id = "#{prefix}_id".to_sym
       @name = "#{prefix}_name".to_sym
-      @ids = []
       @names = [] # TODO Change to SortedArray
     end
   
@@ -63,13 +59,6 @@ module Ramen
         raise RamenError, "can not add type to #RamenHash. type_added=#{obj.class}; type_allowed=#{@clazz}"
       end
     
-      if obj.respond_to?(@id) then
-        id = obj.send(@id)
-        id = id.downcase if id.respond_to?(:downcase)
-        @ids << id
-        self[id]=obj
-      end
-      
       name = obj.send(@name)
       name = name.downcase if name.respond_to?(:downcase)
       @names << name
@@ -81,44 +70,13 @@ module Ramen
     #
     def each()
       @names.each do |name|
-        yield self[name]
+        yield name, self[name]
       end
     end
     
-    def each_by( keys )
-      keys.each do |key|
-        yield key, self[key]
-      end
-    end
-    private :each_by
-    
-    # calls the block, giving the block the item name and the item
-    #
-    # usage
-    #   hash.each_by_name do |name, obj|
-    #     puts name
-    #     puts obj.inspect
-    #   end
-    def each_by_name( &block )
-      each_by( @names, &block )
-      self
-    end
-    
-    # calls the block, giving the block the item id and the item
-    #
-    # usage
-    #   hash.each_by_id do |id, obj|
-    #     puts id
-    #     puts obj.inspect
-    #   end
-    def each_by_id( &block )
-      each_by( @ids, &block )
-      self
-    end
-    
     def to_s
       results = []
-      self.each_by_id do |key, value|
+      self.each do |key, value|
         results << (key.to_s + ':' + self[key].send(@name) + '=>' + value.to_s)
       end
       results.join( ' ' )

data/lib/ramen/version.rb

@@ -10,7 +10,7 @@ module Ramen
   module Version
     MAJOR = 0
     MINOR = 4
-    REVISION = 1
+    REVISION = 2
     STRING = [MAJOR, MINOR, REVISION].join('.')
   end
 end

data/readme.txt

@@ -5,7 +5,7 @@ Ramen creates an object model from your database's metadata (Schema, Tables,
 Columns, Indexes, Keys). This metadata is sometimes called 
 _data_ _dictionary_, _system_ _catalog_, or _INFORMATION_ _SCHEMA_.
 
-Version:: 0.4.0 SQL Server 2005 and MySQL 5.0.
+Version:: 0.4.2 SQL Server 2005 and MySQL 5.0.
 
 What can you do with Ramen?
 * Build a tool for generating test data (see Noodle on Rubyforge)

data/test/mysql_create_test_db.sql

@@ -1,4 +1,4 @@
-DROP DATABASE IF EXISTS RamenTestSchema;
+DROP DATABASE IF EXISTS RamenTestSchema;
 DROP DATABASE IF EXISTS RamenTestSchema2;
 
 CREATE DATABASE RamenTestSchema;

data/test/test_ramen.rb

@@ -86,11 +86,6 @@ class Test_Ramen < Test::Unit::TestCase
     employee = db.schema['RamenTestSchema'].table['Employee']
     assert_equal( 0, employee.is_published ) if employee.respond_to? :is_published #sql2005
     assert_equal( 1, employee.auto_increment ) if employee.respond_to? :auto_increment # mysql
-    
-    if employee.respond_to? :table_id then
-      employee = db.schema['RamenTestSchema'].table[employee.table_id]
-      assert_equal( 'Employee', employee.table_name )
-    end
   end
   
   def t_column_access( key, db )
@@ -271,12 +266,8 @@ class Test_Ramen < Test::Unit::TestCase
     fk = table.fk['FK_MultiColumnFK_MultiColumnPK']
     referenced_table = db.schema['RamenTestSchema'].table['MultiColumnPK']
     assert_same( referenced_table, fk.referenced_table )
-    if fk.respond_to? :foreign_key_id
-      assert_equal( 4, fk.column.size )
-    else
-      assert_equal( 2, fk.column.size )
-      assert_equal( ['fk1', 'fk2'], fk.column.keys.sort )
-    end
+    assert_equal( 2, fk.column.size )
+    assert_equal( ['fk1', 'fk2'], fk.column.keys.sort )
   end
   
   def t_belongs_to( key, db )

data/test/test_ramen_hash.rb

@@ -9,26 +9,22 @@ require 'lib/ramen'
 module Ramen
   class ObjToStoreInHash
     attr_reader :obj_id, :obj_name
-    def initialize( id, name )
-      @obj_id = id
+    def initialize( name )
       @obj_name = name
     end
   end
 
   class TestRamenHash < Test::Unit::TestCase
     def setup
-      @obj1 = ObjToStoreInHash.new( 1, 'One' )
-      @obj2 = ObjToStoreInHash.new( 2, 'Two' )
+      @obj1 = ObjToStoreInHash.new( 'One' )
+      @obj2 = ObjToStoreInHash.new( 'Two' )
       @collection = RamenHash.new( ObjToStoreInHash, 'obj' )
       @collection.add( @obj1 )
       @collection.add( @obj2 )
     end
     
     def test_hash
-      assert_equal(@obj1, @collection[1])
       assert_equal(@obj1, @collection['One'])
-
-      assert_equal(@obj2, @collection[2])
       assert_equal(@obj2, @collection['Two'])
     end
     
@@ -44,25 +40,13 @@ module Ramen
       end
     end
     
-    def test_each_by_name
-      @collection.each_by_name do |name,value|
+    def test_each
+      @collection.each do |name,value|
         assert( (['one','two'].include? name), "name must be either one or two, name=#{name}")
         assert_same( @collection[name], value )
       end
     end
     
-    def test_each_by_id
-      @collection.each_by_id do |id,value|
-        assert( ([1,2].include? id), "id must be either 1 or 2, id=#{id}")
-        assert_same( @collection[id], value )
-      end
-    end
-    
-    def test_each
-      @collection.each do |obj|
-        assert( ([1,2].include? obj.obj_id), "id must be either 1 or 2, id=#{obj.obj_id}")
-      end
-    end
     
     def test_to_s
       # simply exercise to_s to ensure it doesn't throw exception

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ramen
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
-date: 2008-04-28 00:00:00 -05:00
+  version: 0.4.2
+date: 2008-05-20 00:00:00 -05:00
 summary: Ramen, database reflection library.  Easy access to the definition of schemas, tables, columns, indexes, and foreign keys.
 require_paths: 
 - lib