dm-is-reflective 1.0.1 → 1.1.0

data/CHANGES.md

@@ -1,5 +1,11 @@
 # CHANGES
 
+## dm-is-reflective 1.1.0, 2013-01-11
+
+* The need for dm-migrations is now removed.
+* Added a few more datatypes. Thanks @onewheelskyward
+* Tested against dm-core 1.2.0.
+
 ## dm-is-reflective 1.0.1, 2012-05-16
 
 * allow_nil is more close to db's semantics, not required. Thanks miaout17.

data/README.md

@@ -13,6 +13,23 @@ by Lin Jen-Shin ([godfat](http://godfat.org))
 DataMapper plugin that helps you manipulate an existing database.
 It creates mappings between existing columns and model's properties.
 
+## REQUIREMENTS:
+
+* dm-core
+* choose one: dm-sqlite-adapter, dm-postgres-adapter, dm-mysql-adapter
+
+## INSTALLATION:
+
+``` shell
+    gem install dm-is-reflective
+```
+
+``` ruby
+    gem 'dm-is-reflective',
+      :git => 'git://github.com/godfat/dm-is-reflective.git',
+      :submodules => true
+```
+
 ## SYNOPSIS:
 
 ``` ruby
@@ -99,25 +116,16 @@ It creates mappings between existing columns and model's properties.
     # => [DataMapper::Is::Reflective::User]
 ```
 
-## REQUIREMENTS:
-
-* dm-core
-* dm-do-adapter
-* choose one: dm-sqlite-adapter, dm-postgres-adapter, dm-mysql-adapter
-
-## INSTALL:
-
-    gem install dm-is-reflective
-
 ## CONTRIBUTORS:
 
+* Andrew Kreps (@onewheelskyward)
 * Lin Jen-Shin (@godfat)
 
 ## LICENSE:
 
 Apache License 2.0
 
-Copyright (c) 2008-2012, Lin Jen-Shin (godfat)
+Copyright (c) 2008-2013, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,8 +1,13 @@
 # encoding: utf-8
 
-require "#{dir = File.dirname(__FILE__)}/task/gemgem"
-Gemgem.dir = dir
+begin
+  require "#{dir = File.dirname(__FILE__)}/task/gemgem"
+rescue LoadError
+  sh "git submodule update --init"
+  exec Gem.ruby, "-S", "rake", *ARGV
+end
 
+Gemgem.dir = dir
 ($LOAD_PATH << File.expand_path("#{Gemgem.dir}/lib" )).uniq!
 
 desc 'Generate gemspec'
@@ -21,3 +26,16 @@ task 'gem:spec' do
 
   Gemgem.write
 end
+
+desc 'auto_migrate database'
+task 'auto_migrate' do
+  require 'dm-migrations'
+  require './test/abstract'
+  require './test/test_dm-is-reflective'
+  include Abstract
+  [:SqliteTest, :PostgresTest, :MysqlTest].each do |db|
+    next unless Object.const_defined?(db)
+    Object.const_get(db).setup_data_mapper
+    [User, Comment, SuperUser].each(&:auto_migrate!)
+  end
+end

data/TODO.md

@@ -1,13 +1,8 @@
 # TODO
 
-* use extlib to type check args, sorry that i want to sleep right now
-* deal with require order problem
-* extract some types to data_objects_adapter
+* make sure reflective_lookup_primitive has everything as
+  type_map from dm-migrations
 
-* test Model#fields with different repo
-
-* better doc...
-* 0.7.1 for more data types for postgresql adapter
-* 0.9 automatic determine model relationship
+* fix `rake auto_migrate`
 
 * use bacon instead of minitest

data/dm-is-reflective.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-is-reflective"
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2012-05-16"
+  s.date = "2013-01-11"
   s.description = "DataMapper plugin that helps you manipulate an existing database.\nIt creates mappings between existing columns and model's properties."
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   "test/test_dm-is-reflective.rb"]
   s.homepage = "https://github.com/godfat/dm-is-reflective"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "DataMapper plugin that helps you manipulate an existing database."
   s.test_files = ["test/test_dm-is-reflective.rb"]
 

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

@@ -23,33 +23,14 @@ module DataMapper
       #        [:salt_second, String,   {:required => false, :size => 50}]]
       def fields storage
         reflective_query_storage(storage).map{ |field|
-          primitive = reflective_primitive(field)
-
-          type = self.class.type_map.sort{ |(k1, v1), (k2, v2)|
-                   # search from the most derived class
-                   if    k1 < k2 || k2 == Class then -1
-                   elsif k1 > k2 || k1 == Class then  1
-                   else                               0
-                   end
-                 }.find{ |(klass, attrs)|
-                   next false if [Object, Class, Time].include?(klass)
-                   attrs[:primitive] == primitive
-                 }
-          type = type ? type.first : reflective_lookup_primitive(primitive)
-
-          attrs = reflective_attributes(field)
-
-          type = if attrs[:serial] && type == Integer
+          attr = reflective_attributes(field)
+          type = reflective_lookup_primitive(reflective_primitive(field))
+          pick = if attr[:serial] && type == Integer
                    Property::Serial
-
-                 elsif type == TrueClass
-                   Property::Boolean
-
                  else
-                    type
+                   type
                  end
-
-          [reflective_field_name(field).to_sym, type, attrs]
+          [reflective_field_name(field).to_sym, pick, attr]
         }
       end
 
@@ -133,8 +114,10 @@ module DataMapper
         model.__send__(:include, Resource)
         model.is(:reflective)
         model.storage_names[:default] = storage
-        model.__send__(:reflect, /.*/)
         scope.const_set(Inflector.classify(storage), model)
+        model.__send__(:reflect, /.*/)
+        model.finalize if model.respond_to?(:finalize)
+        model
       end
 
       def reflective_lookup_primitive primitive

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

@@ -45,19 +45,19 @@ module DataMapper
       end
 
       def reflective_lookup_primitive primitive
-        p = primitive.upcase
-
-        return Integer    if p == 'YEAR'
-        return Integer    if p =~          /\w*INT(EGER)?( SIGNED| UNSIGNED)?( ZEROFILL)?/
-        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 Date       if p == 'DATE'
-        return DateTime   if %w[DATETIME TIMESTAMP].member?(p)
-        return Property::Boolean if %w[BOOL BOOLEAN].member?(p)
-        return Property::Text    if p =~ /\w*TEXT/
-
-        super(primitive)
+        case primitive.upcase
+        when 'YEAR'                           ; Integer
+        when /\w*INT(EGER)?( SIGNED| UNSIGNED)?( ZEROFILL)?/
+                                              ; Integer
+        when /(DOUBLE|FLOAT|DECIMAL)( SIGNED| UNSIGNED)?( ZEROFILL)?/
+                                              ; BigDecimal
+        when /\w*BLOB|\w*BINARY|ENUM|SET|CHAR/; String
+        when 'TIME'                           ; Time
+        when 'DATE'                           ; Date
+        when 'DATETIME', 'TIMESTAMP'          ; DateTime
+        when 'BOOL', 'BOOLEAN'                ; Property::Boolean
+        when /\w*TEXT/                        ; Property::Text
+        end || super(primitive)
       end
     end
   end

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

@@ -68,17 +68,15 @@ module DataMapper
       end
 
       def reflective_lookup_primitive primitive
-        p = primitive.upcase
-
-        return Integer  if p =~ /^INT\d+$/
-        return String   if p == 'VARCHAR'
-        return DateTime if p == 'TIMESTAMP'
-        return Property::Text    if p == 'TEXT'
-        return Property::Boolean if p == 'BOOL'
-
-        super(primitive)
+        case primitive.upcase
+        when /^INT\d+$/         ; Integer
+        when /^FLOAT\d+$/       ; Float
+        when 'VARCHAR', 'BPCHAR'; String
+        when 'TIMESTAMP', 'DATE'; DateTime
+        when 'TEXT'             ; Property::Text
+        when 'BOOL'             ; Property::Boolean
+        end || super(primitive)
       end
-
     end
   end
 end

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

@@ -47,13 +47,14 @@ module DataMapper
       end
 
       def reflective_lookup_primitive primitive
-        p = primitive.upcase
-
-        return Integer  if p == 'INTEGER'
-        return Float    if p == 'REAL' || p == 'NUMERIC'
-        return Property::Text if p == 'TEXT'
-
-        super(primitive)
+        case primitive.upcase
+        when 'INTEGER'        ; Integer
+        when 'REAL', 'NUMERIC'; Float
+        when 'VARCHAR'        ; String
+        when 'TIMESTAMP'      ; DateTime
+        when 'BOOLEAN'        ; Property::Boolean
+        when 'TEXT'           ; Property::Text
+        end || super(primitive)
       end
     end
   end

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

@@ -15,7 +15,7 @@ module Reflective
       DataMapper.repository(repo).adapter.fields(storage_name(repo))
     end
 
-    # it automaticly creates reflection from storage fields to properties.
+    # it automatically creates reflection from storage fields to properties.
     # i.e. you don't have to specify any property if you are connecting
     # to an existing database.
     # you can pass it Regexp to map any field it matched, or just
@@ -49,7 +49,7 @@ module Reflective
     def reflect *targets
       targets << /.*/ if targets.empty?
 
-      fields.map{ |field|
+      result = fields.map{ |field|
         name, type, attrs = field
 
         reflected = targets.each{ |target|
@@ -70,6 +70,9 @@ module Reflective
 
         property(reflected, type, attrs) if reflected.kind_of?(Symbol)
       }.compact
+
+      finalize if respond_to?(:finalize)
+      result
     end
   end # of ClassMethod
 

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

@@ -2,7 +2,7 @@
 module DataMapper
   module Is
     module Reflective
-      VERSION = '1.0.1'
+      VERSION = '1.1.0'
     end
   end
 end

data/test/abstract.rb

@@ -4,8 +4,9 @@ require 'dm-migrations'
 require 'dm-is-reflective'
 
 module Abstract
-  def setup_data_mapper
-    raise 'please provide a clean database because it is a destructive test!!'
+  def self.next_id
+    @id ||= 0
+    @id += 1
   end
 
   AttrCommon   = {:allow_nil => true}
@@ -74,8 +75,6 @@ module Abstract
     is :reflective
   end
 
-  class Model; end
-
   Tables = ['abstract_comments', 'abstract_super_users', 'abstract_users']
 
   def sort_fields fields
@@ -85,18 +84,20 @@ module Abstract
   end
 
   def create_fake_model
-    model = Model.dup.send(:include, DataMapper::Resource)
-    model.is :reflective
-    [ model, setup_data_mapper ]
+    model = Class.new
+    model.module_eval do
+      include DataMapper::Resource
+      property :id, DataMapper::Property::Serial
+      is :reflective
+    end
+    Abstract.const_set("Model#{Abstract.next_id}", model)
+    [model, self.class.setup_data_mapper]
   end
 
   attr_reader :dm
   def setup
-    @dm = setup_data_mapper
-    # this is significant faster than DataMapper.auto_migrate!
-    User.auto_migrate!
-    Comment.auto_migrate!
-    SuperUser.auto_migrate!
+    @dm = self.class.setup_data_mapper
+    [User, Comment, SuperUser].each(&:auto_migrate!)
   end
 
   def new_scope
@@ -110,14 +111,12 @@ module Abstract
 
   def test_create_comment
     Comment.create(:title => 'XD')
-    assert_equal 1, Comment.first.id
     assert_equal 'XD', Comment.first.title
   end
 
   def test_create_user
     now = Time.now
     User.create(:created_at => now)
-    assert_equal 1, User.first.id
     assert_equal now.asctime, User.first.created_at.asctime
 
     return now
@@ -136,7 +135,6 @@ module Abstract
     assert_equal comment_fields, sort_fields(model.fields)
 
     assert_equal 'XD', model.first.title
-    assert_equal 1, model.first.id
   end
 
   def test_reflect_and_create
@@ -146,10 +144,9 @@ module Abstract
 
     model.create(:title => 'orz')
     assert_equal 'orz', model.first.title
-    assert_equal 1, model.first.id
 
     model.create
-    assert_equal 'default title', model.get(2).title
+    assert_equal 'default title', model.last.title
   end
 
   def test_storages_and_fields
@@ -216,7 +213,7 @@ module Abstract
 
     assert_equal 'XD', comment.first.title
     comment.create(:title => 'orz', :body => 'dm-reflect')
-    assert_equal 'dm-reflect', comment.get(2).body
+    assert_equal 'dm-reflect', comment.last.body
   end
 
   def test_auto_genclass
@@ -232,7 +229,7 @@ module Abstract
 
     assert_equal now.asctime, user.first.created_at.asctime
     user.create(:login => 'godfat')
-    assert_equal 'godfat', user.get(2).login
+    assert_equal 'godfat', user.last.login
   end
 
   def test_auto_genclass_with_regexp
@@ -252,5 +249,4 @@ module Abstract
 
     assert_equal model.properties.map(&:object_id).sort, mapped.map(&:object_id).sort
   end
-
 end

data/test/test_dm-is-reflective.rb

@@ -1,9 +1,5 @@
 
-if respond_to?(:require_relative, true)
-  require_relative 'abstract'
-else
-  require File.dirname(__FILE__) + '/abstract'
-end
+require './test/abstract'
 
 TestCase = begin
              require 'minitest/unit'
@@ -14,7 +10,7 @@ TestCase = begin
              Test::Unit::TestCase
            end
 
-%w[sqlite mysql postgres].each{ |adapter|
+%w[sqlite postgres mysql].each{ |adapter|
   begin
     require "dm-#{adapter}-adapter"
   rescue LoadError
@@ -26,15 +22,14 @@ TestCase = begin
 class SqliteTest < TestCase
   include Abstract
 
-  def setup_data_mapper
+  def self.setup_data_mapper
     DataMapper.setup(:default, 'sqlite::memory:')
-
   end
 end if defined?(DataMapper::Adapters::SqliteAdapter)
 
 class SqliteHashSetupTest < TestCase
   include Abstract
-  def setup_data_mapper
+  def self.setup_data_mapper
     DataMapper.setup(:default, :adapter => 'sqlite', :database => ':memory:')
   end
 end if defined?(DataMapper::Adapters::SqliteAdapter)
@@ -43,7 +38,7 @@ end if defined?(DataMapper::Adapters::SqliteAdapter)
 class PostgresTest < TestCase
   include Abstract
 
-  def setup_data_mapper
+  def self.setup_data_mapper
     DataMapper.setup(:default, 'postgres://dm_is_reflective:godfat@localhost/dm_is_reflective')
   end
 end if defined?(DataMapper::Adapters::PostgresAdapter)
@@ -52,7 +47,7 @@ end if defined?(DataMapper::Adapters::PostgresAdapter)
 class MysqlTest < TestCase
   include Abstract
 
-  def setup_data_mapper
+  def self.setup_data_mapper
     DataMapper.setup(:default, 'mysql://dm_is_reflective:godfat@localhost/dm_is_reflective')
   end
 end if defined?(DataMapper::Adapters::MysqlAdapter)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-is-reflective
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
@@ -157,10 +157,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin that helps you manipulate an existing database.
 test_files:
 - test/test_dm-is-reflective.rb
-has_rdoc: