active_type 0.4.5 → 0.7.5

data/lib/active_type/no_table.rb

@@ -1,81 +1,167 @@
 module ActiveType
 
-  module NoTable
+  if ActiveRecord::VERSION::MAJOR < 5
 
-    extend ActiveSupport::Concern
+    module NoTable
 
+      extend ActiveSupport::Concern
 
-    module ClassMethods
+      module ClassMethods
+
+        def column_types
+          {}
+        end
+
+        def columns
+          []
+        end
+
+        def primary_key
+          nil
+        end
+
+        def destroy(*)
+          new
+        end
+
+        def destroy_all(*)
+          []
+        end
+
+        def find_by_sql(*)
+          []
+        end
 
-      def primary_key
-        nil
       end
 
-      def column_types
-        {}
+      def id
+        nil
       end
 
-      def columns
+      def attribute_names
         []
       end
 
-      def destroy(*)
-        new
+      def transaction(&block)
+        @_current_transaction_records ||= []
+        yield
       end
 
-      def destroy_all(*)
-        []
+      def destroy
+        @destroyed = true
+        freeze
       end
 
+      def reload
+        self
+      end
 
-      def find_by_sql(*)
-        []
+
+      private
+
+      def create(*)
+        true
       end
 
-    end
+      def update(*)
+        true
+      end
 
-    def id
-      nil
-    end
+      if ActiveRecord::Base.private_method_defined?(:create_record)
+        def create_record(*)
+          true
+        end
+
+        def update_record(*)
+          true
+        end
+      else
+        def _create_record(*)
+          @new_record = false
+          true
+        end
+
+        def _update_record(*)
+          true
+        end
+      end
 
-    def attribute_names
-      []
     end
 
-    def transaction(&block)
-      @_current_transaction_records ||= []
-      yield
-    end
+  else
 
-    def destroy
-      @destroyed = true
-      freeze
-    end
+    # Rails 5+
 
-    def reload
-      self
-    end
+    module NoTable
 
+      extend ActiveSupport::Concern
 
-    private
+      class DummySchemaCache
 
-    def create(*)
-      true
-    end
+        def columns_hash(table_name)
+          {}
+        end
 
-    def update(*)
-      true
-    end
+        def data_source_exists?(table_name)
+          false
+        end
 
-    if ActiveRecord::Base.private_method_defined?(:create_record)
-      def create_record(*)
+        def clear_data_source_cache!(table_name)
+        end
+
+      end
+
+      class DummyConnection < ActiveRecord::ConnectionAdapters::AbstractAdapter
+
+        attr_reader :schema_cache
+
+        def initialize(*)
+          super
+          @schema_cache = DummySchemaCache.new
+        end
+
+      end
+
+      module ClassMethods
+
+        def connection
+          @connection ||= DummyConnection.new(nil)
+        end
+
+        def destroy(*)
+          new
+        end
+
+        def destroy_all(*)
+          []
+        end
+
+        def find_by_sql(*)
+          []
+        end
+
+      end
+
+      def destroy
+        @destroyed = true
+        freeze
+      end
+
+      def reload
+        self
+      end
+
+
+      private
+
+      def create(*)
         true
       end
 
-      def update_record(*)
+      def update(*)
         true
       end
-    else
+
       def _create_record(*)
         @new_record = false
         true
@@ -84,6 +170,7 @@ module ActiveType
       def _update_record(*)
         true
       end
+
     end
 
   end

data/lib/active_type/type_caster.rb

@@ -1,11 +1,13 @@
 module ActiveType
   class TypeCaster
 
-    def self.get(type, connection)
+    def self.get(type)
       native_caster = if ActiveRecord::VERSION::STRING < '4.2'
         NativeCasters::DelegateToColumn.new(type)
+      elsif ActiveRecord::VERSION::STRING < '5'
+        NativeCasters::DelegateToRails4Type.new(type)
       else
-        NativeCasters::DelegateToType.new(type, connection)
+        NativeCasters::DelegateToRails5Type.new(type)
       end
       new(type, native_caster)
     end
@@ -20,17 +22,9 @@ module ActiveType
       # outside the classes that have that responsibility.
       case @type
       when :integer
-        if value == ''
-          nil
-        else
-          native_type_cast_from_user(value)
-        end
+        cast_integer(value)
       when :timestamp, :datetime
-        time = native_type_cast_from_user(value)
-        if time && ActiveRecord::Base.time_zone_aware_attributes
-          time = ActiveSupport::TimeWithZone.new(nil, Time.zone, time)
-        end
-        time
+        cast_time(value)
       else
         native_type_cast_from_user(value)
       end
@@ -40,10 +34,40 @@ module ActiveType
       @native_caster.type_cast_from_user(value)
     end
 
+    private
+
+    def cast_integer(value)
+      if value == ''
+        nil
+      else
+        native_type_cast_from_user(value)
+      end
+    end
+
+    def cast_time(value)
+      time = nil
+      if ActiveRecord::Base.time_zone_aware_attributes
+        if value.is_a?(String)
+          time = Time.zone.parse(value) rescue nil
+        end
+        time ||= native_type_cast_from_user(value)
+        if time
+          if value.is_a?(String) && value !~ /[+\-Z][\d:]*$/
+            # time was given without an explicit zone, so assume it was given in Time.zone
+            ActiveSupport::TimeWithZone.new(nil, Time.zone, time)
+          else
+            time.in_time_zone rescue time
+          end
+        end
+      else
+        native_type_cast_from_user(value)
+      end
+    end
+
     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)
@@ -62,23 +86,14 @@ module ActiveType
 
       # Adapter for Rails 4.2+.
       # In these versions, casting logic lives in subclasses of ActiveRecord::Type::Value
-      class DelegateToType
+      class DelegateToRails4Type
 
-        def initialize(type, connection)
+        def initialize(type)
           # The specified type (e.g. "string") may not necessary match the
           # native type ("varchar") expected by the connection adapter.
           # PostgreSQL is one of these. Perform a translation if the adapter
           # supports it (but don't turn a mysql boolean into a tinyint).
-          if !type.nil? && !(type == :boolean) && connection.respond_to?(:native_database_types)
-            native_type = connection.native_database_types[type.to_sym]
-            if native_type && native_type[:name]
-              type = native_type[:name]
-            else
-              # unknown type, we just dont cast
-              type = nil
-            end
-          end
-          @active_record_type = connection.lookup_cast_type(type)
+          @active_record_type = ActiveRecord::ConnectionAdapters::AbstractAdapter.new(nil).lookup_cast_type(type)
         end
 
         def type_cast_from_user(value)
@@ -87,6 +102,32 @@ module ActiveType
 
       end
 
+      # Adapter for Rails 5+.
+      # In these versions, casting logic lives in subclasses of ActiveRecord::Type::Value
+      class DelegateToRails5Type
+
+        def initialize(type)
+          @active_record_type = lookup(type)
+        end
+
+        def type_cast_from_user(value)
+          @active_record_type.cast(value)
+        end
+
+        private
+
+        def lookup(type)
+          if type.respond_to?(:cast)
+            type
+          else
+            ActiveRecord::Type.lookup(type, adapter: nil)
+          end
+        rescue ::ArgumentError
+          ActiveRecord::Type::Value.new
+        end
+
+      end
+
     end
 
   end

data/lib/active_type/util.rb

@@ -20,21 +20,40 @@ module ActiveType
     def cast_record(record, klass)
       # record.becomes(klass).dup
       klass.new do |casted|
+        using_single_table_inheritance = using_single_table_inheritance?(klass, casted)
+
         # Rails 3.2, 4.2
         casted.instance_variable_set(:@attributes, record.instance_variable_get(:@attributes))
         # Rails 3.2
-        record.instance_variable_set(:@attributes_cache, record.instance_variable_get(:@attributes_cache))
+        casted.instance_variable_set(:@attributes_cache, record.instance_variable_get(:@attributes_cache))
         # Rails 4.2
         casted.instance_variable_set(:@changed_attributes, record.instance_variable_get(:@changed_attributes))
+        # Rails 5.0
+        casted.instance_variable_set(:@mutation_tracker, record.instance_variable_get(:@mutation_tracker))
         # Rails 3.2, 4.2
         casted.instance_variable_set(:@new_record, record.new_record?)
         # Rails 3.2, 4.2
         casted.instance_variable_set(:@destroyed, record.destroyed?)
         # Rails 3.2, 4.2
-        casted.instance_variable_set(:@errors, record.errors)
+        errors = record.errors
+        if errors.kind_of? ActiveModel::Errors
+          errors = errors.dup
+          # otherwise attributes defined in ActiveType::Record
+          # won't be visible to `errors.add`
+          errors.instance_variable_set(:@base, casted)
+        end
+        casted.instance_variable_set(:@errors, errors)
+
+        casted[klass.inheritance_column] = klass.sti_name if using_single_table_inheritance
       end
     end
 
+    # Backport for Rails 3.2
+    def using_single_table_inheritance?(klass, record)
+      inheritance_column = klass.inheritance_column
+      record[inheritance_column].present? && record.has_attribute?(inheritance_column)
+    end
+
     def cast_relation(relation, klass)
       scoped(klass).merge(scoped(relation))
     end
@@ -42,8 +61,4 @@ module ActiveType
     extend self
 
   end
-
-  # Make Util methods available under the `ActiveType` namespace
-  # like `ActiveType.cast(...)`
-  extend Util
 end

data/lib/active_type/version.rb

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

data/lib/active_type/virtual_attributes.rb

@@ -46,7 +46,7 @@ module ActiveType
       private
 
       def add_virtual_column(name, type, options)
-        type_caster = TypeCaster.get(type, @owner.connection)
+        type_caster = TypeCaster.get(type)
         column = VirtualColumn.new(name, type_caster, options.slice(:default))
         @owner.virtual_columns_hash = @owner.virtual_columns_hash.merge(name.to_s => column)
       end
@@ -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/lib/active_type.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 require 'active_type/version'
+
 require 'active_record'
-require 'active_type/util'
-require 'active_type/record'
-require 'active_type/object'
 
 if ActiveRecord::VERSION::STRING == '4.2.0'
   raise(<<-MESSAGE.strip_heredoc)
@@ -12,3 +10,15 @@ if ActiveRecord::VERSION::STRING == '4.2.0'
     For details see https://github.com/makandra/active_type/issues/31
   MESSAGE
 end
+
+module ActiveType
+  extend ActiveSupport::Autoload
+
+  autoload :Object
+  autoload :Record
+  autoload :Util
+
+  # Make Util methods available under the `ActiveType` namespace
+  # like `ActiveType.cast(...)`
+  extend Util
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.7.5
 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: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
@@ -81,6 +82,16 @@ files:
 - gemfiles/Gemfile.4.2.1.pg.lock
 - gemfiles/Gemfile.4.2.1.sqlite3
 - gemfiles/Gemfile.4.2.1.sqlite3.lock
+- gemfiles/Gemfile.5.0.0.mysql2.lock
+- gemfiles/Gemfile.5.0.0.pg.lock
+- gemfiles/Gemfile.5.0.0.sqlite3
+- gemfiles/Gemfile.5.0.0.sqlite3.lock
+- gemfiles/Gemfile.5.1.0.mysql2
+- gemfiles/Gemfile.5.1.0.mysql2.lock
+- gemfiles/Gemfile.5.1.0.pg
+- gemfiles/Gemfile.5.1.0.pg.lock
+- gemfiles/Gemfile.5.1.0.sqlite3
+- gemfiles/Gemfile.5.1.0.sqlite3.lock
 - lib/active_type.rb
 - lib/active_type/extended_record.rb
 - lib/active_type/extended_record/inheritance.rb
@@ -96,31 +107,6 @@ files:
 - lib/active_type/util.rb
 - lib/active_type/version.rb
 - lib/active_type/virtual_attributes.rb
-- spec/active_type/extended_record/single_table_inheritance_spec.rb
-- spec/active_type/extended_record_spec.rb
-- spec/active_type/nested_attributes_spec.rb
-- spec/active_type/object_spec.rb
-- spec/active_type/record_spec.rb
-- spec/active_type/util_spec.rb
-- spec/integration/holidays_spec.rb
-- spec/integration/shape_spec.rb
-- spec/integration/sign_in_spec.rb
-- spec/integration/sign_up_spec.rb
-- spec/shared_examples/accessors.rb
-- spec/shared_examples/belongs_to.rb
-- spec/shared_examples/coercible_columns.rb
-- spec/shared_examples/constructor.rb
-- spec/shared_examples/defaults.rb
-- spec/shared_examples/dirty_tracking.rb
-- spec/shared_examples/dupable.rb
-- spec/shared_examples/mass_assignment.rb
-- spec/spec_helper.rb
-- spec/support/database.rb
-- spec/support/database.sample.yml
-- spec/support/error_on.rb
-- spec/support/i18n.rb
-- spec/support/protected_params.rb
-- spec/support/time_zone.rb
 homepage: https://github.com/makandra/active_type
 licenses:
 - MIT
@@ -133,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -141,33 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Make any Ruby object quack like ActiveRecord
-test_files:
-- spec/active_type/extended_record/single_table_inheritance_spec.rb
-- spec/active_type/extended_record_spec.rb
-- spec/active_type/nested_attributes_spec.rb
-- spec/active_type/object_spec.rb
-- spec/active_type/record_spec.rb
-- spec/active_type/util_spec.rb
-- spec/integration/holidays_spec.rb
-- spec/integration/shape_spec.rb
-- spec/integration/sign_in_spec.rb
-- spec/integration/sign_up_spec.rb
-- spec/shared_examples/accessors.rb
-- spec/shared_examples/belongs_to.rb
-- spec/shared_examples/coercible_columns.rb
-- spec/shared_examples/constructor.rb
-- spec/shared_examples/defaults.rb
-- spec/shared_examples/dirty_tracking.rb
-- spec/shared_examples/dupable.rb
-- spec/shared_examples/mass_assignment.rb
-- spec/spec_helper.rb
-- spec/support/database.rb
-- spec/support/database.sample.yml
-- spec/support/error_on.rb
-- spec/support/i18n.rb
-- spec/support/protected_params.rb
-- spec/support/time_zone.rb
+test_files: []

data/spec/active_type/extended_record/single_table_inheritance_spec.rb

@@ -1,62 +0,0 @@
-require 'spec_helper'
-
-module STISpec
-
-  class Parent < ActiveRecord::Base
-    self.table_name = 'sti_records'
-  end
-
-  class Child < Parent
-  end
-
-  class ExtendedChild < ActiveType::Record[Child]
-  end
-
-  class ExtendedExtendedChild < ActiveType::Record[ExtendedChild]
-  end
-
-end
-
-
-describe 'ActiveType::Record[STIModel]' do
-
-  describe 'persistence' do
-
-    def should_save_and_load(save_as, load_as)
-      record = save_as.new(:persisted_string => "string")
-      expect(record.save).to eq(true)
-
-      reloaded_child = load_as.find(record.id)
-      expect(reloaded_child.persisted_string).to eq("string")
-      expect(reloaded_child).to be_a(load_as)
-    end
-
-    it 'can save and load the active type record' do
-
-      should_save_and_load(STISpec::ExtendedChild, STISpec::ExtendedChild)
-    end
-
-    it 'can save as base and load as active type record' do
-      should_save_and_load(STISpec::Child, STISpec::ExtendedChild)
-    end
-
-    it 'can save as active type and load as base record' do
-      should_save_and_load(STISpec::ExtendedChild, STISpec::Child)
-    end
-
-    it 'can load via the base class and convert to active type record' do
-      record = STISpec::ExtendedChild.new(:persisted_string => "string")
-      expect(record.save).to eq(true)
-
-      reloaded_child = STISpec::Child.find(record.id).becomes(STISpec::ExtendedChild)
-      expect(reloaded_child.persisted_string).to eq("string")
-      expect(reloaded_child).to be_a(STISpec::ExtendedChild)
-    end
-
-    it 'can save classes further down the inheritance tree' do
-      should_save_and_load(STISpec::ExtendedExtendedChild, STISpec::ExtendedExtendedChild)
-    end
-
-  end
-
-end