jsonb_accessor 1.3.7-java → 1.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce484d9aeee21dc13a5af013a9621e95d83b56304b6c8f12ff889e4a198ed4a3
-  data.tar.gz: 10da9efa55604838e84f1741885b64cfb4cb958d1f6c1ca49b8e4bb44c028764
+  metadata.gz: 35b19c75fe9615c62f23f463cc888eec8e9bce7e04b8719d72dcd424e48976df
+  data.tar.gz: 982e7853f817ff89c6db7a17fffe55733f536f0fe2b9d24cedb2bcfe4a90d532
 SHA512:
-  metadata.gz: cde3cd949401ce97e08e44549a4d1053bd5560bbd6b3b9f6ac42fab160c4d631510501a26933e6b7fc2e43ef5ab31fbc67393253c0358c41dbd4902b20c13cb3
-  data.tar.gz: 74f273a9462b9abf39e1e0f97e04d411a6f3549c803faab600583585168246df199a93fa520bca5967a54aa6865d549098d029e91acdad79c2ea8877477ca4f9
+  metadata.gz: af53d7db74992093da6869c3d430ee098b3cb12987d87f5459dc85af3c4fa20fd492065bba0b737e983609a0ccda3d524c01f568c1e502ab555c5a1db0b31c7e
+  data.tar.gz: 21a9997db6d4b21ec4ef737835f1a8f4630ab31fd89b3a29b9905c93ef7e79df354fdabea63648fe4cfe1b2420c3689c2d594a0fdb83ff3b3efaeb8ca9c67353

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
@@ -25,7 +24,7 @@ jobs:
     needs: lint
     services:
       db:
-        image: postgres:9.4
+        image: postgres
         env:
           POSTGRES_HOST_AUTH_METHOD: trust
           POSTGRES_DB: jsonb_accessor
@@ -37,101 +36,42 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - gemfile: activerecord_5.0.0
-            ruby: '2.4'
-
-          - gemfile: activerecord_5.1.0
-            ruby: '2.4'
-
-          - gemfile: activerecord_5.2.0
-            ruby: '2.4'
-
-          - gemfile: activerecord_5.0.0
-            ruby: '2.5'
-
-          - gemfile: activerecord_5.1.0
-            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'
-
-          - gemfile: activerecord_5.0.0
-            ruby: '2.6'
-
-          - gemfile: activerecord_5.1.0
-            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'
-
-          - gemfile: activerecord_5.0.0
-            ruby: '2.7'
-
-          - gemfile: activerecord_5.1.0
-            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'
-
-          - gemfile: activerecord_7.0.1
-            ruby: '2.7'
-
-          - gemfile: activerecord_6.1.0
+          - gemfile: activerecord_6.1
             ruby: '3.0'
 
-          - gemfile: activerecord_6.1.0
+          - gemfile: activerecord_6.1
             ruby: '3.1'
 
-          - gemfile: activerecord_6.1.0
+          - gemfile: activerecord_6.1
             ruby: '3.2'
 
-          - gemfile: activerecord_7.0.1
+          - gemfile: activerecord_7.0
             ruby: '3.0'
 
-          - gemfile: activerecord_7.0.1
+          - gemfile: activerecord_7.0
             ruby: '3.1'
 
-          - gemfile: activerecord_7.0.1
+          - gemfile: activerecord_7.0
             ruby: '3.2'
 
-          - gemfile: activerecord_5.1.0
-            ruby: 'jruby-9.3'
-
-          - gemfile: activerecord_5.2.0
-            ruby: 'jruby-9.3'
+          - gemfile: activerecord_7.1
+            ruby: '3.0'
 
-          - gemfile: activerecord_6.0.0
-            ruby: 'jruby-9.3'
+          - gemfile: activerecord_7.1
+            ruby: '3.1'
 
-          - gemfile: activerecord_6.1.0
-            ruby: 'jruby-9.3'
+          - gemfile: activerecord_7.1
+            ruby: '3.2'
 
-          # waiting for https://github.com/jruby/activerecord-jdbc-adapter/issues/1125 to be addressed
-          # - gemfile: activerecord_7.0.1
-          #   ruby: 'jruby-9.4'
+          - gemfile: activerecord_7.0
+            ruby: 'jruby-9.4'
 
     name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}
 
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
@@ -141,8 +81,7 @@ jobs:
 
     - name: Bundle install
       run: |
-        bundle config set gemfile "${GITHUB_WORKSPACE}/gemfiles/${{ matrix.gemfile }}.gemfile"
-        bundle install --jobs 4 --retry 3
+        bundle install
 
     - name: Setup DB
       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 @@
-jruby-9.3.9.0
+3.2.2

data/Appraisals

@@ -1,25 +1,13 @@
 # frozen_string_literal: true
 
-appraise "activerecord-5.0.0" do
-  gem "activerecord", "~> 5.0.0"
-end
-
-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"
+appraise "activerecord-6.1" do
+  gem "activerecord", "~> 6.1"
 end
 
-appraise "activerecord-6.1.0" do
-  gem "activerecord", "~> 6.1"
+appraise "activerecord-7.0" do
+  gem "activerecord", "~> 7.0.8"
 end
 
-appraise "activerecord-7.0.1" do
-  gem "activerecord", "~> 7.0.1"
+appraise "activerecord-7.1" do
+  gem "activerecord", "~> 7.1"
 end

data/CHANGELOG.md

@@ -1,6 +1,30 @@
 # Changelog
 ## [Unreleased]
 
+## [1.4] - 2023-10-15
+### Breaking change
+- `jsonb_accessor` dropped support for Ruby 2 and Rails versions lower than 6.1. Support for ActiveRecord::Enum was also
+dropped because ActiveRecord 7.1 now requires each enum field to be backed by a database column. Enums will still work
+when using AR versions lower than 7.1. This is a limitation of Rails, not of this gem.
+
+### Fixed
+
+- Bug fix: An array of datetimes previously caused an error. https://github.com/madeintandem/jsonb_accessor/pull/169. Thanks @bekicot.
+- Rails 7.1 is officially supported and tested against.
+
+## [1.3.10] - 2023-05-30
+### No changes
+A new release was necessary to fix the corrupted 1.3.9 Java release on RubyGems.
+
+## [1.3.9] - 2023-05-30
+### No changes
+A new release was necessary to fix the corrupted 1.3.8 Java release on RubyGems.
+
+## [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)

data/Dockerfile

@@ -1,12 +1,12 @@
-ARG RUBY_VERSION=latest
-FROM ruby:${RUBY_VERSION}
+ARG RUBY_VERSION
+ARG RUBY_PLATFORM
+FROM ${RUBY_PLATFORM}:${RUBY_VERSION}
 
-WORKDIR /usr/src/app
+RUN apt-get update && apt-get install -y --no-install-recommends git
 
-RUN mkdir -p lib/jsonb_accessor
-COPY lib/jsonb_accessor/version.rb ./lib/jsonb_accessor/
-COPY *.gemspec Gemfile* ./
+WORKDIR /usr/src/app
 
+COPY lib/jsonb_accessor/version.rb ./lib/jsonb_accessor/version.rb
+COPY jsonb_accessor.gemspec Gemfile ./
 RUN bundle install
-
-COPY . .
+COPY . ./

data/Makefile

@@ -0,0 +1,7 @@
+build-gem:
+	@docker build --build-arg RUBY_PLATFORM=ruby --build-arg RUBY_VERSION=3.2.2 -t jsonb_accessor-ruby:3.2.2 .
+	@docker run --rm -v $(PWD):/usr/src/app -w /usr/src/app jsonb_accessor-ruby:3.2.2 gem build
+
+build-gem-java:
+	@docker build --build-arg RUBY_PLATFORM=jruby --build-arg RUBY_VERSION=9.4.2-jdk -t jsonb_accessor-jruby:9.4.2-jdk .
+	@docker run --rm -v $(PWD):/usr/src/app -w /usr/src/app jsonb_accessor-jruby:9.4.2-jdk gem build --platform java

data/README.md

@@ -318,7 +318,8 @@ Because this gem promotes attributes nested into the JSON column to first level
 
 ## Dependencies
 
-- ActiveRecord >= 5.0
+- Ruby > 3. Lower versions are not tested.
+- ActiveRecord >= 6.1
 - Postgres >= 9.4 (in order to use the [jsonb column type](http://www.postgresql.org/docs/9.4/static/datatype-json.html)).
 
 ## Upgrading
@@ -353,3 +354,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/bin/console

@@ -7,7 +7,7 @@ require "rspec"
 require File.expand_path("../spec/spec_helper.rb", __dir__)
 
 dbconfig = YAML.safe_load(ERB.new(File.read(File.join("db", "config.yml"))).result, aliases: true)
-ActiveRecord::Base.establish_connection(dbconfig["development"])
+ActiveRecord::Base.establish_connection(dbconfig["test"])
 
 # rubocop:disable Lint/UselessAssignment
 x = Product.new

data/db/config.yml

@@ -2,7 +2,7 @@ default: &default
   adapter: postgresql
   database: jsonb_accessor
   host: <%= ENV.fetch("DATABASE_HOST") { "127.0.0.1" } %>
-  user: postgres
+  username: <%= ENV.fetch("DATABASE_USER") { "postgres" } %>
 
 test:
   <<: *default

data/db/schema.rb

@@ -1,18 +1,16 @@
-# frozen_string_literal: true
-
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20_150_407_031_737) do
+ActiveRecord::Schema.define(version: 2015_04_07_031737) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -30,7 +28,8 @@ ActiveRecord::Schema.define(version: 20_150_407_031_737) do
     t.float "float_type"
     t.time "time_type"
     t.date "date_type"
-    t.datetime "datetime_type"
+    t.datetime "datetime_type", precision: nil
     t.decimal "decimal_type"
   end
+
 end

data/docker-compose.yml

@@ -6,7 +6,8 @@ services:
       - DATABASE_HOST=postgres
     build:
       args:
-        - RUBY_VERSION=${RUBY_VERSION:-2.7.2}
+        - RUBY_VERSION=${RUBY_VERSION:-3.2.2}
+        - RUBY_PLATFORM=${RUBY_PLATFORM:-ruby}
       context: .
     volumes:
       - '.:/usr/src/app'
@@ -15,7 +16,7 @@ services:
 
 
   postgres:
-    image: postgres:12
+    image: postgres
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
       - POSTGRES_DB=jsonb_accessor

data/gemfiles/{activerecord_5.0.0.gemfile → activerecord_7.0.gemfile}

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

data/gemfiles/{activerecord_5.1.0.gemfile → activerecord_7.1.gemfile}

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

data/jsonb_accessor.gemspec

@@ -17,24 +17,24 @@ Gem::Specification.new do |spec|
   spec.description           = "Adds typed jsonb backed fields to your ActiveRecord models."
   spec.homepage              = "https://github.com/devmynd/jsonb_accessor"
   spec.license               = "MIT"
-  spec.required_ruby_version = ">= 2"
+  spec.required_ruby_version = ">= 3"
 
   spec.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) || f.match(/png\z/) }
   spec.bindir                = "exe"
   spec.executables           = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths         = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 5.0"
-  spec.add_dependency "activesupport", ">= 5.0"
+  spec.add_dependency "activerecord", ">= 6.1"
+  spec.add_dependency "activesupport", ">= 6.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 "appraisal", "~> 2.5"
   spec.add_development_dependency "awesome_print"
-  spec.add_development_dependency "database_cleaner", "~> 1.6.0"
+  spec.add_development_dependency "database_cleaner-active_record", "~> 2.1"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-doc"
   spec.add_development_dependency "pry-nav"

data/lib/jsonb_accessor/helpers.rb

@@ -24,14 +24,23 @@ module JsonbAccessor
       return value if value.blank?
 
       if attribute_type == :datetime
-        value = if active_record_default_timezone == :utc
-                  Time.find_zone("UTC").parse(value).in_time_zone
+        value = if value.is_a?(Array)
+                  value.map { |v| parse_date(v) }
                 else
-                  Time.zone.parse(value)
+                  parse_date(value)
                 end
       end
 
       value
     end
+
+    # Parse datetime based on the configured default_timezone
+    def parse_date(datetime)
+      if active_record_default_timezone == :utc
+        Time.find_zone("UTC").parse(datetime).in_time_zone
+      else
+        Time.zone.parse(datetime)
+      end
+    end
   end
 end

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,10 @@
 # frozen_string_literal: true
 
 module JsonbAccessor
-  VERSION = "1.3.7"
+  VERSION = "1.4"
+
+  def self.enum_support?
+    # From AR 7.1 on, enums require a database column.
+    Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("7.1")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonb_accessor
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: '1.4'
 platform: java
 authors:
 - Michael Crismali
@@ -10,14 +10,14 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-29 00:00:00.000000000 Z
+date: 2023-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
   name: activerecord
   prerelease: false
   type: :runtime
@@ -25,13 +25,13 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
   name: activesupport
   prerelease: false
   type: :runtime
@@ -39,7 +39,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.5'
   name: appraisal
   prerelease: false
   type: :development
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -87,15 +87,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
-  name: database_cleaner
+        version: '2.1'
+  name: database_cleaner-active_record
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -214,6 +214,7 @@ files:
 - Dockerfile
 - Gemfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - UPGRADE_GUIDE.md
@@ -223,12 +224,9 @@ files:
 - db/migrate/20150407031737_set_up_testing_db.rb
 - db/schema.rb
 - 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
+- gemfiles/activerecord_6.1.gemfile
+- gemfiles/activerecord_7.0.gemfile
+- gemfiles/activerecord_7.1.gemfile
 - jsonb_accessor.gemspec
 - lib/jsonb_accessor.rb
 - lib/jsonb_accessor/attribute_query_methods.rb
@@ -249,14 +247,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: Adds typed jsonb backed fields to your ActiveRecord models.

data/gemfiles/activerecord_5.2.0.gemfile

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

data/gemfiles/activerecord_6.0.0.gemfile

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

data/gemfiles/activerecord_7.0.1.gemfile

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