versioncake 3.4.0 → 4.0.0

data/gemfiles/{rails4.2.gemfile → rails6.0.gemfile}

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "actionpack", "~> 4.2.0"
-gem "activesupport", "~> 4.2.0"
-gem "railties", "~> 4.2.0"
+gem "actionpack", "~> 5.2.0"
+gem "activesupport", "~> 5.2.0"
+gem "railties", "~> 5.2.0"
 
 gemspec path: "../"

data/gemfiles/rails6.0.gemfile.lock

@@ -0,0 +1,122 @@
+PATH
+  remote: ..
+  specs:
+    versioncake (3.4.0)
+      actionpack (>= 5.0)
+      activesupport (>= 5.0)
+      railties (>= 5.0)
+      tzinfo
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (5.2.4.1)
+      actionview (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.4.1)
+      activesupport (= 5.2.4.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activesupport (5.2.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.4)
+    concurrent-ruby (1.1.6)
+    coveralls (0.8.21)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    crass (1.0.6)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    erubi (1.9.0)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
+    loofah (2.4.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (0.9.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
+    rack (2.2.2)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (13.0.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    simplecov (0.14.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    term-ansicolor (1.6.0)
+      tins (~> 1.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tins (1.15.0)
+    tzinfo (1.2.6)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 5.2.0)
+  activesupport (~> 5.2.0)
+  appraisal
+  coveralls
+  railties (~> 5.2.0)
+  rake
+  rspec
+  rspec-rails
+  versioncake!
+
+BUNDLED WITH
+   1.17.2

data/lib/versioncake/configuration.rb

@@ -5,7 +5,7 @@ module VersionCake
   class Configuration
     VERSION_KEY_DEFAULT = 'api_version'
 
-    attr_reader :extraction_strategies, :response_strategies, :supported_version_numbers,
+    attr_reader :extraction_strategies, :response_strategies,
       :versioned_resources, :default_version, :missing_version_use_unversioned_template
     attr_accessor :missing_version, :version_key, :rails_view_versioning
 

data/lib/versioncake/strategies/path_parameter_strategy.rb

@@ -4,7 +4,7 @@ module VersionCake
     def execute(request)
       version = nil
       request.path.split('/').find do |part|
-        next unless match = part.match(%r{v(?<version>\d+)})
+        next unless match = part.match(%r{\Av(?<version>\d+)\z})
         version = match[:version]
         break
       end

data/lib/versioncake/version.rb

@@ -1,3 +1,3 @@
 module VersionCake
-  VERSION = '3.4.0'
+  VERSION = '4.0.0'
 end

data/lib/versioncake/view_additions.rb

@@ -6,8 +6,18 @@ require 'action_view'
 ActionView::LookupContext.register_detail(:versions){ [] }
 
 ActionView::PathResolver.class_eval do
-  # not sure why we are doing this yet, but looks like a good idea
-  if ActionPack::VERSION::MAJOR >= 4 && ActionPack::VERSION::MINOR >= 1 || ActionPack::VERSION::MAJOR >= 5
+  if ActionPack::VERSION::MAJOR >= 6
+    ActionView::PathResolver::EXTENSIONS.replace({
+      locale: ".",
+      formats: ".",
+      versions: ".",
+      variants: "+",
+      handlers: "."
+    })
+    Kernel::silence_warnings {
+      ActionView::PathResolver::DEFAULT_PATTERN = ":prefix/:action{.:locale,}{.:formats,}{.:versions,}{+:variants,}{.:handlers,}"
+    }
+  elsif ActionPack::VERSION::MAJOR >= 4 && ActionPack::VERSION::MINOR >= 1 || ActionPack::VERSION::MAJOR >= 5
     ActionView::PathResolver::EXTENSIONS.replace({
                                                      locale: ".",
                                                      formats: ".",
@@ -20,13 +30,6 @@ ActionView::PathResolver.class_eval do
       @pattern = pattern || ":prefix/:action{.:locale,}{.:formats,}{+:variants,}{.:versions,}{.:handlers,}"
       super()
     end
-  else
-    ActionView::PathResolver::EXTENSIONS.replace [:locale, :formats, :versions, :handlers]
-
-    # The query builder has the @details from the lookup_context and will
-    # match the detail name to the string in the pattern, so we must append
-    # it to the default pattern
-    ActionView::PathResolver::DEFAULT_PATTERN.replace ":prefix/:action{.:locale,}{.:formats,}{.:versions,}{.:handlers,}"
   end
 
   # The default extract handler expects that the handler is the last extension and

data/spec/integration/rack/middleware_regression_spec.rb

@@ -27,7 +27,7 @@ describe VersionCake::Rack::Middleware do
 
       it "test yml test cases" do
         begin
-          _response_status, _response_headers, response = app.request(method, '/renders', headers.merge(params: params))
+          response = app.request(method, '/renders', headers.merge(params: params))
           expect(response.body).to(eq(test_response), custom_message(headers, params, method, response.body, test_response))
         rescue => e
           raise custom_message(headers, params, method, response.body, test_response) + ", but it failed with an exception '#{e.message}'"
@@ -53,7 +53,7 @@ describe VersionCake::Rack::Middleware do
 
     context 'and the request does not contain a version' do
       it 'does not include a version (rails will convert nil => unversioned template)' do
-        _response_status, _response_headers, response = app.request('get', '/renders')
+        response = app.request('get', '/renders')
         expect(response.body).to eq 'version is ' # nil
       end
     end

data/spec/integration/view/view_additions_spec.rb

@@ -33,19 +33,10 @@ describe ActionView::PathResolver do
       it { expect(template_format).to eq 'application/json' }
     end
 
-    context 'when in Rails >=4.1' do
-      before do
-        unless (ActionPack::VERSION::MAJOR == 4 && ActionPack::VERSION::MINOR >= 1) ||
-            ActionPack::VERSION::MAJOR > 5
-          skip('Template variants are only available in Rails >=4.1')
-        end
-      end
-
-      context 'when handler, format, variant and version are present' do
-        let(:template_extension) { 'application.json+tablet.v1.jbuilder' }
-
-        it { expect(template_format).to eq 'application/json' }
-      end
+    context 'when handler, format, variant and version are present' do
+      let(:template_extension) { 'application.json+tablet.v1.jbuilder' }
+
+      it { expect(template_format).to eq 'application/json' }
     end
   end
 end

data/spec/unit/strategies/path_parameter_strategy_spec.rb

@@ -10,6 +10,26 @@ describe VersionCake::PathParameterStrategy do
     it { is_expected.to eq 11 }
   end
 
+  context "a request with a substring matching /v\d+/ returns nil" do
+    context "as a postpended string" do
+      let(:request) { instance_double('Request', path: 'parameter/aav11/parameter') }
+
+      it { is_expected.to be_nil }
+    end
+
+    context "as a prepended string" do
+      let(:request) { instance_double('Request', path: 'parameter/v11aa/parameter') }
+
+      it { is_expected.to be_nil }
+    end
+
+    context "as an interstital string" do
+      let(:request) { instance_double('Request', path: 'parameter/aav11aa/parameter') }
+
+      it { is_expected.to be_nil }
+    end
+  end
+
   context "a request without an api_version path parameter returns nil" do
     let(:request) { instance_double('Request', path: 'parameter/parameter') }
 

data/versioncake.gemspec

@@ -19,16 +19,16 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.2'
 
-  s.add_dependency('actionpack',    '>= 3.2')
-  s.add_dependency('activesupport', '>= 3.2')
-  s.add_dependency('railties',      '>= 3.2')
-  s.add_dependency('tzinfo')
+  s.add_dependency('actionpack',    '~> 5.0')
+  s.add_dependency('activesupport', '~> 5.0')
+  s.add_dependency('railties',      '~> 5.0')
+  s.add_dependency('tzinfo',        '~> 1.2')
 
-  s.add_development_dependency 'appraisal'
-  s.add_development_dependency 'coveralls'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'appraisal', '~> 2.2'
+  s.add_development_dependency 'coveralls', '~> 0.8'
+  s.add_development_dependency 'rake', '~> 13.0'
 
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'rspec', '~> 3.6'
+  s.add_development_dependency 'rspec-rails', '~> 3.6'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: versioncake
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Jim Jones
@@ -9,134 +9,134 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2020-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 description: Render versioned views automagically based on the clients requested version.
 email:
 - jim.jones1@gmail.com
@@ -159,16 +159,12 @@ files:
 - Rakefile
 - bin/versioncake
 - gemfiles/.bundle/config
-- gemfiles/rails3.2.gemfile
-- gemfiles/rails3.2.gemfile.lock
-- gemfiles/rails4.0.gemfile
-- gemfiles/rails4.0.gemfile.lock
-- gemfiles/rails4.1.gemfile
-- gemfiles/rails4.1.gemfile.lock
-- gemfiles/rails4.2.gemfile
-- gemfiles/rails4.2.gemfile.lock
 - gemfiles/rails5.0.gemfile
 - gemfiles/rails5.0.gemfile.lock
+- gemfiles/rails5.2.gemfile
+- gemfiles/rails5.2.gemfile.lock
+- gemfiles/rails6.0.gemfile
+- gemfiles/rails6.0.gemfile.lock
 - images/versioncake-logo450x100.png
 - lib/generators/templates/versioncake.rb
 - lib/generators/versioncake/install_generator.rb
@@ -271,8 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Easily render versions of your rails views.