versioncake 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f84afe2a8666bd9519a29fcc2e1a586a112cc0af
-  data.tar.gz: 6099b97d3dd4d7c03079adda4023ba0f8cdf73ac
+  metadata.gz: 528ead5896829c40e35bf158b7313781c6e0f617
+  data.tar.gz: 5f6ad615f20ebb354e48645000dc3d06a2dccf51
 SHA512:
-  metadata.gz: a41ea97ca34301cdf0ad20e7a3697333e85dc51b07474af15cc5fe92bcc7816ea838303c473979260686b414846896599c717ee3b33e1acfb9e6be413069eb8e
-  data.tar.gz: 8fb2a7b282d56c12ebef07c948a6dc9516d431164a1363b1827e7d28885894af788945e3eed8116fdbbdcb95c395834bcda796c44e50d7797866d22a640474c6
+  metadata.gz: 406f567291185122b3cb72391ce4cf72136256561353ee612fc4eb0207afec7854918bce313d18841f4be7ebe1b9b697115b7ed8967515801f340855987a65b6
+  data.tar.gz: da661fbcf7d007dd1d8dd43ac66338c13cd4d42b2aae6e7c84e952e85a37b716bc50750151ca4ad9ccff9f617aa13e2bb420a5a1cde07e143f04611654453acc

data/.travis.yml

@@ -5,11 +5,12 @@ before_install:
   - gem install bundler
 
 rvm:
-  - 1.9.2
+  - 1.9.2-p330
   - 1.9.3
   - 2.0.0
   - 2.1.0
   - 2.2.0
+  - 2.2.2
   - ruby-head
 
 gemfile:
@@ -17,15 +18,26 @@ gemfile:
   - gemfiles/rails4.0.gemfile
   - gemfiles/rails4.1.gemfile
   - gemfiles/rails4.2.gemfile
+  - gemfiles/rails5.0.gemfile
 
 matrix:
   exclude:
-    - rvm: 1.9.2
+    - rvm: 1.9.2-p330
       gemfile: gemfiles/rails4.0.gemfile
-    - rvm: 1.9.2
+    - rvm: 1.9.2-p330
       gemfile: gemfiles/rails4.1.gemfile
-    - rvm: 1.9.2
+    - rvm: 1.9.2-p330
       gemfile: gemfiles/rails4.2.gemfile
+    - rvm: 1.9.2-p330
+      gemfile: gemfiles/rails5.0.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails5.0.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails5.0.gemfile
+    - rvm: 2.1.0
+      gemfile: gemfiles/rails5.0.gemfile
+    - rvm: 2.2.0
+      gemfile: gemfiles/rails5.0.gemfile
 
   allow_failures:
     - rvm: ruby-head

data/Appraisals

@@ -27,3 +27,9 @@ appraise "rails4.2" do
   gem('activesupport',  '~> 4.2.0')
   gem('railties',       '~> 4.2.0')
 end
+
+appraise "rails5.0" do
+  gem('actionpack',     '~> 5.0.0')
+  gem('activesupport',  '~> 5.0.0')
+  gem('railties',       '~> 5.0.0')
+end

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## Unreleased Changes
 
-[Full Changelog](https://github.com/bwillis/versioncake/compare/v3.2...master)
+[Full Changelog](https://github.com/bwillis/versioncake/compare/v3.3...master)
 
 Bug Fixes:
 
@@ -14,7 +14,21 @@ Deprecations:
 
 * None
 
-## 3.2.0 (Aug 8, 2015)
+## 3.3.0 (May 7, 2017)
+
+Bug Fixes:
+
+* Remove Fixnum deprecation warnings (#61) thanks [John Hawthorn](https://github.com/jhawthorn)
+
+Enhancements:
+
+* None
+
+Deprecations:
+
+* None
+
+## 3.2.0 (Aug 8, 2016)
 
 Bug Fixes:
 

data/CONTRIBUTING.md

@@ -14,5 +14,5 @@ We really like when people not only discover something they want added/fixed/rem
 
 Version Cake supports multiple versions of Rails with Appriasals. These will be automatically tested against several ruby versions on CI. If you need to debug a problem, or want to be dilegent and run all of these do the following:
 
-* Install the gems for all supported Rails versions: `bundle exec rake appraisal install`
+* Install the gems for all supported Rails versions: `bundle exec appraisal install`
 * Run all the tests for the supported Rails versions: `bundle exec rake appraisal spec`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    versioncake (3.2.0)
+    versioncake (3.3.0)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
       railties (>= 3.2)
@@ -10,98 +10,95 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.2.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (5.1.0)
+      actionview (= 5.1.0)
+      activesupport (= 5.1.0)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
-      activesupport (= 4.2.6)
+    actionview (5.1.0)
+      activesupport (= 5.1.0)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activesupport (4.2.6)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activesupport (5.1.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    appraisal (2.1.0)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    builder (3.2.2)
-    coveralls (0.8.13)
-      json (~> 1.8)
-      simplecov (~> 0.11.0)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    coveralls (0.8.21)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (~> 1.6.0)
-    diff-lcs (1.2.5)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    diff-lcs (1.3)
     docile (1.1.5)
-    erubis (2.7.0)
-    i18n (0.7.0)
-    json (1.8.3)
+    erubi (1.6.0)
+    i18n (0.8.1)
+    json (2.1.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
+    method_source (0.8.2)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
-    nokogiri (1.6.8)
+    minitest (5.10.1)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    pkg-config (1.1.7)
-    rack (1.6.4)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-dom-testing (2.0.2)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.6)
-      actionpack (= 4.2.6)
-      activesupport (= 4.2.6)
+    railties (5.1.0)
+      actionpack (= 5.1.0)
+      activesupport (= 5.1.0)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rake (12.0.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-rails (3.4.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    simplecov (0.11.2)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    term-ansicolor (1.3.2)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tins (1.6.0)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tins (1.13.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -116,4 +113,4 @@ DEPENDENCIES
   versioncake!
 
 BUNDLED WITH
-   1.12.5
+   1.14.6

data/README.md

@@ -129,14 +129,14 @@ Notice the version numbers are denoted by the "v{version number}" extension with
 
 #### views/posts/index.json.v1.jbuilder
 ```ruby
-json.array!(@posts) do |json, post|
+json.array!(@posts) do |post|
     json.(post, :id, :title)
 end
 ```
 
 #### views/posts/index.json.v4.jbuilder
 ```ruby
-json.array!(@posts) do |json, post|
+json.array!(@posts) do |post|
     json.(post, :id, :title)
     json.comments post.comments, :id, :text
 end
@@ -431,6 +431,8 @@ Thanks to all those who have helped make Version Cake really sweet:
 * [Yukio Mizuta](https://github.com/untidy-hair)
 * [David Butler](https://github.com/dwbutler)
 * [Jeroen K.](https://github.com/jrnkntl)
+* [Masaya Myojin](https://github.com/mmyoji)
+* [John Hawthorn](https://github.com/jhawthorn)
 
 # Related Material
 

data/RELEASE.md

@@ -3,7 +3,7 @@
 Keeping releases consistent is important so here are the steps to follow when pushing a new version.
 
 1. Bump [lib/versioncake/version.rb](https://github.com/bwillis/versioncake/blob/master/lib/versioncake/version.rb) to the next major.minor version
-2. Make sure all tests are passing ```bundle && rake && rake appraisal spec```
+2. Make sure all tests are passing ```bundle && bundle exec rake && bundle exec rake appraisal spec```
 3. Smoke test in 350-rest-api-versioning/store-after-versioncake
 
  Verify:

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/rails3.2.gemfile

@@ -5,6 +5,6 @@ source "https://rubygems.org"
 gem "actionpack", "~> 3.2.0"
 gem "activesupport", "~> 3.2.0"
 gem "railties", "~> 3.2.0"
-gem "test-unit", "~> 3.0"
+gem "test-unit", "~>3.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    versioncake (3.2.0)
+    versioncake (3.3.0)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
       railties (>= 3.2)
@@ -97,9 +97,9 @@ GEM
     test-unit (3.1.4)
       power_assert
     thor (0.18.1)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     tilt (1.4.1)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -118,4 +118,4 @@ DEPENDENCIES
   versioncake!
 
 BUNDLED WITH
-   1.10.6
+   1.14.6

data/gemfiles/rails4.0.gemfile

@@ -5,6 +5,6 @@ source "https://rubygems.org"
 gem "actionpack", "~> 4.0.0"
 gem "activesupport", "~> 4.0.0"
 gem "railties", "~> 4.0.0"
-gem "test-unit", "~> 3.0"
+gem "test-unit", "~>3.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    versioncake (3.2.0)
+    versioncake (3.3.0)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
       railties (>= 3.2)
@@ -99,4 +99,4 @@ DEPENDENCIES
   versioncake!
 
 BUNDLED WITH
-   1.10.6
+   1.14.6

data/gemfiles/rails4.1.gemfile

@@ -6,4 +6,4 @@ gem "actionpack", "~> 4.1.0"
 gem "activesupport", "~> 4.1.0"
 gem "railties", "~> 4.1.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    versioncake (3.2.0)
+    versioncake (3.3.0)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
       railties (>= 3.2)
@@ -103,4 +103,4 @@ DEPENDENCIES
   versioncake!
 
 BUNDLED WITH
-   1.10.6
+   1.14.6

data/gemfiles/rails4.2.gemfile

@@ -6,4 +6,4 @@ gem "actionpack", "~> 4.2.0"
 gem "activesupport", "~> 4.2.0"
 gem "railties", "~> 4.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    versioncake (3.2.0)
+    versioncake (3.3.0)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
       railties (>= 3.2)
@@ -130,4 +130,4 @@ DEPENDENCIES
   versioncake!
 
 BUNDLED WITH
-   1.10.6
+   1.14.6

data/gemfiles/rails5.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionpack", "~> 5.0.0"
+gem "activesupport", "~> 5.0.0"
+gem "railties", "~> 5.0.0"
+
+gemspec path: "../"

data/gemfiles/rails5.0.gemfile.lock

@@ -0,0 +1,121 @@
+PATH
+  remote: ..
+  specs:
+    versioncake (3.3.0)
+      actionpack (>= 3.2)
+      activesupport (>= 3.2)
+      railties (>= 3.2)
+      tzinfo
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (5.0.0)
+      actionview (= 5.0.0)
+      activesupport (= 5.0.0)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.0)
+      activesupport (= 5.0.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.2)
+    concurrent-ruby (1.0.2)
+    coveralls (0.8.15)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+      tins (>= 1.6.0, < 2)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    erubis (2.7.0)
+    i18n (0.7.0)
+    json (2.0.2)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    method_source (0.8.2)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    rack (2.0.1)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6.0)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.0)
+      actionpack (= 5.0.0)
+      activesupport (= 5.0.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    term-ansicolor (1.3.2)
+      tins (~> 1.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tins (1.12.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 5.0.0)
+  activesupport (~> 5.0.0)
+  appraisal
+  coveralls
+  railties (~> 5.0.0)
+  rake
+  rspec
+  rspec-rails
+  versioncake!
+
+BUNDLED WITH
+   1.14.6

data/lib/versioncake/strategies/extraction_strategy.rb

@@ -5,7 +5,7 @@ module VersionCake
 
     def extract(request)
       version = execute(request)
-      if version.is_a?(Fixnum)
+      if version.is_a?(Integer)
         version
       elsif version.is_a?(String) && /[0-9]+/.match(version)
         version.to_i

data/lib/versioncake/version.rb

@@ -1,3 +1,3 @@
 module VersionCake
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 end

data/spec/integration/controller/renders_controller_spec.rb

@@ -1,8 +1,7 @@
 require './spec/rails_helper'
 
 describe RendersController, type: :controller do
-  let(:request_options) { {} }
-  subject(:response_body) { get :index, request_options; response.body }
+  subject(:response_body) { get :index; response.body }
 
   context '#index' do
     render_views
@@ -60,7 +59,12 @@ describe RendersController, type: :controller do
     end
 
     context '#set_version' do
-      let(:request_options) { { 'override_version' => 1 } }
+      params_style = if ActionPack::VERSION::MAJOR >= 5
+        { params: { override_version: 1 } }
+      else
+        { override_version: 1 }
+      end
+      subject(:response_body) { get :index, params_style; response.body }
       let(:request_version) { 3 }
 
       it { expect(controller.request_version).to eq 1 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: versioncake
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Jim Jones
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -158,6 +158,7 @@ files:
 - RELEASE.md
 - Rakefile
 - bin/versioncake
+- gemfiles/.bundle/config
 - gemfiles/rails3.2.gemfile
 - gemfiles/rails3.2.gemfile.lock
 - gemfiles/rails4.0.gemfile
@@ -166,6 +167,8 @@ files:
 - gemfiles/rails4.1.gemfile.lock
 - gemfiles/rails4.2.gemfile
 - gemfiles/rails4.2.gemfile.lock
+- gemfiles/rails5.0.gemfile
+- gemfiles/rails5.0.gemfile.lock
 - images/versioncake-logo450x100.png
 - lib/generators/templates/versioncake.rb
 - lib/generators/versioncake/install_generator.rb
@@ -269,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Easily render versions of your rails views.