graphiti 1.0.rc.21 → 1.0.rc.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d9aba6937773f5fccd9d4728c4b9d359e1edc94aa160ec72fab31df0068d1a2c
-  data.tar.gz: 1d39ffdcb8c9ed1c543b2bac2c00ccf4c2814831a237369a2e56bb7ff65d2de2
+SHA1:
+  metadata.gz: d213472a51c9849c856ba5742132b6298ca17b47
+  data.tar.gz: 81201cada6bf3cf2e0c566495eb46f343acf0932
 SHA512:
-  metadata.gz: e6e646ddf4069ee3563a8500291649fd62763594c54068bf50a2b044ca82696794a0de8aa40e5ea38e398de7808ffc853736a0978c2ccc56030cdadc0965ad4c
-  data.tar.gz: 3e294b2980ca2ab4f117d6e2ef888df7d37a529db9ac1491d44e349f7dd8582f677d2bbb291a40814e0ecc0c2360b2e63a711923ccfe088cd53c631535bd7127
+  metadata.gz: f98bbcbb4a61d7e783e4a651a66843bd3e74c3418002069917be3f564e596a202bc6eb2c72049a89ec7f2608f60c07e44da1447d8b93605c6e5fd5ffa244fbab
+  data.tar.gz: 3754a4e800e735ac54496f808d0e5cfedd1b2bd35e939086a14c02acdca46b61fbfa5bf9c2b587224e399301d9cda32fdc0709f6d80b772d8735f789821b576a

data/.gitignore

@@ -10,3 +10,4 @@
 .byebug_history
 spec/dummy/log/*
 *~
+.vscode/

data/.standard.yml

@@ -0,0 +1,14 @@
+fix: true
+parallel: true
+ruby_version: 2.4
+
+ignore:
+  - 'vendor/**/*'
+  - 'spec/**/*':
+    # There are some false hits when doing repeated
+    # Class.new blocks in different test cases
+    - Lint/DuplicateMethods
+    # This was causing many tests to be harder to read.
+    # Ongoing discussion with StandardRB team in
+    # https://github.com/testdouble/standard/issues/94
+    - Standard/SemanticBlocks

data/.travis.yml

@@ -4,8 +4,37 @@ rvm:
 - 2.4
 - 2.5
 - 2.6
-script: bundle exec rspec && bundle exec appraisal install && bundle exec appraisal
-  rails-5 rspec && bundle exec appraisal rails-4 rspec
+gemfile:
+  - Gemfile
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_5.gemfile
+  - gemfiles/rails_6.gemfile
+env:
+  - COMMAND=standardrb --no-fix --format progress
+  - COMMAND=rspec
+  - COMMAND=rspec APPRAISAL_INITIALIZED=true
+matrix:
+  exclude:
+    - 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
+      gemfile: gemfiles/rails_6.gemfile
+    - env: COMMAND=rspec APPRAISAL_INITIALIZED=true
+      gemfile: Gemfile
+    - env: COMMAND=rspec
+      gemfile: gemfiles/rails_4.gemfile
+    - env: COMMAND=rspec
+      gemfile: gemfiles/rails_5.gemfile
+    - env: COMMAND=rspec
+      gemfile: gemfiles/rails_6.gemfile
+    - gemfile: gemfiles/rails_6.gemfile
+      rvm: 2.4
+
+script:
+  - bundle exec $COMMAND
+
 install: bundle install --retry=3 --jobs=3
 before_install:
 - gem install bundler -v '< 2'

data/Appraisals

@@ -1,17 +1,23 @@
 appraise "rails-4" do
   gem "rails", "~> 4.1"
-  gem 'jsonapi-rails', '~> 0.3.1', require: 'jsonapi/rails'
-  gem 'rspec-rails'
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'database_cleaner'
-  gem 'kaminari', '~> 0.17'
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.3.6"
+  gem "database_cleaner"
+  gem "kaminari", "~> 0.17"
 end
 
 appraise "rails-5" do
   gem "rails", "~> 5.2"
-  gem 'jsonapi-rails', '~> 0.3.1', require: 'jsonapi/rails'
-  gem 'rspec-rails'
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'database_cleaner'
-  gem 'kaminari', '~> 0.17'
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.3.6"
+  gem "database_cleaner"
+  gem "kaminari", "~> 0.17"
+end
+
+appraise "rails-6" do
+  gem "rails", "~> 6.0.0.beta2"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.3.6"
+  gem "database_cleaner"
+  gem "kaminari", "~> 0.17"
 end

data/Gemfile

@@ -4,9 +4,9 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
-  gem 'pry'
-  gem 'pry-byebug', platform: [:mri]
-  gem 'appraisal'
-  gem 'guard'
-  gem 'guard-rspec'
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
 end

data/Guardfile

@@ -16,12 +16,12 @@ guard :rspec, cmd: "bundle exec rspec --color --format documentation" do
   dsl.watch_spec_files_for(ruby.lib_files)
 
   # Rails files
-  rails = dsl.rails(view_extensions: %w(erb haml slim))
+  rails = dsl.rails(view_extensions: %w[erb haml slim])
 
   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
 

data/README.md

@@ -4,7 +4,7 @@
 
 Stylish Graph APIs.
 
-[View Official Documentation](https://graphiti-api.github.io/graphiti/guides/)
+[View Official Documentation](https://www.graphiti.dev/guides/)
 
 [Join the Slack Channel](https://join.slack.com/t/graphiti-api/shared_invite/enQtMjkyMTA3MDgxNTQzLWVkMDM3NTlmNTIwODY2YWFkMGNiNzUzZGMzOTY3YmNmZjBhYzIyZWZlZTk4YmI1YTI0Y2M0OTZmZGYwN2QxZjg)
 

data/Rakefile

@@ -4,12 +4,12 @@ require "appraisal"
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   if ENV["APPRAISAL_INITIALIZED"]
-    t.pattern = 'spec/integration/rails'
+    t.pattern = "spec/integration/rails"
   end
 end
 
-if !ENV["APPRAISAL_INITIALIZED"] && !ENV['TRAVIS']
-  task :default => [:spec, :appraisal]
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+  task default: [:spec, :appraisal]
 else
-  task :default => [:spec]
+  task default: [:spec]
 end

data/exe/graphiti

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'graphiti/cli'
+require "graphiti/cli"
 
 Graphiti::CLI.start(ARGV)

data/gemfiles/rails_4.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.1"
-gem "jsonapi-rails", "~> 0.3.1", require: "jsonapi/rails"
 gem "rspec-rails"
 gem "sqlite3", "~> 1.3.6"
 gem "database_cleaner"

data/gemfiles/rails_5.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.2"
-gem "jsonapi-rails", "~> 0.3.1", require: "jsonapi/rails"
 gem "rspec-rails"
 gem "sqlite3", "~> 1.3.6"
 gem "database_cleaner"

data/gemfiles/rails_6.gemfile

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

data/graphiti.gemspec

@@ -1,7 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'graphiti/version'
+require "graphiti/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "graphiti"
@@ -9,26 +8,28 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Lee Richmond"]
   spec.email         = ["richmolj@gmail.com"]
 
-  spec.summary       = %q{Easily build jsonapi.org-compatible APIs}
+  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.require_paths = ["lib"]
-  spec.required_ruby_version = '~> 2.3'
+  spec.required_ruby_version = "~> 2.3"
 
   # Pinning this version until backwards-incompatibility is addressed
-  spec.add_dependency 'jsonapi-serializable', '~> 0.3.0'
-  spec.add_dependency 'dry-types', '~> 0.13'
-  spec.add_dependency 'graphiti_errors', '~> 1.0.beta.1'
-  spec.add_dependency 'concurrent-ruby', '~> 1.0'
-  spec.add_dependency 'activesupport', ['>= 4.1', '< 6']
+  spec.add_dependency "jsonapi-serializable", "= 0.3.0"
+  spec.add_dependency "dry-types", "~> 0.13"
+  spec.add_dependency "graphiti_errors", "~> 1.0.beta.1"
+  spec.add_dependency "concurrent-ruby", "~> 1.0"
+  spec.add_dependency "activesupport", [">= 4.1", "< 6"]
 
-  spec.add_development_dependency "faraday", '~> 0.15'
-  spec.add_development_dependency "kaminari", '~> 0.17'
+  spec.add_development_dependency "faraday", "~> 0.15"
+  spec.add_development_dependency "kaminari", "~> 0.17"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "activemodel", ['>= 4.1', '< 6']
-  spec.add_development_dependency "graphiti_spec_helpers", '1.0.beta.4'
+  spec.add_development_dependency "activemodel", [">= 4.1", "< 6"]
+  spec.add_development_dependency "graphiti_spec_helpers", "1.0.beta.4"
+  spec.add_development_dependency "standard"
 end

data/lib/generators/graphiti/api_test_generator.rb

@@ -1,20 +1,20 @@
 $:.unshift File.dirname(__FILE__)
-require 'generator_mixin'
+require "generator_mixin"
 
 module Graphiti
   class ApiTestGenerator < ::Rails::Generators::Base
     include GeneratorMixin
 
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path("../templates", __FILE__)
 
     argument :resource, type: :string
-    class_option :'actions',
+    class_option :actions,
       type: :array,
       default: nil,
-      aliases: ['--actions', '-a'],
+      aliases: ["--actions", "-a"],
       desc: 'Array of controller actions, e.g. "index show destroy"'
 
-    desc 'Generates rspec request specs at spec/api'
+    desc "Generates rspec request specs at spec/api"
     def generate
       generate_api_specs
     end
@@ -26,33 +26,33 @@ module Graphiti
     end
 
     def dir
-      @resource.gsub('Resource', '').underscore.pluralize
+      @resource.gsub("Resource", "").underscore.pluralize
     end
 
     def generate_api_specs
-      if actions?('index')
+      if actions?("index")
         to = File.join("spec", ApplicationResource.endpoint_namespace, dir, "index_spec.rb")
-        template('index_request_spec.rb.erb', to)
+        template("index_request_spec.rb.erb", to)
       end
 
-      if actions?('show')
+      if actions?("show")
         to = File.join("spec", ApplicationResource.endpoint_namespace, dir, "show_spec.rb")
-        template('show_request_spec.rb.erb', to)
+        template("show_request_spec.rb.erb", to)
       end
 
-      if actions?('create')
+      if actions?("create")
         to = File.join("spec", ApplicationResource.endpoint_namespace, dir, "create_spec.rb")
-        template('create_request_spec.rb.erb', to)
+        template("create_request_spec.rb.erb", to)
       end
 
-      if actions?('update')
+      if actions?("update")
         to = File.join("spec", ApplicationResource.endpoint_namespace, dir, "update_spec.rb")
-        template('update_request_spec.rb.erb', to)
+        template("update_request_spec.rb.erb", to)
       end
 
-      if actions?('destroy')
+      if actions?("destroy")
         to = File.join("spec", ApplicationResource.endpoint_namespace, dir, "destroy_spec.rb")
-        template('destroy_request_spec.rb.erb', to)
+        template("destroy_request_spec.rb.erb", to)
       end
     end
 

data/lib/generators/graphiti/generator_mixin.rb

@@ -4,21 +4,21 @@ module Graphiti
       say(set_color("\n#{header}", :magenta, :bold)) if header
       say("\n#{description}") if description
       answer = ask(set_color("\n(default: #{default}):", :magenta, :bold))
-      answer = default if answer.blank? && default != 'nil'
+      answer = default if answer.blank? && default != "nil"
       say(set_color("\nGot it!\n", :white, :bold))
       answer
     end
 
     def api_namespace
       @api_namespace ||= begin
-        ns = graphiti_config['namespace']
+        ns = graphiti_config["namespace"]
 
         if ns.blank?
           ns = prompt \
             header: "What is your API namespace?",
             description: "This will be used as a route prefix, e.g. if you want the route '/books_api/v1/authors' your namespace would be '/books_api/v1'",
-            default: '/api/v1'
-          update_config!('namespace' => ns)
+            default: "/api/v1"
+          update_config!("namespace" => ns)
         end
 
         ns
@@ -26,7 +26,7 @@ module Graphiti
     end
 
     def actions
-      @options['actions'] || %w(index show create update destroy)
+      @options["actions"] || %w[index show create update destroy]
     end
 
     def actions?(*methods)
@@ -34,12 +34,12 @@ module Graphiti
     end
 
     def graphiti_config
-      File.exists?('.graphiticfg.yml') ? YAML.load_file('.graphiticfg.yml') : {}
+      File.exist?(".graphiticfg.yml") ? YAML.load_file(".graphiticfg.yml") : {}
     end
 
     def update_config!(attrs)
       config = graphiti_config.merge(attrs)
-      File.open('.graphiticfg.yml', 'w') { |f| f.write(config.to_yaml) }
+      File.open(".graphiticfg.yml", "w") { |f| f.write(config.to_yaml) }
     end
   end
 end

data/lib/generators/graphiti/install_generator.rb

@@ -1,33 +1,33 @@
 $:.unshift File.dirname(__FILE__)
-require 'generator_mixin'
+require "generator_mixin"
 
 module Graphiti
   class InstallGenerator < ::Rails::Generators::Base
     include GeneratorMixin
 
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path("../templates", __FILE__)
 
     class_option :'omit-comments',
       type: :boolean,
       default: false,
-      aliases: ['-c'],
-      desc: 'Generate without documentation comments'
+      aliases: ["-c"],
+      desc: "Generate without documentation comments"
 
     desc "This generator boostraps graphiti"
     def install
-      to = File.join('app/resources', "application_resource.rb")
-      template('application_resource.rb.erb', to)
+      to = File.join("app/resources", "application_resource.rb")
+      template("application_resource.rb.erb", to)
 
-      inject_into_file 'app/controllers/application_controller.rb', after: "class ApplicationController < ActionController::API\n" do
+      inject_into_file "app/controllers/application_controller.rb", after: "class ApplicationController < ActionController::API\n" do
         app_controller_code
       end
 
-      inject_into_file 'app/controllers/application_controller.rb', after: "class ApplicationController < ActionController::Base\n" do
+      inject_into_file "app/controllers/application_controller.rb", after: "class ApplicationController < ActionController::Base\n" do
         app_controller_code
       end
 
-      inject_into_file 'config/application.rb', after: "Rails::Application\n" do
-<<-'RUBY'
+      inject_into_file "config/application.rb", after: "Rails::Application\n" do
+        <<-'RUBY'
     # In order for Graphiti to generate links, you need to set the routes host.
     # When not explicitly set, via the HOST env var, this will fall back to
     # the rails server settings.
@@ -39,27 +39,27 @@ module Graphiti
         "http://#{argv_options[:Host]}:#{argv_options[:Port]}"
       end
     end
-RUBY
+        RUBY
       end
 
-      inject_into_file 'spec/rails_helper.rb', after: /RSpec.configure.+^end$/m do
-"\n\nGraphitiSpecHelpers::RSpec.schema!"
+      inject_into_file "spec/rails_helper.rb", after: /RSpec.configure.+^end$/m do
+        "\n\nGraphitiSpecHelpers::RSpec.schema!"
       end
 
-      insert_into_file "config/routes.rb", :after => "Rails.application.routes.draw do\n" do
+      insert_into_file "config/routes.rb", after: "Rails.application.routes.draw do\n" do
         if defined?(VandalUi)
-        <<-STR
+          <<-STR
   scope path: ApplicationResource.endpoint_namespace, defaults: { format: :jsonapi } do
     mount VandalUi::Engine, at: '/vandal'
     # your routes go here
   end
-        STR
+          STR
         else
-        <<-STR
+          <<-STR
   scope path: ApplicationResource.endpoint_namespace, defaults: { format: :jsonapi } do
     # your routes go here
   end
-        STR
+          STR
         end
       end
     end
@@ -67,7 +67,7 @@ RUBY
     private
 
     def omit_comments?
-      @options['omit-comments']
+      @options["omit-comments"]
     end
 
     def app_controller_code