Merge pull request #39 from tf/rails-6

Rails 6 suppport

Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in embedded-video.gemspec
 gemspec
+
+if ENV['PAGEFLOW_DEPENDENCIES'] == 'experimental'
+  git 'https://github.com/codevise/pageflow', branch: 'edge', glob: '**/*.gemspec' do
+    gem 'pageflow'
+    gem 'pageflow-support'
+  end
+end

lib/pageflow-embedded-video.rb

@@ -1,4 +1,5 @@
 require 'pageflow/embedded_video/engine'
+require 'pageflow/embedded_video/version'
 
 module Pageflow
   module EmbeddedVideo

lib/pageflow/embedded_video/engine.rb

@@ -5,7 +5,22 @@ module EmbeddedVideo
     class Engine < Rails::Engine
       isolate_namespace Pageflow::EmbeddedVideo
 
-      config.paths.add('lib', eager_load: true)
+      if Rails.respond_to?(:autoloaders)
+        lib = root.join('lib')
+
+        config.autoload_paths << lib
+        config.eager_load_paths << lib
+
+        initializer 'pageflow_embedded_video.autoloading' do
+          Rails.autoloaders.main.ignore(
+            lib.join('pageflow-embedded-video.rb'),
+            lib.join('pageflow/embedded_video/version.rb')
+          )
+        end
+      else
+        config.autoload_paths << File.join(config.root, 'lib')
+      end
+
       config.i18n.load_path += Dir[config.root.join('config', 'locales', '**', '*.yml').to_s]
     end
   end

pageflow-embedded-video.gemspec

@@ -16,15 +16,20 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.1'
+  spec.required_ruby_version = '>= 2.1'
 
   spec.add_runtime_dependency 'pageflow', ['>= 15.7', '< 17']
   spec.add_runtime_dependency 'pageflow-public-i18n', '~> 1.0'
 
   spec.add_development_dependency 'bundler', ['>= 1.0', '< 3']
   spec.add_development_dependency 'pageflow-support', ['>= 14', '< 17']
   spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rspec-rails', '~> 3.0'
+
+  if ENV['PAGEFLOW_DEPENDENCIES'] == 'experimental'
+    spec.add_development_dependency 'rspec-rails', '~> 6.0'
+  else
+    spec.add_development_dependency 'rspec-rails', '~> 3.0'
+  end
 
   # Semantic versioning rake tasks
   spec.add_development_dependency 'semmy', '~> 1.0'