pg_serializable 2.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63d160c9c9813d6cd0cfb694af1d3f3b16f542cad5d0ced046d6b12ba52f4857
-  data.tar.gz: 1d1d71c4935b37e899f2e13514df90aa468f9d29c69b398cf4fe710cf94a3c68
+  metadata.gz: 181c689aa09605b1f74bbffdb786891117b964e594cab8eb9937407d6d05e9d0
+  data.tar.gz: 3abdee223e868fa8f569df557a624aa5d9181e87ca5c536c3e1223273bb80c91
 SHA512:
-  metadata.gz: 1b8307eecd420d164389ca4e04556c131e2e13d478023b0d38e70ae68498306559659a8370ea59234719d9e931c3a19a95c6ace42f2c686c99bcf5535b298bbf
-  data.tar.gz: 75d931172e41d8fb860744d4582df3b18f1aa6c868bcd5d8167ff38c720b814533e92824dc28ae7b25d493df19e5a378ce730a16cec5270f0fe6bb7cd8c2ccd3
+  metadata.gz: 9976896c041b29e6f56026e9198ef89c6840821c4dd3926f6a26c4b78b8154a382879e51b73d40ab47a901adcd12d2434a70bfea80c8e17e564bb3a4ee355c56
+  data.tar.gz: a0d234f3602ee53002036a5a3fc9b2bb89e6920339a55fe9551029551fc6e027dd4e6c5160da04e833a93e327f8cc7cd3a8cd6f6658830ef6d0ecf1eb3ed3ee4

data/Gemfile.lock

@@ -1,50 +1,47 @@
 PATH
   remote: .
   specs:
-    pg_serializable (2.0.0)
-      activerecord (~> 5.2)
-      activesupport (~> 5.2)
-      oj (~> 3.6)
+    pg_serializable (3.0.2)
+      activerecord (>= 5.2, < 7.0)
+      activesupport (>= 5.2, < 7.0)
       pg (>= 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activesupport (5.2.3)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+      zeitwerk (~> 2.2, >= 2.2.2)
     codecov (0.1.14)
       json
       simplecov
       url
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     database_cleaner (1.7.0)
     diff-lcs (1.3)
     docile (1.3.1)
     factory_bot (5.0.2)
       activesupport (>= 4.2.0)
     ffaker (2.11.0)
-    i18n (1.6.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     json (2.2.0)
     method_source (0.9.2)
-    minitest (5.11.3)
-    oj (3.7.12)
-    pg (1.1.4)
+    minitest (5.14.1)
+    pg (1.2.3)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -64,23 +61,23 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     url (0.3.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
   codecov
   database_cleaner
   factory_bot
   ffaker
   pg_serializable!
   pry
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.5
+   2.1.4

data/README.md

@@ -7,6 +7,23 @@
 
 Serialize json directly from postgres (9.4+).
 
+## Upgrading from version 2.x.x to 3.x.x
+
+Serialization returns a PORO instead of a json string. If you have code like:
+```ruby
+OJ.load(Product.where(id: ids).json)
+```
+
+You can replace it with:
+```ruby
+Product.where(id: ids).json
+```
+
+To automatically use OJ to serialize your POROs to json strings, add this code to your initialization:
+```ruby
+Oj.optimize_rails()
+```
+
 ## Motivation
 Models:
 ```ruby
@@ -533,7 +550,7 @@ class Variation < ApplicationRecord
   serializable do
     default do
       attributes :id
-      belongs_to: :color
+      belongs_to :color
     end
 
     trait :for_products do

data/lib/pg_serializable.rb

@@ -1,4 +1,3 @@
-require 'oj'
 require 'active_support/concern'
 require 'active_support/core_ext/module/delegation'
 require 'pg_serializable/errors'
@@ -57,7 +56,7 @@ module PgSerializable
 
     def to_pg_json(scope)
       res = scope.as_json.first
-      ::Oj.dump(res['coalesce'] || res['json_build_object'])
+      res['coalesce'] || res['json_build_object']
     end
 
     private

data/lib/pg_serializable/version.rb

@@ -1,3 +1,3 @@
 module PgSerializable
-  VERSION = "2.0.0"
+  VERSION = "3.0.2"
 end

data/lib/pg_serializable/visitors/json.rb

@@ -56,8 +56,8 @@ module PgSerializable
         key = "\'#{subject.label}\'"
         enum_hash = subject.klass.defined_enums[subject.column_name.to_s]
         val = "CASE \"#{table_alias}\".\"#{subject.column_name}\" " +
-        enum_hash.map do |val, int|
-          "WHEN #{int} THEN \'#{subject.prc ? subject.prc.call(val) : val}\'"
+        enum_hash.map do |enum_key, enum_value|
+          "WHEN #{enum_value.is_a?(String) ? "'#{enum_value}'" : enum_value} THEN \'#{subject.prc ? subject.prc.call(enum_key) : enum_key}\'"
         end.join(' ') + " ELSE NULL END"
         "#{key}, #{val}"
       end

data/pg_serializable.gemspec

@@ -21,17 +21,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "codecov"
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "factory_bot"
   spec.add_development_dependency "ffaker"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
-  spec.add_runtime_dependency "activesupport", "~> 5.2"
-  spec.add_runtime_dependency "activerecord", "~> 5.2"
+  spec.add_runtime_dependency "activesupport", ">= 5.2", "< 7.0"
+  spec.add_runtime_dependency "activerecord", ">= 5.2", "< 7.0"
   spec.add_runtime_dependency "pg", ">= 1.1"
-  spec.add_runtime_dependency "oj", "~> 3.6"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pg_serializable
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - matthewjf
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-07 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,30 +112,42 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +162,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
 description: serializes rails models from postgres (9.5+)
 email:
 - matthewjf@gmail.com
@@ -236,8 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: serializes rails models from postgres (9.5+)