activerecord-typedstore 0.6.1 → 1.0.0.beta1

data/spec/spec_helper.rb

@@ -5,16 +5,18 @@ require 'database_cleaner'
 
 require 'simplecov'
 require 'coveralls'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
-]
+])
 SimpleCov.start
 
 require 'activerecord-typedstore'
 
 Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support', '**', '*.rb'))].each { |f| require f }
 
+Time.zone = 'UTC'
+
 RSpec.configure do |config|
   config.order = 'random'
 end

data/spec/support/models.rb

@@ -40,7 +40,13 @@ def define_columns(t)
   t.decimal :shipping_cost, precision: 16, scale: 2
 
   t.integer :grades, array: true
-  t.string :tags, array: true, null: false, default: []
+
+  if t.respond_to?(:name) && t.name =~ /sqlite|mysql/
+    # native sqlite cannot automatically cast array to yaml
+    t.string :tags, array: true, null: false, default: [].to_yaml
+  else
+    t.string :tags, array: true, null: false, default: []
+  end
 
   t.string :nickname, blank: false, default: 'Please enter your nickname'
 end
@@ -49,6 +55,7 @@ def define_store_columns(t)
   define_columns(t)
   t.any :author
   t.any :source, blank: false, default: 'web'
+  t.any :signup, default: {}
   t.string :country, blank: false, default: 'Canada', accessor: false
 end
 
@@ -88,7 +95,9 @@ class CreateAllTables < ActiveRecord::Migration
   end
 end
 ActiveRecord::Migration.verbose = true
-CreateAllTables.up
+ActiveRecord::Migration.suppress_messages do
+  CreateAllTables.up
+end
 
 class ColumnCoder
 
@@ -144,13 +153,29 @@ if ENV['POSTGRES']
     end
 
     if ENV['POSTGRES_JSON']
-      class PostgresJsonTypedStoreModel < ActiveRecord::Base
-        establish_connection ENV['POSTGRES_URL'] || :test_postgresql
-        store :untyped_settings, accessors: [:title]
-        typed_store :settings, coder: ColumnCoder.new(AsJson) do |s|
-          define_store_columns(s)
+
+      if AR_VERSION >= AR_4_2
+
+        class PostgresJsonTypedStoreModel < ActiveRecord::Base
+          establish_connection ENV['POSTGRES_URL'] || :test_postgresql
+          store :untyped_settings, accessors: [:title]
+          typed_store :settings, coder: false do |s|
+            define_store_columns(s)
+          end
         end
+
+      else
+
+        class PostgresJsonTypedStoreModel < ActiveRecord::Base
+          establish_connection ENV['POSTGRES_URL'] || :test_postgresql
+          store :untyped_settings, accessors: [:title]
+          typed_store :settings, coder: ColumnCoder.new(AsJson) do |s|
+            define_store_columns(s)
+          end
+        end
+
       end
+
     end
 
   end
@@ -199,7 +224,6 @@ class MarshalTypedStoreModel < ActiveRecord::Base
   end
 end
 
-
 Models = [
   Sqlite3RegularARModel,
   YamlTypedStoreModel,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-typedstore
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,56 +92,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 description: ActiveRecord::Store but with type definition
 email:
 - jean.boussier@gmail.com
@@ -163,11 +163,10 @@ files:
 - gemfiles/Gemfile.ar-4.2
 - gemfiles/Gemfile.ar-edge
 - lib/active_record/typed_store.rb
-- lib/active_record/typed_store/ar_32_fallbacks.rb
-- lib/active_record/typed_store/coder.rb
-- lib/active_record/typed_store/column.rb
 - lib/active_record/typed_store/dsl.rb
 - lib/active_record/typed_store/extension.rb
+- lib/active_record/typed_store/field.rb
+- lib/active_record/typed_store/type.rb
 - lib/active_record/typed_store/typed_hash.rb
 - lib/active_record/typed_store/version.rb
 - lib/activerecord-typedstore.rb
@@ -191,9 +190,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6

data/lib/active_record/typed_store/ar_32_fallbacks.rb

@@ -1,95 +0,0 @@
-class ActiveRecord::Store::IndifferentCoder
-  # Backport from rails 4.0
-  def initialize(coder_or_class_name)
-    @coder =
-      if coder_or_class_name.respond_to?(:load) && coder_or_class_name.respond_to?(:dump)
-        coder_or_class_name
-      else
-        ActiveRecord::Coders::YAMLColumn.new(coder_or_class_name || Object)
-      end
-  end
-
-  def dump(obj)
-    @coder.dump self.class.as_indifferent_hash(obj)
-  end
-
-  def load(yaml)
-    self.class.as_indifferent_hash @coder.load(yaml)
-  end
-
-end
-
-module ActiveRecord::TypedStore
-
-  module AR32Fallbacks
-    extend ActiveSupport::Concern
-
-    included do
-      cattr_accessor :virtual_attribute_methods
-      self.virtual_attribute_methods = []
-    end
-
-    module ClassMethods
-
-      def typed_store(store_attribute, dsl)
-        _ar_32_fallback_accessors(store_attribute, dsl.accessors)
-      end
-
-      protected
-
-      def define_virtual_attribute_method(name)
-        virtual_attribute_methods << name
-        define_attribute_method(name)
-      end
-
-      # ActiveModel override heavilly inspired from the original code
-      def define_attribute_method(attr_name)
-        return super unless virtual_attribute_methods.include?(attr_name)
-
-        attribute_method_matchers.each do |matcher|
-          method_name = matcher.method_name(attr_name)
-          unless instance_method_already_implemented?(method_name)
-            define_optimized_call generated_attribute_methods, method_name, matcher.method_missing_target, attr_name.to_s
-          end
-        end
-        attribute_method_matchers_cache.clear
-      end
-
-      def _ar_32_fallback_accessors(store_attribute, accessors)
-        accessors.each do |accessor|
-          _ar_32_fallback_accessor(store_attribute, accessor)
-        end
-      end
-
-      def _ar_32_fallback_accessor(store_attribute, key)
-        define_method("#{key}=") do |value|
-          write_store_attribute(store_attribute, key, value)
-        end
-        define_method(key) do
-          read_store_attribute(store_attribute, key)
-        end
-      end
-
-    end
-
-    private
-
-    def initialize_store_attribute(store_attribute)
-      send("#{store_attribute}=", {}) unless send(store_attribute).is_a?(Hash)
-      send(store_attribute)
-    end
-
-    def read_store_attribute(store_attribute, key)
-      store = initialize_store_attribute(store_attribute)
-      store[key]
-    end
-
-    def write_store_attribute(store_attribute, key, value)
-      attribute_will_change!(store_attribute.to_s)
-      send(store_attribute)[key] = value
-    end
-
-  end
-
-  Extension.send(:include, AR32Fallbacks)
-end

data/lib/active_record/typed_store/coder.rb

@@ -1,28 +0,0 @@
-module ActiveRecord::TypedStore
-
-  class Coder < ::ActiveRecord::Store::IndifferentCoder
-
-    class << self
-
-      def create(store_class)
-        Class.new(self) do
-          @store_class = store_class
-        end
-      end
-
-      def as_indifferent_hash(obj)
-        return obj if obj.is_a?(@store_class)
-        @store_class.new(obj)
-      end
-
-    end
-
-    delegate :as_indifferent_hash, to: 'self.class'
-
-    def dump(obj)
-      @coder.dump(obj.try(:to_hash) || {})
-    end
-
-  end
-
-end

data/lib/active_record/typed_store/column.rb

@@ -1,86 +0,0 @@
-module ActiveRecord::TypedStore
-
-  class Column < ::ActiveRecord::ConnectionAdapters::Column
-    attr_reader :array, :blank
-
-    def initialize(name, type, options={})
-      @name = name
-      @type = type
-      @array = options.fetch(:array, false)
-      @default = extract_default(options.fetch(:default, nil))
-      @null = options.fetch(:null, true)
-      @blank = options.fetch(:blank, true)
-      @accessor = options.fetch(:accessor, true)
-      @scale = options[:scale]
-      @limit = options[:limit]
-      @precision = options[:precision]
-    end
-
-    def accessor?
-      @accessor
-    end
-
-    def cast(value)
-      casted_value = type_cast(value)
-      if !blank
-        casted_value = default if casted_value.blank?
-      elsif !null
-        casted_value = default if casted_value.nil?
-      end
-      casted_value
-    end
-
-    def extract_default(value)
-      return value if (type == :string || type == :text) && value.nil?
-
-      type_cast(value)
-    end
-
-    def type_cast(value, map=true)
-      if array && (map || value.is_a?(Array))
-        return [] if map && !value.is_a?(Array)
-        return value.map{ |v| type_cast(v, false) }
-      end
-
-      if type == :string || type == :text
-        return value.to_s unless value.nil? && (null || array)
-      end
-
-      if IS_AR_3_2 && type == :datetime && value.is_a?(DateTime)
-        return super(value.iso8601)
-      end
-
-      defined?(super) ? super(value) : type_cast_from_database(value)
-    end
-
-  end
-
-  if defined? ::ActiveRecord::Type
-    BaseColumn = remove_const(:Column)
-
-    class DecimalType < ::ActiveRecord::Type::Decimal
-      def type_cast_from_database(value)
-        value = value.to_s if value.is_a?(Float)
-        super(value)
-      end
-    end
-
-    class Column < BaseColumn
-      CAST_TYPES = {
-        boolean: ::ActiveRecord::Type::Boolean,
-        integer: ::ActiveRecord::Type::Integer,
-        string: ::ActiveRecord::Type::String,
-        float: ::ActiveRecord::Type::Float,
-        date: ::ActiveRecord::Type::Date,
-        datetime: ::ActiveRecord::Type::DateTime,
-        decimal: DecimalType,
-        any: ::ActiveRecord::Type::Value,
-      }
-
-      def initialize(_, type, options = {})
-        @cast_type = CAST_TYPES.fetch(type).new(options.slice(:limit, :scale, :precision))
-        super
-      end
-    end
-  end
-end