dm-is-reflective 1.1.0 → 1.2.0

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

@@ -1,8 +1,4 @@
 
-module DataMapper
-  module Is
-    module Reflective
-      VERSION = '1.1.0'
-    end
-  end
+module DmIsReflective
+  VERSION = '1.2.0'
 end

data/task/gemgem.rb

@@ -14,6 +14,7 @@ module Gemgem
 
       s.description = description.join
       s.summary     = description.first
+      s.license     = readme['LICENSE'].sub(/.+\n\n/, '').lines.first.strip
 
       s.rubygems_version = Gem::VERSION
       s.date             = Time.now.strftime('%Y-%m-%d')
@@ -33,8 +34,8 @@ module Gemgem
     @readme ||=
       if path
         ps = "##{File.read(path)}".
-             scan(/((#+)[^\n]+\n\n.+?(?=\n\n\2[^#\n]+\n))/m).map(&:first)
-        ps.inject({'HEADER' => ps.first}){ |r, s, i|
+             scan(/((#+)[^\n]+\n\n.+?(?=(\n\n\2[^#\n]+\n)|\Z))/m).map(&:first)
+        ps.inject('HEADER' => ps.first){ |r, s, i|
           r[s[/\w+/]] = s
           r
         }
@@ -44,7 +45,7 @@ module Gemgem
   end
 
   def description
-    @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines.to_a
+    @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines
   end
 
   def changes
@@ -104,9 +105,9 @@ module Gemgem
   end
 
   def split_lines ruby
-    ruby.gsub(/(.+?)\[(.+?)\]/){ |s|
+    ruby.gsub(/(.+?)\s*=\s*\[(.+?)\]/){ |s|
       if $2.index(',')
-        "#{$1}[\n  #{$2.split(',').map(&:strip).join(",\n  ")}]"
+        "#{$1} = [\n  #{$2.split(',').map(&:strip).join(",\n  ")}]"
       else
         s
       end
@@ -179,7 +180,7 @@ namespace :gem do
 
 desc 'Install gem'
 task :install => [:build] do
-  sh("#{Gem.ruby} -S gem install pkg/#{Gemgem.gem_tag}")
+  sh("#{Gem.ruby} -S gem install pkg/#{Gemgem.gem_tag}.gem")
 end
 
 desc 'Build gem'

data/test/test_mysql.rb

@@ -0,0 +1,23 @@
+
+require 'dm-is-reflective/test'
+require_adapter 'mysql'
+
+describe 'mysql' do
+  if ENV['TRAVIS']
+    def setup_data_mapper
+      DataMapper.setup(:default, :adapter  => 'mysql'     ,
+                                 :username => 'root'      ,
+                                 :host     => 'localhost' ,
+                                 :database => 'myapp_test')
+    end
+  else
+    def setup_data_mapper
+      DataMapper.setup(:default, :adapter  => 'mysql'           ,
+                                 :username => 'dm_is_reflective',
+                                 :password => 'godfat'          ,
+                                 :host     => 'localhost'       ,
+                                 :database => 'dm_is_reflective')
+    end
+  end
+  behaves_like :reflective
+end if defined?(DataMapper::Adapters::MysqlAdapter)

data/test/test_postgres.rb

@@ -0,0 +1,23 @@
+
+require 'dm-is-reflective/test'
+require_adapter 'postgres'
+
+describe 'postgres' do
+  if ENV['TRAVIS']
+    def setup_data_mapper
+      DataMapper.setup(:default, :adapter  => 'postgres'  ,
+                                 :username => 'postgres'  ,
+                                 :host     => 'localhost' ,
+                                 :database => 'myapp_test')
+    end
+  else
+    def setup_data_mapper
+      DataMapper.setup(:default, :adapter  => 'postgres'        ,
+                                 :username => 'dm_is_reflective',
+                                 :password => 'godfat'          ,
+                                 :host     => 'localhost'       ,
+                                 :database => 'dm_is_reflective')
+    end
+  end
+  behaves_like :reflective
+end if defined?(DataMapper::Adapters::PostgresAdapter)

data/test/test_sqlite.rb

@@ -0,0 +1,10 @@
+
+require 'dm-is-reflective/test'
+require_adapter 'sqlite'
+
+describe 'sqlite' do
+  def setup_data_mapper
+    DataMapper.setup(:default, :adapter => 'sqlite', :database => ':memory:')
+  end
+  behaves_like :reflective
+end if defined?(DataMapper::Adapters::SqliteAdapter)

data/test/test_to_source.rb

@@ -0,0 +1,55 @@
+
+require 'dm-is-reflective/test'
+
+describe 'DataMapper::Resource#to_source' do
+  DataMapper.setup(:default, :adapter => 'in_memory')
+  Comment.create # enforce Comment#user_id generated
+
+  should 'match Abstract::User' do
+    Abstract::User.to_source.should.eq <<-RUBY
+class ::Abstract::User < Object
+  include DataMapper::Resource
+  property :id, DataMapper::Property::Serial, {:primitive=>Integer, :min=>1, :serial=>true}
+property :login, DataMapper::Property::String, {:primitive=>String, :length=>70}
+property :sig, DataMapper::Property::Text, {:primitive=>String, :lazy=>true, :length=>65535}
+property :created_at, DataMapper::Property::DateTime, {:primitive=>DateTime}
+end
+    RUBY
+  end
+
+  should 'match Abstract::Comment' do
+    Abstract::Comment.to_source.should.eq <<-RUBY
+class ::Abstract::Comment < Object
+  include DataMapper::Resource
+  property :id, DataMapper::Property::Serial, {:primitive=>Integer, :min=>1, :serial=>true}
+property :title, DataMapper::Property::String, {:primitive=>String, :length=>50, :default=>"default title", :allow_nil=>false}
+property :body, DataMapper::Property::Text, {:primitive=>String, :lazy=>true, :length=>65535}
+property :user_id, DataMapper::Property::Integer, {:primitive=>Integer, :index=>:user, :required=>false, :key=>false, :unique=>false, :min=>1, :max=>2147483647}
+end
+    RUBY
+  end
+
+  should 'match Abstract::Comment::Abstract::Comment' do
+    Abstract::Comment.to_source(Abstract::Comment).should.eq <<-RUBY
+class Abstract::Comment::Abstract::Comment < Object
+  include DataMapper::Resource
+  property :id, DataMapper::Property::Serial, {:primitive=>Integer, :min=>1, :serial=>true}
+property :title, DataMapper::Property::String, {:primitive=>String, :length=>50, :default=>"default title", :allow_nil=>false}
+property :body, DataMapper::Property::Text, {:primitive=>String, :lazy=>true, :length=>65535}
+property :user_id, DataMapper::Property::Integer, {:primitive=>Integer, :index=>:user, :required=>false, :key=>false, :unique=>false, :min=>1, :max=>2147483647}
+end
+    RUBY
+  end
+
+  should 'match Abstract::Comment::Abstract::User' do
+    Abstract::User.to_source('Abstract::Comment').should.eq <<-RUBY
+class Abstract::Comment::Abstract::User < Object
+  include DataMapper::Resource
+  property :id, DataMapper::Property::Serial, {:primitive=>Integer, :min=>1, :serial=>true}
+property :login, DataMapper::Property::String, {:primitive=>String, :length=>70}
+property :sig, DataMapper::Property::Text, {:primitive=>String, :lazy=>true, :length=>65535}
+property :created_at, DataMapper::Property::DateTime, {:primitive=>DateTime}
+end
+    RUBY
+  end
+end

metadata

@@ -1,165 +1,162 @@
 --- !ruby/object:Gem::Specification
 name: dm-is-reflective
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-do-adapter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-migrations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-mysql-adapter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-postgres-adapter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'DataMapper plugin that helps you manipulate an existing database.
-
-  It creates mappings between existing columns and model''s properties.'
+description: |-
+  DataMapper plugin that helps you manipulate an existing database.
+  It creates mappings between existing columns and model's properties.
 email:
 - godfat (XD) godfat.org
-executables: []
+executables:
+- dm-is-reflective
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .gitmodules
+- .travis.yml
 - CHANGES.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - TODO.md
+- bin/dm-is-reflective
 - dm-is-reflective.gemspec
 - lib/dm-is-reflective.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/sqlite_adapter.rb
-- lib/dm-is-reflective/is/reflective.rb
+- lib/dm-is-reflective/adapters/data_objects_adapter.rb
+- lib/dm-is-reflective/adapters/mysql_adapter.rb
+- lib/dm-is-reflective/adapters/postgres_adapter.rb
+- lib/dm-is-reflective/adapters/sqlite_adapter.rb
+- lib/dm-is-reflective/reflective.rb
+- lib/dm-is-reflective/runner.rb
+- lib/dm-is-reflective/test.rb
 - lib/dm-is-reflective/version.rb
 - task/.gitignore
 - task/gemgem.rb
-- test/abstract.rb
 - test/setup_db.sh
-- test/test_dm-is-reflective.rb
+- test/test_mysql.rb
+- test/test_postgres.rb
+- test/test_sqlite.rb
+- test/test_to_source.rb
 homepage: https://github.com/godfat/dm-is-reflective
-licenses: []
+licenses:
+- Apache License 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: DataMapper plugin that helps you manipulate an existing database.
 test_files:
-- test/test_dm-is-reflective.rb
+- test/test_mysql.rb
+- test/test_postgres.rb
+- test/test_sqlite.rb
+- test/test_to_source.rb

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

@@ -1,138 +0,0 @@
-
-module DataMapper
-  module Is::Reflective
-    module DataObjectsAdapter
-      include DataMapper
-
-      # returns all tables' name in the repository.
-      #  e.g.
-      #       ['comments', 'users']
-      def storages
-        reflective_auto_load_adapter_extension
-        storages # call the overrided method
-      end
-
-      # returns all fields, with format [[name, type, attrs]]
-      #  e.g.
-      #       [[:created_at,  DateTime, {:required => false}],
-      #        [:email,       String,   {:required => false, :size => 255,
-      #                                  :default => 'nospam@nospam.tw'}],
-      #        [:id, DataMapper::Property::Serial,  {:required => true, :serial => true,
-      #                                  :key => true}],
-      #        [:salt_first,  String,   {:required => false, :size => 50}],
-      #        [:salt_second, String,   {:required => false, :size => 50}]]
-      def fields storage
-        reflective_query_storage(storage).map{ |field|
-          attr = reflective_attributes(field)
-          type = reflective_lookup_primitive(reflective_primitive(field))
-          pick = if attr[:serial] && type == Integer
-                   Property::Serial
-                 else
-                   type
-                 end
-          [reflective_field_name(field).to_sym, pick, attr]
-        }
-      end
-
-      # returns a hash with storage names in keys and
-      # corresponded fields in values. e.g.
-      #   {'users' => [[:id,          Integer,  {:required => true,
-      #                                          :serial => true,
-      #                                          :key => true}],
-      #                [:email,       String,   {:required => false,
-      #                                          :default => 'nospam@nospam.tw'}],
-      #                [:created_at,  DateTime, {:required => false}],
-      #                [:salt_first,  String,   {:required => false, :size => 50}],
-      #                [:salt_second, String,   {:required => false, :size => 50}]]}
-      # see AbstractAdapter#storages and AbstractAdapter#fields for detail
-      def storages_and_fields
-        storages.inject({}){ |result, storage|
-          result[storage] = fields(storage)
-          result
-        }
-      end
-
-      # automaticly generate model class(es) and reflect
-      # all fields with reflect /.*/ for you.
-      #  e.g.
-      #       dm.auto_genclass!
-      #       # => [DataMapper::Is::Reflective::User,
-      #       #     DataMapper::Is::Reflective::SchemaInfo,
-      #       #     DataMapper::Is::Reflective::Session]
-      #
-      # you can change the scope of generated models:
-      #  e.g.
-      #       dm.auto_genclass! :scope => Object
-      #       # => [User, SchemaInfo, Session]
-      #
-      # you can generate classes for tables you specified only:
-      #  e.g.
-      #       dm.auto_genclass! :scope => Object, :storages => /^phpbb_/
-      #       # => [PhpbbUser, PhpbbPost, PhpbbConfig]
-      #
-      # you can generate classes with String too:
-      #  e.g.
-      #       dm.auto_genclass! :storages => ['users', 'config'], :scope => Object
-      #       # => [User, Config]
-      #
-      # you can generate a class only:
-      #  e.g.
-      #       dm.auto_genclass! :storages => 'users'
-      #       # => [DataMapper::Is::Reflective::User]
-      def auto_genclass! opts = {}
-        opts[:scope] ||= Is::Reflective
-        opts[:storages] ||= /.*/
-        opts[:storages] = [opts[:storages]].flatten
-
-        storages.map{ |storage|
-
-          mapped = opts[:storages].each{ |target|
-            case target
-              when Regexp;
-                break storage if storage =~ target
-
-              when Symbol, String;
-                break storage if storage == target.to_s
-
-              else
-                raise ArgumentError.new("invalid argument: #{target.inspect}")
-            end
-          }
-
-          reflective_genclass(mapped, opts[:scope]) if mapped.kind_of?(String)
-        }.compact
-      end
-
-      private
-      def reflective_query_storage storage
-        reflective_auto_load_adapter_extension
-        reflective_query_storage(storage) # call the overrided method
-      end
-
-      def reflective_genclass storage, scope
-        model = Class.new
-        model.__send__(:include, Resource)
-        model.is(:reflective)
-        model.storage_names[:default] = storage
-        scope.const_set(Inflector.classify(storage), model)
-        model.__send__(:reflect, /.*/)
-        model.finalize if model.respond_to?(:finalize)
-        model
-      end
-
-      def reflective_lookup_primitive primitive
-        raise TypeError.new("#{primitive} not found for #{self.class}")
-      end
-
-      def reflective_auto_load_adapter_extension
-        # TODO: can we fix this adapter name in dm-sqlite-adapter?
-        adapter = options[:adapter].sub(/\Asqlite3\Z/, 'sqlite')
-
-        require "dm-is-reflective/is/adapters/#{adapter}_adapter"
-        class_name = "#{Inflector.camelize(adapter)}Adapter"
-        Adapters.const_get(class_name).__send__(:include,
-          Is::Reflective.const_get(class_name))
-      end
-    end
-  end
-end