activerecord-postgres-json 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8994f61e8f3c2f0f62053662313b5d928879f696
-  data.tar.gz: 9639c733f8fd8b282362f13ed8c72165740ece83
+SHA256:
+  metadata.gz: 407ecfb24032a8c34bce6bc34eb02e6ce4845b13ea1d663b41476d8cb59fa3f4
+  data.tar.gz: 1c8e108f8126b9831b20d8f78f2ccac0d00857b4f3c573345d6ebacaa727b43c
 SHA512:
-  metadata.gz: 299e502fedc17e9ddece9b00a26c55d56d32f0ba3259ab570a6ccabde3dcea7e53a368c4227d389b39bd6d3288512af5085e87a26ea318343df3a0fe3fa18bce
-  data.tar.gz: 5be62b5062003837686dd6adc6f621fcbf8ed92bf1fb7c654bd8d87e73d63496acd992c3b7da849507b8b04802200f5aae5409d4b857fc5b478bf2fd72425034
+  metadata.gz: f497075d5d89ff8b487d5dd13246cf11ec222d4b681f67b8a48c136f5b3cce4f1fe0edb2bbafe4b6be31630db8e34eca19ad56be72e80eca0415af8542a5329e
+  data.tar.gz: 8061bde4477a992fc2dbac854c2c378f88278eba07c97b531b76f36f3acc70bccd89f75449105a95efbcbceca882a555ffdec4a7eb14178a00674afcb9d36df0

data/.rubocop.yml

@@ -4,7 +4,7 @@ LineLength:
 HashSyntax:
   EnforcedStyle: ruby19
 
-SingleSpaceBeforeFirstArg:
+Layout/SpaceBeforeFirstArg:
   Enabled: false
 
 Metrics/AbcSize:
@@ -19,8 +19,9 @@ Metrics/ClassLength:
 Metrics/MethodLength:
   Max: 20
 
-TrailingComma:
+Naming/FileName:
   Enabled: false
+
 AllCops:
   Exclude:
     - '**/*.gemspec'

data/Gemfile

@@ -1,16 +1,18 @@
-source 'http://rubygems.org'
+# frozen_string_literal: true
 
-gem 'activerecord', '>= 3.2', '< 4'
+source 'https://rubygems.org'
+
+gem 'activerecord', '>= 3.2', '< 4.2'
 gem 'multi_json'
 
 group :development, :test do
-  gem 'rspec', '~> 2.0'
-  gem 'pg'
+  gem 'pg', '~> 0.20.0'
+  gem 'rspec'
 end
 
 group :development do
-  gem 'rubocop'
-  gem 'rdoc'
   gem 'bundler'
   gem 'jeweler'
+  gem 'rdoc'
+  gem 'rubocop'
 end

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/activerecord-postgres-json.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: activerecord-postgres-json 0.2.1 ruby lib
+# stub: activerecord-postgres-json 0.2.2 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "activerecord-postgres-json"
-  s.version = "0.2.1"
+  s.name = "activerecord-postgres-json".freeze
+  s.version = "0.2.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Roman Shterenzon"]
-  s.date = "2015-01-16"
-  s.description = "Active Record support for PostgreSQL JSON type"
-  s.email = "romanbsd@yahoo.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Roman Shterenzon".freeze]
+  s.date = "2020-09-14"
+  s.description = "Active Record support for PostgreSQL JSON type".freeze
+  s.email = "romanbsd@yahoo.com".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -37,42 +37,33 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/support/database_setup.rb"
   ]
-  s.homepage = "http://github.com/romanbsd/activerecord-postgres-json"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.3"
-  s.summary = "Active Record support for PostgreSQL JSON type"
+  s.homepage = "http://github.com/romanbsd/activerecord-postgres-json".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.1.2".freeze
+  s.summary = "Active Record support for PostgreSQL JSON type".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, ["< 4", ">= 3.2"])
-      s.add_runtime_dependency(%q<multi_json>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.0"])
-      s.add_development_dependency(%q<pg>, [">= 0"])
-      s.add_development_dependency(%q<rubocop>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<activerecord>, ["< 4", ">= 3.2"])
-      s.add_dependency(%q<multi_json>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.0"])
-      s.add_dependency(%q<pg>, [">= 0"])
-      s.add_dependency(%q<rubocop>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<activerecord>.freeze, [">= 3.2", "< 4.2"])
+    s.add_runtime_dependency(%q<multi_json>.freeze, [">= 0"])
+    s.add_development_dependency(%q<pg>.freeze, ["~> 0.20.0"])
+    s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
+    s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rubocop>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<activerecord>, ["< 4", ">= 3.2"])
-    s.add_dependency(%q<multi_json>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.0"])
-    s.add_dependency(%q<pg>, [">= 0"])
-    s.add_dependency(%q<rubocop>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<activerecord>.freeze, [">= 3.2", "< 4.2"])
+    s.add_dependency(%q<multi_json>.freeze, [">= 0"])
+    s.add_dependency(%q<pg>.freeze, ["~> 0.20.0"])
+    s.add_dependency(%q<rspec>.freeze, [">= 0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+    s.add_dependency(%q<rubocop>.freeze, [">= 0"])
   end
 end
 

data/lib/activerecord-postgres-json.rb

@@ -1,4 +1,6 @@
-ActiveSupport.on_load :active_record do # rubocop:disable Style/FileName
+# frozen_string_literal: true
+
+ActiveSupport.on_load :active_record do
   require 'activerecord-postgres-json/activerecord'
 end
 require 'activerecord-postgres-json/coders'

data/lib/activerecord-postgres-json/activerecord.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 require 'active_record/connection_adapters/postgresql_adapter'
 
@@ -6,6 +8,14 @@ module ActiveRecord
     PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:json]  = { name: 'json' }
     PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:jsonb] = { name: 'jsonb' }
 
+    if ::ActiveRecord.version >= Gem::Version.new('4.0.0')
+      # As suggested here: http://www.innovationontherun.com/fixing-unknown-oid-geography-errors-with-postgis-and-rails-4-0/
+      # to prevent the Rails 4.0/4.1 error of
+      # "unknown OID: {field}"
+      PostgreSQLAdapter::OID.register_type('json', PostgreSQLAdapter::OID::Identity.new)
+      PostgreSQLAdapter::OID.register_type('jsonb', PostgreSQLAdapter::OID::Identity.new)
+    end
+
     class PostgreSQLColumn < Column
       # Adds the json type for the column.
       def simplified_type_with_json(field_type)

data/lib/activerecord-postgres-json/coders.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'multi_json'
 
 module ActiveRecord
@@ -14,7 +16,8 @@ module ActiveRecord
       def initialize(params = {})
         @default = {}
         return unless params.class.name == 'Hash'
-        @default   = params[:default] if params[:default]
+
+        @default = params[:default] if params[:default]
         @symbolize_keys = params[:symbolize_keys] if params[:symbolize_keys]
       end
 

data/spec/activerecord-postgres-json_spec.rb

@@ -31,7 +31,7 @@ describe 'ActiverecordPostgresJson', db: true do
         data ->> 'title'            AS title,
         data #>> '{author,name}'    AS author_name,
         data #>> '{author,email}'   AS author_email,
-        (data ->> 'tags')::json     AS tags,
+        (data ->> 'tags')::jsonb     AS tags,
         (data ->> 'draft')::boolean AS draft
       FROM posts
     SQL

data/spec/support/database_setup.rb

@@ -1,5 +1,6 @@
 require 'logger'
 require 'pg'
+require 'yaml'
 
 db_config = YAML.load_file(File.expand_path('../../database.yml', __FILE__))
 
@@ -19,4 +20,4 @@ rescue Exception => e
 ensure
   ActiveRecord::Base.logger = Logger.new(STDOUT)
   ActiveRecord::Base.logger.formatter = ->(_, _, _, msg) { "#{msg}\n" }
-end
+end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres-json
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Roman Shterenzon
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -45,21 +45,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,7 +157,7 @@ homepage: http://github.com/romanbsd/activerecord-postgres-json
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -172,9 +172,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Active Record support for PostgreSQL JSON type
 test_files: []