diff --git a/Appraisals b/Appraisals index f7dc642..1968686 100644 --- a/Appraisals +++ b/Appraisals @@ -1,21 +1,5 @@ -appraise 'rails-4-2-8' do - gem "rails", "4.2.8" -end - -appraise 'rails-4-2-9' do - gem "rails", "4.2.9" -end - -appraise 'rails-5-0-3' do - gem "rails", "5.0.3" -end - -appraise 'rails-5-0-4' do - gem "rails", "5.0.4" -end - -appraise 'rails-5-1-2' do - gem "rails", "5.1.2" +appraise 'rails-5-1-6-2' do + gem "rails", "5.1.6.2" end appraise 'rails-5-2-1' do diff --git a/Gemfile b/Gemfile index 625a71d..9d364ab 100644 --- a/Gemfile +++ b/Gemfile @@ -12,10 +12,6 @@ gemspec gem 'minitest-ci' # for CircleCI gem 'minitest-focus', group: %i[development test], require: false -gem 'pry-byebug', group: %i[development test] -gem 'pry-highlight', group: %i[development test] -gem 'pry-rails', group: %i[development test] -gem 'pry-remote', group: %i[development test] gem 'pg', '~> 0.18', group: %i[development test] gem 'rubocop', require: false diff --git a/Gemfile.lock b/Gemfile.lock index e037604..6e751b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,74 +3,73 @@ PATH specs: squint (1.1.1) pg - rails (>= 4.2.8) + rails (>= 5.1.6.2) GEM remote: https://rubygems.org/ specs: - actioncable (5.0.4) - actionpack (= 5.0.4) - nio4r (>= 1.2, < 3.0) + actioncable (5.1.7) + actionpack (= 5.1.7) + nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.4) - actionpack (= 5.0.4) - actionview (= 5.0.4) - activejob (= 5.0.4) + actionmailer (5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.4) - actionview (= 5.0.4) - activesupport (= 5.0.4) + actionpack (5.1.7) + actionview (= 5.1.7) + activesupport (= 5.1.7) rack (~> 2.0) - rack-test (~> 0.6.3) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.4) - activesupport (= 5.0.4) + actionview (5.1.7) + activesupport (= 5.1.7) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.4) - activesupport (= 5.0.4) + activejob (5.1.7) + activesupport (= 5.1.7) globalid (>= 0.3.6) - activemodel (5.0.4) - activesupport (= 5.0.4) - activerecord (5.0.4) - activemodel (= 5.0.4) - activesupport (= 5.0.4) - arel (~> 7.0) - activesupport (5.0.4) + activemodel (5.1.7) + activesupport (= 5.1.7) + activerecord (5.1.7) + activemodel (= 5.1.7) + activesupport (= 5.1.7) + arel (~> 8.0) + activesupport (5.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) appraisal (2.2.0) bundler rake thor (>= 0.14.0) - arel (7.1.4) + arel (8.0.0) ast (2.3.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) - builder (3.2.3) - byebug (9.0.6) - coderay (1.1.1) + builder (3.2.4) coercible (1.0.0) descendants_tracker (~> 0.0.1) concurrent-ruby (1.0.5) + crass (1.0.6) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) equalizer (0.0.11) - erubis (2.7.0) - globalid (0.4.0) + erubi (1.9.0) + globalid (0.4.2) activesupport (>= 4.2.0) - i18n (0.8.4) + i18n (0.8.6) ice_nine (0.11.2) - json (2.1.0) - loofah (2.0.3) + loofah (2.2.3) + crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.6.6) mime-types (>= 1.16, < 4) @@ -78,60 +77,43 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_portile2 (2.2.0) - minitest (5.10.2) + mini_portile2 (2.3.0) + minitest (5.10.3) minitest-ci (3.2.0) minitest (>= 5.0.6) minitest-focus (1.1.2) minitest (>= 4, < 6) nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) parallel (1.11.2) parser (2.4.0.0) ast (~> 2.2) pg (0.21.0) powerpack (0.1.1) - pry (0.10.4) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) - pry (~> 0.10) - pry-highlight (0.1.0) - coderay - json - nokogiri - pry - pry-rails (0.3.6) - pry (>= 0.10.4) - pry-remote (0.1.8) - pry (~> 0.9) - slop (~> 3.0) - rack (2.0.3) + rack (2.0.9) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.4) - actioncable (= 5.0.4) - actionmailer (= 5.0.4) - actionpack (= 5.0.4) - actionview (= 5.0.4) - activejob (= 5.0.4) - activemodel (= 5.0.4) - activerecord (= 5.0.4) - activesupport (= 5.0.4) - bundler (>= 1.3.0, < 2.0) - railties (= 5.0.4) + rails (5.1.7) + actioncable (= 5.1.7) + actionmailer (= 5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) + activemodel (= 5.1.7) + activerecord (= 5.1.7) + activesupport (= 5.1.7) + bundler (>= 1.3.0) + railties (= 5.1.7) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.0.4) - actionpack (= 5.0.4) - activesupport (= 5.0.4) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.1.7) + actionpack (= 5.1.7) + activesupport (= 5.1.7) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -146,11 +128,10 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.8.1) - slop (3.6.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -159,7 +140,7 @@ GEM virtus thor (0.19.4) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.7) thread_safe (~> 0.1) unicode-display_width (1.3.0) virtus (1.0.5) @@ -169,7 +150,7 @@ GEM equalizer (~> 0.0, >= 0.0.9) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.5) PLATFORMS ruby @@ -179,13 +160,9 @@ DEPENDENCIES minitest-ci minitest-focus pg (~> 0.18) - pry-byebug - pry-highlight - pry-rails - pry-remote rubocop squint! storext BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/circle.yml b/circle.yml index 3f02932..25c4ea2 100644 --- a/circle.yml +++ b/circle.yml @@ -1,24 +1,54 @@ -machine: - timezone: - America/Chicago +version: 2.1 -dependencies: - override: - - 'rvm-exec 2.2.2 bundle install' - - 'rvm-exec 2.3.4 bundle install' - - 'rvm-exec 2.4.1 bundle install' +orbs: + ruby: circleci/ruby@1.1.0 + node: circleci/node@2 - post: - - 'rvm-exec 2.2.2 bundle exec appraisal install' - - 'rvm-exec 2.3.4 bundle exec appraisal install' - - 'rvm-exec 2.4.1 bundle exec appraisal install' +jobs: + # build: + # docker: + # - image: cimg/ruby:2.7-node + # steps: + # - checkout + # - ruby/install-deps + # - node/install-packages: + # package-mgr: yarn + # cache-key: "yarn.lock" -database: - override: - - 'rvm-exec 2.3.4 bundle exec appraisal rails-4-2-8 rake --rakefile test/dummy/Rakefile db:setup' + test: + parallelism: 1 + docker: + - image: cimg/ruby:2.7-node + - image: circleci/postgres:9.6-alpine + environment: + POSTGRES_USER: squint-ruby + POSTGRES_DB: squint_test + POSTGRES_PASSWORD: "" + environment: + BUNDLE_JOBS: "1" + BUNDLE_RETRY: "3" + PGHOST: 127.0.0.1 + PGUSER: squint-ruby + PGPASSWORD: "" + RAILS_ENV: test + steps: + - checkout + - ruby/install-deps + - run: + name: Wait for DB + command: dockerize -wait tcp://localhost:5432 -timeout 1m + - run: gem install bundler:2.0.2 && bundle version + - run: bundle install + - run: bundle exec appraisal generate + - run: bundle exec appraisal install + - run: + name: Database setup + command: bundle exec appraisal rails-5-1-6-2 rake --rakefile test/dummy/Rakefile db:setup --trace + - run: bundle exec appraisal rake + +workflows: + version: 2 + test: + jobs: + - test -test: - override: - - 'rvm-exec 2.2.2 bundle exec appraisal rake' - - 'rvm-exec 2.3.4 bundle exec appraisal rake' - - 'rvm-exec 2.4.1 bundle exec appraisal rake' diff --git a/gemfiles/Rails_4.2.8.gemfile b/gemfiles/Rails_4.2.8.gemfile deleted file mode 100644 index 79c9859..0000000 --- a/gemfiles/Rails_4.2.8.gemfile +++ /dev/null @@ -1,15 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "minitest-ci" -gem "minitest-focus", group: [:development, :test], require: false -gem "pry-byebug", group: [:development, :test] -gem "pry-highlight", group: [:development, :test] -gem "pry-rails", group: [:development, :test] -gem "pry-remote", group: [:development, :test] -gem "rubocop", require: false -gem "storext" -gem "rails", "4.2.8" - -gemspec path: "../" diff --git a/gemfiles/Rails_5.0.gemfile b/gemfiles/Rails_5.0.gemfile deleted file mode 100644 index 0245b4c..0000000 --- a/gemfiles/Rails_5.0.gemfile +++ /dev/null @@ -1,15 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "minitest-ci" -gem "minitest-focus", group: [:development, :test], require: false -gem "pry-byebug", group: [:development, :test] -gem "pry-highlight", group: [:development, :test] -gem "pry-rails", group: [:development, :test] -gem "pry-remote", group: [:development, :test] -gem "rubocop", require: false -gem "storext" -gem "rails", "5.0.3" - -gemspec path: "../" diff --git a/gemfiles/Rails_5.0.gemfile.lock b/gemfiles/Rails_5.0.gemfile.lock deleted file mode 100644 index e8dafe6..0000000 --- a/gemfiles/Rails_5.0.gemfile.lock +++ /dev/null @@ -1,191 +0,0 @@ -PATH - remote: .. - specs: - squint (0.0.3) - pg - rails - -GEM - remote: https://rubygems.org/ - specs: - actioncable (5.0.3) - actionpack (= 5.0.3) - nio4r (>= 1.2, < 3.0) - websocket-driver (~> 0.6.1) - actionmailer (5.0.3) - actionpack (= 5.0.3) - actionview (= 5.0.3) - activejob (= 5.0.3) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.0.3) - actionview (= 5.0.3) - activesupport (= 5.0.3) - rack (~> 2.0) - rack-test (~> 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.3) - activesupport (= 5.0.3) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.3) - activesupport (= 5.0.3) - globalid (>= 0.3.6) - activemodel (5.0.3) - activesupport (= 5.0.3) - activerecord (5.0.3) - activemodel (= 5.0.3) - activesupport (= 5.0.3) - arel (~> 7.0) - activesupport (5.0.3) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - appraisal (2.2.0) - bundler - rake - thor (>= 0.14.0) - arel (7.1.4) - ast (2.3.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - builder (3.2.3) - byebug (9.0.6) - coderay (1.1.1) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - concurrent-ruby (1.0.5) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - equalizer (0.0.11) - erubis (2.7.0) - globalid (0.4.0) - activesupport (>= 4.2.0) - i18n (0.8.4) - ice_nine (0.11.2) - json (2.1.0) - loofah (2.0.3) - nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.2.0) - minitest (5.10.2) - minitest-ci (3.2.0) - minitest (>= 5.0.6) - minitest-focus (1.1.2) - minitest (>= 4, < 6) - nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - parallel (1.11.2) - parser (2.4.0.0) - ast (~> 2.2) - pg (0.21.0) - powerpack (0.1.1) - pry (0.10.4) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) - pry (~> 0.10) - pry-highlight (0.1.0) - coderay - json - nokogiri - pry - pry-rails (0.3.6) - pry (>= 0.10.4) - pry-remote (0.1.8) - pry (~> 0.9) - slop (~> 3.0) - rack (2.0.3) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.3) - actioncable (= 5.0.3) - actionmailer (= 5.0.3) - actionpack (= 5.0.3) - actionview (= 5.0.3) - activejob (= 5.0.3) - activemodel (= 5.0.3) - activerecord (= 5.0.3) - activesupport (= 5.0.3) - bundler (>= 1.3.0, < 2.0) - railties (= 5.0.3) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.0.3) - actionpack (= 5.0.3) - activesupport (= 5.0.3) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (2.2.2) - rake - rake (12.0.0) - rubocop (0.49.1) - parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.8.1) - slop (3.6.0) - sprockets (3.7.1) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.0) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - storext (2.2.2) - rails (>= 4.0, < 6.0) - virtus - thor (0.19.4) - thread_safe (0.3.6) - tzinfo (1.2.3) - thread_safe (~> 0.1) - unicode-display_width (1.3.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - websocket-driver (0.6.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - -PLATFORMS - ruby - -DEPENDENCIES - appraisal - minitest-ci - minitest-focus - pry-byebug - pry-highlight - pry-rails - pry-remote - rails (= 5.0.3) - rubocop - squint! - storext - -BUNDLED WITH - 1.15.1 diff --git a/gemfiles/rails_4_2_8.gemfile b/gemfiles/rails_4_2_8.gemfile deleted file mode 100644 index 44926d8..0000000 --- a/gemfiles/rails_4_2_8.gemfile +++ /dev/null @@ -1,16 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "minitest-ci" -gem "minitest-focus", group: [:development, :test], require: false -gem "pry-byebug", group: [:development, :test] -gem "pry-highlight", group: [:development, :test] -gem "pry-rails", group: [:development, :test] -gem "pry-remote", group: [:development, :test] -gem "pg", "~> 0.18", group: [:development, :test] -gem "rubocop", require: false -gem "storext" -gem "rails", "4.2.8" - -gemspec path: "../" diff --git a/gemfiles/rails_4_2_8.gemfile.lock b/gemfiles/rails_4_2_8.gemfile.lock deleted file mode 100644 index 025ff3e..0000000 --- a/gemfiles/rails_4_2_8.gemfile.lock +++ /dev/null @@ -1,187 +0,0 @@ -PATH - remote: .. - specs: - squint (1.1.0) - pg - rails (>= 4.2.8) - -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.8) - actionview (= 4.2.8) - activesupport (= 4.2.8) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.8) - activesupport (= 4.2.8) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.8) - activesupport (= 4.2.8) - globalid (>= 0.3.0) - activemodel (4.2.8) - activesupport (= 4.2.8) - builder (~> 3.1) - activerecord (4.2.8) - activemodel (= 4.2.8) - activesupport (= 4.2.8) - arel (~> 6.0) - activesupport (4.2.8) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - appraisal (2.2.0) - bundler - rake - thor (>= 0.14.0) - arel (6.0.4) - ast (2.4.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - builder (3.2.3) - byebug (10.0.2) - coderay (1.1.2) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - concurrent-ruby (1.0.5) - crass (1.0.4) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - equalizer (0.0.11) - erubis (2.7.0) - globalid (0.4.1) - activesupport (>= 4.2.0) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - ice_nine (0.11.2) - jaro_winkler (1.5.1-x86_64-darwin-17) - json (2.1.0) - loofah (2.2.2) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - method_source (0.9.0) - mini_mime (1.0.1) - mini_portile2 (2.3.0) - minitest (5.11.3) - minitest-ci (3.4.0) - minitest (>= 5.0.6) - minitest-focus (1.1.2) - minitest (>= 4, < 6) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - parallel (1.12.1) - parser (2.5.1.2) - ast (~> 2.4.0) - pg (0.21.0) - powerpack (0.1.2) - pry (0.11.3) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.6.0) - byebug (~> 10.0) - pry (~> 0.10) - pry-highlight (0.1.0) - coderay - json - nokogiri - pry - pry-rails (0.3.6) - pry (>= 0.10.4) - pry-remote (0.1.8) - pry (~> 0.9) - slop (~> 3.0) - rack (1.6.10) - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.8) - actionmailer (= 4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) - activemodel (= 4.2.8) - activerecord (= 4.2.8) - activesupport (= 4.2.8) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.8) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (4.2.8) - actionpack (= 4.2.8) - activesupport (= 4.2.8) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (3.0.0) - rake (12.3.1) - rubocop (0.59.2) - jaro_winkler (~> 1.5.1) - parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) - rainbow (>= 2.2.2, < 4.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.10.0) - slop (3.6.0) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - storext (2.2.2) - rails (>= 4.0, < 6.0) - virtus - thor (0.20.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - unicode-display_width (1.4.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - -PLATFORMS - ruby - -DEPENDENCIES - appraisal - minitest-ci - minitest-focus - pg (~> 0.18) - pry-byebug - pry-highlight - pry-rails - pry-remote - rails (= 4.2.8) - rubocop - squint! - storext - -BUNDLED WITH - 1.16.6 diff --git a/gemfiles/rails_4_2_9.gemfile b/gemfiles/rails_4_2_9.gemfile deleted file mode 100644 index 87a47b3..0000000 --- a/gemfiles/rails_4_2_9.gemfile +++ /dev/null @@ -1,16 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "minitest-ci" -gem "minitest-focus", group: [:development, :test], require: false -gem "pry-byebug", group: [:development, :test] -gem "pry-highlight", group: [:development, :test] -gem "pry-rails", group: [:development, :test] -gem "pry-remote", group: [:development, :test] -gem "pg", "~> 0.18", group: [:development, :test] -gem "rubocop", require: false -gem "storext" -gem "rails", "4.2.9" - -gemspec path: "../" diff --git a/gemfiles/rails_4_2_9.gemfile.lock b/gemfiles/rails_4_2_9.gemfile.lock deleted file mode 100644 index afd8906..0000000 --- a/gemfiles/rails_4_2_9.gemfile.lock +++ /dev/null @@ -1,187 +0,0 @@ -PATH - remote: .. - specs: - squint (1.1.0) - pg - rails (>= 4.2.8) - -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.9) - actionview (= 4.2.9) - activesupport (= 4.2.9) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.9) - activesupport (= 4.2.9) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.9) - activesupport (= 4.2.9) - globalid (>= 0.3.0) - activemodel (4.2.9) - activesupport (= 4.2.9) - builder (~> 3.1) - activerecord (4.2.9) - activemodel (= 4.2.9) - activesupport (= 4.2.9) - arel (~> 6.0) - activesupport (4.2.9) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - appraisal (2.2.0) - bundler - rake - thor (>= 0.14.0) - arel (6.0.4) - ast (2.4.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - builder (3.2.3) - byebug (10.0.2) - coderay (1.1.2) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - concurrent-ruby (1.0.5) - crass (1.0.4) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - equalizer (0.0.11) - erubis (2.7.0) - globalid (0.4.1) - activesupport (>= 4.2.0) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - ice_nine (0.11.2) - jaro_winkler (1.5.1-x86_64-darwin-17) - json (2.1.0) - loofah (2.2.2) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - method_source (0.9.0) - mini_mime (1.0.1) - mini_portile2 (2.3.0) - minitest (5.11.3) - minitest-ci (3.4.0) - minitest (>= 5.0.6) - minitest-focus (1.1.2) - minitest (>= 4, < 6) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - parallel (1.12.1) - parser (2.5.1.2) - ast (~> 2.4.0) - pg (0.21.0) - powerpack (0.1.2) - pry (0.11.3) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.6.0) - byebug (~> 10.0) - pry (~> 0.10) - pry-highlight (0.1.0) - coderay - json - nokogiri - pry - pry-rails (0.3.6) - pry (>= 0.10.4) - pry-remote (0.1.8) - pry (~> 0.9) - slop (~> 3.0) - rack (1.6.10) - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.9) - actionmailer (= 4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) - activemodel (= 4.2.9) - activerecord (= 4.2.9) - activesupport (= 4.2.9) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.9) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (4.2.9) - actionpack (= 4.2.9) - activesupport (= 4.2.9) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (3.0.0) - rake (12.3.1) - rubocop (0.59.2) - jaro_winkler (~> 1.5.1) - parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) - rainbow (>= 2.2.2, < 4.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.10.0) - slop (3.6.0) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - storext (2.2.2) - rails (>= 4.0, < 6.0) - virtus - thor (0.20.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - unicode-display_width (1.4.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - -PLATFORMS - ruby - -DEPENDENCIES - appraisal - minitest-ci - minitest-focus - pg (~> 0.18) - pry-byebug - pry-highlight - pry-rails - pry-remote - rails (= 4.2.9) - rubocop - squint! - storext - -BUNDLED WITH - 1.16.6 diff --git a/gemfiles/rails_5_0.gemfile b/gemfiles/rails_5_0.gemfile deleted file mode 100644 index 6349ef4..0000000 --- a/gemfiles/rails_5_0.gemfile +++ /dev/null @@ -1,15 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "minitest-ci" -gem "minitest-focus", group: [:development, :test], require: false -gem "pry-byebug", group: [:development, :test] -gem "pry-highlight", group: [:development, :test] -gem "pry-rails", group: [:development, :test] -gem "pry-remote", group: [:development, :test] -gem "rubocop", require: false -gem "storext" -gem "rails", "5.0.4" - -gemspec path: "../" diff --git a/gemfiles/rails_5_0.gemfile.lock b/gemfiles/rails_5_0.gemfile.lock deleted file mode 100644 index 531841d..0000000 --- a/gemfiles/rails_5_0.gemfile.lock +++ /dev/null @@ -1,191 +0,0 @@ -PATH - remote: .. - specs: - squint (0.0.3) - pg - rails (>= 4.2.8) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (5.0.3) - actionpack (= 5.0.3) - nio4r (>= 1.2, < 3.0) - websocket-driver (~> 0.6.1) - actionmailer (5.0.3) - actionpack (= 5.0.3) - actionview (= 5.0.3) - activejob (= 5.0.3) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.0.3) - actionview (= 5.0.3) - activesupport (= 5.0.3) - rack (~> 2.0) - rack-test (~> 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.3) - activesupport (= 5.0.3) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.3) - activesupport (= 5.0.3) - globalid (>= 0.3.6) - activemodel (5.0.3) - activesupport (= 5.0.3) - activerecord (5.0.3) - activemodel (= 5.0.3) - activesupport (= 5.0.3) - arel (~> 7.0) - activesupport (5.0.3) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - appraisal (2.2.0) - bundler - rake - thor (>= 0.14.0) - arel (7.1.4) - ast (2.3.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - builder (3.2.3) - byebug (9.0.6) - coderay (1.1.1) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - concurrent-ruby (1.0.5) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - equalizer (0.0.11) - erubis (2.7.0) - globalid (0.4.0) - activesupport (>= 4.2.0) - i18n (0.8.4) - ice_nine (0.11.2) - json (2.1.0) - loofah (2.0.3) - nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.2.0) - minitest (5.10.2) - minitest-ci (3.2.0) - minitest (>= 5.0.6) - minitest-focus (1.1.2) - minitest (>= 4, < 6) - nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - parallel (1.11.2) - parser (2.4.0.0) - ast (~> 2.2) - pg (0.21.0) - powerpack (0.1.1) - pry (0.10.4) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) - pry (~> 0.10) - pry-highlight (0.1.0) - coderay - json - nokogiri - pry - pry-rails (0.3.6) - pry (>= 0.10.4) - pry-remote (0.1.8) - pry (~> 0.9) - slop (~> 3.0) - rack (2.0.3) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.3) - actioncable (= 5.0.3) - actionmailer (= 5.0.3) - actionpack (= 5.0.3) - actionview (= 5.0.3) - activejob (= 5.0.3) - activemodel (= 5.0.3) - activerecord (= 5.0.3) - activesupport (= 5.0.3) - bundler (>= 1.3.0, < 2.0) - railties (= 5.0.3) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.0.3) - actionpack (= 5.0.3) - activesupport (= 5.0.3) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (2.2.2) - rake - rake (12.0.0) - rubocop (0.49.1) - parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.8.1) - slop (3.6.0) - sprockets (3.7.1) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.0) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - storext (2.2.2) - rails (>= 4.0, < 6.0) - virtus - thor (0.19.4) - thread_safe (0.3.6) - tzinfo (1.2.3) - thread_safe (~> 0.1) - unicode-display_width (1.3.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - websocket-driver (0.6.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - -PLATFORMS - ruby - -DEPENDENCIES - appraisal - minitest-ci - minitest-focus - pry-byebug - pry-highlight - pry-rails - pry-remote - rails (= 5.0.3) - rubocop - squint! - storext - -BUNDLED WITH - 1.15.1 diff --git a/gemfiles/rails_5_0_3.gemfile b/gemfiles/rails_5_0_3.gemfile deleted file mode 100644 index 38aee77..0000000 --- a/gemfiles/rails_5_0_3.gemfile +++ /dev/null @@ -1,16 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "minitest-ci" -gem "minitest-focus", group: [:development, :test], require: false -gem "pry-byebug", group: [:development, :test] -gem "pry-highlight", group: [:development, :test] -gem "pry-rails", group: [:development, :test] -gem "pry-remote", group: [:development, :test] -gem "pg", "~> 0.18", group: [:development, :test] -gem "rubocop", require: false -gem "storext" -gem "rails", "5.0.3" - -gemspec path: "../" diff --git a/gemfiles/rails_5_0_3.gemfile.lock b/gemfiles/rails_5_0_3.gemfile.lock deleted file mode 100644 index 56d27f2..0000000 --- a/gemfiles/rails_5_0_3.gemfile.lock +++ /dev/null @@ -1,193 +0,0 @@ -PATH - remote: .. - specs: - squint (1.1.0) - pg - rails (>= 4.2.8) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (5.0.3) - actionpack (= 5.0.3) - nio4r (>= 1.2, < 3.0) - websocket-driver (~> 0.6.1) - actionmailer (5.0.3) - actionpack (= 5.0.3) - actionview (= 5.0.3) - activejob (= 5.0.3) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.0.3) - actionview (= 5.0.3) - activesupport (= 5.0.3) - rack (~> 2.0) - rack-test (~> 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.3) - activesupport (= 5.0.3) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.3) - activesupport (= 5.0.3) - globalid (>= 0.3.6) - activemodel (5.0.3) - activesupport (= 5.0.3) - activerecord (5.0.3) - activemodel (= 5.0.3) - activesupport (= 5.0.3) - arel (~> 7.0) - activesupport (5.0.3) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - appraisal (2.2.0) - bundler - rake - thor (>= 0.14.0) - arel (7.1.4) - ast (2.4.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - builder (3.2.3) - byebug (10.0.2) - coderay (1.1.2) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - concurrent-ruby (1.0.5) - crass (1.0.4) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - equalizer (0.0.11) - erubis (2.7.0) - globalid (0.4.1) - activesupport (>= 4.2.0) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - ice_nine (0.11.2) - jaro_winkler (1.5.1-x86_64-darwin-17) - json (2.1.0) - loofah (2.2.2) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - method_source (0.9.0) - mini_mime (1.0.1) - mini_portile2 (2.3.0) - minitest (5.11.3) - minitest-ci (3.4.0) - minitest (>= 5.0.6) - minitest-focus (1.1.2) - minitest (>= 4, < 6) - nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - parallel (1.12.1) - parser (2.5.1.2) - ast (~> 2.4.0) - pg (0.21.0) - powerpack (0.1.2) - pry (0.11.3) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.6.0) - byebug (~> 10.0) - pry (~> 0.10) - pry-highlight (0.1.0) - coderay - json - nokogiri - pry - pry-rails (0.3.6) - pry (>= 0.10.4) - pry-remote (0.1.8) - pry (~> 0.9) - slop (~> 3.0) - rack (2.0.5) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.3) - actioncable (= 5.0.3) - actionmailer (= 5.0.3) - actionpack (= 5.0.3) - actionview (= 5.0.3) - activejob (= 5.0.3) - activemodel (= 5.0.3) - activerecord (= 5.0.3) - activesupport (= 5.0.3) - bundler (>= 1.3.0, < 2.0) - railties (= 5.0.3) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (5.0.3) - actionpack (= 5.0.3) - activesupport (= 5.0.3) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (3.0.0) - rake (12.3.1) - rubocop (0.59.2) - jaro_winkler (~> 1.5.1) - parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) - rainbow (>= 2.2.2, < 4.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.10.0) - slop (3.6.0) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - storext (2.2.2) - rails (>= 4.0, < 6.0) - virtus - thor (0.20.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - unicode-display_width (1.4.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - websocket-driver (0.6.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) - -PLATFORMS - ruby - -DEPENDENCIES - appraisal - minitest-ci - minitest-focus - pg (~> 0.18) - pry-byebug - pry-highlight - pry-rails - pry-remote - rails (= 5.0.3) - rubocop - squint! - storext - -BUNDLED WITH - 1.16.6 diff --git a/gemfiles/rails_5_0_4.gemfile b/gemfiles/rails_5_0_4.gemfile deleted file mode 100644 index 6684dca..0000000 --- a/gemfiles/rails_5_0_4.gemfile +++ /dev/null @@ -1,16 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "minitest-ci" -gem "minitest-focus", group: [:development, :test], require: false -gem "pry-byebug", group: [:development, :test] -gem "pry-highlight", group: [:development, :test] -gem "pry-rails", group: [:development, :test] -gem "pry-remote", group: [:development, :test] -gem "pg", "~> 0.18", group: [:development, :test] -gem "rubocop", require: false -gem "storext" -gem "rails", "5.0.4" - -gemspec path: "../" diff --git a/gemfiles/rails_5_0_4.gemfile.lock b/gemfiles/rails_5_0_4.gemfile.lock deleted file mode 100644 index 3a9bbda..0000000 --- a/gemfiles/rails_5_0_4.gemfile.lock +++ /dev/null @@ -1,193 +0,0 @@ -PATH - remote: .. - specs: - squint (1.1.0) - pg - rails (>= 4.2.8) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (5.0.4) - actionpack (= 5.0.4) - nio4r (>= 1.2, < 3.0) - websocket-driver (~> 0.6.1) - actionmailer (5.0.4) - actionpack (= 5.0.4) - actionview (= 5.0.4) - activejob (= 5.0.4) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.0.4) - actionview (= 5.0.4) - activesupport (= 5.0.4) - rack (~> 2.0) - rack-test (~> 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.4) - activesupport (= 5.0.4) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.4) - activesupport (= 5.0.4) - globalid (>= 0.3.6) - activemodel (5.0.4) - activesupport (= 5.0.4) - activerecord (5.0.4) - activemodel (= 5.0.4) - activesupport (= 5.0.4) - arel (~> 7.0) - activesupport (5.0.4) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - appraisal (2.2.0) - bundler - rake - thor (>= 0.14.0) - arel (7.1.4) - ast (2.4.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - builder (3.2.3) - byebug (10.0.2) - coderay (1.1.2) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - concurrent-ruby (1.0.5) - crass (1.0.4) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - equalizer (0.0.11) - erubis (2.7.0) - globalid (0.4.1) - activesupport (>= 4.2.0) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - ice_nine (0.11.2) - jaro_winkler (1.5.1-x86_64-darwin-17) - json (2.1.0) - loofah (2.2.2) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - method_source (0.9.0) - mini_mime (1.0.1) - mini_portile2 (2.3.0) - minitest (5.11.3) - minitest-ci (3.4.0) - minitest (>= 5.0.6) - minitest-focus (1.1.2) - minitest (>= 4, < 6) - nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - parallel (1.12.1) - parser (2.5.1.2) - ast (~> 2.4.0) - pg (0.21.0) - powerpack (0.1.2) - pry (0.11.3) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.6.0) - byebug (~> 10.0) - pry (~> 0.10) - pry-highlight (0.1.0) - coderay - json - nokogiri - pry - pry-rails (0.3.6) - pry (>= 0.10.4) - pry-remote (0.1.8) - pry (~> 0.9) - slop (~> 3.0) - rack (2.0.5) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.4) - actioncable (= 5.0.4) - actionmailer (= 5.0.4) - actionpack (= 5.0.4) - actionview (= 5.0.4) - activejob (= 5.0.4) - activemodel (= 5.0.4) - activerecord (= 5.0.4) - activesupport (= 5.0.4) - bundler (>= 1.3.0, < 2.0) - railties (= 5.0.4) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (5.0.4) - actionpack (= 5.0.4) - activesupport (= 5.0.4) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (3.0.0) - rake (12.3.1) - rubocop (0.59.2) - jaro_winkler (~> 1.5.1) - parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) - rainbow (>= 2.2.2, < 4.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.10.0) - slop (3.6.0) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - storext (2.2.2) - rails (>= 4.0, < 6.0) - virtus - thor (0.20.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - unicode-display_width (1.4.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - websocket-driver (0.6.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) - -PLATFORMS - ruby - -DEPENDENCIES - appraisal - minitest-ci - minitest-focus - pg (~> 0.18) - pry-byebug - pry-highlight - pry-rails - pry-remote - rails (= 5.0.4) - rubocop - squint! - storext - -BUNDLED WITH - 1.16.6 diff --git a/gemfiles/rails_5_1_2.gemfile b/gemfiles/rails_5_1_2.gemfile deleted file mode 100644 index cd62ade..0000000 --- a/gemfiles/rails_5_1_2.gemfile +++ /dev/null @@ -1,16 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "minitest-ci" -gem "minitest-focus", group: [:development, :test], require: false -gem "pry-byebug", group: [:development, :test] -gem "pry-highlight", group: [:development, :test] -gem "pry-rails", group: [:development, :test] -gem "pry-remote", group: [:development, :test] -gem "pg", "~> 0.18", group: [:development, :test] -gem "rubocop", require: false -gem "storext" -gem "rails", "5.1.2" - -gemspec path: "../" diff --git a/gemfiles/rails_5_1_2.gemfile.lock b/gemfiles/rails_5_1_2.gemfile.lock deleted file mode 100644 index 2b1c9cd..0000000 --- a/gemfiles/rails_5_1_2.gemfile.lock +++ /dev/null @@ -1,193 +0,0 @@ -PATH - remote: .. - specs: - squint (1.1.0) - pg - rails (>= 4.2.8) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (5.1.2) - actionpack (= 5.1.2) - nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.1.2) - actionpack (= 5.1.2) - actionview (= 5.1.2) - activejob (= 5.1.2) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.1.2) - actionview (= 5.1.2) - activesupport (= 5.1.2) - rack (~> 2.0) - rack-test (~> 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.2) - activesupport (= 5.1.2) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.2) - activesupport (= 5.1.2) - globalid (>= 0.3.6) - activemodel (5.1.2) - activesupport (= 5.1.2) - activerecord (5.1.2) - activemodel (= 5.1.2) - activesupport (= 5.1.2) - arel (~> 8.0) - activesupport (5.1.2) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - appraisal (2.2.0) - bundler - rake - thor (>= 0.14.0) - arel (8.0.0) - ast (2.4.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - builder (3.2.3) - byebug (10.0.2) - coderay (1.1.2) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - concurrent-ruby (1.0.5) - crass (1.0.4) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - equalizer (0.0.11) - erubi (1.7.1) - globalid (0.4.1) - activesupport (>= 4.2.0) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - ice_nine (0.11.2) - jaro_winkler (1.5.1-x86_64-darwin-17) - json (2.1.0) - loofah (2.2.2) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - method_source (0.9.0) - mini_mime (1.0.1) - mini_portile2 (2.3.0) - minitest (5.11.3) - minitest-ci (3.4.0) - minitest (>= 5.0.6) - minitest-focus (1.1.2) - minitest (>= 4, < 6) - nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - parallel (1.12.1) - parser (2.5.1.2) - ast (~> 2.4.0) - pg (0.21.0) - powerpack (0.1.2) - pry (0.11.3) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.6.0) - byebug (~> 10.0) - pry (~> 0.10) - pry-highlight (0.1.0) - coderay - json - nokogiri - pry - pry-rails (0.3.6) - pry (>= 0.10.4) - pry-remote (0.1.8) - pry (~> 0.9) - slop (~> 3.0) - rack (2.0.5) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.1.2) - actioncable (= 5.1.2) - actionmailer (= 5.1.2) - actionpack (= 5.1.2) - actionview (= 5.1.2) - activejob (= 5.1.2) - activemodel (= 5.1.2) - activerecord (= 5.1.2) - activesupport (= 5.1.2) - bundler (>= 1.3.0, < 2.0) - railties (= 5.1.2) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (5.1.2) - actionpack (= 5.1.2) - activesupport (= 5.1.2) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (3.0.0) - rake (12.3.1) - rubocop (0.59.2) - jaro_winkler (~> 1.5.1) - parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) - rainbow (>= 2.2.2, < 4.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.10.0) - slop (3.6.0) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - storext (2.2.2) - rails (>= 4.0, < 6.0) - virtus - thor (0.20.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - unicode-display_width (1.4.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - websocket-driver (0.6.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) - -PLATFORMS - ruby - -DEPENDENCIES - appraisal - minitest-ci - minitest-focus - pg (~> 0.18) - pry-byebug - pry-highlight - pry-rails - pry-remote - rails (= 5.1.2) - rubocop - squint! - storext - -BUNDLED WITH - 1.16.6 diff --git a/gemfiles/rails_5_2_1.gemfile b/gemfiles/rails_5_2_1.gemfile index 339ba1b..a65818c 100644 --- a/gemfiles/rails_5_2_1.gemfile +++ b/gemfiles/rails_5_2_1.gemfile @@ -4,10 +4,6 @@ source "https://rubygems.org" gem "minitest-ci" gem "minitest-focus", group: [:development, :test], require: false -gem "pry-byebug", group: [:development, :test] -gem "pry-highlight", group: [:development, :test] -gem "pry-rails", group: [:development, :test] -gem "pry-remote", group: [:development, :test] gem "pg", "~> 0.18", group: [:development, :test] gem "rubocop", require: false gem "storext" diff --git a/lib/squint.rb b/lib/squint.rb index 00cdcd8..739dcd1 100644 --- a/lib/squint.rb +++ b/lib/squint.rb @@ -27,7 +27,7 @@ module WhereMethods 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 WhereMethods # 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 WhereMethods 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) diff --git a/squint.gemspec b/squint.gemspec index 8f76e20..83d0609 100644 --- a/squint.gemspec +++ b/squint.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| "Rakefile", "readme.md", ".all-contributorsrc"] s.test_files = Dir["test/**/*"] - s.add_dependency "rails", ">= 4.2.8" + s.add_dependency "rails", ">= 5.1.6.2" s.add_dependency "pg" s.add_development_dependency 'appraisal' diff --git a/test/dummy/app/assets/config/manifest.js b/test/dummy/app/assets/config/manifest.js new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/test/dummy/app/assets/config/manifest.js @@ -0,0 +1 @@ +{} diff --git a/test/dummy/app/models/post.rb b/test/dummy/app/models/post.rb index 911b20f..c4afd6a 100644 --- a/test/dummy/app/models/post.rb +++ b/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 diff --git a/test/dummy/app/models/user.rb b/test/dummy/app/models/user.rb new file mode 100644 index 0000000..a8cc09b --- /dev/null +++ b/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 diff --git a/test/dummy/db/migrate/20200318185942_create_users.rb b/test/dummy/db/migrate/20200318185942_create_users.rb new file mode 100644 index 0000000..33974a1 --- /dev/null +++ b/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 diff --git a/test/dummy/db/migrate/20200318185943_add_settings_to_posts.rb b/test/dummy/db/migrate/20200318185943_add_settings_to_posts.rb new file mode 100644 index 0000000..6d4e79b --- /dev/null +++ b/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 diff --git a/test/dummy/db/schema.rb b/test/dummy/db/schema.rb index 8a8e3b4..d9226c7 100644 --- a/test/dummy/db/schema.rb +++ b/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 @@ 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 diff --git a/test/dummy/user.rb b/test/dummy/user.rb new file mode 100644 index 0000000..a8cc09b --- /dev/null +++ b/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 diff --git a/test/squint_test.rb b/test/squint_test.rb index b87d945..4e7653e 100644 --- a/test/squint_test.rb +++ b/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