active_type 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc7ab992e4c50b6b75f74a62feb7b12c65a46703
-  data.tar.gz: 4b03beac33f4608904815d836cdf05fc68e2f769
+  metadata.gz: ae001f6573873833446638cad632eb52ca6c54e2
+  data.tar.gz: fd9903ddb3435cef627cba36dfd68a95a13a09a6
 SHA512:
-  metadata.gz: 7cda677b927c7c8af52015bf23f2ebd3bb597ccf793bdecbc793ca3ea7a4da80bee0986d0f9a651b06dfdccdaae7ce2b7066de9aec7f76a5104db8d79918e79c
-  data.tar.gz: 8e4ce97d57197a2e618774e660a7ad70547ee12d906650d492cafb2f7c2dbf4adb4d12b29d3643d0e8de27917e2a93ac166cc5da000b66ba5d569ef2f1f14721
+  metadata.gz: 8a4bc20542bdddd93b52dc0c5e80177425450c32582b429bcd837ea916e2eea52d0e22f1602d5fc757d63a3cb6c1486a17030644e5d41c2737c7f235f12a547f
+  data.tar.gz: 3aaf32f0db3df343720e31e6adc4c3f94bb76e804956292f60a54594abc179e3ff929b9214da6b74b473ea9baae35a881a98f9df18af72af786319d28c88d6d9

data/.gitignore

@@ -5,3 +5,4 @@ tags
 .idea
 tmp
 spec/support/database.yml
+.bundle

data/.travis.yml

@@ -19,7 +19,7 @@ gemfile:
 before_script:
   - psql -c 'create database active_type_test;' -U postgres
   - mysql -e 'create database IF NOT EXISTS active_type_test;'
-script: bundle exec rspec spec
+script: bundle exec rake spec
 sudo: false
 cache: bundler
 notifications:

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ActiveType is in a pre-1.0 state. This means that its APIs and behavior are subject to breaking changes without deprecation notices. Until 1.0, version numbers will follow a [Semver][]-ish `0.y.z` format, where `y` is incremented when new features or breaking changes are introduced, and `z` is incremented for lesser changes or bug fixes.
 
+## [0.6.3][] (2017-01-30)
+
+* Fix a load error when using `ActiveType::Object` before using `ActiveRecord::Base` within a Rails app.
+
 ## [0.6.2][] (2017-01-30)
 
 * When used with Rails, defer loading to not interfere with `ActiveRecord` configuration in initializers.

data/Rakefile

@@ -4,13 +4,20 @@ require 'bundler/gem_tasks'
 desc 'Default: Run all specs.'
 task :default => 'all:spec'
 
+
+desc "Run specs and isolated specs"
+task :spec do
+  success = run_specs
+  fail "Tests failed" unless success
+end
+
 namespace :all do
 
   desc "Run specs on all versions"
   task :spec do
     success = true
     for_each_gemfile do
-      success &= system("bundle exec rspec spec")
+      success &= run_specs
     end
     fail "Tests failed" unless success
   end
@@ -40,3 +47,17 @@ def for_each_gemfile
     yield
   end
 end
+
+def for_each_isolated_spec
+  Dir["spec/isolated/**/*_spec.rb"].sort.each do |isolated_spec|
+    yield(isolated_spec)
+  end
+end
+
+def run_specs
+  success = system("bundle exec rspec spec --exclude-pattern '**/isolated/**'")
+  for_each_isolated_spec do |isolated_spec|
+    success &= system("bundle exec rspec #{isolated_spec}")
+  end
+  success
+end

data/gemfiles/Gemfile.3.2.mysql2

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '=3.2.22'
 gem 'rspec', '~> 3.4'
 gem 'mysql2', '= 0.3.17'
+gem 'rake'
 
 gem 'active_type', :path => '..'
 gem 'i18n', '=0.6.11' # 0.7 no longer builds for Ruby 1.8.7

data/gemfiles/Gemfile.3.2.mysql2.lock

@@ -24,6 +24,7 @@ GEM
     i18n (0.6.11)
     multi_json (1.11.2)
     mysql2 (0.3.17)
+    rake (10.4.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -47,6 +48,7 @@ DEPENDENCIES
   activerecord (= 3.2.22)
   i18n (= 0.6.11)
   mysql2 (= 0.3.17)
+  rake
   rspec (~> 3.4)
 
 BUNDLED WITH

data/gemfiles/Gemfile.3.2.sqlite3

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '=3.2.22'
 gem 'rspec', '~>3.4'
 gem 'sqlite3'
+gem 'rake'
 
 gem 'active_type', :path => '..'
 gem 'i18n', '=0.6.11' # 0.7 no longer builds for Ruby 1.8.7

data/gemfiles/Gemfile.3.2.sqlite3.lock

@@ -23,6 +23,7 @@ GEM
     diff-lcs (1.2.5)
     i18n (0.6.11)
     multi_json (1.11.2)
+    rake (10.4.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -46,6 +47,7 @@ DEPENDENCIES
   active_type!
   activerecord (= 3.2.22)
   i18n (= 0.6.11)
+  rake
   rspec (~> 3.4)
   sqlite3
 

data/gemfiles/Gemfile.4.0.sqlite3

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 gem 'activerecord', '~>4.0.0'
 gem 'rspec', '~>3.4'
 gem 'sqlite3'
+gem 'rake'
 
 gem 'active_type', :path => '..'

data/gemfiles/Gemfile.4.0.sqlite3.lock

@@ -28,6 +28,7 @@ GEM
     i18n (0.7.0)
     minitest (4.7.5)
     multi_json (1.11.2)
+    rake (10.4.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -51,6 +52,7 @@ PLATFORMS
 DEPENDENCIES
   active_type!
   activerecord (~> 4.0.0)
+  rake
   rspec (~> 3.4)
   sqlite3
 

data/gemfiles/Gemfile.4.1.sqlite3

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 gem 'activerecord', '~>4.1.0'
 gem 'rspec', '~>3.4'
 gem 'sqlite3'
+gem 'rake'
 
 gem 'active_type', :path => '..'

data/gemfiles/Gemfile.4.1.sqlite3.lock

@@ -26,6 +26,7 @@ GEM
     i18n (0.7.0)
     json (1.8.3)
     minitest (5.8.3)
+    rake (10.4.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -50,6 +51,7 @@ PLATFORMS
 DEPENDENCIES
   active_type!
   activerecord (~> 4.1.0)
+  rake
   rspec (~> 3.4)
   sqlite3
 

data/gemfiles/Gemfile.4.2.1.mysql2

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 gem 'activerecord', '~>4.2.1'
 gem 'rspec', '~>3.4'
 gem 'mysql2', '~> 0.3.17'
+gem 'rake'
 
 gem 'active_type', :path => '..'

data/gemfiles/Gemfile.4.2.1.mysql2.lock

@@ -27,6 +27,7 @@ GEM
     json (1.8.3)
     minitest (5.8.3)
     mysql2 (0.3.20)
+    rake (10.4.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -51,6 +52,7 @@ DEPENDENCIES
   active_type!
   activerecord (~> 4.2.1)
   mysql2 (~> 0.3.17)
+  rake
   rspec (~> 3.4)
 
 BUNDLED WITH

data/gemfiles/Gemfile.4.2.1.pg

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 gem 'activerecord', '~>4.2.1'
 gem 'rspec', '~>3.4'
 gem 'pg'
+gem 'rake'
 
 gem 'active_type', :path => '..'

data/gemfiles/Gemfile.4.2.1.pg.lock

@@ -27,6 +27,7 @@ GEM
     json (1.8.3)
     minitest (5.8.3)
     pg (0.18.4)
+    rake (10.4.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -51,6 +52,7 @@ DEPENDENCIES
   active_type!
   activerecord (~> 4.2.1)
   pg
+  rake
   rspec (~> 3.4)
 
 BUNDLED WITH

data/gemfiles/Gemfile.4.2.1.sqlite3

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 gem 'activerecord', '~>4.2.1'
 gem 'rspec', '~> 3.4'
 gem 'sqlite3'
+gem 'rake'
 
 gem 'active_type', :path => '..'

data/gemfiles/Gemfile.4.2.1.sqlite3.lock

@@ -26,6 +26,7 @@ GEM
     i18n (0.7.0)
     json (1.8.3)
     minitest (5.8.3)
+    rake (10.4.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -50,6 +51,7 @@ PLATFORMS
 DEPENDENCIES
   active_type!
   activerecord (~> 4.2.1)
+  rake
   rspec (~> 3.4)
   sqlite3
 

data/gemfiles/Gemfile.5.0.0.mysql2

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 gem 'activerecord', '~>5.0.0'
 gem 'rspec', '~>3.4'
 gem 'mysql2', '~> 0.3.17'
+gem 'rake'
 
 gem 'active_type', :path => '..'

data/gemfiles/Gemfile.5.0.0.mysql2.lock

@@ -24,6 +24,7 @@ GEM
     i18n (0.7.0)
     minitest (5.9.0)
     mysql2 (0.3.21)
+    rake (10.4.2)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -48,6 +49,7 @@ DEPENDENCIES
   active_type!
   activerecord (~> 5.0.0)
   mysql2 (~> 0.3.17)
+  rake
   rspec (~> 3.4)
 
 BUNDLED WITH

data/gemfiles/Gemfile.5.0.0.pg

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 gem 'activerecord', '~>5.0.0'
 gem 'rspec', '~>3.4'
 gem 'pg'
+gem 'rake'
 
 gem 'active_type', :path => '..'

data/gemfiles/Gemfile.5.0.0.pg.lock

@@ -24,6 +24,7 @@ GEM
     i18n (0.7.0)
     minitest (5.9.0)
     pg (0.18.4)
+    rake (10.4.2)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -48,6 +49,7 @@ DEPENDENCIES
   active_type!
   activerecord (~> 5.0.0)
   pg
+  rake
   rspec (~> 3.4)
 
 BUNDLED WITH

data/gemfiles/Gemfile.5.0.0.sqlite3

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 gem 'activerecord', '~>5.0.0'
 gem 'rspec', '~> 3.4'
 gem 'sqlite3'
+gem 'rake'
 
 gem 'active_type', :path => '..'

data/gemfiles/Gemfile.5.0.0.sqlite3.lock

@@ -23,6 +23,7 @@ GEM
     diff-lcs (1.2.5)
     i18n (0.7.0)
     minitest (5.9.0)
+    rake (10.4.2)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -47,6 +48,7 @@ PLATFORMS
 DEPENDENCIES
   active_type!
   activerecord (~> 5.0.0)
+  rake
   rspec (~> 3.4)
   sqlite3
 

data/lib/active_type.rb

@@ -2,30 +2,19 @@
 
 require 'active_type/version'
 
+require 'active_record'
 
-load_now = proc do
-  require 'active_type/util'
-  require 'active_type/record'
-  require 'active_type/object'
-
-  if ActiveRecord::VERSION::STRING == '4.2.0'
-    raise(<<-MESSAGE.strip_heredoc)
-      ActiveType is not compatible with ActiveRecord 4.2.0. Please upgrade to 4.2.1
-      For details see https://github.com/makandra/active_type/issues/31
-    MESSAGE
-  end
+if ActiveRecord::VERSION::STRING == '4.2.0'
+  raise(<<-MESSAGE.strip_heredoc)
+    ActiveType is not compatible with ActiveRecord 4.2.0. Please upgrade to 4.2.1
+    For details see https://github.com/makandra/active_type/issues/31
+  MESSAGE
 end
 
+module ActiveType
+  extend ActiveSupport::Autoload
 
-if defined?(Rails) && defined?(ActiveSupport)
-  # If we are inside Rails, we'll assume active_record will be required anyways
-  # in this case, wait until then, to not mess with ActiveRecord configuration.
-  # (compare https://github.com/rails/rails/issues/23589)
-  ActiveSupport.on_load(:active_record) do
-    load_now.call()
-  end
-else
-  # No Rails.
-  require 'active_record'
-  load_now.call()
+  autoload :Object
+  autoload :Record
+  autoload :Util
 end

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler