versionist 1.5.0 → 1.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzU5YWVkYTQ5ZmExNzYxZTQzODZhYjliNDNiNTgwZTkwMTBjYzlkNg==
-  data.tar.gz: !binary |-
-    OTI2Yjc1ODUxY2MyZWNiNThkNjVmMTdjNzkwMTY5Yzc5MWIyNTljNg==
+SHA1:
+  metadata.gz: 8c65e59b55907757f334aa9d756ffecf623bff64
+  data.tar.gz: 08eda1f342cdf427a82f7445f7da93df562fb406
 SHA512:
-  metadata.gz: !binary |-
-    ODQ1ODMyMjA4MmZlNDQyZjhkNjZjZGE1NzNjOGMwNDhhYTI2YWNhZWVlYjIy
-    NmQ3NmFiMWQ0ZGMzMjEwZjJlYjkzNGVhNjYyY2RkNzUwOGQ5MDAwOGIyMjQ1
-    YmU0ZTVhMzkyMDI5ZTQxNzJiYTBlM2JmMzc3NGNkNjViMGU4YTY=
-  data.tar.gz: !binary |-
-    ZTM0NjA4M2NlMzRmM2ZiNzEwOGJhZTNhNWMxODNmMzFlMDJlZWZlZmQyODEy
-    MDg0ZTE4ODg5YzllZjk3YTQ3NGI1YWZlZDFiNzFhYTQyN2M2ZWJhNzU1ZWNh
-    NmQwNWRlYjVjMDhmMjllNWZmMGMxMjE4NmRmODIzMGY5YTg3ZWY=
+  metadata.gz: 832d3e240c6a4033a8552681a23731b65992801b316bb6e1b44305a3690252fd69ea49b872fd156207eb743fd53df98920ca963bdba50661b446afeddaea6a5b
+  data.tar.gz: 9ab37e812a37b205af78ff3186da4548ed8936e6ef3ff74a479d0c88adfd831ff951b5b4b7f63c278ada8639eb1936decc74fab29180fb100c3d08c7c4726e7e

data/lib/generators/versionist/copy_api_version/copy_api_version_generator.rb

@@ -56,26 +56,28 @@ module Versionist
       in_root do
         case Versionist.configuration.configured_test_framework
         when :test_unit
-          if File.exists? "test/functional/#{module_name_for_path(old_module_name)}"
-            log "Copying all files from test/functional/#{module_name_for_path(old_module_name)} to test/functional/#{module_name_for_path(new_module_name)}"
-            FileUtils.cp_r "test/functional/#{module_name_for_path(old_module_name)}", "test/functional/#{module_name_for_path(new_module_name)}"
-            Dir.glob("test/functional/#{module_name_for_path(new_module_name)}/*.rb").each do |f|
+          if File.exists? "#{test_path}/#{module_name_for_path(old_module_name)}"
+            log "Copying all files from #{test_path}/#{module_name_for_path(old_module_name)} to #{test_path}/#{module_name_for_path(new_module_name)}"
+            FileUtils.cp_r "#{test_path}/#{module_name_for_path(old_module_name)}", "#{test_path}/#{module_name_for_path(new_module_name)}"
+            Dir.glob("#{test_path}/#{module_name_for_path(new_module_name)}/*.rb").each do |f|
               text = File.read(f)
               File.open(f, 'w') {|f| f << text.gsub(/#{old_module_name}/, new_module_name)}
             end
           else
-            say "No controller tests found in test/functional for #{old_version}"
+            say "No tests found in #{test_path} for #{old_version}"
           end
 
-          if File.exists? "test/integration/#{module_name_for_path(old_module_name)}"
-            log "Copying all files from test/integration/#{module_name_for_path(old_module_name)} to test/integration/#{module_name_for_path(new_module_name)}"
-            FileUtils.cp_r "test/integration/#{module_name_for_path(old_module_name)}", "test/integration/#{module_name_for_path(new_module_name)}"
-            Dir.glob("test/integration/#{module_name_for_path(new_module_name)}/*.rb").each do |f|
-              text = File.read(f)
-              File.open(f, 'w') {|f| f << text.gsub(/#{old_module_name}/, new_module_name)}
+          if older_than_rails_5?
+            if File.exists? "test/integration/#{module_name_for_path(old_module_name)}"
+              log "Copying all files from test/integration/#{module_name_for_path(old_module_name)} to test/integration/#{module_name_for_path(new_module_name)}"
+              FileUtils.cp_r "test/integration/#{module_name_for_path(old_module_name)}", "test/integration/#{module_name_for_path(new_module_name)}"
+              Dir.glob("test/integration/#{module_name_for_path(new_module_name)}/*.rb").each do |f|
+                text = File.read(f)
+                File.open(f, 'w') {|f| f << text.gsub(/#{old_module_name}/, new_module_name)}
+              end
+            else
+              say "No integration tests found in test/integration for #{old_version}"
             end
-          else
-            say "No integration tests found in test/integration for #{old_version}"
           end
         when :rspec
           if File.exists? "spec/controllers/#{module_name_for_path(old_module_name)}"

data/lib/generators/versionist/new_api_version/new_api_version_generator.rb

@@ -64,10 +64,15 @@ module Versionist
       in_root do
         case Versionist.configuration.configured_test_framework
         when :test_unit
-          empty_directory "test/functional/#{module_name_for_path(module_name)}"
-          template 'base_controller_functional_test.rb', File.join("test", "functional", "#{module_name_for_path(module_name)}", "base_controller_test.rb")
+          empty_directory "test/#{test_path}/#{module_name_for_path(module_name)}"
           empty_directory "test/integration/#{module_name_for_path(module_name)}"
-          template 'base_controller_integration_test.rb', File.join("test", "integration", "#{module_name_for_path(module_name)}", "base_controller_test.rb")
+
+          if older_than_rails_5?
+            template 'base_controller_integration_test.rb', File.join("test", "integration", "#{module_name_for_path(module_name)}", "base_controller_test.rb")
+            template 'base_controller_functional_test.rb', File.join("test", "#{test_path}", "#{module_name_for_path(module_name)}", "base_controller_test.rb")
+          else
+            template 'base_controller_functional_test_rails_5.rb', File.join("test", "#{test_path}", "#{module_name_for_path(module_name)}", "base_controller_test_rails_5.rb")
+          end
         when :rspec
           @rspec_require_file = rspec_helper_filename
           empty_directory "spec/controllers/#{module_name_for_path(module_name)}"
@@ -92,7 +97,12 @@ module Versionist
         case Versionist.configuration.configured_test_framework
         when :test_unit
           empty_directory "test/presenters/#{module_name_for_path(module_name)}"
-          template 'base_presenter_test.rb', File.join("test", "presenters", "#{module_name_for_path(module_name)}", "base_presenter_test.rb")
+
+          if older_than_rails_5?
+            template 'base_presenter_test.rb', File.join("test", "presenters", "#{module_name_for_path(module_name)}", "base_presenter_test.rb")
+          else
+            template 'base_presenter_test_rails_5.rb', File.join("test", "presenters", "#{module_name_for_path(module_name)}", "base_presenter_test_rails_5.rb")
+          end
         when :rspec
           @rspec_require_file = rspec_helper_filename
           empty_directory "spec/presenters/#{module_name_for_path(module_name)}"

data/lib/generators/versionist/new_api_version/templates/base_controller_functional_test_rails_5.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class <%= module_name %>::BaseControllerTest < ActionDispatch::IntegrationTest
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

data/lib/generators/versionist/new_api_version/templates/base_presenter_test_rails_5.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class <%= module_name %>::BasePresenterTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

data/lib/generators/versionist/new_controller/new_controller_generator.rb

@@ -32,8 +32,12 @@ module Versionist
       in_root do
         case Versionist.configuration.configured_test_framework
         when :test_unit
-          template 'new_controller_functional_test.rb', File.join("test", "functional", "#{module_name_for_path(module_name)}", "#{file_name}_controller_test.rb")
-          template 'new_controller_integration_test.rb', File.join("test", "integration", "#{module_name_for_path(module_name)}", "#{file_name}_controller_test.rb")
+          if older_than_rails_5?
+            template 'new_controller_integration_test.rb', File.join("test", "integration", "#{module_name_for_path(module_name)}", "#{file_name}_controller_test.rb")
+            template 'new_controller_functional_test.rb', File.join("test", "#{test_path}", "#{module_name_for_path(module_name)}", "#{file_name}_controller_test.rb")
+          else
+            template 'new_controller_functional_test_rails_5.rb', File.join("test", "#{test_path}", "#{module_name_for_path(module_name)}", "#{file_name}_controller_test_rails_5.rb")
+          end
         when :rspec
           @rspec_require_file = rspec_helper_filename
           template 'new_controller_spec.rb', File.join("spec", "controllers", "#{module_name_for_path(module_name)}", "#{file_name}_controller_spec.rb"), :assigns => { :rspec_require_file => @rspec_require_file }

data/lib/generators/versionist/new_controller/templates/new_controller_functional_test_rails_5.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class <%= module_name %>::<%= class_name%>ControllerTest < ActionDispatch::IntegrationTest
+
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

data/lib/generators/versionist/new_presenter/new_presenter_generator.rb

@@ -19,7 +19,11 @@ module Versionist
       in_root do
         case Versionist.configuration.configured_test_framework
         when :test_unit
-          template 'new_presenter_test.rb', File.join("test", "presenters", "#{module_name_for_path(module_name)}", "#{file_name}_presenter_test.rb")
+          if older_than_rails_5?
+            template 'new_presenter_test.rb', File.join("test", "presenters", "#{module_name_for_path(module_name)}", "#{file_name}_presenter_test.rb")
+          else
+            template 'new_presenter_test_rails_5.rb', File.join("test", "presenters", "#{module_name_for_path(module_name)}", "#{file_name}_presenter_test_rails_5.rb")
+          end
         when :rspec
           @rspec_require_file = rspec_helper_filename
           template 'new_presenter_spec.rb', File.join("spec", "presenters", "#{module_name_for_path(module_name)}", "#{file_name}_presenter_spec.rb"), :assigns => { :rspec_require_file => @rspec_require_file }

data/lib/generators/versionist/new_presenter/templates/new_presenter_test_rails_5.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class <%= module_name %>::<%= class_name%>PresenterTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

data/lib/versionist.rb

@@ -17,6 +17,15 @@ module Versionist
   def self.configuration
     @@configuration ||= Configuration.new
   end
+
+  def self.older_than_rails_5?
+    defined?(Rails) && Rails.version.to_i < 5
+  end
+
+  def self.test_path
+    return "test/functional" if older_than_rails_5?
+    "test/controllers"
+  end
 end
 
 require 'versionist/railtie' if defined?(Rails) && Rails::VERSION::MAJOR >= 3

data/lib/versionist/version.rb

@@ -1,3 +1,3 @@
 module Versionist
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: versionist
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Brian Ploetz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 description: A plugin for versioning Rails based RESTful APIs.
@@ -65,17 +65,20 @@ files:
 - lib/generators/versionist/new_api_version/new_api_version_generator.rb
 - lib/generators/versionist/new_api_version/templates/base_controller.rb
 - lib/generators/versionist/new_api_version/templates/base_controller_functional_test.rb
+- lib/generators/versionist/new_api_version/templates/base_controller_functional_test_rails_5.rb
 - lib/generators/versionist/new_api_version/templates/base_controller_integration_test.rb
 - lib/generators/versionist/new_api_version/templates/base_controller_spec.rb
 - lib/generators/versionist/new_api_version/templates/base_presenter.rb
 - lib/generators/versionist/new_api_version/templates/base_presenter_spec.rb
 - lib/generators/versionist/new_api_version/templates/base_presenter_test.rb
+- lib/generators/versionist/new_api_version/templates/base_presenter_test_rails_5.rb
 - lib/generators/versionist/new_api_version/templates/docs_index.rb
 - lib/generators/versionist/new_api_version/templates/docs_style.rb
 - lib/generators/versionist/new_controller/USAGE
 - lib/generators/versionist/new_controller/new_controller_generator.rb
 - lib/generators/versionist/new_controller/templates/new_controller.rb
 - lib/generators/versionist/new_controller/templates/new_controller_functional_test.rb
+- lib/generators/versionist/new_controller/templates/new_controller_functional_test_rails_5.rb
 - lib/generators/versionist/new_controller/templates/new_controller_integration_test.rb
 - lib/generators/versionist/new_controller/templates/new_controller_spec.rb
 - lib/generators/versionist/new_presenter/USAGE
@@ -83,6 +86,7 @@ files:
 - lib/generators/versionist/new_presenter/templates/new_presenter.rb
 - lib/generators/versionist/new_presenter/templates/new_presenter_spec.rb
 - lib/generators/versionist/new_presenter/templates/new_presenter_test.rb
+- lib/generators/versionist/new_presenter/templates/new_presenter_test_rails_5.rb
 - lib/generators/versionist/rspec_helper.rb
 - lib/versionist.rb
 - lib/versionist/configuration.rb
@@ -102,17 +106,17 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
@@ -120,5 +124,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: versionist-1.5.0
+summary: versionist-1.6.0
 test_files: []