Merge pull request #5 from nebulab/rails-6

Add support for Rails 6

.circleci/config.yml

@@ -10,13 +10,14 @@ jobs:
       - checkout
       - restore_cache:
           keys:
+            - renderful-v1-{{ .Branch }}-{{ .Revision }}
             - renderful-v1-{{ .Branch }}
             - renderful-v1-
       - run:
           name: Bundle Install
           command: bundle check || bundle install
       - save_cache:
-          key: renderful-v1-{{ .Branch }}
+          key: renderful-v1-{{ .Branch }}-{{ .Revision }}
           paths:
             - vendor/bundle
 
@@ -29,12 +30,11 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - renderful-v1-{{ .Branch }}
-            - renderful-v1-
+            - renderful-v1-{{ .Branch }}-{{ .Revision }}
       - run:
           name: Run RSpec
           command: |
-            bundle exec rspec --profile 10 \
+            bundle exec appraisal rspec --profile 10 \
               --format RspecJunitFormatter \
               --out test_results/rspec.xml \
               --format progress \
@@ -51,8 +51,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - renderful-v1-{{ .Branch }}
-            - renderful-v1-
+            - renderful-v1-{{ .Branch }}-{{ .Revision }}
       - run:
           name: Run RuboCop
           command: bundle exec rubocop

.gitignore

@@ -1,2 +1,3 @@
 .rspec_status
 Gemfile.lock
+gemfiles/*.lock

Appraisals

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+appraise 'rails-5-2' do
+  gem 'rails', '~> 5.2.0'
+end
+
+appraise 'rails-6-0' do
+  gem 'rails', '~> 6.0.0'
+end

CHANGELOG.md

@@ -7,6 +7,10 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Added
+
+- Added support for Rails 6
+
 ### Fixed
 
 - Fixed linked entries not being invalidated ([5325981](https://github.com/nebulab/renderful/commit/5325981b6ed093407712e16e9937d86f92cdbab0))

config.ru

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler"
+
+Bundler.require :default, :development
+
+Combustion.initialize! :all
+run Combustion::Application

gemfiles/rails_5_2.gemfile

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

gemfiles/rails_6_0.gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+
+gemspec path: "../"

renderful.gemspec

@@ -28,12 +28,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'contentful', '~> 2.11'
-  spec.add_dependency 'rails', '~> 5.0'
+  spec.add_dependency 'rails', ['>= 5.0.0', '< 7']
 
+  spec.add_development_dependency 'appraisal', '~> 2.2'
   spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'combustion', '~> 1.1'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'redis', '~> 4.1'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec-rails', '~> 4.0.0.beta4'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
   spec.add_development_dependency 'rubocop', '~> 0.79.0'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.37'

spec/internal/app/views/renderful/_test_component.html.erb

@@ -0,0 +1 @@
+test_local is <%= test_local %>

spec/internal/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter:  sqlite3
+  database: db/combustion_test.sqlite

spec/internal/config/routes.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Rails.application.routes.draw do
+  # Add your own routes here, or remove this file if you don't have need for it.
+end

spec/internal/log/.gitignore

@@ -0,0 +1 @@
+*.log

spec/renderful/renderer/rails_spec.rb

@@ -2,8 +2,6 @@
 
 require 'spec_helper'
 
-require 'action_controller'
-
 RSpec.describe Renderful::Renderer::Rails do
   subject(:renderer) do
     TestComponentRenderer.new(entry, client: client)
@@ -12,8 +10,6 @@
   let(:entry) { OpenStruct.new(content_type: OpenStruct.new(id: 'testComponent')) }
   let(:client) { instance_double('Renderful::Client') }
 
-  let(:rails_renderer) { instance_spy('ActionController::Renderer') }
-
   before(:all) do
     TestComponentRenderer = Class.new(described_class) do
       def locals
@@ -22,45 +18,11 @@ def locals
     end
   end
 
-  before { allow(ActionController::Base).to receive(:renderer).and_return(rails_renderer) }
-
   describe '#render' do
-    it 'returns the output from the ActionController renderer' do
-      allow(rails_renderer).to receive(:render).and_return('render_output')
-
+    it 'renders the correct partial' do
       result = renderer.render
 
-      expect(result).to eq('render_output')
-    end
-
-    it 'infers the correct component view' do
-      renderer.render
-
-      expect(rails_renderer).to have_received(:render).with(a_hash_including(
-                                                              partial: 'renderful/test_component',
-                                                            ))
-    end
-
-    it 'passes locals to the view' do
-      renderer.render
-
-      expect(rails_renderer).to have_received(:render).with(a_hash_including(
-                                                              locals: a_hash_including(
-                                                                test_local: 'local_value',
-                                                              ),
-                                                            ))
-    end
-
-    it 'passes the entry, renderer and client to the view' do
-      renderer.render
-
-      expect(rails_renderer).to have_received(:render).with(a_hash_including(
-                                                              locals: a_hash_including(
-                                                                entry: entry,
-                                                                renderer: renderer,
-                                                                client: client,
-                                                              ),
-                                                            ))
+      expect(result.strip).to eq('test_local is local_value')
     end
   end
 end

spec/spec_helper.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
-require "bundler/setup"
-require "renderful"
+require 'combustion'
+Combustion.initialize! :action_controller, :action_view, :sprockets
+
+require 'rspec/rails'
+require 'renderful'
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
-  config.example_status_persistence_file_path = ".rspec_status"
+  config.example_status_persistence_file_path = '.rspec_status'
 
   # Disable RSpec exposing methods globally on `Module` and `main`
   config.disable_monkey_patching!