activerecord-typedstore 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 922ee9aa28151d4d9682563fb960a01e3f0b483d1c9d1e9168c095391b87344e
-  data.tar.gz: 1116257100c7775ec75c3742666c9ab35454ceca71bef07781fe8581edaeeeec
+  metadata.gz: bdeb6337150bcfbc1307433960078b4ee4fa86930eea89ed1e27214df82b6d1a
+  data.tar.gz: 883fc7c802f2d86ca5a5c18133a75b8759907de917a938d765b3f55852338170
 SHA512:
-  metadata.gz: 0c01c5370bc89c17b38a7f9a928e96064cececa214eb9e43a90a10b0ee8e990d18fbea8d18f1c45e1b1f3a9446d17174e79fe5483b1ae5a89ac5f5e994e618a8
-  data.tar.gz: 99fc46ff54dd8ba238ef3bda41d2861d200fb8f11f41a5b07d0c5846d747435c3424a5f550c168c6f73a36c78638f6affbf95636f4a75c56af40ad8d42685268
+  metadata.gz: 989ac79c84da4898c175da31cef578c576396987c7356093430e116089e27c377f561f05a53872bd0adfb79c4ee4deae795f8d0ef0e67bc1b4f461ef04790e1b
+  data.tar.gz: a7f1e9fb20c79d5acd321140aad66d345c058155f2722d2afc9b25247615428b0286c8040d5c2a432a2f2d05b5a2666d2c773dbc56dcdfba9113d39f13901593

data/.github/workflows/ruby.yml

@@ -0,0 +1,47 @@
+name: Ruby
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    strategy:
+      matrix:
+        ruby: [2.6, 2.7]
+        gemfile: [Gemfile.ar-5.2, Gemfile.ar-6.0, Gemfile.ar-6.1, Gemfile.ar-master]
+        exclude:
+          - ruby: 2.6
+            gemfile: Gemfile.ar-6.0
+          - ruby: 2.6
+            gemfile: Gemfile.ar-6.1
+          - ruby: 2.6
+            gemfile: Gemfile.ar-master
+        timezone_aware: [0, 1]
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
+      TIMEZONE_AWARE: ${{ matrix.timezone_aware }}
+      POSTGRES: 1
+      MYSQL: 1
+      POSTGRES_JSON: 1
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Start MySQL and create DB
+      run: |
+        sudo systemctl start mysql.service
+        mysql -uroot -proot -e 'create database typed_store_test;'
+    - name: Start PostgresQL and create DB
+      run: |
+        sudo sed -i s/md5/trust/g /etc/postgresql/*/main/pg_hba.conf
+        sudo systemctl start postgresql.service
+        sudo -u postgres createuser --createdb --superuser ${USER}
+        createdb typed_store_test
+        echo "POSTGRES_URL=postgres://localhost/typed_store_test" >> $GITHUB_ENV
+    - name: Ruby Tests
+      run: bundle exec rake

data/gemfiles/Gemfile.ar-6.1

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+ENV['PG_VERSION'] = '~> 1.1'
+gemspec path: '..'
+
+gem 'activerecord', '~> 6.1.0'

data/lib/active_record/typed_store/extension.rb

@@ -23,6 +23,7 @@ module ActiveRecord::TypedStore
 
       if ActiveRecord.version >= Gem::Version.new('6.1.0.alpha')
         attribute(store_attribute) do |subtype|
+          subtype = subtype.subtype if subtype.is_a?(Type)
           Type.new(typed_klass, dsl.coder, subtype)
         end
       else

data/lib/active_record/typed_store/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module TypedStore
-    VERSION = '1.3.1'
+    VERSION = '1.3.2'
   end
 end

data/spec/active_record/typed_store_spec.rb

@@ -854,3 +854,17 @@ describe MarshalTypedStoreModel do
   it_should_behave_like 'a store'
   it_should_behave_like 'a model supporting arrays'
 end
+
+describe InheritedTypedStoreModel do
+  let(:model) { described_class.new }
+
+  it 'can be serialized' do
+    model.update(new_attribute: "foobar")
+    expect(model.reload.new_attribute).to be == "foobar"
+  end
+
+  it 'is casted' do
+    model.update(new_attribute: 42)
+    expect(model.settings[:new_attribute]).to be == '42'
+  end
+end

data/spec/support/models.rb

@@ -6,7 +6,7 @@ ActiveRecord::Base.time_zone_aware_attributes = ENV['TIMEZONE_AWARE'] != '0'
 ActiveRecord::Base.configurations = {
   'test_sqlite3' => { 'adapter' => 'sqlite3', 'database' => '/tmp/typed_store.db' },
   'test_postgresql' => { 'adapter' => 'postgresql', 'database' => 'typed_store_test', 'username' => 'postgres' },
-  'test_mysql' => { 'adapter' => 'mysql2', 'database' => 'typed_store_test', 'username' => 'travis' },
+  'test_mysql' => { 'adapter' => 'mysql2', 'database' => 'typed_store_test', 'username' => 'root', 'password' => 'root' },
 }
 
 def define_columns(t)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-typedstore
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -143,9 +143,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -154,6 +154,7 @@ files:
 - gemfiles/Gemfile.ar-5.0
 - gemfiles/Gemfile.ar-5.2
 - gemfiles/Gemfile.ar-6.0
+- gemfiles/Gemfile.ar-6.1
 - gemfiles/Gemfile.ar-master
 - lib/active_record/typed_store.rb
 - lib/active_record/typed_store/behavior.rb
@@ -189,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Add type casting and full method attributes support to АctiveRecord store

data/.travis.yml

@@ -1,34 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-
-before_install:
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem install bundler -v '< 2'
-
-rvm:
-  - "2.5"
-  - "2.6"
-gemfile:
-  - gemfiles/Gemfile.ar-5.2
-  - gemfiles/Gemfile.ar-6.0
-  - gemfiles/Gemfile.ar-master
-
-env:
-  - TIMEZONE_AWARE=1 POSTGRES=1 MYSQL=1 POSTGRES_JSON=1
-  - TIMEZONE_AWARE=0 POSTGRES=1 MYSQL=1 POSTGRES_JSON=1
-
-matrix:
-  exclude:
-    - rvm: "2.6"
-      gemfile: 'gemfiles/Gemfile.6-0'
-    - rvm: "2.6"
-      gemfile: 'gemfiles/Gemfile.ar-master'
-
-services:
-  - mysql
-  - postgresql
-
-before_script:
-  - mysql -e 'create database typed_store_test;'
-  - psql -c 'create database typed_store_test;' -U postgres