simple_jsonapi_rails 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54156ceb047d874781ddfed03c156591ad715c50
-  data.tar.gz: 8d16312de66be3a1f767c522f8cee3345274ee8b
+  metadata.gz: 8e158d2536bbf8f13b80484a8cbf923735847230
+  data.tar.gz: b4013491327e08a1f4a714a186607f330e858cbd
 SHA512:
-  metadata.gz: 02a985a3712fd7da77b28cc4a1b8f536ca7914127fc8d70bf2e280d7ab33071738896ab18a8715ac894e668b01eb56ed98aa552dd2d640e620f481ef954af7a3
-  data.tar.gz: 6fd49421b5c11edf2b38a1b9f60c712d1ca4a9b08e450ad5c403421fe69ce3249c27cc95f37f62544351825454265d7bb0648f42cd170a623b12e339b4158951
+  metadata.gz: 737a8c8b15f36b15bf3f83e74f218e0af46c4c78b06a84762017226d4061898057c7b2875619479aebb73b976c0f6de1218f3fe1356d655f369e0c16158e4f79
+  data.tar.gz: 9ade29fba92a87cce3c5a4858635a469a7d39fbc6e287149b2ae29fac9013a560ac4623655228b678f77f3de75280c739d4648b0be92ba7b6c7705f9cb2eee76

data/.gitignore

@@ -1,7 +1,7 @@
 /.bundle/
 /.yardoc
 /_yardoc/
-/Gemfile.lock
+Gemfile.lock
 /coverage/
 /doc/
 /pkg/

data/Appraisals

@@ -0,0 +1,14 @@
+appraise "rails-51-rack-test-07" do
+  gem "rails", "~> 5.1.0"
+  gem "rack-test", "~> 0.7.0"
+end
+
+appraise "rails-52-rack-test-07" do
+  gem "rails", "~> 5.2.0"
+  gem "rack-test", "~> 0.7.0"
+end
+
+appraise "rails-52-rack-test-10" do
+  gem "rails", "~> 5.2.0"
+  gem "rack-test", "~> 1.0.0"
+end

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.1.1 - August 20, 2018
+* Removes workaround for DELETE requests with rack-test 1.x
+* Adds test coverage for Rails 5.2
+
 ## Version 1.1.0 - June 12, 2018
 * Adding 'show' to the list of valid routes, namespaced as 'fetch'
 

data/Jenkinsfile

@@ -1,92 +1,3 @@
-pipeline {
-  agent none
-  options {
-    timeout(time: 1, unit: 'HOURS')
-    skipDefaultCheckout()
-  }
+@Library('plm-global-jenkins')_
 
-  stages {
-    stage("Build Ruby") {
-      agent {
-        node {
-          label 'docker'
-        }
-      }
-
-      steps {
-        script {
-          with_ruby_build() {
-            script {
-              uid = sh(returnStdout: true, script: 'stat -c %g .').trim()
-              gid = sh(returnStdout: true, script: 'stat -c %u .').trim()
-            }
-
-            sh "chown -R ${uid}:${gid} vendor/bundle/"
-            sh "rm -rf vendor/bundle/ruby/2.3.0/cache"
-            stash name: 'ruby-bundle', includes: 'vendor/bundle/'
-          }
-        }
-      }
-    }
-
-    stage("Test") {
-      steps {
-        script {
-          node('docker') {
-            checkout([
-              $class: 'GitSCM',
-              branches: scm.branches,
-              doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations,
-              extensions: scm.extensions + [[$class: 'CloneOption', noTags: true, reference: '', shallow: true]],
-              userRemoteConfigs: scm.userRemoteConfigs
-            ])
-            try {
-              docker.image('ruby:2.3.3').inside() {
-                sh 'rm -rf vendor/bundle'
-                unstash 'ruby-bundle'
-                sh 'bundle install --path=vendor/bundle'
-
-                withEnv([
-                  'DISABLE_SPRING=1',
-                  'TZ=America/New_York'
-                ]) {
-                  sh 'bundle exec rake test'
-                }
-              }
-            }
-            finally {
-              junit 'test/reports/'
-              cleanWs()
-            }
-          }
-        }
-      }
-    }
-  }
-
-  post {
-    failure {
-      script {
-        if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'current') {
-          slackSend (channel: '#plm_website', color: '#FF0000', message: "FAILED ${env.JOB_NAME} [${env.BUILD_NUMBER}] (${env.RUN_DISPLAY_URL})")
-        }
-      }
-    }
-  }
-}
-
-def with_ruby_build(closure) {
-  docker.image('ruby:2.3.3').inside() {
-    checkout([
-      $class: 'GitSCM',
-      branches: scm.branches,
-      doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations,
-      extensions: scm.extensions + [[$class: 'CloneOption', noTags: true, reference: '', shallow: true]],
-      userRemoteConfigs: scm.userRemoteConfigs
-    ])
-    sh 'rm -rf vendor/bundle'
-    sh 'bundle install --path=vendor/bundle'
-    closure()
-    cleanWs()
-  }
-}
+publishRubyPackagePipeline('./lib/simple_jsonapi/rails/version.rb', 'SimpleJsonapi::Rails::VERSION')

data/gemfiles/rails_51_rack_test_07.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "rails", "~> 5.1.0"
+gem "rack-test", "~> 0.7.0"
+
+gemspec path: "../"

data/gemfiles/rails_52_rack_test_07.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "rails", "~> 5.2.0"
+gem "rack-test", "~> 0.7.0"
+
+gemspec path: "../"

data/gemfiles/rails_52_rack_test_10.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "rails", "~> 5.2.0"
+gem "rack-test", "~> 1.0.0"
+
+gemspec path: "../"

data/lib/simple_jsonapi/rails/test_helpers.rb

@@ -1,20 +1,22 @@
 # SimpleJsonapi::Rails::Railtie.initializers.each(&:run)
 
-# Work-around for rack-test/rack-test#200. Remove once that issue is resolved.
-module PatchRackTestDeleteRequests
-  def request(uri, env = {}, &block)
-    if env[:method] == :delete && env["HTTP_ACCEPT"] == SimpleJsonapi::MIME_TYPE && JSON.parse(env[:params]).present?
-      env[:input] = env[:params]
-    end
+# Work-around for rack-test/rack-test#200, which is resolved in rack-test 1.0.0 (see rack-test/rack-test#223)
+if Gem::Version.new(Rack::Test::VERSION) < Gem::Version.new("1.0.0")
+  module PatchRackTestDeleteRequests
+    def request(uri, env = {}, &block)
+      if env[:method] == :delete && env["HTTP_ACCEPT"] == SimpleJsonapi::MIME_TYPE && env[:params].present?
+        env[:input] = env[:params]
+      end
 
-    super(uri, env, &block)
+      super(uri, env, &block)
+    end
   end
-end
 
-Rack::Test::Session.prepend(PatchRackTestDeleteRequests)
+  Rack::Test::Session.prepend(PatchRackTestDeleteRequests)
+end
 
 ActiveSupport.on_load(:action_controller) do
   ActionDispatch::IntegrationTest.register_encoder :jsonapi,
-    param_encoder:   ->(params) { params.to_json },
-    response_parser: ->(body) { JSON.parse(body) }
+    param_encoder:   ->(params) { params&.to_json },
+    response_parser: ->(body) { JSON.parse(body) if body.present? }
 end

data/lib/simple_jsonapi/rails/version.rb

@@ -1,5 +1,5 @@
 module SimpleJsonapi
   module Rails
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
   end
 end

data/simple_jsonapi_rails.gemspec

@@ -21,12 +21,13 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'simple_jsonapi'
   spec.add_runtime_dependency 'rails', '>= 4.2', '< 6.0'
 
-  spec.add_development_dependency 'rails', '~> 5.1.0'
+  spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'listen'
   spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'minitest-reporters'
+  spec.add_development_dependency 'minitest-reporters', '~> 1.1.11'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rails', '~> 5.1.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'will_paginate'

data/test/dummy/app/controllers/orders_controller.rb

@@ -30,6 +30,11 @@ class OrdersController < ApiController
     render jsonapi_resource: order, serializer: OrderSerializer, status: :ok
   end
 
+  def destroy
+    Order.find(params[:id]).destroy
+    head :no_content
+  end
+
   private
 
   def order_params

data/test/dummy/config/application.rb

@@ -9,5 +9,9 @@ Bundler.require(*Rails.groups)
 module Dummy
   class Application < Rails::Application
     config.load_defaults 5.1
+
+    if Gem::Version.new(Rails.version) >= Gem::Version.new("5.2.0")
+      Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
+    end
   end
 end

data/test/test_helper.rb

@@ -3,9 +3,12 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 # Set up the dummy app
 ENV['RAILS_ENV'] = 'test'
 require_relative 'dummy/config/environment'
-# change to ActiveRecord::MigrationContext.new(File.expand_path("dummy/db/migrate/", __dir__)).migrate
-# when we upgrade rails >= 5.2.0
-ActiveRecord::Migrator.migrate File.expand_path("dummy/db/migrate/", __dir__)
+
+if Gem::Version.new(Rails.version) < Gem::Version.new("5.2.0")
+  ActiveRecord::Migrator.migrate(File.expand_path("dummy/db/migrate/", __dir__))
+else
+  ActiveRecord::MigrationContext.new(File.expand_path("dummy/db/migrate/", __dir__)).migrate
+end
 
 require 'active_support'
 

data/test/test_helpers_test.rb

@@ -0,0 +1,24 @@
+require "test_helper"
+
+class TestHelpersTest < ActionDispatch::IntegrationTest
+  before do
+    @controller = OrdersController.new
+    @routes = Dummy::Application.routes
+  end
+
+  let(:order) { Order.create!(customer_name: "Customer X", date: Date.today) }
+  let(:response_json) { response.parsed_body }
+
+  describe "parameter encoder" do
+    it "sends a DELETE request with no body as jsonapi" do
+      delete order_path(order), as: :jsonapi
+      assert_response :no_content
+      assert_operator response.parsed_body, :blank?
+    end
+
+    it "sends a DELETE request with a body as jsonapi" do
+      delete order_path(order), params: { data: { id: "foo" } }, as: :jsonapi
+      assert_response :no_content
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_jsonapi_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - PatientsLikeMe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_jsonapi
@@ -45,19 +45,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -104,16 +104,16 @@ dependencies:
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.11
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -193,12 +207,16 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - Jenkinsfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails_51_rack_test_07.gemfile
+- gemfiles/rails_52_rack_test_07.gemfile
+- gemfiles/rails_52_rack_test_10.gemfile
 - lib/simple_jsonapi/errors/active_model_error.rb
 - lib/simple_jsonapi/errors/active_model_error_serializer.rb
 - lib/simple_jsonapi/errors/active_record/record_not_found_serializer.rb
@@ -242,6 +260,7 @@ files:
 - test/errors/active_model_error_test.rb
 - test/errors/active_record/record_not_found_serializer_test.rb
 - test/test_helper.rb
+- test/test_helpers_test.rb
 homepage: https://www.patientslikeme.com
 licenses:
 - MIT
@@ -296,3 +315,4 @@ test_files:
 - test/errors/active_model_error_test.rb
 - test/errors/active_record/record_not_found_serializer_test.rb
 - test/test_helper.rb
+- test/test_helpers_test.rb