versioncake 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 9d665c399a348be606cceacc98e2ee0e1258b1bb
-  data.tar.gz: c174aae7c97ffed8e747790ec7adabe8991c1b2c
-SHA512:
-  metadata.gz: 4f6b4d84def066ac15cdc11aff3b889926b2a5407aa1691731590c9be8cb326490449ed20484b98fd09f13f54c1cbda7dc32c7364d4933e3bed6b8fc2a302ce5
-  data.tar.gz: dbdb751791239e414980bc39face0c7b9c8ce928d98da9be5c684b9cb8a45b3378c667bd1e3ebe3addf1dc9f32100ac1552937d5d951ab6241433ec99263b509
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2VhZjA2ZWU5ODU0MWVhYTQ4Nzk1NmM1OTFjNmIzYzJjZGUwZGQ5OQ==
+  data.tar.gz: !binary |-
+    M2RhOTQ5YzNiODAzY2JkMzg2NjMzM2UwMDllNjdjMjBiNjVjNDgzNg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NmJiMzc5YTk5MjcwODU2MTI0M2YzOGIxYTlhM2EwOWJjZDRjYzJiOWJjMDIz
+    MzJmOTA0NjFhMzlhM2I5ODMyMzE4YWYzNzc5ZTMzMWNkMGJjZDdjY2RjNzE4
+    ODc4NDE0MmU1ZmY2ZjM1ZDc1ZmJiMTg4ZWVhODViMGU3MjkxOGE=
+  data.tar.gz: !binary |-
+    MWExYWQ1ZmI5ZThlN2Q4N2QwNTg5NDU4NzM5MzdlODQ5NzFiODczNjIxMTM1
+    MzUzYjQ1OGRlMTVhNDM1MmRlMWRmMDY4NzYyNTRjYzIxZDFjZTM1YTkyYjhm
+    ZTkxMWM2YTNkZmEyYTdhOTEzNzZlOTk5MjI3NDJlZjZmYjJjMmM=

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## Unreleased Changes
 
-[Full Changelog](https://github.com/bwillis/versioncake/compare/v2.4...master)
+[Full Changelog](https://github.com/bwillis/versioncake/compare/v2.5...master)
 
 Bug Fixes:
 
@@ -14,6 +14,14 @@ Deprecations:
 
 * None
 
+## 2.5.0 (Apr 18, 2014)
+
+[Full Changelog](https://github.com/bwillis/versioncake/compare/v2.4...v2.5)
+
+Bug Fixes:
+
+* Fix issue where calling helper methods can return nil in prepended before_filters (#32)
+
 ## 2.4.0 (Apr 14, 2014)
 
 [Full Changelog](https://github.com/bwillis/versioncake/compare/v2.3...v2.4)

data/Gemfile.lock

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

data/README.md

@@ -34,7 +34,7 @@ gem install versioncake
 ### Requirements
 
 | Version | Rails 3.2 Support? | Rails 4 Support? | Rails 4.1 Support? | [Rails API](https://github.com/rails-api/rails-api) 0.2 Support? |
-| ------- |:---------:| -------:| -------:|
+| ------- |:---------:| -------:| -------:| -------:|
 | [1.0](CHANGELOG.md#100-march-14-2013) | Yes       | No      | No      | No   |
 | [1.1](CHANGELOG.md#110-may-18-2013)   | Yes       | No      | No      | No   |
 | [1.2](CHANGELOG.md#120-may-26-2013)   | Yes       | Yes     | No      | No   |
@@ -51,7 +51,7 @@ The major breaking change to require a bump to v2.0 was the order of the extensi
 
 To make it easier to upgrade, run the following command to automatically rename these files:
 
-`verisoncake migrate` or `verisoncake migrate path/to/views`
+`versioncake migrate` or `versioncake migrate path/to/views`
 
 ### Configuration changes
 
@@ -373,6 +373,7 @@ Thanks to all those who have helped make Version Cake really sweet:
 * [Andres Camacho](https://github.com/andresfcamacho)
 * [Yukio Mizuta](https://github.com/untidy-hair)
 * [David Butler](https://github.com/dwbutler)
+* [Jeroen K.](https://github.com/jrnkntl)
 
 # Related Material
 

data/gemfiles/rails3.2.gemfile.lock

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

data/gemfiles/rails4.0.gemfile.lock

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

data/gemfiles/rails4.1.gemfile.lock

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

data/lib/versioncake/controller_additions.rb

@@ -4,25 +4,39 @@ module VersionCake
   module ControllerAdditions
     extend ActiveSupport::Concern
 
+    attr_accessor :versioned_request
+
+    # set_version is the prepend filter that will determine the version of the
+    # requests.
+    included do
+      prepend_before_filter :set_version
+    end
+
     # The explicit version requested by a client, this may not
     # be the rendered version and may also be nil.
-    attr_accessor :requested_version
-
-    # A boolean check to determine if the latest version is requested.
-    attr_accessor :is_latest_version
+    def requested_version
+      versioned_request.extracted_version
+    end
 
     # The requested version by a client or if it's nil the latest or default
     # version configured.
-    attr_accessor :derived_version
+    def derived_version
+      versioned_request.version
+    end
 
-    # set_version is the prepend filter that will determine the version of the
-    # requests.
-    included do
-      prepend_before_filter :set_version
+    # A boolean check to determine if the latest version is requested.
+    def is_latest_version
+      versioned_request.is_latest_version?
     end
 
     protected
 
+    # The current requests version information.
+    def versioned_request
+      set_version
+      @versioned_request
+    end
+
     # Sets the version of the request as well as several accessor variables.
     #
     # @param override_version a version number to use instead of the one extracted
@@ -30,14 +44,12 @@ module VersionCake
     #
     # @return No explicit return, but several attributes are exposed
     def set_version(override_version=nil)
-      versioned_request         = VersionCake::VersionedRequest.new(request, override_version)
-      @requested_version        = versioned_request.extracted_version
-      @derived_version          = versioned_request.version
-      @is_latest_version        = versioned_request.is_latest_version?
-      if !versioned_request.is_version_supported?
+      return if @versioned_request.present? && override_version.blank?
+      @versioned_request = VersionCake::VersionedRequest.new(request, override_version)
+      if !@versioned_request.is_version_supported?
         raise UnsupportedVersionError.new('Unsupported version error')
       end
-      @_lookup_context.versions = versioned_request.supported_versions
+      @_lookup_context.versions = @versioned_request.supported_versions
     end
   end
 end

data/lib/versioncake/version.rb

@@ -1,3 +1,3 @@
 module VersionCake
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/test/functional/renders_controller_test.rb

@@ -62,4 +62,10 @@ class RendersControllerTest < ActionController::TestCase
     get :index, "api_version" => "abc"
     assert_equal "template v1", @response.body
   end
+
+  test "derived_version can be called before the before_filter and it returns the request version" do
+    @controller.instance_variable_set("@_lookup_context", mock(:versions= => nil))
+    @controller.request.stubs(:query_parameters => {:api_version => "2"})
+    assert_equal 2, @controller.derived_version
+  end
 end

data/test/functional/strategy_controller_test.rb

@@ -18,6 +18,7 @@ class StrategyControllerTest < ActionController::TestCase
       method   = (request['method'] || "get").to_sym
       response = test_case['response']
       @controller.request.stubs(:headers).returns(headers || {})
+      @controller.versioned_request = nil # clear out the versioned request so it's not cached
       begin
         send(method, :index, params || {})
         assert_equal(response, @response.body, custom_message(headers, params, method, response))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: versioncake
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Jim Jones
@@ -9,132 +9,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-18 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Render versioned views automagically based on the clients requested version.
@@ -229,17 +229,17 @@ 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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Easily render versions of your rails views.