Merge pull request #218 from agworld/fix/style_checking

Fix a large number of style errors.

Author: richmolj

.travis.yml

@@ -11,20 +11,20 @@ gemfile:
   - gemfiles/rails_5_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
+    - env: COMMAND="standardrb --no-fix --format progress"
       gemfile: gemfiles/rails_4.gemfile
-    - env: COMMAND=standardrb --no-fix --format progress
+    - 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_6.gemfile
-    - env: COMMAND=standardrb --no-fix --format progress
+    - 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_6_graphiti_rails.gemfile
     - env: COMMAND=rspec APPRAISAL_INITIALIZED=true
       gemfile: Gemfile

Guardfile

@@ -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

deprecated_generators/graphiti/resource_generator.rb

@@ -93,7 +93,7 @@ def default_attributes
         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

graphiti.gemspec

@@ -3,18 +3,18 @@ $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         = ["[email protected]"]
+  spec.name = "graphiti"
+  spec.version = Graphiti::VERSION
+  spec.authors = ["Lee Richmond"]
+  spec.email = ["[email protected]"]
 
-  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"
 

lib/graphiti.rb

@@ -13,7 +13,7 @@
 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 @@ def self.with_context(obj, namespace = nil)
   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

lib/graphiti/adapters/abstract.rb

@@ -17,7 +17,7 @@ def self.sideloading_classes
           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 @@ def self.default_operators
             :suffix,
             :not_suffix,
             :match,
-            :not_match,
+            :not_match
           ],
           uuid: [:eq, :not_eq],
           enum: [:eq, :not_eq],
@@ -45,7 +45,7 @@ def self.default_operators
           date: numerical_operators,
           datetime: numerical_operators,
           hash: [:eq],
-          array: [:eq],
+          array: [:eq]
         }
       end
 

lib/graphiti/adapters/active_record.rb

@@ -12,7 +12,7 @@ def self.sideloading_classes
           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
 
@@ -82,24 +82,24 @@ def filter_string_not_suffix(scope, attribute, value)
       # 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|
+          map = value.map { |v|
             v = v.downcase
             v = scope.sanitize_sql_like(v)
             "%#{v}%"
-          end
+          }
           clause = column.lower.matches_any(map, escape_char, true)
           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

lib/graphiti/configuration.rb

@@ -43,7 +43,7 @@ def initialize
         end
 
         if (logger = ::Rails.logger)
-          self.debug = logger.level.zero? && self.debug
+          self.debug = logger.level.zero? && debug
           Graphiti.logger = logger
         end
       end

lib/graphiti/debugger.rb

@@ -59,10 +59,10 @@ def on_sideload_data(payload, params, took)
         add_chunk(payload[:resource], payload[:parent]) do |logs, json|
           logs << [" \\_ #{sideload.name}", :yellow, true]
           json[:name] = sideload.name
-          if sideload.class.scope_proc
-            query = "#{payload[:resource].class.name}: Manual sideload via .scope"
+          query = if sideload.class.scope_proc
+            "#{payload[:resource].class.name}: Manual sideload via .scope"
           else
-            query = "#{payload[:resource].class.name}.all(#{params.inspect})"
+            "#{payload[:resource].class.name}.all(#{params.inspect})"
           end
           logs << ["    #{query}", :cyan, true]
           json[:query] = query
@@ -148,7 +148,7 @@ def add_chunk(resource = nil, parent = nil)
           parent: parent,
           logs: logs,
           json: json,
-          children: [],
+          children: []
         }
       end
 

lib/graphiti/delegates/pagination.rb

@@ -15,7 +15,7 @@ def links
           links[:last] = pagination_link(last_page)
           links[:prev] = pagination_link(current_page - 1) unless current_page == 1
           links[:next] = pagination_link(current_page + 1) unless current_page == last_page
-        end.select {|k, v| !v.nil? }
+        end.select { |k, v| !v.nil? }
       end
 
       private
@@ -29,8 +29,8 @@ def pagination_link(page)
         uri.query = @proxy.query.hash.merge({
           page: {
             number: page,
-            size: page_size,
-          },
+            size: page_size
+          }
         }).to_query
         uri.to_s
       end