versioncake 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffbff82e08d0898e40a246fead162ecc1868740a
-  data.tar.gz: a7ad336abb131b5a8824ff02ae350dede3f7c24b
+  metadata.gz: f84afe2a8666bd9519a29fcc2e1a586a112cc0af
+  data.tar.gz: 6099b97d3dd4d7c03079adda4023ba0f8cdf73ac
 SHA512:
-  metadata.gz: fdaac92293782079e8bcadaf2badeb95e25024fb350883c71c68714af84dcff5821cc8cf075c8e21723c8efa917ac2560f2af3a1f5eef94d452cf7966976ddb8
-  data.tar.gz: 3b944387b2585102051a3921c8c9528957e275016dd113acd079d7489889a3064732427a2ee0ce55cec184aade173a1283f606432fbae9b359937a8e7bbc0f41
+  metadata.gz: a41ea97ca34301cdf0ad20e7a3697333e85dc51b07474af15cc5fe92bcc7816ea838303c473979260686b414846896599c717ee3b33e1acfb9e6be413069eb8e
+  data.tar.gz: 8fb2a7b282d56c12ebef07c948a6dc9516d431164a1363b1827e7d28885894af788945e3eed8116fdbbdcb95c395834bcda796c44e50d7797866d22a640474c6

data/.travis.yml

@@ -1,4 +1,9 @@
 language: ruby
+
+# https://github.com/travis-ci/travis-ci/issues/5239
+before_install:
+  - gem install bundler
+
 rvm:
   - 1.9.2
   - 1.9.3

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## Unreleased Changes
 
-[Full Changelog](https://github.com/bwillis/versioncake/compare/v3.0...master)
+[Full Changelog](https://github.com/bwillis/versioncake/compare/v3.2...master)
 
 Bug Fixes:
 
@@ -14,6 +14,23 @@ Deprecations:
 
 * None
 
+## 3.2.0 (Aug 8, 2015)
+
+Bug Fixes:
+
+* Deprecated versions would not render properly (#47)
+* Blank `api_version` does not raise `MissingVersionError` (#50)
+* Fix `set_version` not overriding version number (#54)
+* Fix api only Rails app exception (#55)
+
+Enhancements:
+
+* Support missing version as unversioned template (#43)
+
+Deprecations:
+
+* None
+
 ## 3.1.0 (Sept 29, 2015)
 
 Bug Fixes:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    versioncake (3.1.0)
+    versioncake (3.2.0)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
       railties (>= 3.2)
@@ -10,20 +10,20 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.2.4)
-      actionview (= 4.2.4)
-      activesupport (= 4.2.4)
+    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)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.4)
-      activesupport (= 4.2.4)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       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.4)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -34,29 +34,25 @@ GEM
       rake
       thor (>= 0.14.0)
     builder (3.2.2)
-    coveralls (0.8.2)
+    coveralls (0.8.13)
       json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.10.0)
+      simplecov (~> 0.11.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
+      tins (~> 1.6.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.24)
-      unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
     i18n (0.7.0)
     json (1.8.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.8.1)
-    netrc (0.10.3)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    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 (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -66,40 +62,36 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.4)
-      actionpack (= 4.2.4)
-      activesupport (= 4.2.4)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-rails (3.3.3)
+      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.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    simplecov (0.10.0)
+      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)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
@@ -108,12 +100,9 @@ GEM
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tins (1.5.4)
+    tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
 
 PLATFORMS
   ruby
@@ -127,4 +116,4 @@ DEPENDENCIES
   versioncake!
 
 BUNDLED WITH
-   1.10.6
+   1.12.5

data/README.md

@@ -388,10 +388,10 @@ end
 
 You can also test a specific version through a specific strategy such query_parameter or request_parameter strategies (configured in test environment) like so:
 ```ruby
-# test/functional/renders_controller_test.rb#L47
+# test/integration/renders_integration_test.rb#L47
 test "render version 1 of the partial based on the parameter _api_version" do
-  get :index, "api_version" => "1"
-  assert_equal @response.body, "index.html.v1.erb"
+  get renders_path("api_version" => "1")
+  assert_equal "index.html.v1.erb", @response.body
 end
 ```
 

data/gemfiles/rails3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    versioncake (3.1.0)
+    versioncake (3.2.0)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
       railties (>= 3.2)

data/gemfiles/rails4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    versioncake (3.1.0)
+    versioncake (3.2.0)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
       railties (>= 3.2)

data/gemfiles/rails4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    versioncake (3.1.0)
+    versioncake (3.2.0)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
       railties (>= 3.2)

data/gemfiles/rails4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    versioncake (3.1.0)
+    versioncake (3.2.0)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
       railties (>= 3.2)

data/lib/generators/templates/versioncake.rb

@@ -29,8 +29,18 @@ VersionCake.setup do |config|
   # ```
   # config.extraction_strategy = [:http_accept_parameter, :http_header, :request_parameter, :path_parameter, :query_parameter]
 
-  # Version when no version in present in the request. If none is specified then it will error
-  config.missing_version = 5
+  # Missing Version
+  # What to use when no version in present in the request.
+  #
+  # Defaults to `:unversioned_template`
+  #
+  # Integer value:
+  #   the version number to use
+  #
+  # `:unversioned_template` value:
+  # If you are using `rails_view_versioning` this will render the "base template" aka
+  # the template without a version number.
+  # config.missing_version = :unversioned_template
 
   # Set the version key that clients will send example: `API-VERSION: 5`, api_version=2
   # config.version_key = 'api_version'

data/lib/versioncake/configuration.rb

@@ -7,13 +7,16 @@ module VersionCake
     SUPPORTED_VERSIONS_DEFAULT = (1..10)
     VERSION_KEY_DEFAULT = 'api_version'
 
-    attr_reader :extraction_strategies, :response_strategies, :supported_version_numbers, :versioned_resources
+    attr_reader :extraction_strategies, :response_strategies, :supported_version_numbers,
+      :versioned_resources, :default_version, :missing_version_use_unversioned_template
     attr_accessor :missing_version, :version_key, :rails_view_versioning
 
     def initialize
       @versioned_resources           = []
       @version_key                   = VERSION_KEY_DEFAULT
       @rails_view_versioning         = true
+      @missing_version_use_unversioned_template = true
+      @default_version = nil
       self.supported_version_numbers = SUPPORTED_VERSIONS_DEFAULT
       self.extraction_strategy       = [
           :http_accept_parameter,
@@ -25,6 +28,17 @@ module VersionCake
       self.response_strategy         = []
     end
 
+    def missing_version=(val)
+      @missing_version = val
+      if @missing_version == :unversioned_template
+        @missing_version_use_unversioned_template = true
+        @default_version = nil
+      else
+        @missing_version_use_unversioned_template = false
+        @default_version = val
+      end
+    end
+
     def extraction_strategy=(val)
       @extraction_strategies = []
       Array.wrap(val).each do |configured_strategy|
@@ -76,4 +90,4 @@ module VersionCake
       @resources << VersionCake::VersionedResource.new(regex, obsolete, unsupported, supported)
     end
   end
-end
+end

data/lib/versioncake/controller_additions.rb

@@ -45,23 +45,41 @@ module VersionCake
     # @return No explicit return, but several attributes are exposed
     def check_version!(override_version=nil)
       return unless version_context
-      
-      case version_context.result
-        when :version_invalid, :version_too_high, :version_too_low, :unknown
-          raise UnsupportedVersionError.new('Unsupported version error')
-        when :obsolete
-          raise ObsoleteVersionError.new('The version given is obsolete')
-        when :no_version
+
+      check_for_version_errors!(version_context.result)
+      configure_rails_view_versioning(version_context)
+    end
+
+    def check_for_version_errors!(result)
+      case result
+      when :version_invalid, :version_too_high, :version_too_low, :unknown
+        raise UnsupportedVersionError.new('Unsupported version error')
+      when :obsolete
+        raise ObsoleteVersionError.new('The version given is obsolete')
+      when :no_version
+        unless VersionCake.config.missing_version_use_unversioned_template
           raise MissingVersionError.new('No version was given')
+        end
       end
+    end
 
-      if VersionCake.config.rails_view_versioning
-        @_lookup_context.versions = version_context.supported_versions.map { |n| :"v#{n}" }
+    def configure_rails_view_versioning(version_context)
+      return unless VersionCake.config.rails_view_versioning
+
+      if version_context.result == :no_version &&
+        VersionCake.config.missing_version_use_unversioned_template
+        lookup_context.versions = nil
+      else
+        lookup_context.versions = version_context.available_versions.map { |n| :"v#{n}" }
       end
     end
 
     def set_version(version)
+      service = VersionCake::VersionContextService.new(VersionCake.config)
+      request.env['versioncake.context'] = service.create_context_from_context(version_context, version)
       @request_version = version
+
+      check_version!
     end
   end
 end

data/lib/versioncake/strategies/extraction_strategy.rb

@@ -9,7 +9,7 @@ module VersionCake
         version
       elsif version.is_a?(String) && /[0-9]+/.match(version)
         version.to_i
-      elsif version.nil? # no version was found
+      elsif version_blank?(version)
         nil
       else
         raise Exception, "Invalid format for version number."
@@ -20,6 +20,10 @@ module VersionCake
       VersionCake.config.version_key
     end
 
+    def version_blank?(version)
+      version.nil? || (version.is_a?(String) && version.length == 0)
+    end
+
     # Execute should return a number or a numeric string if it successfully finds a version. 
     # If no version is found, nil should be returned. Any other results returned will raise
     # an exception.

data/lib/versioncake/test_helpers.rb

@@ -2,8 +2,8 @@ module VersionCake
   module TestHelpers
     # Test helper the mimics the middleware because we do not
     # have middleware during tests.
-    def set_request_version(resource, version)
-      service = VersionCake::VersionContextService.new(VersionCake.config)
+    def set_request_version(resource, version, config=VersionCake.config)
+      service = VersionCake::VersionContextService.new(config)
       @request.env['versioncake.context'] = service.create_context resource, version
     end
 
@@ -11,4 +11,4 @@ module VersionCake
       @request.env['versioncake.context'] = VersionCake::VersionContext.new(version, resource, status)
     end
   end
-end
+end

data/lib/versioncake/version.rb

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

data/lib/versioncake/version_context.rb

@@ -1,6 +1,7 @@
 module VersionCake
   class VersionContext
-    attr_reader :version, :resource, :result
+    attr_reader :resource, :result
+    attr_accessor :version
 
     def initialize(version, resource, result)
       @version, @resource, @result = version, resource, result
@@ -13,8 +14,8 @@ module VersionCake
 
     # Ordered versions that are equal to or lower
     # than the requested version.
-    def supported_versions
-      @resource.supported_versions.sort.reverse.reject { |v| v > @version }
+    def available_versions
+      @resource.available_versions.reverse.reject { |v| v > @version }
     end
   end
 end

data/lib/versioncake/version_context_service.rb

@@ -3,7 +3,7 @@ module VersionCake
 
     def initialize(config)
       @versioned_resources = config.versioned_resources
-      @default_version = config.missing_version
+      @default_version = config.default_version
       @strategies = config.extraction_strategies
     end
 
@@ -18,7 +18,7 @@ module VersionCake
       request.execute
 
       result = if request.failed
-        :invalid_version
+        :version_invalid
       else
         check_version(resource, request.version)
       end
@@ -34,6 +34,12 @@ module VersionCake
       VersionCake::VersionContext.new(version, resource, result)
     end
 
+    def create_context_from_context(context, version)
+      result = check_version(context.resource, version)
+
+      VersionCake::VersionContext.new(version, context.resource, result)
+    end
+
     private
 
     def check_version(resource, version)

data/lib/versioncake/versioned_resource.rb

@@ -7,8 +7,12 @@ module VersionCake
         uri, supported_versions, deprecated_versions, obsolete_versions
     end
 
+    def available_versions
+      (@supported_versions.to_a + @deprecated_versions.to_a).sort
+    end
+
     def latest_version
-      @supported_versions.last
+      available_versions.last
     end
   end
 end

data/spec/integration/controller/renders_controller_spec.rb

@@ -6,7 +6,8 @@ describe RendersController, type: :controller do
 
   context '#index' do
     render_views
-    before { set_request_version 'renders', request_version }
+    let(:config) { VersionCake.config }
+    before { set_request_version 'renders', request_version, config }
     before { response_body }
 
     context 'when requesting the non latest version' do
@@ -36,12 +37,34 @@ describe RendersController, type: :controller do
       it { expect(response_body).to eq 'template v2' }
     end
 
+    context 'when requesting without a version' do
+      context 'and missing version is configured to unversioned_template' do
+        let(:request_version) { nil }
+
+        # TODO: Restructure
+        # Need a better way to stub/unstub the `VersionCake.config` that generates
+        # the context and is used in the controller.
+        let(:config) do
+          VersionCake.config.tap do |config|
+            config.missing_version = :unversioned_template
+          end
+        end
+        after { VersionCake.config.missing_version = nil }
+        # /TODO
+
+        it { expect(controller.request_version).to eq nil }
+        it { expect(controller.is_latest_version?).to be_falsey }
+        it { expect(controller.is_deprecated_version?).to be_falsey }
+        it { expect(response_body).to eq 'base template' }
+      end
+    end
+
     context '#set_version' do
-      let(:request_options) { { 'override_version' => 2 } }
+      let(:request_options) { { 'override_version' => 1 } }
       let(:request_version) { 3 }
 
-      it { expect(controller.request_version).to eq 2 }
-      it { expect(response_body).to eq 'template v2' }
+      it { expect(controller.request_version).to eq 1 }
+      it { expect(response_body).to eq 'template v1' }
     end
   end
 

data/spec/integration/rack/middleware_regression_spec.rb

@@ -3,25 +3,27 @@ require 'yaml'
 
 describe VersionCake::Rack::Middleware do
   let(:app) do
+    _config = config
     rack = Rack::Builder.new do
-      config = VersionCake::Configuration.new
-      config.resources { |r| r.resource %r{.*}, [], [], (1..5) }
-      use VersionCake::Rack::Middleware, config
-      run lambda { |env| [ 200, {},[ env['versioncake.context'].version ] ] }
+      use VersionCake::Rack::Middleware, _config
+      run lambda { |env| [ 200, {},[ "version is #{env['versioncake.context'].version}" ] ] }
     end
     Rack::MockRequest.new(rack)
   end
+  let(:config) do
+    config = VersionCake::Configuration.new
+    config.resources { |r| r.resource %r{.*}, [], [], (1..5) }
+    config
+  end
 
   test_cases = YAML.load(File.open('./spec/fixtures/test_cases.yml'))
   test_cases.each do |test_case|
     context 'for a test case' do
-
-
       let(:data) { test_case['request'] || {} }
       let(:method) { (data['method'] || 'get').to_sym }
       let(:headers) { data['headers'] || {} }
       let(:params) { data['params'] || {} }
-      let(:test_response) { test_case['response'] }
+      let(:test_response) { "version is #{test_case['response']}" }
 
       it "test yml test cases" do
         begin
@@ -40,4 +42,20 @@ describe VersionCake::Rack::Middleware do
     data << "params:#{params}" if params
     "Expected #{data.join(',')} with method #{method} to yield '#{expected_response}', but got '#{actual_response}'"
   end
+
+  context 'when configured with unversioned template' do
+    let(:config) do
+      config = VersionCake::Configuration.new
+      config.resources { |r| r.resource %r{.*}, [], [], (1..5) }
+      config.missing_version = :unversioned_template
+      config
+    end
+
+    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')
+        expect(response.body).to eq 'version is ' # nil
+      end
+    end
+  end
 end

data/spec/unit/configuration_spec.rb

@@ -60,6 +60,22 @@ describe VersionCake::Configuration do
     it { expect(config.latest_version).to eq 54 }
   end
 
+  context '#missing_version' do
+    before { config.missing_version = 5 }
+
+    it { expect(config.missing_version).to eq 5 }
+    it { expect(config.default_version).to eq 5 }
+    it { expect(config.missing_version_use_unversioned_template).to eq false }
+
+    context 'when set to use the base template' do
+      before { config.missing_version = :unversioned_template }
+
+      it { expect(config.missing_version).to eq :unversioned_template }
+      it { expect(config.default_version).to be_nil }
+      it { expect(config.missing_version_use_unversioned_template).to eq true }
+    end
+  end
+
   context 'by default' do
     it 'has all extraction strategies' do
       expect(config.extraction_strategies.map(&:class)).to match_array(

data/spec/unit/version_context_service_spec.rb

@@ -21,12 +21,13 @@ describe VersionCake::VersionContextService do
   let(:config) do
     double('config',
       versioned_resources: [resource_user, resource_all],
-      missing_version: 9,
+      default_version: default_version,
       extraction_strategies: [
         VersionCake::CustomStrategy.new(lambda{ |req| req.version })
       ]
     )
   end
+  let(:default_version) { 6 }
   let(:service) { described_class.new(config) }
 
   describe '#create_context_from_request' do
@@ -52,6 +53,38 @@ describe VersionCake::VersionContextService do
       it { expect(context.resource).to eq resource_user }
       it { expect(context.result).to eq :obsolete }
     end
+
+    context 'for a missing version' do
+      let(:request) { double(version: nil, path: 'users/123') }
+
+      it { expect(context.version).to eq 6 }
+      it { expect(context.resource).to eq resource_user }
+      it { expect(context.result).to eq :supported }
+
+      context 'when no default version is configured' do
+        let(:default_version) { nil }
+
+        it { expect(context.version).to eq nil }
+        it { expect(context.resource).to eq resource_user }
+        it { expect(context.result).to eq :no_version }
+
+        context 'when the version is blank' do
+          let(:request) { double(version: '', path: 'users/123') }
+
+          it { expect(context.version).to eq nil }
+          it { expect(context.resource).to eq resource_user }
+          it { expect(context.result).to eq :no_version }
+        end
+      end
+    end
+
+    context 'for an invalid version' do
+      let(:request) { double(version: 'asdasd', path: 'users/123') }
+
+      it { expect(context.version).to eq nil }
+      it { expect(context.resource).to eq resource_user }
+      it { expect(context.result).to eq :version_invalid }
+    end
   end
 
   describe '#create_context' do
@@ -81,4 +114,34 @@ describe VersionCake::VersionContextService do
       it { expect(context.result).to eq :obsolete }
     end
   end
+
+  describe '#create_context_from_context' do
+    let(:uri) { 'users/21' }
+    let(:existing_version) { 1 }
+    let(:existing_context) { service.create_context(uri, existing_version) }
+    let(:version) { 5 }
+    subject(:context) { service.create_context_from_context(existing_context, version) }
+
+    it { expect(context.version).to eq 5 }
+    it { expect(context.resource).to eq resource_user }
+    it { expect(context.result).to eq :supported }
+
+    context 'for a deprecated version' do
+      let(:uri) { 'posts/21' }
+      let(:version) { 5 }
+
+      it { expect(context.version).to eq 5 }
+      it { expect(context.resource).to eq resource_all }
+      it { expect(context.result).to eq :deprecated }
+    end
+
+    context 'for an obsolete version' do
+      let(:uri) { 'posts/21' }
+      let(:version) { 2 }
+
+      it { expect(context.version).to eq 2 }
+      it { expect(context.resource).to eq resource_all }
+      it { expect(context.result).to eq :obsolete }
+    end
+  end
 end

data/spec/unit/version_context_spec.rb

@@ -6,29 +6,30 @@ describe VersionCake::VersionContext do
         latest_version: 8,
         supported_versions: [5,6,7,8],
         deprecated_versions: [4],
+        available_versions: [4,5,6,7,8],
         obsolete_versions: [2,3]
     )
   end
   let(:result) { :supported }
   subject(:context) { described_class.new(version, resource, result) }
 
-  describe '#supported_versions' do
+  describe '#available_versions' do
     let(:version) { 7 }
 
-    it { expect(context.supported_versions).to eq [7,6,5] }
+    it { expect(context.available_versions).to eq [7,6,5,4] }
 
     context 'for a deprecated version' do
       let(:version) { 4 }
       let(:result) { :deprecated }
 
-      it { expect(context.supported_versions).to eq [] }
+      it { expect(context.available_versions).to eq [4] }
     end
 
     context 'for an obsolete version' do
       let(:version) { 2 }
       let(:result) { :obsolete }
 
-      it { expect(context.supported_versions).to eq [] }
+      it { expect(context.available_versions).to eq [] }
     end
   end
 

data/spec/unit/versioned_resource_spec.rb

@@ -4,6 +4,20 @@ describe VersionCake::VersionedResource do
 
   let(:resource) { described_class.new('hello/123', [1,2], [3], [4,5,6])}
 
+  describe '#available_versions' do
+    subject { resource.available_versions }
+
+    it { is_expected.to match_array (3..6).to_a }
+
+    context 'when given out of order' do
+      let(:resource) { described_class.new('hello/123', [1,2], [3], [7,6,4,5])}
+
+      it 'order them' do
+        is_expected.to match_array (3..7).to_a
+      end
+    end
+  end
+
   describe '#latest_version' do
     subject { resource.latest_version }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: versioncake
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Jim Jones
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack