jsonb_accessor 1.3.6 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c291219f0d8fa746d82718410e4eb6743a2e53b0c7f55b2d4770b0ab40b4de
-  data.tar.gz: 92cb5a1e680f3bcab2aff0ad1c459e1f67714083337a1cf0675837aba3f01a65
+  metadata.gz: fc33a0dd7ef12bf1804fd787f0f8cfa8e8ddc7ee3973c6dd0fb1a172a6d3342c
+  data.tar.gz: 2defa503de6becb46bc44be77e52ba2f42073e33cb142e5ac07f6ca396f6c38c
 SHA512:
-  metadata.gz: cf6c29dba63cdc774387bc4e8146b7884188ef6219e29a901367cc380da7257501401a4788534016ea6c8c95a1a2cfb526e8657ae6f8606caa4e91748c4358dd
-  data.tar.gz: f8805f9278ca28e29b2521b3283e132e2264687a5dfaee01c18de82ede3de38465228092a96571bbb66d24a24cd3a01b5d61732ef2cbacca75fc02679860eb39
+  metadata.gz: dd0b9dfc9b5d595c5c3c03ee7eb75050eb3755329010c1f7ad4df81f466f4b19717aa4ab4ef628fc49a71dc3134f95bb64202b993fc18b1413c0267bbbe37221
+  data.tar.gz: 762df4f22bc02d367ee20cee9056deabcdc0782a1afeb3592a992227cbcedb8ec9dec6d9aa38d998fe61fa9f42f53c79dd1036426d925d3e3568f39f0e82bf6b

data/.github/workflows/ci.yml

@@ -10,12 +10,11 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.2
         bundler-cache: true
         
     - name: Rubocop
@@ -38,54 +37,100 @@ jobs:
       matrix:
         include:
           - gemfile: activerecord_5.0.0
-            ruby: 2.4.5
+            ruby: '2.4'
 
           - gemfile: activerecord_5.1.0
-            ruby: 2.4.5
+            ruby: '2.4'
+
+          - gemfile: activerecord_5.2.0
+            ruby: '2.4'
 
           - gemfile: activerecord_5.0.0
-            ruby: 2.5.3
+            ruby: '2.5'
 
           - gemfile: activerecord_5.1.0
-            ruby: 2.5.3
+            ruby: '2.5'
+
+          - gemfile: activerecord_5.2.0
+            ruby: '2.5'
+
+          - gemfile: activerecord_6.0.0
+            ruby: '2.5'
 
           - gemfile: activerecord_6.1.0
-            ruby: 2.5.3
+            ruby: '2.5'
 
           - gemfile: activerecord_5.0.0
-            ruby: 2.6.1
+            ruby: '2.6'
 
           - gemfile: activerecord_5.1.0
-            ruby: 2.6.1
+            ruby: '2.6'
+
+          - gemfile: activerecord_5.2.0
+            ruby: '2.6'
+
+          - gemfile: activerecord_6.0.0
+            ruby: '2.6'
 
           - gemfile: activerecord_6.1.0
-            ruby: 2.6.1
+            ruby: '2.6'
 
           - gemfile: activerecord_5.0.0
-            ruby: 2.7.2
+            ruby: '2.7'
 
           - gemfile: activerecord_5.1.0
-            ruby: 2.7.2
+            ruby: '2.7'
+
+          - gemfile: activerecord_5.2.0
+            ruby: '2.7'
+
+          - gemfile: activerecord_6.0.0
+            ruby: '2.7'
 
           - gemfile: activerecord_6.1.0
-            ruby: 2.7.2
+            ruby: '2.7'
 
           - gemfile: activerecord_7.0.1
-            ruby: 2.7.2
+            ruby: '2.7'
+
+          - gemfile: activerecord_6.1.0
+            ruby: '3.0'
+
+          - gemfile: activerecord_6.1.0
+            ruby: '3.1'
 
           - gemfile: activerecord_6.1.0
-            ruby: 3.0.0
+            ruby: '3.2'
+
+          - gemfile: activerecord_7.0.1
+            ruby: '3.0'
 
           - gemfile: activerecord_7.0.1
-            ruby: 3.0.0
+            ruby: '3.1'
 
           - gemfile: activerecord_7.0.1
-            ruby: 3.1.0
+            ruby: '3.2'
+
+          - gemfile: activerecord_5.1.0
+            ruby: 'jruby-9.3'
+
+          - gemfile: activerecord_5.2.0
+            ruby: 'jruby-9.3'
+
+          - gemfile: activerecord_6.0.0
+            ruby: 'jruby-9.3'
+
+          - gemfile: activerecord_6.1.0
+            ruby: 'jruby-9.3'
+
+          # waiting for https://github.com/jruby/activerecord-jdbc-adapter/issues/1125 to be addressed
+          # - gemfile: activerecord_7.0.1
+          #   ruby: 'jruby-9.4'
 
     name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
@@ -100,7 +145,7 @@ jobs:
 
     - name: Setup DB
       run: |
-        bundle exec rake db:create db:schema:load
+        bundle exec rake db:schema:load
 
     - name: Run tests
       run: |

data/.rubocop.yml

@@ -60,3 +60,5 @@ Gemspec/RequiredRubyVersion:
   Enabled: false
 Gemspec/RequireMFA:
   Enabled: false
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+3.2.1

data/Appraisals

@@ -8,6 +8,14 @@ appraise "activerecord-5.1.0" do
   gem "activerecord", "~> 5.1.3"
 end
 
+appraise "activerecord-5.2.0" do
+  gem "activerecord", "~> 5.2.8"
+end
+
+appraise "activerecord-6.0.0" do
+  gem "activerecord", "~> 6.0.6"
+end
+
 appraise "activerecord-6.1.0" do
   gem "activerecord", "~> 6.1"
 end

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 ## [Unreleased]
 
+## [1.3.8] - 2023-05-29
+### Fixes
+
+- Support for ActiveRecord::Enum. [#163](https://github.com/madeintandem/jsonb_accessor/pull/163)
+
+## [1.3.7] - 2022-12-29
+
+- jruby support. jsonb_accessor now depends on `activerecord-jdbcpostgresql-adapter` instead of `pg` when the RUBY_PLATFORM is java. [#157](https://github.com/madeintandem/jsonb_accessor/pull/157)
+
 ## [1.3.6] - 2022-09-23
 ### Fixed
 

data/Gemfile

@@ -4,6 +4,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in jsonb_accessor.gemspec
 gemspec
-
-# Travis CI requires in Gemfile
-gem "pg"

data/README.md

@@ -353,3 +353,9 @@ docker-compose run ruby rake spec
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create a new Pull Request
+
+## Alternatives
+
+- https://github.com/DmitryTsepelev/store_model 💪
+- https://github.com/palkan/store_attribute ❤️
+- https://github.com/jrochkind/attr_json 🤩

data/docker-compose.yml

@@ -6,7 +6,7 @@ services:
       - DATABASE_HOST=postgres
     build:
       args:
-        - RUBY_VERSION=${RUBY_VERSION:-2.7.2}
+        - RUBY_VERSION=${RUBY_VERSION:-3.2.1}
       context: .
     volumes:
       - '.:/usr/src/app'

data/gemfiles/activerecord_5.0.0.gemfile

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "pg"
 gem "activerecord", "~> 5.0.0"
 
 gemspec path: "../"

data/gemfiles/activerecord_5.1.0.gemfile

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "pg"
 gem "activerecord", "~> 5.1.3"
 
 gemspec path: "../"

data/gemfiles/activerecord_5.2.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.2.8"
+
+gemspec path: "../"

data/gemfiles/activerecord_6.0.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.6"
+
+gemspec path: "../"

data/gemfiles/activerecord_6.1.0.gemfile

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "pg"
 gem "activerecord", "~> 6.1"
 
 gemspec path: "../"

data/gemfiles/activerecord_7.0.1.gemfile

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "pg"
 gem "activerecord", "~> 7.0.1"
 
 gemspec path: "../"

data/jsonb_accessor.gemspec

@@ -4,11 +4,14 @@ lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "jsonb_accessor/version"
 
+is_java = RUBY_PLATFORM == "java"
+
 Gem::Specification.new do |spec|
   spec.name                  = "jsonb_accessor"
   spec.version               = JsonbAccessor::VERSION
   spec.authors               = ["Michael Crismali", "Joe Hirn", "Jason Haruska"]
   spec.email                 = ["michael@crismali.com", "joe@devmynd.com", "jason@haruska.com"]
+  spec.platform              = "java" if is_java
 
   spec.summary               = "Adds typed jsonb backed fields to your ActiveRecord models."
   spec.description           = "Adds typed jsonb backed fields to your ActiveRecord models."
@@ -23,7 +26,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activerecord", ">= 5.0"
   spec.add_dependency "activesupport", ">= 5.0"
-  spec.add_dependency "pg", ">= 0.18.1"
+  if is_java
+    spec.add_dependency "activerecord-jdbcpostgresql-adapter", ">= 50.0"
+  else
+    spec.add_dependency "pg", ">= 0.18.1"
+  end
 
   spec.add_development_dependency "appraisal", "~> 2.2.0"
   spec.add_development_dependency "awesome_print"

data/lib/jsonb_accessor/macro.rb

@@ -66,7 +66,9 @@ module JsonbAccessor
             define_method("#{name}=") do |value|
               super(value)
 
-              attribute_value = public_send(name)
+              # If enum was defined, take the value from the enum and not what comes out directly from the getter
+              attribute_value = defined_enums[name].present? ? defined_enums[name][value] : public_send(name)
+
               # Rails always saves time based on `default_timezone`. Since #as_json considers timezone, manual conversion is needed
               if attribute_value.acts_like?(:time)
                 attribute_value = (JsonbAccessor::Helpers.active_record_default_timezone == :utc ? attribute_value.utc : attribute_value.in_time_zone).strftime("%F %R:%S.%L")

data/lib/jsonb_accessor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonbAccessor
-  VERSION = "1.3.6"
+  VERSION = "1.3.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonb_accessor
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.8
 platform: ruby
 authors:
 - Michael Crismali
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2023-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -225,6 +225,8 @@ files:
 - docker-compose.yml
 - gemfiles/activerecord_5.0.0.gemfile
 - gemfiles/activerecord_5.1.0.gemfile
+- gemfiles/activerecord_5.2.0.gemfile
+- gemfiles/activerecord_6.0.0.gemfile
 - gemfiles/activerecord_6.1.0.gemfile
 - gemfiles/activerecord_7.0.1.gemfile
 - jsonb_accessor.gemspec
@@ -254,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Adds typed jsonb backed fields to your ActiveRecord models.