pgrel 0.1.1 → 0.3.1

data/lib/pgrel/active_record/store_chain/array_chain.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module QueryMethods
     # Store chain for array columns.
@@ -11,7 +13,7 @@ module ActiveRecord
       #   Model.store(:store).overlap('c').all #=> [Model(name: 'first', ...)]
       #   Model.store(:store).overlap(['b']).size #=> 2
       def overlap(*vals)
-        update_scope "#{@store_name} && #{type_cast(vals.flatten)}"
+        update_scope "#{quoted_store_name} && #{type_cast(vals.flatten)}"
       end
     end
   end

data/lib/pgrel/active_record/store_chain/hstore_chain.rb

@@ -1,35 +1,30 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module QueryMethods
     # Store chain for hstore columns.
     class HstoreChain < KeyStoreChain
-      # Query by store values.
-      #
-      # Supports array values.
+      # Overlap values
       #
       # Example
-      #   Model.create!(name: 'first', store: {b: 1, c: 2})
-      #   Model.create!(name: 'second', store: {b: 2, c: 3})
+      #   Model.create!(name: 'first', store: {a: 1, b: 2})
+      #   Model.create!(name: 'second', store: {b: 1, c: 3})
       #
-      #   Model.store(:store, c: 2).all #=> [Model(name: 'first', ...)]
-      #   Model.store(:store, b: [1, 2]).size #=> 2
-      def where(opts)
-        opts = stringify(opts)
-        where_with_prefix "#{@store_name}->", opts
+      #   Model.store(:store).overlap_values(1, 2).all
+      #   #=>[Model(name: 'first', ...), Model(name: 'second')]
+      def overlap_values(*values)
+        update_scope("avals(#{quoted_store_name}) && ARRAY[?]", values.map(&:to_s))
       end
 
-      private
-
-      def stringify(val)
-        case val
-        when String
-          val
-        when Array
-          val.map { |v| stringify(v) }
-        when Hash
-          Hash[val.map { |k, v| [stringify(k), stringify(v)] }]
-        else
-          val.to_s
-        end
+      # Contains values
+      #
+      # Example
+      #   Model.create!(name: 'first', store: {a: 1, b: 2})
+      #   Model.create!(name: 'second', store: {b: 1, c: 3})
+      #
+      #   Model.store(:store).contains_values(1, 2).all #=> [Model(name: 'first', ...)]
+      def contains_values(*values)
+        update_scope("avals(#{quoted_store_name}) @> ARRAY[?]", values.map(&:to_s))
       end
     end
   end

data/lib/pgrel/active_record/store_chain/jsonb_chain.rb

@@ -1,24 +1,12 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module QueryMethods
     # Store chain for jsonb columns.
     class JsonbChain < KeyStoreChain
-      # Query by store values.
-      # Supports array values (convert to IN statement).
-      #
-      # Example
-      #   Model.create!(name: 'first', store: {b: 1, c: 2})
-      #   Model.create!(name: 'second', store: {b: 2, c: 3})
-      #
-      #   Model.store(:store, c: 2).all #=> [Model(name: 'first', ...)]
-      #   Model.store(:store, b: [1, 2]).size #=> 2
-      def where(opts)
-        opts = flatten_json(opts)
-        where_with_prefix "#{@store_name}->", opts
-      end
+      OPERATORS = {contains: "@>", overlap: "&&"}.freeze
 
-      # Query by quality in path.
-      #
-      # Path can be set as object or as args.
+      # Query by value in path.
       #
       # Example:
       #   Model.create!(name: 'first', store: {b: 1, c: { d: 3 } })
@@ -30,37 +18,48 @@ module ActiveRecord
         args = flatten_hash(args.first) if args.size == 1
         val = args.pop
 
-        path = "{#{args.join(',')}}"
+        path = "{#{args.join(",")}}"
 
         case val
         when Hash
-          op = '#>'
+          op = "#>"
           val = ::ActiveSupport::JSON.encode(val)
         when Array
-          op = '#>>'
+          op = "#>>"
           val = val.map(&:to_s)
         else
-          op = '#>>'
+          op = "#>>"
           val = val.to_s
         end
 
-        where_with_prefix "#{@store_name}#{op}", path => val
+        where_with_prefix "#{quoted_store_name}#{op}", path => val
       end
 
-      private
+      # Overlap values
+      #
+      # Example
+      #   Model.create!(name: 'first', store: {a: 1, b: 2})
+      #   Model.create!(name: 'second', store: {b: 1, c: 3})
+      #
+      #   Model.store(:store).overlap_values(1, 2).all
+      #   #=>[Model(name: 'first', ...), Model(name: 'second')]
+      def overlap_values(*values)
+        update_scope(value_query(:overlap), cast_values(values))
+      end
 
-      def flatten_json(val)
-        Hash[
-          val.map do |k, v|
-            if v.is_a?(Array)
-              [k, v.map { |i| ::ActiveSupport::JSON.encode(i) }]
-            else
-              [k, ::ActiveSupport::JSON.encode(v)]
-            end
-          end
-        ]
+      # Contains values
+      #
+      # Example
+      #   Model.create!(name: 'first', store: {a: 1, b: 2})
+      #   Model.create!(name: 'second', store: {b: 1, c: 3})
+      #
+      #   Model.store(:store).contains_values(1, 2).all #=> [Model(name: 'first', ...)]
+      def contains_values(*values)
+        update_scope(value_query(:contains), cast_values(values))
       end
 
+      private
+
       def flatten_hash(hash)
         case hash
         when Hash
@@ -71,6 +70,22 @@ module ActiveRecord
           hash
         end
       end
+
+      def value_query(operator)
+        oper = OPERATORS[operator]
+        "(SELECT array_agg(value) FROM jsonb_each(#{quoted_store_name})) #{oper} ARRAY[?]::jsonb[]"
+      end
+
+      def cast_values(values)
+        values.map do |v|
+          case v
+          when Hash, Array, String
+            v.to_json
+          else
+            v.to_s
+          end
+        end
+      end
     end
   end
 end

data/lib/pgrel/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pgrel # :nodoc:
-  VERSION = "0.1.1"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgrel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.1
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,84 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.1'
-- !ruby/object:Gem::Dependency
-  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: '10.1'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 description: ActiveRecord extension for querying hstore and jsonb.
 email:
 - dementiev.vm@gmail.com
@@ -101,33 +73,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
-- Gemfile
-- MIT-LICENSE
+- CHANGELOG.md
+- LICENSE.txt
 - README.md
-- Rakefile
-- gemfiles/rails40.gemfile
-- gemfiles/rails41.gemfile
-- gemfiles/rails42.gemfile
-- gemfiles/rails5.gemfile
 - lib/pgrel.rb
 - lib/pgrel/active_record.rb
 - lib/pgrel/active_record/query_methods.rb
+- lib/pgrel/active_record/querying.rb
+- lib/pgrel/active_record/relation.rb
+- lib/pgrel/active_record/store/flexible_hstore.rb
+- lib/pgrel/active_record/store/flexible_jsonb.rb
+- lib/pgrel/active_record/store/flexible_store.rb
 - lib/pgrel/active_record/store_chain.rb
 - lib/pgrel/active_record/store_chain/array_chain.rb
 - lib/pgrel/active_record/store_chain/hstore_chain.rb
 - lib/pgrel/active_record/store_chain/jsonb_chain.rb
 - lib/pgrel/version.rb
-- pgrel.gemspec
-- spec/pgrel/array_spec.rb
-- spec/pgrel/hstore_spec.rb
-- spec/pgrel/jsonb_spec.rb
-- spec/spec_helper.rb
-- spec/support/array_store.rb
-- spec/support/hstore.rb
-- spec/support/jsonb.rb
 homepage: http://github.com/palkan/pgrel
 licenses:
 - MIT
@@ -147,10 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension for querying hstore and jsonb.
 test_files: []
-has_rdoc: 

data/.gitignore

@@ -1,36 +0,0 @@
-# Numerous always-ignore extensions
-*.diff
-*.err
-*.orig
-*.log
-*.rej
-*.swo
-*.swp
-*.vi
-*~
-*.sass-cache
-*.iml
-.idea/
-
-# Sublime
-*.sublime-project
-*.sublime-workspace
-
-# OS or Editor folders
-.DS_Store
-.cache
-.project
-.settings
-.tmproj
-Thumbs.db
-coverage/
-
-.bundle/
-*.log
-*.gem
-pkg/
-spec/dummy/log/*.log
-spec/dummy/tmp/
-spec/dummy/.sass-cache
-Gemfile.local
-Gemfile.lock

data/.rubocop.yml

@@ -1,41 +0,0 @@
-# This strict rubocop config should be used before submiting PR and should pass
-# Doesn't include:
-# - specs
-
-
-AllCops:
-  # Include gemspec and Rakefile
-  Include:
-    - 'app/**/*.rb'
-    - 'config/**/*.rb'
-    - 'lib/**/*.rb'
-    - 'lib/**/*.rake'
-  Exclude:
-    - 'vendor/**/*'
-    - 'spec/**/*'
-    - 'db/*.rb'
-    - 'bin/**/*'
-  RunRailsCops: false
-  DisplayCopNames: true
-  StyleGuideCopsOnly: false
-
-Metrics/LineLength:
-  Max: 100
-
-Metrics/MethodLength:
-  Max: 15
-
-Metrics/AbcSize:
-  Max: 20
-
-Style/BarePercentLiterals:
-  Enabled: false
-
-Style/CommentAnnotation:
-  Enabled: false
-
-Style/RaiseArgs:
-  Enabled: false
-
-Style/StringLiterals: 
-  Enabled: false

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-cache: bundler
-
-addons:
-  postgresql: "9.4"
-
-before_script:
-  - createuser pgrel -d
-  - createdb -U pgrel pgrel
-  - psql -U postgres -d pgrel -c 'CREATE EXTENSION IF NOT EXISTS hstore;'
-
-matrix:
-  include:
-    - rvm: 2.2.1
-      gemfile: gemfiles/rails5.gemfile
-    - rvm: 2.2.1
-      gemfile: gemfiles/rails42.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails41.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails40.gemfile