activerecord-typedstore 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ab5f09b64721a41a7eae679a4ae848813504913d1d87815c035352da6b3134eb
-  data.tar.gz: bc9d48e95b48f9ad9d5b7e02f1edd9a1ce1004e8c93bfb6d18fc4d944d63c161
+SHA1:
+  metadata.gz: aa72e9f075af5501961f90eac06098f00a6c2f6a
+  data.tar.gz: a32a4b9b052cd8174756e9adf3062e5fd002da7b
 SHA512:
-  metadata.gz: bbd034206f96e1063bdb078417b685148346edeeb36968068bd54a2a8e95321ec56d5aa69b50851238607a862a01cba1a1770ac541e283eba12735c11dd84f5a
-  data.tar.gz: f04cdc9a39338b8b0fcc164da82f4b472acbf7e59543e6f8ebf5b51300e5bf55f4cb01d602a7dfc083833fef38069ed468049a49be3b6ff45b84dac7e0f86952
+  metadata.gz: 131bed9f1753d59907ad67582491a8b3dec85b597b15a3b458eecdf1ee33292bb75be81657e8778b2b49d3b7462aeff5e3671d411f6ea9def139cf1444738ee6
+  data.tar.gz: d3ec0ae6531e13aa6a7217ee202f8d1342425a259217fe7d3b5e7c190987786becd6fcfea9e087a93442476918e5fe93010a6d9fc5aa7f3fd7c988529c6fb543

data/.travis.yml

@@ -11,6 +11,8 @@ gemfile:
 env:
   - TIMEZONE_AWARE=1 POSTGRES=1 MYSQL=1
   - TIMEZONE_AWARE=0 POSTGRES=1 MYSQL=1
+  - TIMEZONE_AWARE=1 POSTGRES=1 POSTGRES_JSON=1
+  - TIMEZONE_AWARE=0 POSTGRES=1 POSTGRES_JSON=1
 
 addons:
   postgresql: 9.3

data/README.md

@@ -95,7 +95,7 @@ end
 ```
 
 Type casting rules and attribute behavior are exactly the same as a for real database columns.
-Actually the only difference is that you wont be able to query on these attributes (unless you use Postgres JSON or HStore types) and that you don't need to do a migration to add / remove an attribute.
+Actually the only difference is that you wont be able to query on these attributes (unless you use JSON or Postgres HStore types) and that you don't need to do a migration to add / remove an attribute.
 
 If not, please fill an issue.
 
@@ -123,21 +123,7 @@ typed_store :settings, coder: Base64MarshalCoder do |s|
 end
 ```
 
-If you want to use Postgres HStore or JSON column types, then you need a very simple coder:
-```ruby
-module DumbCoder
-  extend self
-
-  def load(data)
-    data || {}
-  end
-
-  def dump(data)
-    data || {}
-  end
-
-end
-```
+If you want to use JSON column or Postgres HStore types, then you can pass in `ActiveRecord::TypedStore::IdentityCoder` as the coder.
 
 ## HStore limitations
 

data/lib/active_record/typed_store/dsl.rb

@@ -29,7 +29,7 @@ module ActiveRecord::TypedStore
     delegate :keys, to: :@fields
 
     NO_DEFAULT_GIVEN = Object.new
-    [:string, :text, :integer, :float, :datetime, :date, :boolean, :decimal, :any].each do |type|
+    [:string, :text, :integer, :float, :time, :datetime, :date, :boolean, :decimal, :any].each do |type|
       define_method(type) do |name, **options|
         @fields[name] = Field.new(name, type, options)
       end

data/lib/active_record/typed_store/field.rb

@@ -39,6 +39,7 @@ module ActiveRecord::TypedStore
       string: ::ActiveRecord::Type::String,
       float: ::ActiveRecord::Type::Float,
       date: ::ActiveRecord::Type::Date,
+      time: ::ActiveRecord::Type::Time,
       datetime: ::ActiveRecord::Type::DateTime,
       decimal: ::ActiveRecord::Type::Decimal,
       any: ::ActiveRecord::Type::Value,

data/lib/active_record/typed_store/identity_coder.rb

@@ -0,0 +1,13 @@
+module ActiveRecord::TypedStore
+  module IdentityCoder
+    extend self
+
+    def load(data)
+      data || {}
+    end
+
+    def dump(data)
+      data || {}
+    end
+  end
+end

data/lib/active_record/typed_store/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module TypedStore
-    VERSION = '1.1.3'
+    VERSION = '1.2.0'
   end
 end

data/spec/active_record/typed_store_spec.rb

@@ -426,6 +426,58 @@ shared_examples 'any model' do
 
   end
 
+  describe 'time attributes' do
+    let(:time) { Time.new(1984, 6, 8, 13, 57, 12) }
+    let(:time_string) { '1984-06-08 13:57:12' }
+    let(:time) { time_string.respond_to?(:in_time_zone) ? time_string.in_time_zone : Time.parse(time_string) }
+
+    context "with ActiveRecord #{ActiveRecord::VERSION::STRING}" do
+      if AR_VERSION < AR_4_0
+        it 'has the defined default as initial value' do
+          model.save
+          expect(model.published_at).to be == time
+        end
+
+        it 'properly cast assigned value to time' do
+          model.remind_at = time_string
+          expect(model.remind_at).to be == time
+        end
+        it 'properly cast assigned value to time on save' do
+          model.remind_at = time_string
+          model.save
+          model.reload
+          expect(model.remind_at).to be == time
+        end
+        it 'retreive a Time instance' do
+          model.update(published_at: time)
+          expect(model.reload.published_at).to be == time
+        end
+      else
+        it 'has the defined default as initial value' do
+          model.save
+          expect(model.reload.published_at).to be == time
+        end
+
+        it 'retreive a time instance' do
+          model.update(published_at: time)
+          expect(model.reload.published_at).to be == time
+        end
+
+        if ActiveRecord::Base.time_zone_aware_attributes
+          it 'properly cast assigned value to time' do
+            model.remind_at = time_string
+            expect(model.remind_at).to be == time
+          end
+        else
+          it 'properly cast assigned value to time' do
+            model.remind_at = time_string
+            expect(model.remind_at).to be == time
+          end
+        end
+      end
+    end
+  end
+
   describe 'datetime attributes' do
 
     let(:datetime) { DateTime.new(1984, 6, 8, 13, 57, 12) }
@@ -513,7 +565,7 @@ shared_examples 'any model' do
 
 end
 
-shared_examples 'a store' do |retain_type=true|
+shared_examples 'a store' do |retain_type = true, settings_type = :text|
   let(:model) { described_class.new }
 
   describe "without connection" do
@@ -537,7 +589,7 @@ shared_examples 'a store' do |retain_type=true|
   describe 'model.typed_stores' do
     it "can access keys" do
       stores = model.class.typed_stores
-      expect(stores[:settings].keys).to eq [:no_default, :name, :email, :cell_phone, :public, :enabled, :age, :max_length, :rate, :price, :published_on, :remind_on, :published_at, :remind_at, :total_price, :shipping_cost, :grades, :tags, :nickname, :author, :source, :signup, :country]
+      expect(stores[:settings].keys).to eq [:no_default, :name, :email, :cell_phone, :public, :enabled, :age, :max_length, :rate, :price, :published_on, :remind_on, :published_at_time, :remind_at_time, :published_at, :remind_at, :total_price, :shipping_cost, :grades, :tags, :nickname, :author, :source, :signup, :country]
     end
 
     it "can access keys even when accessors are not defined" do
@@ -617,7 +669,7 @@ shared_examples 'a store' do |retain_type=true|
     end
 
     it 'delegates internal methods to the underlying type' do
-      expect(model.class.type_for_attribute("settings").type).to eq :text
+      expect(model.class.type_for_attribute("settings").type).to eq settings_type
     end
   end
 
@@ -855,7 +907,7 @@ end if defined?(PostgresHstoreTypedStoreModel)
 
 describe PostgresJsonTypedStoreModel do
   it_should_behave_like 'any model'
-  it_should_behave_like 'a store'
+  it_should_behave_like 'a store', true, :json
   it_should_behave_like 'a model supporting arrays'
 end if defined?(PostgresJsonTypedStoreModel)
 

data/spec/support/models.rb

@@ -34,6 +34,9 @@ def define_columns(t)
   t.date :published_on, default: '1984-06-08', null: false
   t.date :remind_on
 
+  t.time :published_at_time, default: '1984-06-08 13:57:12', null: false
+  t.time :remind_at_time
+
   t.datetime :published_at, default: '1984-06-08 13:57:12', null: false
   t.datetime :remind_at
 
@@ -100,8 +103,7 @@ class CreateAllTables < MigrationClass
         recreate_table(:postgres_hstore_typed_store_models) { |t| t.hstore :settings; t.text :untyped_settings }
 
         if ENV['POSTGRES_JSON']
-          execute "create extension if not exists json"
-          recreate_table(:postgres_json_typed_store_models) { |t| t.json :settings; t.text :untyped_settings }
+          recreate_table(:postgres_json_typed_store_models) { |t| t.json :settings; t.text :explicit_settings; t.text :partial_settings; t.text :untyped_settings }
         end
       end
     end
@@ -180,9 +182,9 @@ if ENV['POSTGRES']
           establish_connection ENV['POSTGRES_URL'] || :test_postgresql
           store :untyped_settings, accessors: [:title]
 
-          define_store_with_attributes(coder: false)
-          define_store_with_no_attributes(coder: false)
-          define_store_with_partial_attributes(coder: false)
+          define_store_with_attributes(coder: ColumnCoder.new(AsJson))
+          define_store_with_no_attributes(coder: ColumnCoder.new(AsJson))
+          define_store_with_partial_attributes(coder: ColumnCoder.new(AsJson))
         end
 
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-typedstore
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -165,6 +165,7 @@ files:
 - 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/identity_coder.rb
 - lib/active_record/typed_store/type.rb
 - lib/active_record/typed_store/typed_hash.rb
 - lib/active_record/typed_store/version.rb
@@ -194,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Add type casting and full method attributes support to АctiveRecord store