active_type 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: facbcaa21321fefe498b9dfd06e01373a76bc0c4
-  data.tar.gz: 1d49f4942cea269483f1e9f4c1054ef517267a8f
+  metadata.gz: 87578ffca30cf6e55491dbdf6d2979e5f1417983
+  data.tar.gz: 85c59e32dfd6f173cee644da43706f74e1591d6e
 SHA512:
-  metadata.gz: 37658e011161ce41985c72c649f62f6686f6465a7ead8e7546accfe7a38bc82fdde513701d3b2c7d3eb59ba63774d4597bad2f87b6c2b9e0b1bcd50606ac3c2e
-  data.tar.gz: 99064aa007b6b5b3f16063f884bee388e63ae2fdbed7b3b4afeae9aa5080ef01702edb2b63318ca402a195d3ea00d931d60a99abae56dc05c494167fab4b1643
+  metadata.gz: 63c1a195fb0f6cb52ec7cdcfcdf7f32bb78dc8d584edde830eb9de59690b02bc67b2500b1365d4e3f534f2900da9bde01d006d9a74b68a205159f96c433c01dd
+  data.tar.gz: 87f1849abb23e4c2181d3509d6d40d6757f296f011aa8e21d7afb74d6e686b120aa2a76e905ac04a5b126d560200f8e8309188538f160f5053c1f99cdfa6e6fe

data/.travis.yml

@@ -37,19 +37,27 @@ matrix:
       gemfile: gemfiles/Gemfile.4.2.1.mysql2
     - rvm: "1.8.7"
       gemfile: gemfiles/Gemfile.4.2.1.pg
+    - rvm: "1.9.3"
+      gemfile: gemfiles/Gemfile.4.0.sqlite3
     - rvm: "1.9.3"
       gemfile: gemfiles/Gemfile.4.2.1.mysql2
     - rvm: "1.9.3"
       gemfile: gemfiles/Gemfile.4.2.1.pg
+    - rvm: "1.9.3"
+      gemfile: gemfiles/Gemfile.3.2.mysql2
+    - rvm: "2.0.0"
+      gemfile: gemfiles/Gemfile.4.0.sqlite3
     - rvm: "2.0.0"
       gemfile: gemfiles/Gemfile.4.2.1.mysql2
     - rvm: "2.0.0"
       gemfile: gemfiles/Gemfile.4.2.1.pg
-    - rvm: "2.1.2"
-      gemfile: gemfiles/Gemfile.4.0.sqlite3
-    - rvm: "2.2.0"
-      gemfile: gemfiles/Gemfile.3.2.sqlite3
-    - rvm: "2.2.0"
+    - rvm: "2.0.0"
       gemfile: gemfiles/Gemfile.3.2.mysql2
-    - rvm: "2.2.0"
+    - rvm: "2.1.7"
       gemfile: gemfiles/Gemfile.4.0.sqlite3
+    - rvm: "2.1.7"
+      gemfile: gemfiles/Gemfile.4.2.1.mysql2
+    - rvm: "2.1.7"
+      gemfile: gemfiles/Gemfile.4.2.1.pg
+    - rvm: "2.1.7"
+      gemfile: gemfiles/Gemfile.3.2.mysql2

data/gemfiles/Gemfile.3.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.4.5)
+    active_type (0.5.0)
       activerecord (>= 3.2)
 
 GEM

data/gemfiles/Gemfile.3.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.4.5)
+    active_type (0.5.0)
       activerecord (>= 3.2)
 
 GEM

data/gemfiles/Gemfile.4.0.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.4.5)
+    active_type (0.5.0)
       activerecord (>= 3.2)
 
 GEM

data/gemfiles/Gemfile.4.1.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.4.5)
+    active_type (0.5.0)
       activerecord (>= 3.2)
 
 GEM

data/gemfiles/Gemfile.4.2.1.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.4.5)
+    active_type (0.5.0)
       activerecord (>= 3.2)
 
 GEM

data/gemfiles/Gemfile.4.2.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.4.5)
+    active_type (0.5.0)
       activerecord (>= 3.2)
 
 GEM

data/gemfiles/Gemfile.4.2.1.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.4.5)
+    active_type (0.5.0)
       activerecord (>= 3.2)
 
 GEM

data/lib/active_type/type_caster.rb

@@ -43,7 +43,7 @@ module ActiveType
     module NativeCasters
 
       # Adapter for Rails 3.0 - 4.1.
-      # In these versions, casting logic lives in ActiveRecord::ConnectionAdapters::Colum
+      # In these versions, casting logic lives in ActiveRecord::ConnectionAdapters::Column
       class DelegateToColumn
 
         def initialize(type)

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '0.4.5'
+  VERSION = '0.5.0'
 end

data/lib/active_type/virtual_attributes.rb

@@ -181,6 +181,28 @@ module ActiveType
       virtual_attributes[name] = value
     end
 
+    # Returns the contents of the record as a nicely formatted string.
+    def inspect
+      inspection = attributes.collect do |name, value|
+        "#{name}: #{VirtualAttributes.attribute_for_inspect(value)}"
+      end.sort.compact.join(", ")
+      "#<#{self.class} #{inspection}>"
+    end
+
+    def self.attribute_for_inspect(value)
+      if value.is_a?(String) && value.length > 50
+        "#{value[0, 50]}...".inspect
+      elsif value.is_a?(Date) || value.is_a?(Time)
+        %("#{value.to_s(:db)}")
+      elsif value.is_a?(Array) && value.size > 10
+        inspected = value.first(10).inspect
+        %(#{inspected[0...-1]}, ...])
+      else
+        value.inspect
+      end
+    end
+
+
     module ClassMethods
 
       def _virtual_column(name)

data/spec/active_type/object_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'ostruct'
 
 module ObjectSpec
 
@@ -61,6 +62,7 @@ module ObjectSpec
     before_validation :before_validation_callback
     after_save :after_save_callback
     after_commit :after_commit_callback
+    after_rollback :after_rollback_callback
 
     def before_save_callback
     end
@@ -74,6 +76,9 @@ module ObjectSpec
     def after_commit_callback
     end
 
+    def after_rollback_callback
+    end
+
   end
 
   class Child < ActiveRecord::Base
@@ -202,6 +207,22 @@ describe ActiveType::Object do
 
   end
 
+  describe '#inspect' do
+
+    it 'returns the contents of the object as a nicely formatted string' do
+      t = Time.now
+      subject.virtual_string = "string"
+      subject.virtual_integer = 17
+      subject.virtual_time = t
+      subject.virtual_date = Date.today
+      subject.virtual_boolean = true
+      subject.virtual_attribute = OpenStruct.new({:test => "openstruct"})
+
+      expect(subject.inspect).to eq("#<ObjectSpec::Object virtual_attribute: #<OpenStruct test=\"openstruct\">, virtual_boolean: true, virtual_date: \"#{Date.today}\", virtual_integer: 17, virtual_string: \"string\", virtual_time: \"#{t.to_s(:db)}\">")
+    end
+
+  end
+
   describe '#attributes' do
 
     it 'returns a hash of virtual attributes' do
@@ -367,6 +388,20 @@ describe ActiveType::Object do
 
     end
 
+    it 'runs after_rollback callbacks if an after_save callback raises an error', :rollback => false do
+      expect(subject).to receive(:after_save_callback).ordered.and_raise(ActiveRecord::Rollback)
+      expect(subject).to receive(:after_rollback_callback).ordered
+
+      expect(subject.save).to be_falsey
+    end
+
+    it 'does not run after_rollback callbacks if after_save does not raise an error', :rollback => false do
+      expect(subject).to_not receive(:after_rollback_callback)
+
+      expect(subject.save).to be_truthy
+
+    end
+
   end
 
   describe '.find' do

data/spec/active_type/record_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'ostruct'
 
 module RecordSpec
 
@@ -151,6 +152,24 @@ describe ActiveType::Record do
     end
   end
 
+  describe '#inspect' do
+
+    it 'returns the contents of the object as a nicely formatted string' do
+      t = Time.now
+      subject.persisted_string = "persisted string"
+      subject.virtual_string = "string"
+      subject.persisted_integer = 20
+      subject.virtual_integer = 17
+      subject.virtual_time = t
+      subject.virtual_date = Date.today
+      subject.virtual_boolean = true
+      subject.virtual_attribute = OpenStruct.new({:test => "openstruct"})
+
+      expect(subject.inspect).to eq("#<RecordSpec::Record id: nil, persisted_boolean: nil, persisted_date: nil, persisted_integer: 20, persisted_string: \"persisted string\", persisted_time: nil, virtual_attribute: #<OpenStruct test=\"openstruct\">, virtual_boolean: true, virtual_date: \"#{Date.today}\", virtual_integer: 17, virtual_string: \"string\", virtual_time: \"#{t.to_s(:db)}\">")
+    end
+
+  end
+
   describe '#attributes' do
 
     it 'returns a hash of virtual and persisted attributes' do

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ $: << File.join(File.dirname(__FILE__), "/../../lib" )
 require 'active_type'
 
 ActiveRecord::Base.default_timezone = :local
+ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks)
 
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each {|f| require f}
 Dir["#{File.dirname(__FILE__)}/shared_examples/*.rb"].each {|f| require f}

data/spec/support/database.rb

@@ -17,10 +17,8 @@ when /mysql2/
     config.merge!(custom_config)
   end
   ActiveRecord::Base.establish_connection(config)
-when /sqlite3/
-  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 else
-  raise "Unknown database type in Gemfile suffix: #{ENV['BUNDLE_GEMFILE']}"
+  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler