graphiti 1.2.15 → 1.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4833a7e5fef23d277fce48973eafa25e53ba2a1f54c7b74abd0bc85a919813e
-  data.tar.gz: f68f0a86c9ef82a986af03d2e3705ed87e3e1b1f8d9cb2fd924693927bf4531f
+  metadata.gz: db3bae18176af83f5ac1b88c50546cefcf57f38245e69a5fcbb45f3028ca2273
+  data.tar.gz: 6ee077531421990da7d4fe80bedfada136b299420d7b82566e9261b7f1a2800a
 SHA512:
-  metadata.gz: 77490b2ffcd561f1e5e3c97293505abf6f5eee9f798ff96c8948ce14ea981e0d4c8dcbddb76b2d1847d20c437dde2cfa16c9b4dff42ba4a9378dc211a47b1582
-  data.tar.gz: a3a55ae88004095897db6779275c887d85037f941e3de8432655005ca3740bb86ecfe796d491171ca522f896970de6ac75361a86d66e4b1ddb98ffaa21bb3dcb
+  metadata.gz: 0ceeabdfe64a03c4d709353a763a49224a14eb068633dcbd67c4ef2ee370dbdcd47781b0a4c15f19fe02956712aaca3dda42a17eb514bf44b821725261dc7ddf
+  data.tar.gz: d329a82610a68dec935625edbd502e85c39907a64261f170d342f632c82dc211c0fab440edbb16210483eb2154f44d403a2f13d5f3b9b7e41d4aafe68c66bf4a

data/.travis.yml

@@ -3,45 +3,74 @@ language: ruby
 rvm:
 - 2.5
 - 2.6
+- 2.7
 gemfile:
   - Gemfile
   - gemfiles/rails_4.gemfile
-  - gemfiles/rails_5.gemfile
+  - gemfiles/rails_5_0.gemfile
+  - gemfiles/rails_5_1.gemfile
+  - gemfiles/rails_5_2.gemfile
   - gemfiles/rails_6.gemfile
-  - gemfiles/rails_5_graphiti_rails.gemfile
+  - gemfiles/rails_5_0_graphiti_rails.gemfile
+  - gemfiles/rails_5_1_graphiti_rails.gemfile
+  - gemfiles/rails_5_2_graphiti_rails.gemfile
   - gemfiles/rails_6_graphiti_rails.gemfile
 env:
-  - COMMAND=standardrb --no-fix --format progress
+  - COMMAND="standardrb --no-fix --format progress"
   - COMMAND=rspec
   - COMMAND=rspec APPRAISAL_INITIALIZED=true
 matrix:
   exclude:
-    - env: COMMAND=standardrb --no-fix --format progress
+    # Don't run the appraisal version of the specs for the base gemfile
+    - env: COMMAND=rspec APPRAISAL_INITIALIZED=true
+      gemfile: Gemfile
+    # Don't run the standardrb check on any gemfile except the base gemfile
+    # (but run it for each ruby version)
+    - env: COMMAND="standardrb --no-fix --format progress"
       gemfile: gemfiles/rails_4.gemfile
-    - env: COMMAND=standardrb --no-fix --format progress
-      gemfile: gemfiles/rails_5.gemfile
-    - env: COMMAND=standardrb --no-fix --format progress
+    - env: COMMAND="standardrb --no-fix --format progress"
+      gemfile: gemfiles/rails_5_0.gemfile
+    - env: COMMAND="standardrb --no-fix --format progress"
+      gemfile: gemfiles/rails_5_1.gemfile
+    - env: COMMAND="standardrb --no-fix --format progress"
+      gemfile: gemfiles/rails_5_2.gemfile
+    - env: COMMAND="standardrb --no-fix --format progress"
       gemfile: gemfiles/rails_6.gemfile
-    - env: COMMAND=standardrb --no-fix --format progress
-      gemfile: gemfiles/rails_5_graphiti_rails.gemfile
-    - env: COMMAND=standardrb --no-fix --format progress
+    - env: COMMAND="standardrb --no-fix --format progress"
+      gemfile: gemfiles/rails_5_0_graphiti_rails.gemfile
+    - env: COMMAND="standardrb --no-fix --format progress"
+      gemfile: gemfiles/rails_5_1_graphiti_rails.gemfile
+    - env: COMMAND="standardrb --no-fix --format progress"
+      gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
+    - env: COMMAND="standardrb --no-fix --format progress"
       gemfile: gemfiles/rails_6_graphiti_rails.gemfile
-    - env: COMMAND=rspec APPRAISAL_INITIALIZED=true
-      gemfile: Gemfile
+    # Don't run the basic versions of the specs for any of the specific gemfiles
     - env: COMMAND=rspec
       gemfile: gemfiles/rails_4.gemfile
     - env: COMMAND=rspec
-      gemfile: gemfiles/rails_5.gemfile
+      gemfile: gemfiles/rails_5_0.gemfile
+    - env: COMMAND=rspec
+      gemfile: gemfiles/rails_5_1.gemfile
+    - env: COMMAND=rspec
+      gemfile: gemfiles/rails_5_2.gemfile
     - env: COMMAND=rspec
       gemfile: gemfiles/rails_6.gemfile
     - env: COMMAND=rspec
-      gemfile: gemfiles/rails_5_graphiti_rails.gemfile
+      gemfile: gemfiles/rails_5_0_graphiti_rails.gemfile
+    - env: COMMAND=rspec
+      gemfile: gemfiles/rails_5_1_graphiti_rails.gemfile
+    - env: COMMAND=rspec
+      gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
     - env: COMMAND=rspec
       gemfile: gemfiles/rails_6_graphiti_rails.gemfile
+
+    # Don't run rails 4 egmfile against any rubies (for some reason?)
     - gemfile: gemfiles/rails_4.gemfile
       rvm: 2.5
     - gemfile: gemfiles/rails_4.gemfile
       rvm: 2.6
+    - gemfile: gemfiles/rails_4.gemfile
+      rvm: 2.7
 
 script:
   - bundle _1.17.3_ exec $COMMAND

data/Appraisals

@@ -1,18 +1,50 @@
 appraise "rails-4" do
-  gem "rails", "~> 4.1"
+  gem "rails", "~> 4.2"
   gem "rspec-rails"
   gem "sqlite3", "~> 1.3.6"
   gem "database_cleaner"
 end
 
-appraise "rails-5" do
+appraise "rails-5_0" do
+  gem "rails", "~> 5.0"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.3.6"
+  gem "database_cleaner"
+end
+
+appraise "rails-5_1" do
+  gem "rails", "~> 5.1"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.3.6"
+  gem "database_cleaner"
+end
+
+appraise "rails-5_2" do
   gem "rails", "~> 5.2"
   gem "rspec-rails"
   gem "sqlite3", "~> 1.3.6"
   gem "database_cleaner"
 end
 
-appraise "rails-5-graphiti-rails" do
+appraise "rails-5_0-graphiti-rails" do
+  gem "rails", "~> 5.0"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.3.6"
+  gem "database_cleaner"
+  gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
+  gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
+end
+
+appraise "rails-5_1-graphiti-rails" do
+  gem "rails", "~> 5.1"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.3.6"
+  gem "database_cleaner"
+  gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
+  gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
+end
+
+appraise "rails-5_2-graphiti-rails" do
   gem "rails", "~> 5.2"
   gem "rspec-rails"
   gem "sqlite3", "~> 1.3.6"
@@ -22,14 +54,14 @@ appraise "rails-5-graphiti-rails" do
 end
 
 appraise "rails-6" do
-  gem "rails", "~> 6.0.0.rc1"
+  gem "rails", "~> 6.0"
   gem "rspec-rails"
   gem "sqlite3", "~> 1.4.0"
   gem "database_cleaner"
 end
 
 appraise "rails-6-graphiti-rails" do
-  gem "rails", "~> 6.0.0.rc1"
+  gem "rails", "~> 6.0"
   gem "rspec-rails"
   gem "sqlite3", "~> 1.4.0"
   gem "database_cleaner"

data/CHANGELOG.md

@@ -1,7 +1,7 @@
 ## Unreleased
 
 Features:
-
+- [242](https://github.com/graphiti-api/graphiti/pull/242) Bump `jsonapi-renderer` to `~0.2.2` now that (https://github.com/jsonapi-rb/jsonapi-renderer/pull/36) is fixed.
 - [158](https://github.com/graphiti-api/graphiti/pull/158) Filters options `allow_nil: true`
   Option can be set at the resource level `Resource.filters_accept_nil_by_default = true`. 
   By default this is set to false. (@zeisler)

data/Gemfile

@@ -3,6 +3,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in graphiti.gemspec
 gemspec
 
+gem "standard", "0.4.7"
+
 group :test do
   gem "pry"
   gem "pry-byebug", platform: [:mri]

data/Guardfile

@@ -1,7 +1,7 @@
 guard :rspec, cmd: "bundle exec rspec --color --format documentation" do
   require "guard/rspec/dsl"
   dsl = Guard::RSpec::Dsl.new(self)
-  watch(%r{^spec/(.*)\/?(.*)_spec\.rb$})
+  watch(%r{^spec/(.*)/?(.*)_spec\.rb$})
 
   # Feel free to open issues for suggestions and improvements
 
@@ -21,12 +21,12 @@ guard :rspec, cmd: "bundle exec rspec --color --format documentation" do
   watch(rails.controllers) do |m|
     [
       rspec.spec.call("controllers/#{m[1]}_controller"),
-      rspec.spec.call("api/#{m[1]}"),
+      rspec.spec.call("api/#{m[1]}")
     ]
   end
 
   # Rails config changes
-  watch(rails.spec_helper)     { rspec.spec_dir }
-  watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
-  watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
+  watch(rails.spec_helper) { rspec.spec_dir }
+  watch(rails.routes) { "#{rspec.spec_dir}/routing" }
+  watch(rails.app_controller) { "#{rspec.spec_dir}/controllers" }
 end

data/deprecated_generators/graphiti/resource_generator.rb

@@ -93,7 +93,7 @@ module Graphiti
         raise "Unable to set #{self} default_attributes from #{attributes_class}. #{attributes_class} must be a kind of ApplicationRecord"
       end
       if attributes_class.table_exists?
-        return attributes_class.columns.map do |c|
+        attributes_class.columns.map do |c|
           OpenStruct.new({name: c.name.to_sym, type: c.type})
         end
       else

data/gemfiles/rails_5_0.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0"
+gem "rspec-rails"
+gem "sqlite3", "~> 1.3.6"
+gem "database_cleaner"
+
+group :test do
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"

data/gemfiles/rails_5_0_graphiti_rails.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0"
+gem "rspec-rails"
+gem "sqlite3", "~> 1.3.6"
+gem "database_cleaner"
+gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
+gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
+
+group :test do
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.1"
+gem "rspec-rails"
+gem "sqlite3", "~> 1.3.6"
+gem "database_cleaner"
+
+group :test do
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"

data/gemfiles/rails_5_1_graphiti_rails.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.1"
+gem "rspec-rails"
+gem "sqlite3", "~> 1.3.6"
+gem "database_cleaner"
+gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
+gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
+
+group :test do
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0.rc1"
+gem "rails", "~> 6.0"
 gem "rspec-rails"
 gem "sqlite3", "~> 1.4.0"
 gem "database_cleaner"

data/gemfiles/rails_6_graphiti_rails.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0.rc1"
+gem "rails", "~> 6.0"
 gem "rspec-rails"
 gem "sqlite3", "~> 1.4.0"
 gem "database_cleaner"

data/graphiti.gemspec

@@ -3,23 +3,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "graphiti/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "graphiti"
-  spec.version       = Graphiti::VERSION
-  spec.authors       = ["Lee Richmond"]
-  spec.email         = ["richmolj@gmail.com"]
+  spec.name = "graphiti"
+  spec.version = Graphiti::VERSION
+  spec.authors = ["Lee Richmond"]
+  spec.email = ["richmolj@gmail.com"]
 
-  spec.summary       = "Easily build jsonapi.org-compatible APIs"
-  spec.homepage      = "https://github.com/graphiti-api/graphiti"
-  spec.license       = "MIT"
+  spec.summary = "Easily build jsonapi.org-compatible APIs"
+  spec.homepage = "https://github.com/graphiti-api/graphiti"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.required_ruby_version = "~> 2.3"
 
   spec.add_dependency "jsonapi-serializable", "~> 0.3.0"
-  spec.add_dependency "jsonapi-renderer", "0.2.0"
+  spec.add_dependency "jsonapi-renderer", "~> 0.2", ">= 0.2.2"
   spec.add_dependency "dry-types", ">= 0.15.0", "< 2.0"
   spec.add_dependency "graphiti_errors", "~> 1.1.0"
   spec.add_dependency "concurrent-ruby", "~> 1.0"
@@ -31,5 +31,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "activemodel", ">= 4.1"
   spec.add_development_dependency "graphiti_spec_helpers", "1.0.beta.4"
-  spec.add_development_dependency "standard"
 end

data/lib/graphiti.rb

@@ -13,7 +13,7 @@ require "graphiti_errors"
 require "jsonapi/serializable"
 
 module Graphiti
-  DEPRECATOR = ActiveSupport::Deprecation.new('2.0', 'Graphiti')
+  DEPRECATOR = ActiveSupport::Deprecation.new("2.0", "Graphiti")
 
   # @api private
   def self.context
@@ -33,9 +33,9 @@ module Graphiti
   ensure
     self.context = prior
 
-    resources.each { |resource_class|
+    resources.each do |resource_class|
       resource_class.sideloads.values.each(&:clear_resources)
-    }
+    end
   end
 
   def self.config

data/lib/graphiti/adapters/abstract.rb

@@ -17,7 +17,7 @@ module Graphiti
           belongs_to: ::Graphiti::Sideload::BelongsTo,
           has_one: ::Graphiti::Sideload::HasOne,
           many_to_many: ::Graphiti::Sideload::ManyToMany,
-          polymorphic_belongs_to: ::Graphiti::Sideload::PolymorphicBelongsTo,
+          polymorphic_belongs_to: ::Graphiti::Sideload::PolymorphicBelongsTo
         }
       end
 
@@ -33,7 +33,7 @@ module Graphiti
             :suffix,
             :not_suffix,
             :match,
-            :not_match,
+            :not_match
           ],
           uuid: [:eq, :not_eq],
           enum: [:eq, :not_eq],
@@ -45,7 +45,7 @@ module Graphiti
           date: numerical_operators,
           datetime: numerical_operators,
           hash: [:eq],
-          array: [:eq],
+          array: [:eq]
         }
       end
 

data/lib/graphiti/adapters/active_record.rb

@@ -12,7 +12,7 @@ module Graphiti
           has_many: Graphiti::Adapters::ActiveRecord::HasManySideload,
           has_one: Graphiti::Adapters::ActiveRecord::HasOneSideload,
           belongs_to: Graphiti::Adapters::ActiveRecord::BelongsToSideload,
-          many_to_many: Graphiti::Adapters::ActiveRecord::ManyToManySideload,
+          many_to_many: Graphiti::Adapters::ActiveRecord::ManyToManySideload
         }
       end
 
@@ -57,52 +57,61 @@ module Graphiti
         filter_string_eql(scope, attribute, value, is_not: true)
       end
 
-      def filter_string_prefix(scope, attribute, value, is_not: false)
-        column = column_for(scope, attribute)
-        map = value.map { |v| "#{v}%" }
-        clause = column.lower.matches_any(map)
-        is_not ? scope.where.not(clause) : scope.where(clause)
-      end
-
-      def filter_string_not_prefix(scope, attribute, value)
-        filter_string_prefix(scope, attribute, value, is_not: true)
-      end
-
-      def filter_string_suffix(scope, attribute, value, is_not: false)
-        column = column_for(scope, attribute)
-        map = value.map { |v| "%#{v}" }
-        clause = column.lower.matches_any(map)
-        is_not ? scope.where.not(clause) : scope.where(clause)
-      end
-
-      def filter_string_not_suffix(scope, attribute, value)
-        filter_string_suffix(scope, attribute, value, is_not: true)
-      end
-
       # Arel has different match escaping behavior before rails 5.
       # Since rails 4.x does not expose methods to escape LIKE statements
       # anyway, we just don't support proper LIKE escaping in those versions.
-      if ::ActiveRecord.version >= Gem::Version.new('5.0.0')
+      if ::ActiveRecord.version >= Gem::Version.new("5.0.0")
         def filter_string_match(scope, attribute, value, is_not: false)
-          escape_char = '\\'
-          column = column_for(scope, attribute)
-          map = value.map do |v|
-            v = v.downcase
-            v = scope.sanitize_sql_like(v)
+          clause = sanitized_like_for(scope, attribute, value) { |v|
             "%#{v}%"
-          end
-          clause = column.lower.matches_any(map, escape_char, true)
+          }
+          is_not ? scope.where.not(clause) : scope.where(clause)
+        end
+
+        def filter_string_prefix(scope, attribute, value, is_not: false)
+          clause = sanitized_like_for(scope, attribute, value) { |v|
+            "#{v}%"
+          }
+          is_not ? scope.where.not(clause) : scope.where(clause)
+        end
+
+        def filter_string_suffix(scope, attribute, value, is_not: false)
+          clause = sanitized_like_for(scope, attribute, value) { |v|
+            "%#{v}"
+          }
           is_not ? scope.where.not(clause) : scope.where(clause)
         end
       else
         def filter_string_match(scope, attribute, value, is_not: false)
           column = column_for(scope, attribute)
-          map = value.map do |v|
+          map = value.map { |v|
             "%#{v.downcase}%"
-          end
+          }
+          clause = column.lower.matches_any(map)
+          is_not ? scope.where.not(clause) : scope.where(clause)
+        end
+
+        def filter_string_prefix(scope, attribute, value, is_not: false)
+          column = column_for(scope, attribute)
+          map = value.map { |v| "#{v}%" }
           clause = column.lower.matches_any(map)
           is_not ? scope.where.not(clause) : scope.where(clause)
         end
+
+        def filter_string_suffix(scope, attribute, value, is_not: false)
+          column = column_for(scope, attribute)
+          map = value.map { |v| "%#{v}" }
+          clause = column.lower.matches_any(map)
+          is_not ? scope.where.not(clause) : scope.where(clause)
+        end
+      end
+
+      def filter_string_not_prefix(scope, attribute, value)
+        filter_string_prefix(scope, attribute, value, is_not: true)
+      end
+
+      def filter_string_not_suffix(scope, attribute, value)
+        filter_string_suffix(scope, attribute, value, is_not: true)
       end
 
       def filter_string_not_match(scope, attribute, value)
@@ -150,7 +159,7 @@ module Graphiti
 
       # Ensure fractional seconds don't matter
       def filter_datetime_eq(scope, attribute, value, is_not: false)
-        ranges = value.map { |v| (v..v + 1.second - 0.00000001) }
+        ranges = value.map { |v| (v..v + 1.second - 0.00000001) unless v.nil? }
         clause = {attribute => ranges}
         is_not ? scope.where.not(clause) : scope.where(clause)
       end
@@ -273,8 +282,8 @@ module Graphiti
 
       # (see Adapters::Abstract#update)
       def update(model_class, update_params)
-        instance = model_class.find(update_params.delete(:id))
-        instance.update_attributes(update_params)
+        instance = model_class.find(update_params.only(:id))
+        instance.update_attributes(update_params.except(:id))
         instance
       end
 
@@ -298,6 +307,26 @@ module Graphiti
           table[name]
         end
       end
+
+      def sanitized_like_for(scope, attribute, value, &block)
+        escape_char = '\\'
+        column = column_for(scope, attribute)
+        map = value.map { |v|
+          v = v.downcase
+          v = Sanitizer.sanitize_like(v, escape_char)
+          block.call v
+        }
+
+        column.lower.matches_any(map, escape_char, true)
+      end
+
+      class Sanitizer
+        extend ::ActiveRecord::Sanitization::ClassMethods
+
+        def self.sanitize_like(*args)
+          sanitize_sql_like(*args)
+        end
+      end
     end
   end
 end