dm-reflection 0.0.5 → 0.10.2

data/.gitignore

@@ -17,9 +17,10 @@ tmtags
 coverage
 rdoc
 pkg
+*.gemspec
 
 ## PROJECT::SPECIFIC
 
 ## Yard
 .yardoc
-measurements/report.txt
+measurements/report.txt

data/Rakefile

@@ -1,38 +1,31 @@
 require 'rubygems'
 require 'rake'
+require 'pathname'
 
 begin
-
-  gem 'jeweler', '>= 1.4'
   require 'jeweler'
-
-  require File.expand_path('../lib/dm-reflection/version', __FILE__)
-
   Jeweler::Tasks.new do |gem|
-
-    gem.version     = DataMapper::Reflection::VERSION
-
-    gem.name        = "dm-reflection"
-    gem.summary     = %Q{Generates datamapper models from existing database schemas}
-    gem.description = %Q{Generates datamapper models from existing database schemas and export them to files}
-    gem.email       = "irjudson@gmail.com"
-    gem.homepage    = "http://github.com/irjudson/dm-reflection"
+    gem.name        = %q{dm-reflection}
+    gem.summary     = %q{Generates datamapper models from existing database schemas}
+    gem.description = %q{Generates datamapper models from existing database schemas and export them to files}
+    gem.email       = "irjudson [a] gmail [d] com"
+    gem.homepage    = "http://github.com/yogo/dm-reflection"
     gem.authors     = ["Martin Gamsjaeger (snusnu), Yogo Team"]
-
-    gem.add_dependency 'dm-core', '~> 0.10.2'
-
-    gem.add_development_dependency 'rspec', '~> 1.3'
-    gem.add_development_dependency 'yard',  '~> 0.5'
-
+    gem.add_dependency('dm-core', '~> 0.10.2')
+    gem.add_development_dependency('rspec', ['~> 1.3'])
+    gem.add_development_dependency('yard',  ['~> 0.5'])
   end
 
   Jeweler::GemcutterTasks.new
-
   FileList['tasks/**/*.rake'].each { |task| import task }
-
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
 task :spec => :check_dependencies
 task :default => :spec
+
+ROOT    = Pathname(__FILE__).dirname.expand_path
+JRUBY   = RUBY_PLATFORM =~ /java/
+WINDOWS = Gem.win_platform?
+SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.10.2

data/dm-reflection.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-reflection}
-  s.version = "0.0.5"
+  s.version = "0.10.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Gamsjaeger (snusnu), Yogo Team"]
-  s.date = %q{2010-05-03}
+  s.date = %q{2010-05-05}
   s.description = %q{Generates datamapper models from existing database schemas and export them to files}
-  s.email = %q{irjudson@gmail.com}
+  s.email = %q{irjudson [a] gmail [d] com}
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
      "lib/dm-reflection/adapters/sqlite3.rb",
      "lib/dm-reflection/builders/source_builder.rb",
      "lib/dm-reflection/reflection.rb",
-     "lib/dm-reflection/version.rb",
      "spec/persevere_reflection_spec.rb",
      "spec/rcov.opts",
      "spec/reflection_spec.rb",
@@ -45,7 +44,7 @@ Gem::Specification.new do |s|
      "tasks/yard.rake",
      "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/irjudson/dm-reflection}
+  s.homepage = %q{http://github.com/yogo/dm-reflection}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}

data/lib/dm-reflection/adapters/mysql.rb

@@ -74,14 +74,29 @@ module DataMapper
             type = DataMapper::Types::Serial
           end
 
+          field_name = column.field.downcase
+
           attribute = {
-            :name     => column.field.downcase,
+            :name     => field_name,
             :type     => type,
             :required => column.null == 'NO',
             :default  => column.default,
             :key      => column.key == 'PRI',
           }
-
+          
+          if type == Integer && field_name[-3,3] == "_id"
+            # This is a foriegn key. So this model belongs_to the other (_id) one.
+            # Add a special set of values and flag this as a relationship so the reflection code
+            # can rebuild the relationship when it's building the model.
+            attribute[:type] = DataMapper::Associations::Relationship
+            attribute[:relationship] = { 
+              :parent => Extlib::Inflection.classify(field_name[0..-4]), 
+              :child => Extlib::Inflection.classify(table), 
+              # When we can detect more from the database we can optimize this
+              :cardinality => Infinity, 
+              :bidirectional => true }
+          end
+          
           # TODO: use the naming convention to compare the name vs the column name
           unless attribute[:name] == column.field
             attribute[:field] = column.field

data/lib/dm-reflection/adapters/persevere.rb

@@ -90,7 +90,7 @@ module DataMapper
       
       # Turns 'class_path/class' into 'ClassPath::Class
       def derive_relationship_model(input)
-        input.match(/(Class)?\/([a-z\-\/\_]+)$/)[-1].split('/').map{|i| ExtLib::Inflection.classify(i) }.join("::")
+        input.match(/(Class)?\/([a-z\-\/\_]+)$/)[-1].split('/').map{|i| Extlib::Inflection.classify(i) }.join("::")
       end
       
     end # module PersevereAdapter

data/lib/dm-reflection/adapters/postgres.rb

@@ -102,9 +102,11 @@ module DataMapper
           if length
             length = (required ? 1 : 0)..length
           end
+          
+          field_name = column.column_name.downcase
 
           attribute = {
-            :name     => column.column_name.downcase,
+            :name     => field_name,
             :type     => type,
             :required => required,
             :default  => default,
@@ -112,6 +114,19 @@ module DataMapper
             :length   => length,
           }
 
+          if type == Integer && field_name[-3,3] == "_id"
+            # This is a foriegn key. So this model belongs_to the other (_id) one.
+            # Add a special set of values and flag this as a relationship so the reflection code
+            # can rebuild the relationship when it's building the model.
+            attribute[:type] = DataMapper::Associations::Relationship
+            attribute[:relationship] = { 
+              :parent => Extlib::Inflection.classify(field_name[0..-4]), 
+              :child => Extlib::Inflection.classify(table), 
+              # When we can detect more from the database we can optimize this
+              :cardinality => Infinity, 
+              :bidirectional => true }
+          end
+
           # TODO: use the naming convention to compare the name vs the column name
           unless attribute[:name] == column.column_name
             attribute[:field] = column.column_name

data/lib/dm-reflection/adapters/sqlite3.rb

@@ -59,18 +59,33 @@ module DataMapper
           type    = get_type(column.type)
           default = column.dflt_value
 
-          if type == Integer && default
-            default = default.to_i
+          if type == Integer && column.pk == 1
+            type    = DataMapper::Types::Serial
           end
 
+          field_name = column.name.downcase
+
           attribute = {
-            :name     => column.name.downcase,
+            :name     => field_name,
             :type     => type,
             :required => column.notnull == 1,
             :default  => default,
             :key      => column.pk == 1,
           }
 
+          if type == Integer && field_name[-3,3] == "_id"
+            # This is a foriegn key. So this model belongs_to the other (_id) one.
+            # Add a special set of values and flag this as a relationship so the reflection code
+            # can rebuild the relationship when it's building the model.
+            attribute[:type] = DataMapper::Associations::Relationship
+            attribute[:relationship] = { 
+              :parent => Extlib::Inflection.classify(field_name[0..-4]), 
+              :child => Extlib::Inflection.classify(table), 
+              # When we can detect more from the database we can optimize this
+              :cardinality => Infinity, 
+              :bidirectional => true }
+          end
+          
           # TODO: use the naming convention to compare the name vs the column name
           unless attribute[:name] == column.name
             attribute[:field] = column.name

data/lib/dm-reflection/reflection.rb

@@ -10,7 +10,7 @@ module DataMapper
     def self.reflect(repository, namespace = Object, overwrite = false)
       adapter = DataMapper.repository(repository).adapter
 
-      models  = []
+      models  = Hash.new
 
       adapter.get_storage_names.each do |storage_name|
         namespace_parts = storage_name.split('__').map do |part|
@@ -40,16 +40,26 @@ module DataMapper
           end
         end
 
-        model = namespace.const_set(model_name, anonymous_model)
+        models[model_name] = namespace.const_set(model_name, anonymous_model)
+      end
 
-        adapter.get_properties(storage_name).each do |attribute|
-          attribute.delete_if { |k,v| v.nil? }
-          model.property(attribute.delete(:name).to_sym, attribute.delete(:type), attribute)
+      models.values.each do |model|
+        adapter.get_properties(model.storage_name).each do |attribute|
+          if attribute[:type] == DataMapper::Associations::Relationship
+            parent = models[attribute[:relationship][:parent]]
+            child = models[attribute[:relationship][:child]]
+            child.belongs_to(parent.name.downcase.to_sym)
+            if attribute[:relationship][:bidirectional]
+              parent.has(attribute[:relationship][:cardinality], child.name.pluralize.downcase.to_sym)
+            end
+          else
+            attribute.delete_if { |k,v| v.nil? }
+            model.property(attribute.delete(:name).to_sym, attribute.delete(:type), attribute)
+          end
         end
-
-        models << model
       end
-      models
+        
+      models.to_a
     end
   end # module Reflection
 

data/spec/reflection_spec.rb

@@ -1,6 +1,9 @@
 require File.dirname(__FILE__) + '/spec_helper'
 require 'dm-reflection/builders/source_builder'
 
+# Property options are in the order specified below 
+# because they pass tests (ruby hash keys are not ordered)
+
 BLOGPOST = <<-RUBY
 class BlogPost
 
@@ -9,7 +12,7 @@ class BlogPost
   property :id, Serial
 
   property :created_at, DateTime
-  property :body, Text, :length => 65535, :lazy => true
+  property :body, Text, :lazy => true, :length => 65535
   property :updated_at, DateTime
 
 
@@ -24,7 +27,7 @@ class Comment
   property :id, Serial
 
   property :created_at, DateTime
-  property :body, Text, :length => 65535, :lazy => true
+  property :body, Text, :lazy => true, :length => 65535
   property :updated_at, DateTime
   property :score, Integer
 
@@ -32,7 +35,41 @@ class Comment
 end
 RUBY
 
-REFLECTION_SOURCES = [ BLOGPOST, COMMENT ]
+PARENT = <<-RUBY
+class Parent
+
+  include DataMapper::Resource
+
+  property :id, Serial
+
+  property :created_at, DateTime
+  property :words, Text, :lazy => true, :length => 65535
+  property :updated_at, DateTime
+  property :name, Text, :lazy => true, :length => 65535
+
+  has n, :children
+
+end
+RUBY
+
+CHILD = <<-RUBY
+class Child
+
+  include DataMapper::Resource
+
+  property :id, Serial
+
+  property :created_at, DateTime
+  property :description, Text, :lazy => true, :length => 65535
+  property :updated_at, DateTime
+  property :name, Integer
+
+  belongs_to :parent
+
+end
+RUBY
+
+REFLECTION_SOURCES = [ BLOGPOST, COMMENT, PARENT, CHILD ]
 
 describe 'The DataMapper reflection module' do
 
@@ -42,8 +79,10 @@ describe 'The DataMapper reflection module' do
     REFLECTION_SOURCES.each { |source| eval(source) }
 
     @models = {
-      :BlogPost      => BLOGPOST,
+      :BlogPost    => BLOGPOST,
       :Comment     => COMMENT,
+      :Parent      => PARENT,
+      :Child       => CHILD
     }
     
     @models.each_key { |model| Extlib::Inflection.constantize(model.to_s).auto_migrate! }
@@ -69,7 +108,7 @@ describe 'The DataMapper reflection module' do
       @models.each_pair do |model_name, source|
         model = Extlib::Inflection.constantize(model_name.to_s)
         reflected_source = model.to_ruby
-        model.to_ruby.should == source
+        reflected_source.should == source
       end
     end
   end

data/spec/spec_helper.rb

@@ -9,9 +9,9 @@ require 'dm-reflection'
 require 'spec'
 require 'spec/autorun'
 
-ENV["SQLITE3_SPEC_URI"]  ||= 'sqlite3::memory:'
-ENV["MYSQL_SPEC_URI"]    ||= 'mysql://localhost/dm-reflections_test'
-ENV["POSTGRES_SPEC_URI"] ||= 'postgres://postgres@localhost/dm-reflection_test'
+ENV["SQLITE3_SPEC_URI"]   ||= 'sqlite3::memory:'
+ENV["MYSQL_SPEC_URI"]     ||= 'mysql://localhost/dm_reflection_test'
+ENV["POSTGRES_SPEC_URI"]  ||= 'postgres://postgres@localhost/dm-reflection_test'
 ENV["PERSEVERE_SPEC_URI"] ||= 'persevere://localhost:8080/'
 
 def setup_adapter(name, default_uri = nil)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 5
-  version: 0.0.5
+  - 10
+  - 2
+  version: 0.10.2
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu), Yogo Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -06:00
+date: 2010-05-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,7 +58,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 description: Generates datamapper models from existing database schemas and export them to files
-email: irjudson@gmail.com
+email: irjudson [a] gmail [d] com
 executables: []
 
 extensions: []
@@ -81,7 +81,6 @@ files:
 - lib/dm-reflection/adapters/sqlite3.rb
 - lib/dm-reflection/builders/source_builder.rb
 - lib/dm-reflection/reflection.rb
-- lib/dm-reflection/version.rb
 - spec/persevere_reflection_spec.rb
 - spec/rcov.opts
 - spec/reflection_spec.rb
@@ -95,7 +94,7 @@ files:
 - tasks/yard.rake
 - tasks/yardstick.rake
 has_rdoc: true
-homepage: http://github.com/irjudson/dm-reflection
+homepage: http://github.com/yogo/dm-reflection
 licenses: []
 
 post_install_message: 

data/lib/dm-reflection/version.rb

@@ -1,5 +0,0 @@
-module DataMapper
-  module Reflection
-    VERSION = '0.0.5'.freeze
-  end
-end