dm-is-reflective 0.8.0 → 0.9.0

data/lib/dm-is-reflective/is/adapters/mysql_adapter.rb

@@ -1,11 +1,9 @@
 
-require 'dm-is-reflective/is/adapters/abstract_adapter'
-
 module DataMapper
   module Is::Reflective
     module MysqlAdapter
       def storages
-        query 'SHOW TABLES'
+        select('SHOW TABLES')
       end
 
       private
@@ -18,7 +16,7 @@ module DataMapper
           WHERE `table_schema` = ? AND `table_name` = ?
         SQL
 
-        query(sql, db_name, storage)
+        select(sql, options[:path].sub('/', ''), storage)
       end
 
       def reflective_field_name field
@@ -33,7 +31,7 @@ module DataMapper
           attrs[:serial] = true if field.extra      == 'auto_increment'
           attrs[:key]    = true if field.column_key == 'PRI'
 
-          attrs[:nullable] = field.is_nullable == 'YES'
+          attrs[:required] = field.is_nullable != 'YES'
           attrs[:default]  = field.column_default           if
             field.column_default
 
@@ -51,9 +49,10 @@ module DataMapper
         return BigDecimal if p =~ /(DOUBLE|FLOAT|DECIMAL)( SIGNED| UNSIGNED)?( ZEROFILL)?/
         return String     if p =~ /\w*BLOB|\w*BINARY|ENUM|SET|CHAR/
         return Time       if p == 'TIME'
-        return DateTime   if p == 'DATETIME'
-        return DataMapper::Types::Boolean if %w[BOOL BOOLEAN].member?(p)
-        return DataMapper::Types::Text    if p =~ /\w*TEXT/
+        return Date       if p == 'DATE'
+        return DateTime   if %w[DATETIME TIMESTAMP].member?(p)
+        return DataMapper::Property::Boolean if %w[BOOL BOOLEAN].member?(p)
+        return DataMapper::Property::Text    if p =~ /\w*TEXT/
 
         super(primitive)
       end

data/lib/dm-is-reflective/is/adapters/postgres_adapter.rb

@@ -1,6 +1,4 @@
 
-require 'dm-is-reflective/is/adapters/abstract_adapter'
-
 module DataMapper
   module Is::Reflective
     module PostgresAdapter
@@ -10,7 +8,7 @@ module DataMapper
           WHERE table_schema = current_schema()
         SQL
 
-        query(sql)
+        select(sql)
       end
 
       private
@@ -20,7 +18,7 @@ module DataMapper
           WHERE table_schema = current_schema() AND table_name = ?
         SQL
 
-        keys = query(sql, storage).to_set
+        keys = select(sql, storage).to_set
 
         sql = <<-SQL.compress_lines
           SELECT column_name, column_default, is_nullable,
@@ -29,7 +27,7 @@ module DataMapper
           WHERE table_schema = current_schema() AND table_name = ?
         SQL
 
-        query(sql, storage).map{ |struct|
+        select(sql, storage).map{ |struct|
           struct.instance_eval <<-END_EVAL
             def key?
               #{keys.member?(struct.column_name)}
@@ -53,7 +51,7 @@ module DataMapper
 
         attrs[:serial] = true if field.column_default =~ /nextval\('\w+'\)/
         attrs[:key] = true if field.key?
-        attrs[:nullable] = field.is_nullable == 'YES'
+        attrs[:required] = field.is_nullable != 'YES'
         # strip string quotation
         attrs[:default] = field.column_default.gsub(/^'(.*?)'$/, '\1') if
           field.column_default && !attrs[:serial]
@@ -61,7 +59,7 @@ module DataMapper
         if field.character_maximum_length
           attrs[:length] = field.character_maximum_length
         elsif field.udt_name.upcase == 'TEXT'
-          attrs[:length] = DataMapper::Types::Text.length
+          attrs[:length] = DataMapper::Property::Text.length
         end
 
         attrs
@@ -73,8 +71,8 @@ module DataMapper
         return Integer  if p =~ /^INT\d+$/
         return String   if p == 'VARCHAR'
         return DateTime if p == 'TIMESTAMP'
-        return DataMapper::Types::Text    if p == 'TEXT'
-        return DataMapper::Types::Boolean if p == 'BOOL'
+        return DataMapper::Property::Text    if p == 'TEXT'
+        return DataMapper::Property::Boolean if p == 'BOOL'
 
         super(primitive)
       end

data/lib/dm-is-reflective/is/adapters/{sqlite3_adapter.rb → sqlite_adapter.rb}

@@ -1,9 +1,7 @@
 
-require 'dm-is-reflective/is/adapters/abstract_adapter'
-
 module DataMapper
   module Is::Reflective
-    module Sqlite3Adapter
+    module SqliteAdapter
       def storages
         sql = <<-SQL.compress_lines
           SELECT name
@@ -11,13 +9,12 @@ module DataMapper
           WHERE type = 'table' AND NOT name = 'sqlite_sequence'
         SQL
 
-        query sql
+        select(sql)
       end
 
       private
-      # alias_method :reflective_query_storages, :query_table
-      def reflective_query_storage *args, &block
-        query_table(*args, &block)
+      def reflective_query_storage storage
+        select('PRAGMA table_info(?)', storage)
       end
 
       def reflective_field_name field
@@ -33,11 +30,11 @@ module DataMapper
           attrs[:key] = true
           attrs[:serial] = true if supports_serial?
         end
-        attrs[:nullable] = field.notnull != 1
+        attrs[:required] = field.notnull == 1
         attrs[:default] = field.dflt_value[1..-2] if field.dflt_value
 
         if field.type.upcase == 'TEXT'
-          attrs[:length] = DataMapper::Types::Text.length
+          attrs[:length] = DataMapper::Property::Text.length
         else
           ergo = field.type.match(/\((\d+)\)/)
           size = ergo && ergo[1].to_i
@@ -50,9 +47,9 @@ module DataMapper
       def reflective_lookup_primitive primitive
         p = primitive.upcase
 
-        return Integer  if p =~ 'INTEGER'
+        return Integer  if p == 'INTEGER'
         return Float    if p == 'REAL' || p == 'NUMERIC'
-        return DataMapper::Types::Text if p == 'TEXT'
+        return DataMapper::Property::Text if p == 'TEXT'
 
         super(primitive)
       end

data/lib/dm-is-reflective/is/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module Is
     module Reflective
-      VERSION = '0.8.0'
+      VERSION = '0.9.0'
     end
   end
 end

data/lib/dm-is-reflective/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module Is
     module Reflective
-      VERSION = '0.8.0'
+      VERSION = '0.9.0'
     end
   end
 end

data/test/abstract.rb

@@ -1,6 +1,6 @@
 
-require 'rubygems'
 require 'dm-core'
+require 'dm-migrations'
 require 'dm-is-reflective'
 
 module Abstract
@@ -8,20 +8,20 @@ module Abstract
     raise 'please provide a clean database because it is a destructive test!!'
   end
 
-  AttrCommon   = {:nullable => true}
-  AttrCommonPK = {:serial => true, :key => true, :nullable => false}
+  AttrCommon   = {:required => false}
+  AttrCommonPK = {:serial => true, :key => true, :required => true}
   AttrText     = {:length => 65535}.merge(AttrCommon)
 
   def user_fields
     [[:created_at, DateTime, AttrCommon],
-     [:id,         DataMapper::Types::Serial,  AttrCommonPK],
+     [:id,         DataMapper::Property::Serial,  AttrCommonPK],
      [:login,      String,   {:length => 70}.merge(AttrCommon)],
-     [:sig,        DataMapper::Types::Text, AttrText]]
+     [:sig,        DataMapper::Property::Text, AttrText]]
   end
 
   def comment_fields
-    [[:body,    DataMapper::Types::Text,    AttrText],
-     [:id,      DataMapper::Types::Serial,  AttrCommonPK],
+    [[:body,    DataMapper::Property::Text,    AttrText],
+     [:id,      DataMapper::Property::Serial,  AttrCommonPK],
      [:title,   String,   {:length => 50, :default => 'default title'}.
                             merge(AttrCommon)],
      [:user_id, Integer,  AttrCommon]]
@@ -32,11 +32,11 @@ module Abstract
     case self
       when MysqlTest # Mysql couldn't tell it's boolean or tinyint
         [[:bool, Integer, AttrCommon],
-         [:id,   DataMapper::Types::Serial, AttrCommonPK]]
+         [:id,   DataMapper::Property::Serial, AttrCommonPK]]
 
       else
-        [[:bool, DataMapper::Types::Boolean, AttrCommon],
-         [:id,   DataMapper::Types::Serial,  AttrCommonPK]]
+        [[:bool, DataMapper::Property::Boolean, AttrCommon],
+         [:id,   DataMapper::Property::Serial,  AttrCommonPK]]
 
     end
   end
@@ -63,7 +63,7 @@ module Abstract
 
   class Comment
     include DataMapper::Resource
-    belongs_to :user, :nullable => true
+    belongs_to :user, :required => false
 
     property :id,    Serial
     property :title, String,  :length => 50, :default => 'default title'
@@ -166,7 +166,7 @@ module Abstract
     model, local_dm = create_fake_model
     model.storage_names[:default] = 'abstract_comments'
 
-    model.send :reflect, DataMapper::Types::Serial
+    model.send :reflect, DataMapper::Property::Serial
     assert_equal ['id'], model.properties.map(&:name).map(&:to_s).sort
 
     model.send :reflect, Integer
@@ -176,7 +176,7 @@ module Abstract
   def test_reflect_multiple
     model, local_dm = create_fake_model
     model.storage_names[:default] = 'abstract_users'
-    model.send :reflect, :login, DataMapper::Types::Serial
+    model.send :reflect, :login, DataMapper::Property::Serial
 
     assert_equal ['id', 'login'], model.properties.map(&:name).map(&:to_s).sort
   end

data/test/setup_db.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# postgres
+psql postgres -c 'CREATE USER dm_is_reflective'
+psql postgres -c  "ALTER USER dm_is_reflective WITH PASSWORD 'godfat'"
+createdb 'dm_is_reflective'
+psql postgres -c  'ALTER DATABASE dm_is_reflective OWNER TO dm_is_reflective'
+
+# mysql
+mysql -u root -p -e 'GRANT USAGE ON dm_is_reflective.* TO dm_is_reflective@localhost IDENTIFIED BY "godfat"'
+mysql -u root -p -e 'CREATE DATABASE dm_is_reflective'
+mysql -u root -p -e 'GRANT ALL PRIVILEGES ON dm_is_reflective.* TO "dm_is_reflective"'

data/test/{test_dm-is-reflexible.rb → test_dm-is-reflective.rb}

@@ -10,22 +10,22 @@ TestCase = begin
              Test::Unit::TestCase
            end
 
-%w[sqlite3 mysql postgres].each{ |adapter|
+%w[sqlite mysql postgres].each{ |adapter|
   begin
-    require "dm-core/adapters/#{adapter}_adapter"
+    require "dm-#{adapter}-adapter"
   rescue LoadError
     puts "skip #{adapter} test since it's not installed"
   end
 }
 
 # cost 1 second to run
-class Sqlite3Test < TestCase
+class SqliteTest < TestCase
   include Abstract
 
   def setup_data_mapper
-    DataMapper.setup(:default, 'sqlite3::memory:')
+    DataMapper.setup(:default, 'sqlite::memory:')
   end
-end if defined?(DataObjects::Sqlite3)
+end if defined?(DataMapper::Adapters::SqliteAdapter)
 
 
 # cost 2 seconds to run
@@ -33,9 +33,9 @@ class MysqlTest < TestCase
   include Abstract
 
   def setup_data_mapper
-    DataMapper.setup(:default, 'mysql://dm-mapping:godfat@localhost/dm-mapping')
+    DataMapper.setup(:default, 'mysql://dm_is_reflective:godfat@localhost/dm_is_reflective')
   end
-end if defined?(DataObjects::Mysql)
+end if defined?(DataMapper::Adapters::MysqlAdapter)
 
 
 # cost 3 seconds to run
@@ -43,6 +43,6 @@ class PostgresTest < TestCase
   include Abstract
 
   def setup_data_mapper
-    DataMapper.setup(:default, 'postgres://dm-mapping:godfat@localhost/dm-mapping')
+    DataMapper.setup(:default, 'postgres://dm_is_reflective:godfat@localhost/dm_is_reflective')
   end
-end if defined?(DataObjects::Postgres)
+end if defined?(DataMapper::Adapters::PostgresAdapter)

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-reflective
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  hash: 59
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - "Lin Jen-Shin (aka godfat \xE7\x9C\x9F\xE5\xB8\xB8)"
@@ -9,39 +15,121 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 +08:00
+date: 2010-07-05 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.0
-    version: 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: extlib
+  name: dm-do-adapter
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: dm-migrations
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.13
-    version: 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bones
+  name: dm-sqlite-adapter
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: dm-mysql-adapter
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.1
-    version: 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: dm-postgres-adapter
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: bones
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 3
+        - 4
+        - 7
+        version: 3.4.7
+  type: :development
+  version_requirements: *id007
 description: " DataMapper plugin that helps you manipulate an existing database.\n It creates mappings between existing columns and model's properties."
 email: godfat (XD) godfat.org
 executables: []
@@ -49,155 +137,69 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- .gita/COMMIT_EDITMSG
-- .gita/HEAD
-- .gita/ORIG_HEAD
-- .gita/RENAMED-REF
-- .gita/config
-- .gita/description
-- .gita/gitk.cache
-- .gita/hooks/applypatch-msg
-- .gita/hooks/commit-msg
-- .gita/hooks/post-commit
-- .gita/hooks/post-receive
-- .gita/hooks/post-update
-- .gita/hooks/pre-applypatch
-- .gita/hooks/pre-commit
-- .gita/hooks/pre-rebase
-- .gita/hooks/prepare-commit-msg
-- .gita/hooks/update
-- .gita/index
-- .gita/info/exclude
-- .gita/info/refs
-- .gita/logs/HEAD
-- .gita/logs/refs/heads/dm-mapping
-- .gita/logs/refs/heads/master
-- .gita/logs/refs/heads/return-symbol
-- .gita/logs/refs/remotes/origin/dm-mapping
-- .gita/logs/refs/remotes/origin/master
-- .gita/logs/refs/remotes/origin/return-symbol
-- .gita/objects/5c/91380a1616b7c2d23e14eeb49d9edde58e1f47
-- .gita/objects/63/71947bcb9c0dd1d3b3d6f449b2d4b4c6c81e63
-- .gita/objects/73/23ae22118cc54fb0bbb0d6f51cc99191019b96
-- .gita/objects/81/a0ab6e4dbd148faa0644307b313799027d3344
-- .gita/objects/b2/9571a21e3bccb60079dfca630dac981f623489
-- .gita/objects/cb/138acf9efc0f5b3ff91c644cae4dec868442e4
-- .gita/objects/d5/66699fc7ba5237311cc44648d0cd2abbaa895e
-- .gita/objects/info/packs
-- .gita/objects/pack/pack-c9156ef3406b98f5f12875b13643df7a5f41e42c.idx
-- .gita/objects/pack/pack-c9156ef3406b98f5f12875b13643df7a5f41e42c.pack
-- .gita/packed-refs
-- .gita/refs/heads/master
-- .gita/refs/tags/dm-is-reflective-0.8.0
 - CHANGES
 - LICENSE
 - NOTICE
 - README
+- README.rdoc
+- Rakefile
 - TODO
 - dm-is-reflective.gemspec
+- test/setup_db.sh
 files: 
-- .gita/COMMIT_EDITMSG
-- .gita/HEAD
-- .gita/ORIG_HEAD
-- .gita/RENAMED-REF
-- .gita/config
-- .gita/description
-- .gita/gitk.cache
-- .gita/hooks/applypatch-msg
-- .gita/hooks/commit-msg
-- .gita/hooks/post-commit
-- .gita/hooks/post-receive
-- .gita/hooks/post-update
-- .gita/hooks/pre-applypatch
-- .gita/hooks/pre-commit
-- .gita/hooks/pre-rebase
-- .gita/hooks/prepare-commit-msg
-- .gita/hooks/update
-- .gita/index
-- .gita/info/exclude
-- .gita/info/refs
-- .gita/logs/HEAD
-- .gita/logs/refs/heads/dm-mapping
-- .gita/logs/refs/heads/master
-- .gita/logs/refs/heads/return-symbol
-- .gita/logs/refs/remotes/origin/dm-mapping
-- .gita/logs/refs/remotes/origin/master
-- .gita/logs/refs/remotes/origin/return-symbol
-- .gita/objects/5c/91380a1616b7c2d23e14eeb49d9edde58e1f47
-- .gita/objects/63/71947bcb9c0dd1d3b3d6f449b2d4b4c6c81e63
-- .gita/objects/73/23ae22118cc54fb0bbb0d6f51cc99191019b96
-- .gita/objects/81/a0ab6e4dbd148faa0644307b313799027d3344
-- .gita/objects/b2/9571a21e3bccb60079dfca630dac981f623489
-- .gita/objects/cb/138acf9efc0f5b3ff91c644cae4dec868442e4
-- .gita/objects/d5/66699fc7ba5237311cc44648d0cd2abbaa895e
-- .gita/objects/info/packs
-- .gita/objects/pack/pack-c9156ef3406b98f5f12875b13643df7a5f41e42c.idx
-- .gita/objects/pack/pack-c9156ef3406b98f5f12875b13643df7a5f41e42c.pack
-- .gita/packed-refs
-- .gita/refs/heads/master
-- .gita/refs/tags/dm-is-reflective-0.8.0
 - CHANGES
 - LICENSE
 - NOTICE
 - README
+- README.rdoc
 - Rakefile
 - TODO
 - dm-is-reflective.gemspec
 - lib/dm-is-reflective.rb
-- lib/dm-is-reflective/is/adapters/abstract_adapter.rb
+- lib/dm-is-reflective/is/adapters/data_objects_adapter.rb
 - lib/dm-is-reflective/is/adapters/mysql_adapter.rb
 - lib/dm-is-reflective/is/adapters/postgres_adapter.rb
-- lib/dm-is-reflective/is/adapters/sqlite3_adapter.rb
+- lib/dm-is-reflective/is/adapters/sqlite_adapter.rb
 - lib/dm-is-reflective/is/reflective.rb
 - lib/dm-is-reflective/is/version.rb
 - lib/dm-is-reflective/version.rb
-- tasks/ann.rake
-- tasks/bones.rake
-- tasks/gem.rake
-- tasks/git.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
-- tasks/zentest.rake
 - test/abstract.rb
-- test/test_dm-is-reflexible.rb
+- test/setup_db.sh
+- test/test_dm-is-reflective.rb
 has_rdoc: true
 homepage: http://github.com/godfat/dm-is-reflective
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=utf-8
-- --inline-source
-- --line-numbers
-- --promiscuous
 - --main
 - README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: ludy
-rubygems_version: 1.3.5
+rubyforge_project: dm-is-reflective
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: DataMapper plugin that helps you manipulate an existing database. It creates mappings between existing columns and model's properties.
+summary: DataMapper plugin that helps you manipulate an existing database
 test_files: 
-- test/test_dm-is-reflexible.rb
+- test/test_dm-is-reflective.rb