squint 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98ccf8823024cfaf1d97d0a7042dcb6269af96158ade06703aedf79b3e158447
-  data.tar.gz: 1370797c3fa4b327983125277f6abe717f3b8b79e6e7bf38c9994ead82300a2b
+  metadata.gz: f1a001a14acd2fc3e2ca16adbb14999e7c0955f7588f7bf2b24ea6b459020cd7
+  data.tar.gz: 68a54fa15e06555a8c0320aadac4a9578fbb134f2abb34a4908d9a4f2c034d98
 SHA512:
-  metadata.gz: b32b509cf15138f03ea7215fab15271c97a0ae1b17d98743a2ba2f2c02eba47561d5e276cd3fe62f18ccbf90fdcbe283e3291855697e02fc7def8255b29282da
-  data.tar.gz: 9ab6e3389ec91dec76d90244da33a010b87d5d4d14f27ba58940f821e690a7abfaffe8599cd57a7cd14fd212773fe62232a497dc52293b37fee0c7145e53ad0f
+  metadata.gz: f9fcb29b013d12a51aaff4dfed8674a76471ff5eb9e6d92727eeae7ff585c51dc4edb0ef53cb4fdefcf7b6b059391e5bf950c03d659b26d0057c6c32b4567c97
+  data.tar.gz: 86cbf3a386e89e2d0d2da91fe585c94dc0d53eeaad4fdfda75ccff26dc14147056500a369fa8380f1fc4e85b941d92a86d61d9b74a79b0353ea551a5b76e4f75

data/.all-contributorsrc

@@ -92,6 +92,17 @@
       "contributions": [
         "review"
       ]
+    },
+    {
+      "login": "jamescook",
+      "name": "James Cook",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/4067?s=460&u=cb404cc0f1737c2fc53411e300cc8e158ef29295&v=4",
+      "profile": "https://github.com/jamescook",
+      "contributions": [
+        "code",
+        "test",
+        "review"
+      ]
     }
   ]
 }

data/lib/squint.rb

@@ -27,7 +27,7 @@ module Squint
       reln = args.inject([]) do |memo, arg|
         if arg.is_a?(Hash)
           arg.keys.each do |key|
-            if arg[key].is_a?(Hash) && HASH_DATA_COLUMNS[key]
+            if arg[key].is_a?(Hash) && klass::HASH_DATA_COLUMNS[key]
               memo << klass.squint_hash_field_reln(key => arg[key])
             else
               save_args[0] ||= {}
@@ -70,7 +70,7 @@ module Squint
     # put together a list of columns in this model
     # that are hstore, json, or jsonb and will benefit from
     # searchability
-    HASH_DATA_COLUMNS = base.columns_hash.keys.map do |col_name|
+    base::HASH_DATA_COLUMNS = base.columns_hash.keys.map do |col_name|
       if %w[hstore json jsonb].include?(base.columns_hash[col_name].sql_type)
         [col_name.to_sym, base.columns_hash[col_name].sql_type]
       end
@@ -91,7 +91,7 @@ module Squint
     def self.squint_hash_field_reln(*args)
       temp_attr = args[0]
       contains_nil = false
-      column_type = HASH_DATA_COLUMNS[args[0].keys.first]
+      column_type = self::HASH_DATA_COLUMNS[args[0].keys.first]
       column_name_segments = []
       quote_char = '"'.freeze
       while  temp_attr.is_a?(Hash)

data/lib/squint/version.rb

@@ -1,3 +1,3 @@
 module Squint
-  VERSION = "1.1.0".freeze
+  VERSION = "2.0.0".freeze
 end

data/readme.md

@@ -25,7 +25,7 @@
 - [Credits](#credits)
 
 ## Status
-[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-9-orange.svg?style=flat-square)](#contributors)
 [![CircleCI](https://circleci.com/gh/ProctorU/squint.svg?style=svg)](https://circleci.com/gh/ProctorU/squint)
 
 ## Quick Start
@@ -158,9 +158,9 @@ columns exists, so don't use those with StoreXT + Squint
 Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)):
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-| [<img src="https://avatars2.githubusercontent.com/u/864581?v=3" width="100px;"/><br /><sub>Kevin Brown</sub>](https://github.com/chevinbrown)<br />[🎨](#design-chevinbrown "Design") [👀](#review-chevinbrown "Reviewed Pull Requests") | [<img src="https://avatars2.githubusercontent.com/u/1741179?v=3" width="100px;"/><br /><sub>Andrew Fomera</sub>](http://andrewfomera.com)<br />[👀](#review-king601 "Reviewed Pull Requests") | [<img src="https://avatars2.githubusercontent.com/u/708692?v=3" width="100px;"/><br /><sub>Ryan T. Hosford</sub>](https://github.com/rthbound)<br />[💻](https://github.com/ProctorU/squint/commits?author=rthbound "Code") | [<img src="https://avatars2.githubusercontent.com/u/1785682?v=3" width="100px;"/><br /><sub>Matthew Jaeh</sub>](https://github.com/Jaehdawg)<br />[🎨](#design-Jaehdawg "Design") [👀](#review-Jaehdawg "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/3933204?v=3" width="100px;"/><br /><sub>Justin Licata</sub>](https://twitter.com/justinlicata)<br />[💻](https://github.com/ProctorU/squint/commits?author=licatajustin "Code") [🎨](#design-licatajustin "Design") [📖](https://github.com/ProctorU/squint/commits?author=licatajustin "Documentation") [👀](#review-licatajustin "Reviewed Pull Requests") | [<img src="https://avatars3.githubusercontent.com/u/24704300?v=4" width="100px;"/><br /><sub>Kyle Miracle</sub>](https://github.com/kmiracle86)<br />[🐛](https://github.com/ProctorU/squint/issues?q=author%3Akmiracle86 "Bug reports") [👀](#review-kmiracle86 "Reviewed Pull Requests") | [<img src="https://avatars2.githubusercontent.com/u/97011?v=3" width="100px;"/><br /><sub>David H. Wilkins</sub>](http://conecuh.com)<br />[💬](#question-dwilkins "Answering Questions") [🐛](https://github.com/ProctorU/squint/issues?q=author%3Adwilkins "Bug reports") [💻](https://github.com/ProctorU/squint/commits?author=dwilkins "Code") [🎨](#design-dwilkins "Design") [📖](https://github.com/ProctorU/squint/commits?author=dwilkins "Documentation") [💡](#example-dwilkins "Examples") [👀](#review-dwilkins "Reviewed Pull Requests") [⚠️](https://github.com/ProctorU/squint/commits?author=dwilkins "Tests") |
+| [<img src="https://avatars2.githubusercontent.com/u/864581?v=3" width="100px;"/><br /><sub>Kevin Brown</sub>](https://github.com/chevinbrown)<br />[🎨](#design-chevinbrown "Design") [👀](#review-chevinbrown "Reviewed Pull Requests") | [<img src="https://avatars2.githubusercontent.com/u/1741179?v=3" width="100px;"/><br /><sub>Andrew Fomera</sub>](http://andrewfomera.com)<br />[👀](#review-king601 "Reviewed Pull Requests") [💻](https://github.com/ProctorU/squint/commits?author=king601 "Code") | [<img src="https://avatars2.githubusercontent.com/u/708692?v=3" width="100px;"/><br /><sub>Ryan T. Hosford</sub>](https://github.com/rthbound)<br />[💻](https://github.com/ProctorU/squint/commits?author=rthbound "Code") | [<img src="https://avatars2.githubusercontent.com/u/1785682?v=3" width="100px;"/><br /><sub>Matthew Jaeh</sub>](https://github.com/Jaehdawg)<br />[🎨](#design-Jaehdawg "Design") [👀](#review-Jaehdawg "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/3933204?v=3" width="100px;"/><br /><sub>Justin Licata</sub>](https://twitter.com/justinlicata)<br />[💻](https://github.com/ProctorU/squint/commits?author=licatajustin "Code") [🎨](#design-licatajustin "Design") [📖](https://github.com/ProctorU/squint/commits?author=licatajustin "Documentation") [👀](#review-licatajustin "Reviewed Pull Requests") | [<img src="https://avatars3.githubusercontent.com/u/24704300?v=4" width="100px;"/><br /><sub>Kyle Miracle</sub>](https://github.com/kmiracle86)<br />[🐛](https://github.com/ProctorU/squint/issues?q=author%3Akmiracle86 "Bug reports") [👀](#review-kmiracle86 "Reviewed Pull Requests") | [<img src="https://avatars2.githubusercontent.com/u/97011?v=3" width="100px;"/><br /><sub>David H. Wilkins</sub>](http://conecuh.com)<br />[💬](#question-dwilkins "Answering Questions") [🐛](https://github.com/ProctorU/squint/issues?q=author%3Adwilkins "Bug reports") [💻](https://github.com/ProctorU/squint/commits?author=dwilkins "Code") [🎨](#design-dwilkins "Design") [📖](https://github.com/ProctorU/squint/commits?author=dwilkins "Documentation") [💡](#example-dwilkins "Examples") [👀](#review-dwilkins "Reviewed Pull Requests") [⚠️](https://github.com/ProctorU/squint/commits?author=dwilkins "Tests") |
 | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
-| [<img src="https://avatars3.githubusercontent.com/u/19173815?v=3" width="100px;"/><br /><sub>Jay Wright</sub>](https://github.com/TheJayWright)<br />[👀](#review-TheJayWright "Reviewed Pull Requests") |
+| [<img src="https://avatars3.githubusercontent.com/u/19173815?v=3" width="100px;"/><br /><sub>Jay Wright</sub>](https://github.com/TheJayWright)<br />[👀](#review-TheJayWright "Reviewed Pull Requests") | [<img src="https://avatars1.githubusercontent.com/u/4067?s=460&u=cb404cc0f1737c2fc53411e300cc8e158ef29295&v=4" width="100px;"/><br /><sub>James Cook</sub>](https://github.com/jamescook)<br />[💻](https://github.com/ProctorU/squint/commits?author=jamescook "Code") [⚠️](https://github.com/ProctorU/squint/commits?author=jamescook "Tests") [👀](#review-jamescook "Reviewed Pull Requests") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1 @@
+{}

data/test/dummy/app/models/post.rb

@@ -11,4 +11,6 @@ class Post < ActiveRecord::Base
   store_attribute :storext_hstore_attributes, :hstore_friend_count, Integer, default: 0
   store_attribute :storext_hstore_attributes, :hstore_is_awesome, Integer, default: false
   store_attribute :storext_hstore_attributes, :hstore_is_present, Integer, default: nil
+
+  store_attribute :settings, :zip_code, String, default: '90210'
 end

data/test/dummy/app/models/user.rb

@@ -0,0 +1,6 @@
+class User < ActiveRecord::Base
+  include Storext.model
+  include Squint
+
+  store_attribute :settings, :zip_code, String, default: '90210'
+end

data/test/dummy/db/migrate/20200318185942_create_users.rb

@@ -0,0 +1,9 @@
+class CreateUsers < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      t.hstore :settings
+
+      t.timestamps null: false
+    end
+  end
+end

data/test/dummy/db/migrate/20200318185943_add_settings_to_posts.rb

@@ -0,0 +1,7 @@
+class AddSettingsToPosts < ActiveRecord::Migration
+  def change
+    change_table :posts do |t|
+      t.jsonb :settings
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170512185941) do
+ActiveRecord::Schema.define(version: 20200318185943) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -26,11 +25,17 @@ ActiveRecord::Schema.define(version: 20170512185941) do
     t.hstore   "storext_hstore_attributes"
     t.datetime "created_at",                null: false
     t.datetime "updated_at",                null: false
+    t.jsonb    "settings"
+    t.index ["properties"], name: "index_posts_on_properties", using: :gin
+    t.index ["request_info"], name: "index_posts_on_request_info", using: :gin
+    t.index ["storext_hstore_attributes"], name: "index_posts_on_storext_hstore_attributes", using: :gin
+    t.index ["storext_jsonb_attributes"], name: "index_posts_on_storext_jsonb_attributes", using: :gin
   end
 
-  add_index "posts", ["properties"], name: "index_posts_on_properties", using: :gin
-  add_index "posts", ["request_info"], name: "index_posts_on_request_info", using: :gin
-  add_index "posts", ["storext_hstore_attributes"], name: "index_posts_on_storext_hstore_attributes", using: :gin
-  add_index "posts", ["storext_jsonb_attributes"], name: "index_posts_on_storext_jsonb_attributes", using: :gin
+  create_table "users", force: :cascade do |t|
+    t.hstore   "settings"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
 
 end

data/test/dummy/user.rb

@@ -0,0 +1,6 @@
+class User < ActiveRecord::Base
+  include Storext.model
+  include Squint
+
+  store_attribute :settings, :zip_code, String, default: '90210'
+end

data/test/squint_test.rb

@@ -132,4 +132,9 @@ class SquintTest < ActiveSupport::TestCase
                    created_at: '2015-01-01')
     end
   end
+
+  test 'HASH_DATA_COLUMNS is not shared between models' do
+    assert_equal('hstore', User::HASH_DATA_COLUMNS[:settings])
+    assert_equal('jsonb' , Post::HASH_DATA_COLUMNS[:settings])
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squint
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - David H. Wilkins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 5.1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 5.1.6.2
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +69,9 @@ files:
 - lib/squint/version.rb
 - readme.md
 - test/dummy/Rakefile
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/models/post.rb
+- test/dummy/app/models/user.rb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -77,8 +79,11 @@ files:
 - test/dummy/config/environment.rb
 - test/dummy/config/environments/test.rb
 - test/dummy/db/migrate/20170512185941_create_posts.rb
+- test/dummy/db/migrate/20200318185942_create_users.rb
+- test/dummy/db/migrate/20200318185943_add_settings_to_posts.rb
 - test/dummy/db/schema.rb
 - test/dummy/test/fixtures/posts.yml
+- test/dummy/user.rb
 - test/squint_test.rb
 - test/test_helper.rb
 homepage: https://github.com/ProctorU/squint
@@ -100,22 +105,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Search PostgreSQL jsonb and hstore columns
 test_files:
+- test/test_helper.rb
+- test/dummy/Rakefile
+- test/dummy/app/models/user.rb
 - test/dummy/app/models/post.rb
+- test/dummy/app/assets/config/manifest.js
+- test/dummy/user.rb
 - test/dummy/test/fixtures/posts.yml
 - test/dummy/config/environments/test.rb
-- test/dummy/config/environment.rb
 - test/dummy/config/application.rb
-- test/dummy/config/database.yml
 - test/dummy/config/boot.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/database.yml
 - test/dummy/config.ru
-- test/dummy/Rakefile
 - test/dummy/db/schema.rb
+- test/dummy/db/migrate/20200318185943_add_settings_to_posts.rb
 - test/dummy/db/migrate/20170512185941_create_posts.rb
+- test/dummy/db/migrate/20200318185942_create_users.rb
 - test/squint_test.rb
-- test/test_helper.rb