godfat-dm-mapping 0.4.0 → 0.4.1

data/CHANGES

@@ -1,5 +1,8 @@
 = dm-mapper changes history
 
+=== dm-mapping 0.4.1, 2008-08-14
+* removed type hack, replaced with rejecting special type to lookup.
+
 === dm-mapping 0.4.0, 2008-08-04
 * added Migration#auto_genclass!.
 * updated README.

data/README

@@ -1,4 +1,4 @@
-= dm-mapping 0.4.0
+= dm-mapping 0.4.1
 by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
   godfat (XD) godfat.org
 
@@ -23,7 +23,7 @@ by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
 
  class User
    include DataMapper::Resource
-   # maping all
+   # mapping all
    mapping /.*/
 
    # mapping for ended with _at, and started with salt_
@@ -46,10 +46,10 @@ 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,   {:default => 'nospam@nospam.tw'}],
+       ['email',       String,   {:size => 255, :default => 'nospam@nospam.tw'}],
        ['id',          Integer,  {:serial => true}],
-       ['salt_first',  String,   {}],
-       ['salt_second', String,   {}]]
+       ['salt_first',  String,   {:size => 50}],
+       ['salt_second', String,   {:size => 50}]]
 
  dm.fields('users').sort == User.fields.sort
  # => true
@@ -58,8 +58,8 @@ by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
  # => {'users' => [['id',          Integer,  {:serial => true}],
                    ['email',       String,   {:default => 'nospam@nospam.tw'}],
                    ['created_at',  DateTime, {}],
-                   ['salt_first',  String,   {}],
-                   ['salt_second', String,   {}]]}
+                   ['salt_first',  String,   {:size => 50}],
+                   ['salt_second', String,   {:size => 50}]]}
 
  # there's no guarantee of the order in returned array
  dm.auto_genclass!
@@ -74,6 +74,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)
 
 == INSTALL:
 

data/Rakefile

@@ -45,15 +45,16 @@ PROJ.gem.dependencies << ['dm-core', '>=0.9.3'] << ['extlib', '>=0.9.3']
 # PROJ.gem.files = []
 
 PROJ.manifest_file = 'Manifest'
-PROJ.exclude << 'Manifest' << '^tmp' << 'tmp$' << '^pkg'
+PROJ.exclude += ['Manifest', '^tmp', 'tmp$', '^pkg', '.gitignore', '^ann-']
 
 PROJ.readme_file = 'README'
 PROJ.rdoc.main = 'README'
 PROJ.rdoc.remote_dir = 'dm-mapping'
-PROJ.rdoc.exclude << 'Rakefile' << '^tasks' << '^test'
+PROJ.rdoc.exclude += ['Rakefile', '^tasks', '^test']
 PROJ.rdoc.include << '\w+'
 PROJ.rdoc.opts << '--diagram' if !WIN32 and `which dot` =~ %r/\/dot/
-PROJ.rdoc.opts << '--charset=utf-8' << '--inline-source' << '--line-numbers' << '--promiscuous'
+PROJ.rdoc.opts += ['--charset=utf-8', '--inline-source', 
+                   '--line-numbers', '--promiscuous']
 
 PROJ.spec.opts << '--color'
 

data/TODO

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

data/dm-mapping.gemspec

@@ -1,15 +1,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-mapping}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   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)"]
-  s.date = %q{2008-08-04}
+  s.date = %q{2008-08-14}
   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 = [".gitignore", "CHANGES", "LICENSE", "NOTICE", "README", "TODO", "dm-mapping.gemspec"]
-  s.files = [".gitignore", "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.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.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"]

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

@@ -23,9 +23,6 @@ module DataMapper
             type, chain = self.class.type_map.
               lookup_primitive(field.type.gsub(/\(\d+\)/, '').upcase)
 
-            # stupid hack
-            type = String if type == Class
-
             attrs = {}
             attrs[:serial] = true if field.pk != 0
             attrs[:nullable] = true if field.notnull != 0 && !attrs[:serial]

data/lib/dm-mapping/type_map.rb

@@ -7,7 +7,11 @@ module DataMapper
     #       # => { DateTime => {:auto_validation => true} }
     def lookup_primitive primitive, type_map = self
       type_map.chains.find{ |type, chain|
-        primitive == chain.primitive
+        primitive == chain.primitive &&
+        [Integer, Float, BigDecimal,
+         String, TrueClass, FalseClass,
+         DateTime, Date, Time,
+         DM::Text, DM::Boolean].member?(type)
       } or lookup_primitive(primitive, type_map.parent)
     end
   end

data/lib/dm-mapping/version.rb

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

data/tasks/manifest.rake

@@ -15,9 +15,9 @@ namespace :manifest do
       lines.map! do |line|
         case line
         when %r/^(-{3}|\+{3})/; nil
-        when %r/^@/; Console::ANSICode.blue line
-        when %r/^\+/; Console::ANSICode.green line
-        when %r/^\-/; Console::ANSICode.red line
+        when %r/^@/; ANSICode.blue line
+        when %r/^\+/; ANSICode.green line
+        when %r/^\-/; ANSICode.red line
         else line end
       end
     end

data/test/test_sqlite3.rb

@@ -50,17 +50,17 @@ class DMMTest < Test::Unit::TestCase
   end
 
   def user_fields
-    [['created_at', DateTime,                {}],
-     ['id',         Integer,                 {:serial => true}],
-     ['login',      String,                  {}],
-     ['sig',        DataMapper::Types::Text, {}]]
+    [['created_at', DateTime, {}],
+     ['id',         Integer,  {:serial => true}],
+     ['login',      String,   {:size => 50}],
+     ['sig',        DM::Text, {}]]
   end
 
   def comment_fields
-    [['body',    DataMapper::Types::Text, {}],
-     ['id',      Integer                , {:serial => true}],
-     ['title',   String                 , {:default => 'default title'}],
-     ['user_id', Integer                , {}]]
+    [['body',    DM::Text, {}],
+     ['id',      Integer,  {:serial => true}],
+     ['title',   String,   {:size => 50, :default => 'default title'}],
+     ['user_id', Integer,  {}]]
   end
 
   def test_storages

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: godfat-dm-mapping
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 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-04 00:00:00 -07:00
+date: 2008-08-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,7 +37,6 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- .gitignore
 - CHANGES
 - LICENSE
 - NOTICE
@@ -45,7 +44,6 @@ extra_rdoc_files:
 - TODO
 - dm-mapping.gemspec
 files: 
-- .gitignore
 - CHANGES
 - LICENSE
 - NOTICE

data/.gitignore

@@ -1,3 +0,0 @@
-tmp*
-pkg
-doc