pg_serializable 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 648a712ad1604caafa1ce54620bde306d99f38fba5b3897b707bce2302ac15de
-  data.tar.gz: 00e8956c9bc8c41bb967e3340cf6a51b642a06061dd9d736e586696c7662a438
+  metadata.gz: bdecd8f20e4e15821e6f0e57e93b45f8747d384792aa62326be2305987de1683
+  data.tar.gz: 36f0d9ff9a67f5496c30c0abc80b0d8cccce635799e4d5732bd24c6fdf8eefc1
 SHA512:
-  metadata.gz: fd39bd3c82b9732015cad9776b36c45e828fb890e2104c739ad250ee9ecf7aa913d6b328c358286f3f99e315d2b3bb8d63284ff3b679dfe0d0b89e079eaed019
-  data.tar.gz: fa604b60406ff47e4b1b7795f85481c1c10626ca9de59b221e94ba2bd20e70a9e75566ea464e184afbd03557ac916f240f84374326269f4b7de84926cd4a49b2
+  metadata.gz: 06a979406f2f30aba2438166fa1d4dcc5ddb2a2acf5820585bbc3029d7b978dfce32db0c8ad3d800509e12d3abd8a5b0e3f3f53f53ea2c48483160be74fd33dd
+  data.tar.gz: 343113e081a52d110cfd695b7b483be7a7748b52bd8317667eeff2bc82fc563b7a7bd2be967a40acd68039d5173037ab8de52371aa069610661a1f4d2ee2af5e

data/Gemfile.lock

@@ -1,32 +1,43 @@
 PATH
   remote: .
   specs:
-    pg_serializable (1.0.0)
+    pg_serializable (1.3.1)
       activerecord (~> 5.2)
       activesupport (~> 5.2)
       oj (~> 3.6)
+      pg (>= 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
+    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.1)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
-    concurrent-ruby (1.0.5)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    database_cleaner (1.7.0)
     diff-lcs (1.3)
-    i18n (1.1.1)
+    factory_bot (5.0.2)
+      activesupport (>= 4.2.0)
+    ffaker (2.11.0)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
+    method_source (0.9.2)
     minitest (5.11.3)
-    oj (3.6.11)
+    oj (3.7.12)
+    pg (1.1.4)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -37,6 +48,9 @@ GEM
     rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
+    rspec-its (1.3.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
@@ -50,9 +64,14 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.16)
+  database_cleaner
+  factory_bot
+  ffaker
   pg_serializable!
+  pry
   rake (~> 10.0)
   rspec (~> 3.0)
+  rspec-its
 
 BUNDLED WITH
    1.16.5

data/README.md

@@ -596,9 +596,9 @@ Response:
 ]
 ```
 
-## Development
+## Without Rails
 
-TODO
+Rails isn't a dependency of this gem. However, setting it up to work without Rails takes some work. The `specs/support` folder has the initialization code needed to run the gem with just `ActiveSupport` and `ActiveRecord`.
 
 ## License
 

data/lib/pg_serializable.rb

@@ -1,5 +1,6 @@
 require 'oj'
 require 'active_support/concern'
+require 'active_support/core_ext/module/delegation'
 require 'pg_serializable/errors'
 require 'pg_serializable/visitable'
 require 'pg_serializable/nodes'
@@ -7,8 +8,6 @@ require 'pg_serializable/trait_manager'
 require 'pg_serializable/trait'
 require 'pg_serializable/visitors'
 
-Oj.mimic_JSON()
-
 module ActiveRecord
   class Relation
     include PgSerializable::Visitable

data/lib/pg_serializable/version.rb

@@ -1,3 +1,3 @@
 module PgSerializable
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/lib/pg_serializable/visitors/json.rb

@@ -45,7 +45,8 @@ module PgSerializable
         return visit_enum(subject, table_alias: table_alias) if subject.enum?
         table_alias ||= alias_tracker
         key = "\'#{subject.label}\'"
-        val = "\"#{table_alias}\".\"#{subject.prc ? subject.prc.call(column_name) : subject.column_name}\""
+        column_name = "\"#{table_alias}\".\"#{subject.column_name}\""
+        val = subject.prc ? subject.prc.call(column_name) : column_name
         "#{key}, #{val}"
       end
 
@@ -87,13 +88,15 @@ module PgSerializable
 
       def visit_has_many_through(subject, table_alias:, **kwargs)
         current_alias = next_alias!
-
         association = subject.association
         through = association.through_reflection
         source = association.source_reflection
         join_name = source.collection? ? through.plural_name.to_sym : through.name
+        # needs work
         where_clause = begin
-          if through.belongs_to?
+          if source.belongs_to?
+            "#{table_alias}.#{through.join_foreign_key}=#{through.table_name}.#{through.join_primary_key}"
+          elsif through.belongs_to?
             "#{table_alias}.#{through.join_foreign_key}=#{through.table_name}.#{subject.foreign_key}"
           else
             "#{through.table_name}.#{through.join_foreign_key}=#{table_alias}.#{subject.foreign_key}"

data/lib/pg_serializable/visitors/validation.rb

@@ -56,6 +56,7 @@ module PgSerializable
         case subject
         when trait? then subject.attribute_nodes.each { |node| check_for_cycles(node) }
         when association?
+          return if subject.association.nil? # skip if association isn't loaded yet, it'll get caught later
           if subject.target == @root_klass
             raise PgSerializable::AssociationError.new("class #{@root_klass} contains a cycle in nested association #{subject.klass}")
           end

data/pg_serializable.gemspec

@@ -14,17 +14,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/matthewjf/pg_serializable"
   spec.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  # if spec.respond_to?(:metadata)
-  #   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against " \
-  #     "public gem pushes."
-  # end
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
@@ -33,10 +22,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.16"
+  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 "rspec", "~> 3.0"
 
   spec.add_runtime_dependency "activesupport", "~> 5.2"
   spec.add_runtime_dependency "activerecord", "~> 5.2"
+  spec.add_runtime_dependency "pg", ">= 1.1"
   spec.add_runtime_dependency "oj", "~> 3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_serializable
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - matthewjf
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffaker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement