dm-mapping 0.4.1 → 0.5.0

data/CHANGES

@@ -1,5 +1,14 @@
 = dm-mapper changes history
 
+=== dm-mapping 0.5.0, 2008-08-14
+* feature added
+ - added mysql support.
+ - reflect size 65535 in TEXT for sqlite3.
+* bug fixed
+ - reflect VARCHAR(size) instead of default size in sqlite3.
+* misc
+ - renamed sqlite3adapter to sqlite3_adapter.
+
 === dm-mapping 0.4.1, 2008-08-14
 * removed type hack, replaced with rejecting special type to lookup.
 

data/NOTICE

@@ -1,9 +1,30 @@
-= notice for other stuffs
+= notice and thanks
 
 * dm-mapping is a plugin of DataMapper
     > sudo gem install dm-core
     http://datamapper.org
 
 * this project skeleton is built through Mr Bones
-    > sudo gem install bones
     http://codeforpeople.rubyforge.org/bones/
+
+* thanks to Rails team with ActiveRecord, it's inspiring.
+  and some SQL snippets are borrowed from it.
+    http://rubyonrails.org
+
+* Ruby the great language
+    http://www.ruby-lang.org
+
+* Rubygems the great package management
+    http://rubygems.org
+
+* Rake the great task automation
+    http://rake.rubyforge.org
+
+* Facets the great ruby library collection
+    http://facets.rubyforge.org/
+
+* Rubyforge for distributing ruby gems
+    http://rubyforge.org
+
+* Github for hosting git
+    http://github.com

data/README

@@ -1,4 +1,4 @@
-= dm-mapping 0.4.1
+= dm-mapping 0.5.0
 by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
   godfat (XD) godfat.org
 
@@ -18,9 +18,6 @@ by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
  require 'dm-mapping'
  dm = DataMapper.setup :default, 'sqlite3:db/development.sqlite3'
 
- dm.object_id == DataMapper.repository.adapter.object_id
- # => true
-
  class User
    include DataMapper::Resource
    # mapping all
@@ -45,21 +42,26 @@ by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
 
  # there's no guarantee of the order in fields array
  User.fields.sort
- # => [['created_at',  DateTime, {}],
-       ['email',       String,   {:size => 255, :default => 'nospam@nospam.tw'}],
-       ['id',          Integer,  {:serial => true}],
-       ['salt_first',  String,   {:size => 50}],
-       ['salt_second', String,   {:size => 50}]]
+ # => [['created_at',  DateTime, {:nullable => true}],
+       ['email',       String,   {:nullable => true, :size => 255,
+                                  :default => 'nospam@nospam.tw'}],
+       ['id',          Integer,  {:nullable => false, :serial => true,
+                                  :key => true}],
+       ['salt_first',  String,   {:nullable => true, :size => 50}],
+       ['salt_second', String,   {:nullable => true, :size => 50}]]
 
  dm.fields('users').sort == User.fields.sort
  # => true
 
  dm.storages_and_fields
- # => {'users' => [['id',          Integer,  {:serial => true}],
-                   ['email',       String,   {:default => 'nospam@nospam.tw'}],
-                   ['created_at',  DateTime, {}],
-                   ['salt_first',  String,   {:size => 50}],
-                   ['salt_second', String,   {:size => 50}]]}
+ # => {'users' => [['id',          Integer,  {:nullable => false,
+                                              :serial => true,
+                                              :key => true}],
+                   ['email',       String,   {:nullable => true,
+                                              :default => 'nospam@nospam.tw'}],
+                   ['created_at',  DateTime, {:nullable => true}],
+                   ['salt_first',  String,   {:nullable => true, :size => 50}],
+                   ['salt_second', String,   {:nullable => true, :size => 50}]]}
 
  # there's no guarantee of the order in returned array
  dm.auto_genclass!
@@ -74,7 +76,7 @@ by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
 == REQUIREMENTS:
 
 * dm-core 0.9.3
-* at least one do_* adapter (currently only sqlite3 is supported)
+* at least one do_* adapter (currently supports sqlite3 and mysql)
 
 == INSTALL:
 

data/TODO

@@ -1,5 +1,4 @@
 = dm-mapping todo list
 
-* automatic determine model relationship
-* mysql adapter in 0.5
-* postgresql adapter in 0.6
+* 0.6 postgresql adapter
+* 0.7 automatic determine model relationship

data/dm-mapping.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-mapping}
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (a.k.a. godfat \347\234\237\345\270\270)"]
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.description = %q{DataMapper plugin that helps you manipulate an existing database. It creates mappings between existing columns and model's properties.}
   s.email = %q{godfat (XD) godfat.org}
   s.extra_rdoc_files = ["CHANGES", "LICENSE", "NOTICE", "README", "TODO", "dm-mapping.gemspec"]
-  s.files = ["CHANGES", "LICENSE", "NOTICE", "README", "Rakefile", "TODO", "dm-mapping.gemspec", "lib/dm-mapping.rb", "lib/dm-mapping/adapters/abstract_adapter.rb", "lib/dm-mapping/adapters/sqlite3adapter.rb", "lib/dm-mapping/model.rb", "lib/dm-mapping/type_map.rb", "lib/dm-mapping/version.rb", "tasks/ann.rake", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/manifest.rake", "tasks/notes.rake", "tasks/post_load.rake", "tasks/rdoc.rake", "tasks/rubyforge.rake", "tasks/setup.rb", "tasks/spec.rake", "tasks/svn.rake", "tasks/test.rake", "test/test_sqlite3.rb"]
+  s.files = ["CHANGES", "LICENSE", "NOTICE", "README", "Rakefile", "TODO", "dm-mapping.gemspec", "lib/dm-mapping.rb", "lib/dm-mapping/adapters/abstract_adapter.rb", "lib/dm-mapping/adapters/mysql_adapter.rb", "lib/dm-mapping/adapters/sqlite3_adapter.rb", "lib/dm-mapping/model.rb", "lib/dm-mapping/type_map.rb", "lib/dm-mapping/version.rb", "tasks/ann.rake", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/manifest.rake", "tasks/notes.rake", "tasks/post_load.rake", "tasks/rdoc.rake", "tasks/rubyforge.rake", "tasks/setup.rb", "tasks/spec.rake", "tasks/svn.rake", "tasks/test.rake", "test/abstract.rb", "test/test_dm-mapping.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/godfat/dm-mapping}
   s.rdoc_options = ["--diagram", "--charset=utf-8", "--inline-source", "--line-numbers", "--promiscuous", "--main", "README"]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{ludy}
   s.rubygems_version = %q{1.2.0}
   s.summary = %q{DataMapper plugin that helps you manipulate an existing database. It creates mappings between existing columns and model's properties.}
-  s.test_files = ["test/test_sqlite3.rb"]
+  s.test_files = ["test/test_dm-mapping.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/dm-mapping/adapters/abstract_adapter.rb

@@ -18,7 +18,12 @@ module DataMapper
         #        ['salt_first',  String,   {}],
         #        ['salt_second', String,   {}]]
         def fields storage
-          raise NotImplementedError
+          dmm_query_storage(storage).map{ |field|
+            type, chain = self.class.type_map.
+              lookup_primitive(dmm_primitive(field))
+
+            [dmm_field_name(field), type, dmm_attributes(field)]
+          }
         end
 
         # returns a hash with storage names in keys and
@@ -58,6 +63,11 @@ module DataMapper
             scope.const_set(Extlib::Inflection.classify(storage), model)
           }
         end
+
+        private
+        def dmm_query_storage
+          raise NotImplementError.new("#{self.class}#fields is not implemented.")
+        end
       end
     end
   end

data/lib/dm-mapping/adapters/mysql_adapter.rb

@@ -0,0 +1,47 @@
+
+require 'dm-mapping/adapters/abstract_adapter'
+require 'dm-mapping/type_map'
+
+module DataMapper
+  module Adapters
+    class MysqlAdapter < DataObjectsAdapter #:nodoc: all
+      module Migration
+        def storages
+          query 'SHOW TABLES'
+        end
+
+        private
+        # construct needed table metadata
+        def dmm_query_storage storage
+          sql = <<-SQL.compress_lines
+            SELECT column_name, column_default, is_nullable, data_type,
+                   character_maximum_length, column_key, extra
+            FROM `information_schema`.`columns`
+            WHERE `table_schema` = ? AND `table_name` = ?
+          SQL
+
+          query(sql, db_name, storage)
+        end
+
+        def dmm_field_name field
+          field.column_name
+        end
+
+        def dmm_primitive field
+          field.data_type
+        end
+
+        def dmm_attributes field, attrs = {}
+            attrs[:serial] = true if field.extra == 'auto_increment'
+            attrs[:key] = true if field.column_key == 'PRI'
+            attrs[:nullable] = field.is_nullable == 'YES'
+            attrs[:default] = field.column_default if field.column_default
+            attrs[:size] = field.character_maximum_length if
+              field.character_maximum_length
+
+            attrs
+        end
+      end
+    end
+  end
+end

data/lib/dm-mapping/adapters/sqlite3_adapter.rb

@@ -0,0 +1,52 @@
+
+require 'dm-mapping/adapters/abstract_adapter'
+require 'dm-mapping/type_map'
+
+module DataMapper
+  module Adapters
+    class Sqlite3Adapter < DataObjectsAdapter #:nodoc: all
+      module Migration
+        def storages
+# activerecord-2.1.0/lib/active_record/connection_adapters/sqlite_adapter.rb: 177
+          sql = <<-SQL.compress_lines
+            SELECT name
+            FROM sqlite_master
+            WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+          SQL
+# activerecord-2.1.0/lib/active_record/connection_adapters/sqlite_adapter.rb: 181
+
+          query sql
+        end
+
+        private
+        alias_method :dmm_query_storage, :query_table
+        def dmm_field_name field
+          field.name
+        end
+
+        def dmm_primitive field
+          field.type.gsub(/\(\d+\)/, '')
+        end
+
+        def dmm_attributes field, attrs = {}
+          if field.pk != 0
+            attrs[:key] = true
+            attrs[:serial] = true if supports_serial?
+          end
+          attrs[:nullable] = field.notnull != 99
+          attrs[:default] = field.dflt_value[1..-2] if field.dflt_value
+
+          if field.type.upcase == 'TEXT'
+            attrs[:size] = 65535
+          else
+            ergo = field.type.match(/\((\d+)\)/)
+            size = ergo && ergo[1].to_i
+            attrs[:size] = size if size
+          end
+
+          attrs
+        end
+      end
+    end
+  end
+end

data/lib/dm-mapping/type_map.rb

@@ -7,7 +7,7 @@ module DataMapper
     #       # => { DateTime => {:auto_validation => true} }
     def lookup_primitive primitive, type_map = self
       type_map.chains.find{ |type, chain|
-        primitive == chain.primitive &&
+        primitive.upcase == chain.primitive &&
         [Integer, Float, BigDecimal,
          String, TrueClass, FalseClass,
          DateTime, Date, Time,

data/lib/dm-mapping/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Mapping
-    VERSION = '0.4.1' unless defined?(DataMapper::Mapping::VERSION)
+    VERSION = '0.5.0' unless defined?(DataMapper::Mapping::VERSION)
   end
 end

data/lib/dm-mapping.rb

@@ -11,8 +11,9 @@ module DataMapper
   class << self
     # ensure the using adapter is extended by dm-mapping
     def ensure_required_dm_mapping_adapter
-      adapter_name = repository.adapter.class.to_s.split('::').last.downcase
-      require "dm-mapping/adapters/#{adapter_name}"
+      require 'extlib'
+      adapter_name = repository.adapter.class.to_s.split('::').last
+      require "dm-mapping/adapters/#{Extlib::Inflection.underscore(adapter_name)}"
     end
 
     # dirty hack that hook requirement after setup.

data/test/{test_sqlite3.rb → abstract.rb}

@@ -1,17 +1,38 @@
 
-require 'test/unit'
-
 require 'rubygems'
 require 'data_mapper'
 require 'dm-mapping'
 
-class DMMTest < Test::Unit::TestCase
+module Abstract
+  def setup_data_mapper
+    raise 'please provide an clean database because it is a destructive test!!'
+  end
+
+  AttrCommon = {:nullable => true}
+  AttrCommonPK = {:serial => true, :key => true, :nullable => false}
+  AttrText = {:size => 65535}.merge AttrCommon
+
+  def user_fields
+    [['created_at', DateTime, AttrCommon],
+     ['id',         Integer,  AttrCommonPK],
+     ['login',      String,   {:size => 70}.merge(AttrCommon)],
+     ['sig',        DM::Text, AttrText]]
+  end
+
+  def comment_fields
+    [['body',    DM::Text, AttrText],
+     ['id',      Integer,  AttrCommonPK],
+     ['title',   String,   {:size => 50, :default => 'default title'}.
+                            merge(AttrCommon)],
+     ['user_id', Integer,  AttrCommon]]
+  end
+
   class User
     include DataMapper::Resource
     has n, :comments
 
     property :id,         Integer, :serial => true
-    property :login,      String
+    property :login,      String, :size => 70
     property :sig,        Text
     property :created_at, DateTime
   end
@@ -21,19 +42,10 @@ class DMMTest < Test::Unit::TestCase
     belongs_to :user
 
     property :id,    Integer, :serial => true
-    property :title, String,  :default => 'default title'
+    property :title, String,  :size => 50, :default => 'default title'
     property :body,  Text
   end
 
-
-  # override it to test with another adapter
-  # NOTE:
-  #   please provide an clean database because it is a destructive test!!
-  def setup_data_mapper
-    DataMapper.setup(:default, 'sqlite3:tmp.db')
-  end
-
-
   class Model; end
 
   def create_fake_model
@@ -49,23 +61,9 @@ class DMMTest < Test::Unit::TestCase
     Comment.auto_migrate!
   end
 
-  def user_fields
-    [['created_at', DateTime, {}],
-     ['id',         Integer,  {:serial => true}],
-     ['login',      String,   {:size => 50}],
-     ['sig',        DM::Text, {}]]
-  end
-
-  def comment_fields
-    [['body',    DM::Text, {}],
-     ['id',      Integer,  {:serial => true}],
-     ['title',   String,   {:size => 50, :default => 'default title'}],
-     ['user_id', Integer,  {}]]
-  end
-
   def test_storages
-    assert_equal ['dmm_test_comments', 'dmm_test_users'], dm.storages.sort
-    assert_equal comment_fields, dm.fields('dmm_test_comments').sort
+    assert_equal ['abstract_comments', 'abstract_users'], dm.storages.sort
+    assert_equal comment_fields, dm.fields('abstract_comments').sort
   end
 
   def test_create_comment
@@ -77,10 +75,10 @@ class DMMTest < Test::Unit::TestCase
   def test_mapping_all
     test_create_comment # for fixtures
     model, local_dm = create_fake_model
-    model.storage_names[:default] = 'dmm_test_comments'
+    model.storage_names[:default] = 'abstract_comments'
 
-    assert_equal ['dmm_test_comments', 'dmm_test_users'], local_dm.storages.sort
-    assert_equal 'dmm_test_comments', model.storage_name
+    assert_equal ['abstract_comments', 'abstract_users'], local_dm.storages.sort
+    assert_equal 'abstract_comments', model.storage_name
 
     assert_equal 1, model.count
     assert_equal comment_fields, model.fields.sort
@@ -92,7 +90,7 @@ class DMMTest < Test::Unit::TestCase
 
   def test_mapping_and_create
     model, local_dm = create_fake_model
-    model.storage_names[:default] = 'dmm_test_comments'
+    model.storage_names[:default] = 'abstract_comments'
     model.send :mapping
 
     model.create(:title => 'orz')
@@ -104,8 +102,9 @@ class DMMTest < Test::Unit::TestCase
   end
 
   def test_storages_and_fields
-    assert_equal user_fields, dm.fields('dmm_test_users').sort
-    assert_equal( {'dmm_test_users' => user_fields, 'dmm_test_comments' => comment_fields},
+    assert_equal user_fields, dm.fields('abstract_users').sort
+    assert_equal( {'abstract_users' => user_fields,
+                   'abstract_comments' => comment_fields},
                   dm.storages_and_fields.inject({}){ |r, i|
                     key, value = i
                     r[key] = value.sort
@@ -115,7 +114,7 @@ class DMMTest < Test::Unit::TestCase
 
   def test_mapping_type
     model, local_dm = create_fake_model
-    model.storage_names[:default] = 'dmm_test_comments'
+    model.storage_names[:default] = 'abstract_comments'
     model.send :mapping, Integer
 
     assert_equal ['id', 'user_id'], model.properties.map(&:name).map(&:to_s).sort
@@ -123,7 +122,7 @@ class DMMTest < Test::Unit::TestCase
 
   def test_mapping_multiple
     model, local_dm = create_fake_model
-    model.storage_names[:default] = 'dmm_test_users'
+    model.storage_names[:default] = 'abstract_users'
     model.send :mapping, :login, Integer
 
     assert_equal ['id', 'login'], model.properties.map(&:name).map(&:to_s).sort
@@ -131,7 +130,7 @@ class DMMTest < Test::Unit::TestCase
 
   def test_mapping_regexp
     model, local_dm = create_fake_model
-    model.storage_names[:default] = 'dmm_test_comments'
+    model.storage_names[:default] = 'abstract_comments'
     model.send :mapping, /id$/
 
     assert_equal ['id', 'user_id'], model.properties.map(&:name).map(&:to_s).sort
@@ -144,16 +143,12 @@ class DMMTest < Test::Unit::TestCase
   end
 
   def test_auto_genclass
-    for_test_auto_genclass
-    for_test_auto_genclass Object
-  end
-
-  def for_test_auto_genclass scope = DataMapper::Mapping
-    assert_equal ["#{scope == Object ? '' : "#{scope}::"}DmmTestComment",
-                  "#{scope == Object ? '' : "#{scope}::"}DmmTestUser"],
+    scope = self.class
+    assert_equal ["#{scope == Object ? '' : "#{scope}::"}AbstractComment",
+                  "#{scope == Object ? '' : "#{scope}::"}AbstractUser"],
                  dm.auto_genclass!(scope).map(&:to_s).sort
 
-    comment = scope.const_get('DmmTestComment')
+    comment = scope.const_get('AbstractComment')
 
     assert_equal comment_fields, comment.fields.sort
 

data/test/test_dm-mapping.rb

@@ -0,0 +1,23 @@
+
+require 'test/unit'
+require 'test/abstract'
+
+require 'dm-core/adapters/sqlite3_adapter'
+require 'dm-core/adapters/mysql_adapter'
+require 'dm-core/adapters/postgres_adapter'
+
+class Sqlite3Test < Test::Unit::TestCase
+  include Abstract
+
+  def setup_data_mapper
+    DataMapper.setup(:default, 'sqlite3:tmp.sqlite3')
+  end
+end
+
+class MysqlTest < Test::Unit::TestCase
+  include Abstract
+
+  def setup_data_mapper
+    DataMapper.setup(:default, 'mysql://dm-mapping:godfat@localhost/dm-mapping')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-mapping
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors: 
 - "Lin Jen-Shin (a.k.a. godfat \xE7\x9C\x9F\xE5\xB8\xB8)"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-14 00:00:00 +08:00
+date: 2008-08-15 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,7 +55,8 @@ files:
 - dm-mapping.gemspec
 - lib/dm-mapping.rb
 - lib/dm-mapping/adapters/abstract_adapter.rb
-- lib/dm-mapping/adapters/sqlite3adapter.rb
+- lib/dm-mapping/adapters/mysql_adapter.rb
+- lib/dm-mapping/adapters/sqlite3_adapter.rb
 - lib/dm-mapping/model.rb
 - lib/dm-mapping/type_map.rb
 - lib/dm-mapping/version.rb
@@ -72,7 +73,8 @@ files:
 - tasks/spec.rake
 - tasks/svn.rake
 - tasks/test.rake
-- test/test_sqlite3.rb
+- test/abstract.rb
+- test/test_dm-mapping.rb
 has_rdoc: true
 homepage: http://github.com/godfat/dm-mapping
 post_install_message: 
@@ -106,4 +108,4 @@ signing_key:
 specification_version: 2
 summary: DataMapper plugin that helps you manipulate an existing database. It creates mappings between existing columns and model's properties.
 test_files: 
-- test/test_sqlite3.rb
+- test/test_dm-mapping.rb

data/lib/dm-mapping/adapters/sqlite3adapter.rb

@@ -1,37 +0,0 @@
-
-require 'dm-mapping/adapters/abstract_adapter'
-require 'dm-mapping/type_map'
-
-module DataMapper
-  module Adapters
-    class Sqlite3Adapter < DataObjectsAdapter #:nodoc: all
-      module Migration
-        def storages
-# activerecord-2.1.0/lib/active_record/connection_adapters/sqlite_adapter.rb: 177
-          sql = <<-SQL
-            SELECT name
-            FROM sqlite_master
-            WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-          SQL
-# activerecord-2.1.0/lib/active_record/connection_adapters/sqlite_adapter.rb: 181
-
-          query sql
-        end
-
-        def fields table
-          query_table(table).map{ |field|
-            type, chain = self.class.type_map.
-              lookup_primitive(field.type.gsub(/\(\d+\)/, '').upcase)
-
-            attrs = {}
-            attrs[:serial] = true if field.pk != 0
-            attrs[:nullable] = true if field.notnull != 0 && !attrs[:serial]
-            attrs[:default] = field.dflt_value[1..-2] if field.dflt_value
-
-            [field.name, type, attrs.merge(chain.attributes)]
-          }
-        end
-      end
-    end
-  end
-end