dm-reflection 0.11.0 → 0.11.1

data/Rakefile

@@ -12,6 +12,7 @@ begin
     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_dependency('activesupport')
     gem.add_development_dependency('rspec', ['~> 1.3'])
     gem.add_development_dependency('yard',  ['~> 0.5'])
   end

data/VERSION

@@ -1 +1 @@
-0.11.0
+0.11.1

data/dm-reflection.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-reflection}
-  s.version = "0.11.0"
+  s.version = "0.11.1"
 
   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-06-09}
+  s.date = %q{2010-06-24}
   s.description = %q{Generates datamapper models from existing database schemas and export them to files}
   s.email = %q{irjudson [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -62,15 +62,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
       s.add_development_dependency(%q<yard>, ["~> 0.5"])
     else
       s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
       s.add_dependency(%q<yard>, ["~> 0.5"])
     end
   else
     s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
     s.add_dependency(%q<yard>, ["~> 0.5"])
   end

data/lib/dm-reflection.rb

@@ -1,3 +1,4 @@
+require 'activesupport'
 require 'dm-reflection/reflection'
 require 'dm-reflection/adapters/sqlite3'
 require 'dm-reflection/adapters/persevere'

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

@@ -118,28 +118,36 @@ module DataMapper
           end
           
           if join_table
-            attribute[:type] = DataMapper::Associations::Relationship
+            attribute[:type] = :many_to_many
+            attribute.delete(:default)
+            attribute.delete(:key)
+            attribute.delete(:required)
             attribute[:relationship] = {
               # M:M requires we wire things a bit differently and remove the join model
               :many_to_many => true,
-              :parent => Extlib::Inflection.classify(left_table_name), 
-              :child => Extlib::Inflection.classify(right_table_name), 
+              :parent_name => left_table_name.pluralize,
+              :parent => ActiveSupport::Inflector.classify(left_table_name), 
+              :child_name => right_table_name.pluralize,
+              :child => ActiveSupport::Inflector.classify(right_table_name), 
               # When we can detect more from the database we can optimize this
               :cardinality => Infinity, 
               :bidirectional => true }      
               return [attribute]      
           elsif 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] = { 
-              :many_to_many => false,
-              :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 }
+            attribute.delete(:default)
+            attribute.delete(:key)
+            attribute.delete(:required)
+            fixed_field_name = field_name[0..-4]
+            unless table == ActiveSupport::Inflector.tableize(fixed_field_name)
+              attribute[:type] = :belongs_to
+              attribute[:name] = ActiveSupport::Inflector.singularize(fixed_field_name)
+              attribute[:model] = ActiveSupport::Inflector.classify(attribute[:name])
+              attribute[:other_side] = { 
+                :name => ActiveSupport::Inflector.pluralize(table),
+                :model => ActiveSupport::Inflector.camelize(table),
+                # When we can detect more from the database we can optimize this
+                :cardinality => Infinity }
+            end
           end
           attribute
         end

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

@@ -16,13 +16,14 @@ module DataMapper
       chainable do
         def get_type(db_type)
           
-          return :has_one_relation if db_type.has_key?("$ref") 
+          # return :has_one_relation if db_type.has_key?("$ref")
           
           type = db_type['type']
           format = db_type['format']
 
           case type
-          when 'array'     then :has_many_relation
+          when Hash        then :belongs_to
+          when 'array'     then :has_n
           when 'serial'    then DataMapper::Types::Serial
           when 'integer'   then Integer
           # when 'number'    then BigDecimal
@@ -66,30 +67,33 @@ module DataMapper
         def get_properties(table)
           attributes = Array.new
           schema = self.get_schema(table)[0]
+          if schema.has_key?('properties')
+            
           schema['properties'].each_pair do |key, value|
             type = get_type(value)
+            debugger if type.nil?
+            name = key.sub("#{value['prefix']}#{value['separator']}", "")
+            attribute = { :name => name }
             
-            attribute = { :name => key }
-            
-            if type == :has_one_relation
-              # Has one
-              # Retrieve the other side to determine the cardinality
-              other_table = [table.split('/')[0..-2], value['$ref']].join("/")
-              other_schema = self.get_schema(other_table)[0]
-
-            elsif type == :has_many_relation
-              # Has many
-              # Retrieve the other side to determine the cardinality
-              other_table = [table.split('/')[0..-2], value['items']['$ref']].join("/")
-              other_schema = self.get_schema(other_table)[0]
-              
+            if type == :belongs_to
+              # belongs_to
+              attribute[:type] = :belongs_to
+              attribute[:prefix] = value['prefix'] if value.has_key?('prefix')
+            elsif type == :has_n
+              attribute[:type] = :has_n
+              other_table = [table.split('/')[0..-2], value['items']['$ref']].flatten.join("/")
+              other_class = other_table.camelize
+              attribute[:cardinality] = Infinity
+              attribute[:model] = other_class  
+              attribute.merge!({:prefix => value['prefix']}) if value.has_key?('prefix')
             else
               attribute.merge!({ :type => type, :required => !value.delete('optional'), :key => value.has_key?('index') && value.delete('index') }) unless attribute[:type] == DataMapper::Types::Serial
               ['type', 'format', 'unique', 'index', 'items'].each { |key| value.delete(key) }
               value.keys.each { |key| value[key.to_sym] = value[key]; value.delete(key) }
               attribute.merge!(value)
-              attributes << attribute
             end
+            attributes << attribute
+          end
           end
           return attributes
         end
@@ -99,7 +103,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| ActiveSupport::Inflector.classify(i) }.join("::")
       end
       
     end # module PersevereAdapter

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

@@ -124,8 +124,8 @@ module DataMapper
             # 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), 
+              :parent => ActiveSupport::Inflector.classify(field_name[0..-4]), 
+              :child => ActiveSupport::Inflector.classify(table), 
               # When we can detect more from the database we can optimize this
               :cardinality => Infinity, 
               :bidirectional => true }

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

@@ -83,8 +83,8 @@ module DataMapper
             # 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), 
+              :parent => ActiveSupport::Inflector.classify(field_name[0..-4]), 
+              :child => ActiveSupport::Inflector.classify(table), 
               # When we can detect more from the database we can optimize this
               :cardinality => Infinity, 
               :bidirectional => true }

data/lib/dm-reflection/builders/source_builder.rb

@@ -169,7 +169,7 @@ module DataMapper
           end
 
           def type
-            Extlib::Inflection.demodulize(backend.type)
+            ActiveSupport::Inflector.demodulize(backend.type)
           end
 
 
@@ -255,7 +255,7 @@ module DataMapper
           def prioritized_options
             option_priorities.inject([]) do |memo, name|
               if name == :through && through = backend_options[:through]
-                value = through.is_a?(Symbol) ? through : Extlib::Inflection.demodulize(through)
+                value = through.is_a?(Symbol) ? through : ActiveSupport::Inflector.demodulize(through)
                 memo << [ :through, value ]
               end
               memo

data/lib/dm-reflection/reflection.rb

@@ -14,7 +14,7 @@ module DataMapper
 
       adapter.get_storage_names.each do |storage_name|
         namespace_parts = storage_name.split(separator).map do |part|
-          Extlib::Inflection.classify(part)
+          ActiveSupport::Inflector.classify(part)
         end
 
         model_name = namespace_parts.pop
@@ -39,30 +39,40 @@ module DataMapper
             RUBY
           end
         end
-
-        models[model_name] = namespace.const_set(model_name, anonymous_model)
+        
+        full_name = namespace_parts.length > 0 ? [namespace_parts, model_name].join('::') : model_name
+        models[full_name] = namespace.const_set(model_name, anonymous_model)
       end
 
       join_models = Array.new
       
       models.each do |model_name, 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]]
-            if parent.nil? or child.nil?
-              puts "Reflection Relationship: P: #{parent.inspect} C: #{child.inspect} A: #{attribute[:relationship].inspect}"
-            end
-            if attribute[:relationship][:many_to_many]
-              parent.has(attribute[:relationship][:cardinality], child.name.tableize.pluralize.downcase.to_sym, :through => DataMapper::Resource, :model => child)
-              child.has(attribute[:relationship][:cardinality], parent.name.tableize.pluralize.downcase.to_sym, :through => DataMapper::Resource, :model => parent)
-              # Remove join model
-              join_models << model_name
-            else
-              child.belongs_to(parent.name.tableize.downcase.to_sym, :model => parent)
-              if attribute[:relationship][:bidirectional]
-                parent.has(attribute[:relationship][:cardinality], child.name.tableize.pluralize.downcase.to_sym, :model => child)
-              end
+          if attribute[:type] == :many_to_many
+            attribute.delete(:type)
+            attribute.delete(:name)
+            relationship = attribute.delete(:relationship)
+            parent = models[relationship.delete(:parent)]
+            child = models[relationship.delete(:child)]
+            cardinality = relationship.delete(:cardinality)
+            parent.has(cardinality, relationship[:child_name].to_sym, attribute.merge({:through => DataMapper::Resource, :model => child}))
+            child.has(cardinality, relationship[:parent_name].to_sym, attribute.merge({:through => DataMapper::Resource, :model => parent}))
+            join_models << model_name
+          elsif attribute[:type] == :has_n
+            attribute.delete(:type)
+            model.has(attribute.delete(:cardinality), attribute.delete(:name).to_sym, attribute)
+          elsif attribute[:type] == :belongs_to
+            attribute.delete(:type)
+            other_side = attribute.delete(:other_side)
+            name = attribute.delete(:name)
+#            puts "#{model.name}.belongs_to(#{name}, #{attribute.inspect})"
+            model.belongs_to(name.to_sym, attribute.dup)
+            unless other_side.nil?
+              other_name = other_side.delete(:name)
+              cardinality = other_side.delete(:cardinality)
+              other_side[:model] = ActiveSupport::Inflector.singularize(model)
+#              puts "#{models[attribute[:model]]}.has(#{cardinality}, #{other_name}, #{other_side.inspect})"
+              models[attribute[:model]].has(cardinality, other_name.to_sym, other_side)
             end
           else
             attribute.delete_if { |k,v| v.nil? }

data/spec/persevere_reflection_spec.rb

@@ -46,19 +46,19 @@ if ENV['ADAPTER'] == 'persevere'
           :PostComment     => POST_COMMENT,
         }
 
-        @models.each_key { |model| Extlib::Inflection.constantize(model.to_s).auto_migrate! }
-        @models.each_key { |model| remove_model_from_memory( Extlib::Inflection.constantize(model.to_s) ) }
+        @models.keys.reverse.each { |model| ActiveSupport::Inflector.constantize(model.to_s).auto_migrate! }
+        @models.keys.reverse.each { |model| remove_model_from_memory( ActiveSupport::Inflector.constantize(model.to_s) ) }
     end
     
     after(:each) do
-      @models.each_key do |model_name|
+      @models.keys.reverse.each do |model_name|
         next unless Object.const_defined?(model_name)
-        model = Extlib::Inflection.constantize(model_name.to_s)
+        model = ActiveSupport::Inflector.constantize(model_name.to_s)
         remove_model_from_memory(model)
       end
-      @models.each_key do |model_name|
+      @models.keys.reverse.each do |model_name|
         next unless Object.const_defined?(model_name)
-        model = Extlib::Inflection.constantize(model_name.to_s)
+        model = ActiveSupport::Inflector.constantize(model_name.to_s)
         remove_model_from_memory(model)
       end
     end

data/spec/reflection_spec.rb

@@ -84,15 +84,15 @@ describe 'The DataMapper reflection module' do
       :Parent      => PARENT,
       :Child       => CHILD
     }
-    
-    @models.each_key { |model| Extlib::Inflection.constantize(model.to_s).auto_migrate! }
-    @models.each_key { |model| remove_model_from_memory( Extlib::Inflection.constantize(model.to_s) ) }
+        
+    @models.keys.reverse.each { |model| ActiveSupport::Inflector.constantize(model.to_s).auto_migrate! }
+    @models.keys.reverse.each { |model| remove_model_from_memory( ActiveSupport::Inflector.constantize(model.to_s) ) }
   end
 
   after(:each) do
-    @models.each_key do |model_name|
+    @models.keys.reverse.each do |model_name|
       next unless Object.const_defined?(model_name)
-      model = Extlib::Inflection.constantize(model_name.to_s)
+      model = ActiveSupport::Inflector.constantize(model_name.to_s)
       model.auto_migrate_down!
       remove_model_from_memory(model)
     end
@@ -101,12 +101,12 @@ describe 'The DataMapper reflection module' do
   describe 'repository(:name).reflect' do
     it 'should reflect all the models in a repository' do      
       # Reflect the models back into memory.
-      DataMapper::Reflection.reflect(:default)
+      results = DataMapper::Reflection.reflect(:default)
       
       # Iterate through each model in memory and verify the source is the same as the original.
       # using model.to_ruby
       @models.each_pair do |model_name, source|
-        model = Extlib::Inflection.constantize(model_name.to_s)
+        model = ActiveSupport::Inflector.constantize(model_name.to_s)
         reflected_source = model.to_ruby
         reflected_source.should == source
       end
@@ -119,7 +119,7 @@ describe 'The DataMapper reflection module' do
       DataMapper::Reflection.reflect(:default)
       
       @models.each_key do |model_name|
-        model = Extlib::Inflection.constantize(model_name.to_s)
+        model = ActiveSupport::Inflector.constantize(model_name.to_s)
         model.should respond_to(:default_repository_name)
         model.default_repository_name.should == :default
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 11
-  - 0
-  version: 0.11.0
+  - 1
+  version: 0.11.1
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu), Yogo Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 -06:00
+date: 2010-06-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,9 +32,21 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -43,11 +55,11 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -56,7 +68,7 @@ dependencies:
         - 5
         version: "0.5"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: Generates datamapper models from existing database schemas and export them to files
 email: irjudson [a] gmail [d] com
 executables: []