attr_json 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23ec569c6ce1f117952719d5ec18e8cd30f2e80a13d55eab307d37db26308c19
-  data.tar.gz: bd676e6b2d8f606f1578cff495b4843e8722ca3f3dce2863226c59e7a716639b
+  metadata.gz: be1175039b6fbd78d5a9c1bcaae7c4ce003d29f403ef1e86d71d3c226e659a0b
+  data.tar.gz: 588710deb7c2b6076ba1cf1094f9b4ab67fb7bd74cecfc8c560de5b0ef50eafb
 SHA512:
-  metadata.gz: c99101b1123256008aca96b8590a20906ca1650b1c70f82d24231043102296948070e2bcba78ec0c963e84c81f453b91bf82c2a0c7593f2ed57bc458365bf2f8
-  data.tar.gz: 0fe8b60b2b96116b298c44b27ea044f97278eb66114d97cb6f00f868e1c60444bf6a23fecdeceb2a2f52ae670af3cfd809dd6065af3f9bd062df8373f4887897
+  metadata.gz: d71520892d16915465eab7c9e373f5e5ecabb8efee7a295da6532fbedd0c9817890da7e689e31f1bf1c7b3c1cad73f071f3563d7eb6d5637516de40174fce627
+  data.tar.gz: ea225c01754abfa5dec0e8749fd91ff68e1a329b54e684a27fee14655de7eb4eddf832538a961b14bbf83e222e0b90bfe554a8fdac001ca95aefb456353ed763

data/.travis.yml

@@ -1,28 +1,64 @@
 #
-dist: trusty
 sudo: false
 addons:
   postgresql: '9.4'
   chrome: stable
 language: ruby
 cache: bundler
-rvm:
-  - 2.4.5
-  - 2.5.3
-gemfile:
-  - gemfiles/rails_5_0.gemfile
-  - gemfiles/rails_5_1.gemfile
-  - gemfiles/rails_5_2.gemfile
-  - gemfiles/rails_6_0.gemfile
-  - gemfiles/rails_edge_6.gemfile
+
+# rvm:
+#   - 2.4.5
+#   - 2.5.3
+#   - 2.6.5
+#   - 2.7.0
+# gemfile:
+#   - gemfiles/rails_5_0.gemfile
+#   - gemfiles/rails_5_1.gemfile
+#   - gemfiles/rails_5_2.gemfile
+#   - gemfiles/rails_6_0.gemfile
+#   - gemfiles/rails_edge.gemfile
+
 before_install:
-  - gem install bundler -v 1.14.6
+  - gem install bundler -v "~> 2.0"
+
 matrix:
+  include:
+    - rvm: 2.4.5
+      gemfile: gemfiles/rails_5_0.gemfile
+
+    - rvm: 2.4.5
+      gemfile: gemfiles/rails_5_1.gemfile
+
+    - rvm: 2.4.5
+      gemfile: gemfiles/rails_5_2.gemfile
+
+    - rvm: 2.5.3
+      gemfile: gemfiles/rails_5_0.gemfile
+
+    - rvm: 2.5.3
+      gemfile: gemfiles/rails_5_1.gemfile
+
+    - rvm: 2.5.3
+      gemfile: gemfiles/rails_5_2.gemfile
+
+    - rvm: 2.5.3
+      gemfile: gemfiles/rails_6_0.gemfile
+
+    - rvm: 2.6.5
+      gemfile: gemfiles/rails_5_2.gemfile
+
+    - rvm: 2.6.5
+      gemfile: gemfiles/rails_6_0.gemfile
+
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails_6_0.gemfile
+
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails_edge.gemfile
+
   allow_failures:
-  - gemfile: gemfiles/rails_edge_6.gemfile
+  - gemfile: gemfiles/rails_edge.gemfile
   fast_finish: true
-  exclude:
-    - gemfile: gemfiles/rails_edge_6.gemfile
-      rvm: 2.4.5
-    - gemfile: gemfiles/rails_6_0.gemfile
-      rvm: 2.4.5
+
+
+

data/Appraisals

@@ -26,7 +26,7 @@ appraise "rails-5-2" do
 end
 
 appraise "rails-6-0" do
-  gem 'combustion', git: "https://github.com/pat/combustion.git"
+  gem 'combustion', "~> 1.0"
 
   gem "rails", ">= 6.0.0.beta1", "< 6.1"
   gem "pg", "~> 1.0"
@@ -35,7 +35,7 @@ end
 appraise "rails-edge-6" do
   # Edge rails needs unreleased combustion
   # https://github.com/pat/combustion/issues/92
-  gem 'combustion', git: "https://github.com/pat/combustion.git"
+  gem 'combustion', "~> 1.0"
 
   gem "rails", git: "https://github.com/rails/rails.git", branch: "master"
   gem "pg", "~> 1.0"

data/CHANGELOG.md

@@ -4,5 +4,10 @@ Notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [Unreleased](https://github.com/jrochkind/attr_json/compare/v1.1.0...HEAD)
 
+## [1.1.0](https://github.com/jrochkind/attr_json/compare/v1.0.0...v1.1.0)
+
+### Added
+
+* not_jsonb_contains query method, like `jsonb_contains` but negated. https://github.com/jrochkind/attr_json/pull/85

data/Gemfile

@@ -10,7 +10,7 @@ gemspec
 # We also have these development dependencies here in the Gemfile instead of the
 # gemspec so appraisal can override them from our Appraisal file.
 
-gem 'combustion', '~> 0.9.0'
+gem 'combustion', '~> 1.1'
 
 # all of rails is NOT a dependency, just activerecord.
 # But we use it for integration testing with combustion. Hmm, a bit annoying
@@ -24,13 +24,13 @@ gem 'rails'
 gem 'railties'
 
 gem "pg"
-gem "rspec-rails", "~> 3.7"
+gem "rspec-rails", "~> 4.0"
 gem "simple_form", ">= 4.0"
 gem 'cocoon', ">= 1.2"
 gem 'jquery-rails'
 
 gem 'capybara', "~> 3.0"
-gem 'webdrivers', '~> 3.0'
+gem 'webdrivers', '~> 4.0'
 gem "selenium-webdriver"
 
 gem "byebug"

data/README.md

@@ -138,6 +138,9 @@ MyModel.jsonb_contains(my_string: "foo", my_integer: 100).first
 # Implemented with scopes, this is an ordinary relation, you can
 # combine it with whatever, just like ordinary `where`.
 
+MyModel.not_jsonb_contains(my:string: "foo", my_integer: 100).to_sql
+# SELECT "products".* FROM "products" WHERE NOT (products.json_attributes @> ('{"my_string":"foo","my_integer":100}')::jsonb)
+
 # typecasts much like ActiveRecord on query too:
 MyModel.jsonb_contains(my_string: "foo", my_integer: "100")
 # no problem

data/attr_json.gemspec

@@ -48,7 +48,7 @@ attributes use as much of the existing ActiveRecord architecture as we can.}
     spec.add_runtime_dependency "activerecord", ">= 5.0.0", "< 6.1"
   end
 
-  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec", "~> 3.7"
   spec.add_development_dependency "database_cleaner", "~> 1.5"

data/gemfiles/rails_5_0.gemfile

@@ -6,12 +6,12 @@ gem "combustion", "~> 0.9.0"
 gem "rails", "~> 5.0.0"
 gem "railties"
 gem "pg", "~> 0.18"
-gem "rspec-rails", "~> 3.7"
+gem "rspec-rails", "~> 4.0"
 gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "capybara", "~> 3.0"
-gem "webdrivers", "~> 3.0"
+gem "webdrivers", "~> 4.0"
 gem "selenium-webdriver"
 gem "byebug"
 gem "rails-ujs", require: false

data/gemfiles/rails_5_1.gemfile

@@ -6,12 +6,12 @@ gem "combustion", "~> 0.9.0"
 gem "rails", "~> 5.1.0"
 gem "railties"
 gem "pg", "~> 1.0"
-gem "rspec-rails", "~> 3.7"
+gem "rspec-rails", "~> 4.0"
 gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "capybara", "~> 3.0"
-gem "webdrivers", "~> 3.0"
+gem "webdrivers", "~> 4.0"
 gem "selenium-webdriver"
 gem "byebug"
 

data/gemfiles/rails_5_2.gemfile

@@ -6,12 +6,12 @@ gem "combustion", "~> 0.9.0"
 gem "rails", "~> 5.2.0"
 gem "railties"
 gem "pg", "~> 1.0"
-gem "rspec-rails", "~> 3.7"
+gem "rspec-rails", "~> 4.0"
 gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "capybara", "~> 3.0"
-gem "webdrivers", "~> 3.0"
+gem "webdrivers", "~> 4.0"
 gem "selenium-webdriver"
 gem "byebug"
 

data/gemfiles/rails_6_0.gemfile

@@ -2,16 +2,16 @@
 
 source "https://rubygems.org"
 
-gem "combustion", git: "https://github.com/pat/combustion.git"
+gem "combustion", "~> 1.0"
 gem "rails", ">= 6.0.0.beta1", "< 6.1"
 gem "railties"
 gem "pg", "~> 1.0"
-gem "rspec-rails", "~> 3.7"
+gem "rspec-rails", "~> 4.0"
 gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "capybara", "~> 3.0"
-gem "webdrivers", "~> 3.0"
+gem "webdrivers", "~> 4.0"
 gem "selenium-webdriver"
 gem "byebug"
 

data/gemfiles/rails_edge.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "combustion", "~> 1.0"
+gem "rails", git: "https://github.com/rails/rails.git", branch: "master"
+gem "railties"
+gem "pg", "~> 1.0"
+gem "rspec-rails", "~> 3.7"
+gem "simple_form", ">= 4.0"
+gem "cocoon", ">= 1.2"
+gem "jquery-rails"
+gem "capybara", "~> 3.0"
+gem "webdrivers", "~> 4.0"
+gem "selenium-webdriver"
+gem "byebug"
+gem "coffee-rails"
+
+gemspec path: "../"

data/gemfiles/rails_edge_6.gemfile

@@ -2,16 +2,16 @@
 
 source "https://rubygems.org"
 
-gem "combustion", git: "https://github.com/pat/combustion.git"
+gem "combustion", "~> 1.0"
 gem "rails", git: "https://github.com/rails/rails.git", branch: "master"
 gem "railties"
 gem "pg", "~> 1.0"
-gem "rspec-rails", "~> 3.7"
+gem "rspec-rails", "~> 4.0"
 gem "simple_form", ">= 4.0"
 gem "cocoon", ">= 1.2"
 gem "jquery-rails"
 gem "capybara", "~> 3.0"
-gem "webdrivers", "~> 3.0"
+gem "webdrivers", "~> 4.0"
 gem "selenium-webdriver"
 gem "byebug"
 gem "coffee-rails"

data/lib/attr_json/record.rb

@@ -47,7 +47,7 @@ module AttrJson
       when false, nil, ActiveModel::Type::Boolean::FALSE_VALUES
         false
       else
-        if value.respond_to?(:to_i) && ( Numeric === value || value !~ /[^0-9]/ )
+        if value.respond_to?(:to_i) && ( Numeric === value || value.to_s !~ /[^0-9]/ )
           !value.to_i.zero?
         elsif value.respond_to?(:zero?)
           !value.zero?

data/lib/attr_json/record/query_builder.rb

@@ -10,6 +10,20 @@ module AttrJson
       end
 
       def contains_relation
+        contains_relation_impl do |relation, query, params|
+          relation.where(query, params)
+        end
+      end
+
+      def contains_not_relation
+        contains_relation_impl do |relation, query, params|
+          relation.where.not(query, params)
+        end
+      end
+
+      protected
+
+      def contains_relation_impl
         result_relation = relation
 
         group_attributes_by_container.each do |container_attribute, attributes|
@@ -18,14 +32,12 @@ module AttrJson
           attributes.each do |key, value|
             add_to_param_hash!(param_hash, key, value)
           end
-          result_relation = result_relation.where("#{relation.table_name}.#{container_attribute} @> (?)::jsonb", param_hash.to_json)
+          result_relation = yield(result_relation, "#{relation.table_name}.#{container_attribute} @> (?)::jsonb", param_hash.to_json)
         end
 
         result_relation
       end
 
-      protected
-
       def merge_param_hash!(original, new)
         original.deep_merge!(new) do |key, old_val, new_val|
           if old_val.is_a?(Array) && old_val.first.is_a?(Hash) && new_val.is_a?(Array) && new_val.first.is_a?(Hash)

data/lib/attr_json/record/query_scopes.rb

@@ -17,6 +17,8 @@ module AttrJson
     #
     #      some_model.jsonb_contains(a_string: "foo").first
     #
+    #      some_model.not_jsonb_contains(a_string: "bar").first
+    #
     # See more in {file:README} docs.
     module QueryScopes
       extend ActiveSupport::Concern
@@ -29,6 +31,10 @@ module AttrJson
         scope(:jsonb_contains, lambda do |attributes|
           QueryBuilder.new(self, attributes).contains_relation
         end)
+
+        scope(:not_jsonb_contains, lambda do |attributes|
+          QueryBuilder.new(self, attributes).contains_not_relation
+        end)
       end
     end
   end

data/lib/attr_json/type/polymorphic_model.rb

@@ -51,6 +51,8 @@ module AttrJson
     #      MyRecord.jsonb_contains(author: { name: "foo", type: "Corporation"})
     #      MyRecord.jsonb_contains(author: Corporation.new(name: "foo"))
     #
+    # Additionally, there is not_jsonb_contains, which creates the same query terms like jsonb_contains, but negated.
+    #
     class PolymorphicModel < ActiveModel::Type::Value
       class TypeError < ::TypeError ; end
 

data/lib/attr_json/version.rb

@@ -1,3 +1,3 @@
 module AttrJson
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attr_json
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -34,16 +34,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +151,7 @@ files:
 - gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
 - gemfiles/rails_6_0.gemfile
+- gemfiles/rails_edge.gemfile
 - gemfiles/rails_edge_6.gemfile
 - lib/attr_json.rb
 - lib/attr_json/attribute_definition.rb