active_type 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 246492245829189c234439a8edd6332010b65cb1
-  data.tar.gz: 8f1067dcb972089bbee267c147b17782513795f3
+  metadata.gz: c606ca3a39a6de576a55fedfd5c421e279bca952
+  data.tar.gz: a29bd51fb2cc519da17b32729ef2ba5f11b15387
 SHA512:
-  metadata.gz: 30e1c1b46bbb13e3ea56700c001e756d6f7321ab9148f7aec98875114a49549cefe9bb03a888b3ed137632698aa15c933ddfc690abef9b0e67e36fddfd0ba928
-  data.tar.gz: 6e507ab9b563b8830a031f090cc05a8e1b5b3c4202ed7ce8029eaf61f4fddc183e21414267f6ae3c6fc46e1f58252273ce9396e710a33b2d8317183567fba5a5
+  metadata.gz: 71674d907ca1f9e9b6ce9ddd960f55a7776fdee1cc2377285dc3218de61d881ffb501e2e3a4ef11d6eb22ec2ec01c6a1957baa2c862d5f06433916c5f721d771
+  data.tar.gz: a010dbbb16b4c1ece311d31f8ddb1aaded8f4ec07254bd809d4b42be5246d2dca7a5496800be15b5aa112944256971a5eedf48d6485faff398bb996a2fe11536

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.2.3

data/.travis.yml

@@ -3,8 +3,8 @@ rvm:
   - "1.8.7"
   - "1.9.3"
   - "2.0.0"
-  - "2.1.2"
-  - "2.2.0"
+  - "2.1.7"
+  - "2.2.3"
 gemfile:
   - gemfiles/Gemfile.3.2.mysql2
   - gemfiles/Gemfile.3.2.sqlite3
@@ -17,6 +17,8 @@ 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
+sudo: false
+cache: bundler
 notifications:
   email:
     - fail@makandra.de

data/gemfiles/Gemfile.3.2.mysql2

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'activerecord', '=3.2.22'
 gem 'rspec', '<2.99'
-gem 'mysql2', '= 0.3.11'
+gem 'mysql2', '= 0.3.17'
 
 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

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.4.2)
+    active_type (0.4.4)
       activerecord (>= 3.2)
 
 GEM
@@ -23,7 +23,7 @@ GEM
     diff-lcs (1.2.5)
     i18n (0.6.11)
     multi_json (1.11.2)
-    mysql2 (0.3.11)
+    mysql2 (0.3.17)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -32,7 +32,7 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    tzinfo (0.3.45)
+    tzinfo (0.3.46)
 
 PLATFORMS
   ruby
@@ -41,7 +41,7 @@ DEPENDENCIES
   active_type!
   activerecord (= 3.2.22)
   i18n (= 0.6.11)
-  mysql2 (= 0.3.11)
+  mysql2 (= 0.3.17)
   rspec (< 2.99)
 
 BUNDLED WITH

data/gemfiles/Gemfile.3.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.4.2)
+    active_type (0.4.4)
       activerecord (>= 3.2)
 
 GEM
@@ -22,7 +22,7 @@ GEM
     builder (3.0.4)
     diff-lcs (1.2.5)
     i18n (0.6.11)
-    multi_json (1.11.1)
+    multi_json (1.11.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -31,8 +31,8 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    sqlite3 (1.3.10)
-    tzinfo (0.3.44)
+    sqlite3 (1.3.11)
+    tzinfo (0.3.46)
 
 PLATFORMS
   ruby

data/gemfiles/Gemfile.4.0.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.4.2)
+    active_type (0.4.4)
       activerecord (>= 3.2)
 
 GEM
@@ -27,7 +27,7 @@ GEM
     diff-lcs (1.2.5)
     i18n (0.7.0)
     minitest (4.7.5)
-    multi_json (1.11.1)
+    multi_json (1.11.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -36,9 +36,9 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.11)
     thread_safe (0.3.5)
-    tzinfo (0.3.44)
+    tzinfo (0.3.46)
 
 PLATFORMS
   ruby
@@ -48,3 +48,6 @@ DEPENDENCIES
   activerecord (~> 4.0.0)
   rspec (< 2.99)
   sqlite3
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/Gemfile.4.1.sqlite3.lock

@@ -1,20 +1,20 @@
 PATH
   remote: ..
   specs:
-    active_type (0.4.2)
+    active_type (0.4.4)
       activerecord (>= 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.10)
-      activesupport (= 4.1.10)
+    activemodel (4.1.14)
+      activesupport (= 4.1.14)
       builder (~> 3.1)
-    activerecord (4.1.10)
-      activemodel (= 4.1.10)
-      activesupport (= 4.1.10)
+    activerecord (4.1.14)
+      activemodel (= 4.1.14)
+      activesupport (= 4.1.14)
       arel (~> 5.0.0)
-    activesupport (4.1.10)
+    activesupport (4.1.14)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -25,7 +25,7 @@ GEM
     diff-lcs (1.2.5)
     i18n (0.7.0)
     json (1.8.3)
-    minitest (5.7.0)
+    minitest (5.8.3)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -34,7 +34,7 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.11)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -47,3 +47,6 @@ DEPENDENCIES
   activerecord (~> 4.1.0)
   rspec (< 2.99)
   sqlite3
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/Gemfile.4.2.1.mysql2.lock

@@ -1,31 +1,31 @@
 PATH
   remote: ..
   specs:
-    active_type (0.4.2)
+    active_type (0.4.4)
       activerecord (>= 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.5)
+      activemodel (= 4.2.5)
+      activesupport (= 4.2.5)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
+    arel (6.0.3)
     builder (3.2.2)
     diff-lcs (1.2.5)
     i18n (0.7.0)
     json (1.8.3)
-    minitest (5.7.0)
+    minitest (5.8.3)
     mysql2 (0.3.20)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)

data/gemfiles/Gemfile.4.2.1.pg.lock

@@ -1,32 +1,32 @@
 PATH
   remote: ..
   specs:
-    active_type (0.4.2)
+    active_type (0.4.4)
       activerecord (>= 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.5)
+      activemodel (= 4.2.5)
+      activesupport (= 4.2.5)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
+    arel (6.0.3)
     builder (3.2.2)
     diff-lcs (1.2.5)
     i18n (0.7.0)
     json (1.8.3)
-    minitest (5.7.0)
-    pg (0.18.2)
+    minitest (5.8.3)
+    pg (0.18.4)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -47,3 +47,6 @@ DEPENDENCIES
   activerecord (~> 4.2.1)
   pg
   rspec (< 2.99)
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/Gemfile.4.2.1.sqlite3.lock

@@ -1,31 +1,31 @@
 PATH
   remote: ..
   specs:
-    active_type (0.4.2)
+    active_type (0.4.4)
       activerecord (>= 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.5)
+      activemodel (= 4.2.5)
+      activesupport (= 4.2.5)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
+    arel (6.0.3)
     builder (3.2.2)
     diff-lcs (1.2.5)
     i18n (0.7.0)
     json (1.8.3)
-    minitest (5.7.0)
+    minitest (5.8.3)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -34,7 +34,7 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.11)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -47,3 +47,6 @@ DEPENDENCIES
   activerecord (~> 4.2.1)
   rspec (< 2.99)
   sqlite3
+
+BUNDLED WITH
+   1.10.6

data/lib/active_type/no_table.rb

@@ -77,6 +77,7 @@ module ActiveType
       end
     else
       def _create_record(*)
+        @new_record = false
         true
       end
 

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/spec/active_type/object_spec.rb

@@ -57,6 +57,7 @@ module ObjectSpec
     before_save :before_save_callback
     before_validation :before_validation_callback
     after_save :after_save_callback
+    after_commit :after_commit_callback
 
     def before_save_callback
     end
@@ -67,6 +68,9 @@ module ObjectSpec
     def after_save_callback
     end
 
+    def after_commit_callback
+    end
+
   end
 
   class Child < ActiveRecord::Base
@@ -332,9 +336,9 @@ describe ActiveType::Object do
       subject.save
     end
 
-    %w[before_validation before_save after_save].each do |callback|
+    %w[before_validation before_save after_save after_commit].each do |callback|
 
-      it "calls #{callback}" do
+      it "calls #{callback}", :rollback => false do
         subject.should_receive("#{callback}_callback")
 
         subject.save.should be_true

data/spec/spec_helper.rb

@@ -12,12 +12,16 @@ Dir["#{File.dirname(__FILE__)}/shared_examples/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
   config.around do |example|
-    ActiveRecord::Base.transaction do
-      begin
-        example.run
-      ensure
-        raise ActiveRecord::Rollback
+    if example.metadata.fetch(:rollback, true)
+      ActiveRecord::Base.transaction do
+        begin
+          example.run
+        ensure
+          raise ActiveRecord::Rollback
+        end
       end
+    else
+      example.run
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler