versioncake 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61aa19d50e26e583ce2eea0fca2d2e12cc0337c
-  data.tar.gz: 024e457348b85cb229be55db1319944da4ce2a9f
+  metadata.gz: 8fbcc57e744a93f5f6de3774d76ac1243a7fa412
+  data.tar.gz: a928bce4aaf76fa1bfd130773b1e7f8bd4b85727
 SHA512:
-  metadata.gz: edc4648ae169a2c6c61ff8def796b3bf5c5abaf568beb1d80d187f96d2a3ba870ed56ad2ec9c5405cb5865c46bdd97651916b08c57a5f4ede932019d0817ad57
-  data.tar.gz: a8610d6612b85369d1338e27614369d55494d63277ea218b3500457458bc6dcd023c8ffdc27f386356a7446ba6e0d8d5f31f637dc93a71cbbbae3d2fa659b2cb
+  metadata.gz: 9e1bd9d2d1206d7ac5f036ff4b58ac6ef5bc218eb86a11319efa7a93dcb341a8ce1760740be620fbef9ca0b205dd067e414ae0f06c22c28b38851a746ad8b661
+  data.tar.gz: 77692e1b0088daa052cbca53d4da0f35acbac818d7e7e0277df12111eeafb6f0592f05e10faccb8ba6dcd78ecd261a7e45dea494c101eb7d53abe3edb999fbb7

data/.travis.yml

@@ -2,16 +2,21 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
   - ruby-head
 
 gemfile:
   - gemfiles/rails3.2.gemfile
   - gemfiles/rails4.0.gemfile
+  - gemfiles/rails4.1.gemfile
 
 matrix:
   exclude:
     - rvm: 1.9.2
       gemfile: gemfiles/rails4.0.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails4.1.gemfile
 
   allow_failures:
     - rvm: ruby-head

data/Appraisals

@@ -9,3 +9,9 @@ appraise "rails4.0" do
   gem('activesupport',  '~> 4.0.0')
   gem('railties',       '~> 4.0.0')
 end
+
+appraise "rails4.1" do
+  gem('actionpack',     '~> 4.1.0.beta1')
+  gem('activesupport',  '~> 4.1.0.beta1')
+  gem('railties',       '~> 4.1.0.beta1')
+end

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 [Full Changelog](https://github.com/bwillis/versioncake/compare/v1.3...master)
 
+Bug Fixes:
+
+* Adjusting view details priorities so that RABL templates that do not have a format are not prioritized over templates that do have a format (issues #14). This is going to go into v2 as it is a breaking change.
+* Looking up a versioned or unversioned layout template was not working (issue #22). The change related to issue #14 resulted in the template format not being identified properly. Monkey patched another Rails (for old and new Rails) method to fix this issue.
+
+Enhancements:
+
+* New path strategy to support `/v3/posts` style versioning, thanks [Michael Elfassy](https://github.com/elfassy)
+* Support Rails 4.1, thanks [Washington L Braga Jr](https://github.com/huoxito)
+* Added v1->v2 template renaming migration script
+* Improving configuration
+
 ## 1.3.0 (Sept 26, 2013)
 
 [Full Changelog](https://github.com/bwillis/versioncake/compare/v1.2...v1.3)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    versioncake (1.3.0)
+    versioncake (2.0.0)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
       railties (>= 3.2)
@@ -25,7 +25,7 @@ GEM
     appraisal (0.5.2)
       bundler
       rake
-    atomic (1.1.10)
+    atomic (1.1.14)
     builder (3.1.4)
     colorize (0.5.8)
     coveralls (0.6.7)
@@ -35,7 +35,7 @@ GEM
       simplecov (>= 0.7)
       thor
     erubis (2.7.0)
-    i18n (0.6.4)
+    i18n (0.6.9)
     metaclass (0.0.1)
     mime-types (1.23)
     minitest (4.7.5)
@@ -59,7 +59,7 @@ GEM
     simplecov-html (0.7.1)
     test-unit (2.5.5)
     thor (0.18.1)
-    thread_safe (0.1.0)
+    thread_safe (0.1.3)
       atomic
     tzinfo (0.3.37)
 

data/README.md

@@ -14,10 +14,10 @@ Version Cake is an unobtrusive way to version APIs in your Rails app.
 
 ```ruby
 app/views/posts/
- - index.v1.xml.builder
- - index.v3.xml.builder
- - index.v1.json.jbuilder
- - index.v4.json.jbuilder
+ - index.xml.v1.builder
+ - index.xml.v3.builder
+ - index.json.v1.jbuilder
+ - index.json.v4.jbuilder
 ```
 - Gracefully degrade requests to the latest supported version
 - Clients can request API versions through different strategies
@@ -33,7 +33,35 @@ gem install versioncake
 
 ### Requirements
 
-Rails >= v3.2 is supported in versioncake =< v1.1. Rails 4 support is included versioncake >= v1.2.
+| Version | Rails 3.2 Support? | Rails 4 Support? | Rails 4.1 Support? |
+| ------- |:---------:| -------:| -------:|
+| 1.0     | Yes       | No      | No      |
+| 1.1     | Yes       | No      | No      |
+| 1.2     | Yes       | Yes     | No      |
+| 1.3     | Yes       | Yes     | No      |
+| 2.0     | Yes       | Yes     | Yes     |
+
+## Upgrade v1.0 -> v2.0
+
+### Filename changes
+The major breaking change to require a bump to v2.0 was the order of the extensions. To avoid priority issues with the format (#14), the version number and the format have been swapped.
+
+`index.v1.json.jbuilder` -> `index.json.v1.jbuilder`
+
+To make it easier to upgrade, run the following command to automatically rename these files:
+
+`verisoncake migrate` or `verisoncake migrate path/to/views`
+
+### Configuration changes
+
+The configuration options for Version Cake have been namespaced and slightly renamed. The following is a mapping of the old names to the new names:
+
+| Old Name | New Name |
+| --------------------------------------- | -------------------------------------------- |
+| config.view_versions                    | config.versioncake.supported_version_numbers |
+| config.view_version_extraction_strategy | config.versioncake.extraction_strategy       |
+| config.view_version_string              | config.versioncake.version_key               |
+| config.default_version                  | config.versioncake.default_version           |
 
 ## Example
 
@@ -41,8 +69,8 @@ In this simple example we will outline the code that is introduced to support a
 
 ### config/application.rb
 ```ruby
-config.view_versions = (1...4)
-config.view_version_extraction_strategy = :query_parameter # for simplicity
+config.versioncake.supported_version_numbers = (1...4)
+config.versioncake.extraction_strategy       = :query_parameter # for simplicity
 ```
 
 Often times with APIs, depending upon the version, different logic needs to be applied. With the following controller code, the initial value of @posts includes all Post entries.
@@ -65,21 +93,21 @@ class PostsController < ApplicationController
 end
 ```
 
-See the view samples below. The basic top level posts are referenced in views/posts/index.v1.json.jbuilder.
-But for views/posts/index.v4.json.jbuilder, we utilize the additional related comments.
+See the view samples below. The basic top level posts are referenced in views/posts/index.json.v1.jbuilder.
+But for views/posts/index.json.v4.jbuilder, we utilize the additional related comments.
 
 ### Views
 
 Notice the version numbers are denoted by the "v{version number}" extension within the file name.
 
-#### views/posts/index.v1.json.jbuilder
+#### views/posts/index.json.v1.jbuilder
 ```ruby
 json.array!(@posts) do |json, post|
     json.(post, :id, :title)
 end
 ```
 
-#### views/posts/index.v4.json.jbuilder
+#### views/posts/index.json.v4.jbuilder
 ```ruby
 json.array!(@posts) do |json, post|
     json.(post, :id, :title)
@@ -89,7 +117,7 @@ end
 
 ### Sample Output
 
-When a version is specified for which a view doesn't exist, the request degrades and renders the next lowest version number to ensure the API's backwards compatibility.  In the following case, since views/posts/index.v3.json.jbuilder doesn't exist, views/posts/index.v1.json.jbuilder is rendered instead.
+When a version is specified for which a view doesn't exist, the request degrades and renders the next lowest version number to ensure the API's backwards compatibility.  In the following case, since views/posts/index.json.v3.jbuilder doesn't exist, views/posts/index.json.v1.jbuilder is rendered instead.
 
 #### http://localhost:3000/posts.json?api_version=3 
 ```javascript
@@ -110,7 +138,7 @@ When a version is specified for which a view doesn't exist, the request degrades
 ```
 
 
-For a given request, if we specify the version number, and that version of the view exists, that version specific view version will be rendered.  In the below case, views/posts/index.v1.json.jbuilder is rendered.
+For a given request, if we specify the version number, and that version of the view exists, that version specific view version will be rendered.  In the below case, views/posts/index.json.v1.jbuilder is rendered.
 
 #### http://localhost:3000/posts.json?api_version=2 or http://localhost:3000/posts.json?api_version=1 
 ```javascript
@@ -131,7 +159,7 @@ For a given request, if we specify the version number, and that version of the v
 ```
 
 
-When no version is specified, the latest version of the view is rendered.  In this case, views/posts/index.v4.json.jbuilder.
+When no version is specified, the latest version of the view is rendered.  In this case, views/posts/index.json.v4.jbuilder.
 
 #### http://localhost:3000/posts.json
 ```javascript
@@ -172,35 +200,39 @@ The configuration should be placed in your Rails projects `config/application.rb
 You need to define the supported versions in your Rails application.rb file as `view_versions`. Use this config to set the range of supported API versions that can be served:
 
 ```ruby
-config.view_versions = [1,2,3,4,5] # or (1..5)
+config.versioncake.supported_version_numbers = [1,2,3,4,5] # or (1..5)
 ```
 
 #### Extraction Strategy
 
 You can also define the way to extract the version. The `view_version_extraction_strategy` allows you to set one of the default strategies or provide a proc to set your own. You can also pass it a prioritized array of the strategies.
 ```ruby
-config.view_version_extraction_strategy = :query_parameter # [:http_header, :http_accept_parameter]
+config.versioncake.extraction_strategy = :query_parameter # [:http_header, :http_accept_parameter]
 ```
 These are the available strategies:
- - **query_parameter**: version in the url query parameter, for testing or to override for special case i.e. ```http://localhost:3000/posts.json?api_version=1```  (This is the default.)
- - **request_parameter**: version that is sent in the body of the request. Good for testing.
- - **http_header**: Api version HTTP header ie. ```X-API-Version: 1```
- - **http_accept_parameter**: HTTP Accept header ie. ```Accept: application/xml; version=1``` [why do this?](http://blog.steveklabnik.com/posts/2011-07-03-nobody-understands-rest-or-http#i_want_my_api_to_be_versioned)
- - **custom**: `lambda {|request| request.headers["HTTP_X_MY_VERSION"].to_i }` takes the request object and must return an integer
+
+Strategy | Description | Example
+--- | --- | ---
+:query_parameter | version in the url query parameter, for testing or to override for special case | `http://localhost:3000/posts.json?api_version=1`  (This is the default.)
+:path_parameter | version in the url path parameter | `api/v:api_version/` 
+request_parameter | version that is sent in the body of the request | Good for testing.
+:http_header | Api version HTTP header | `X-API-Version: 1`
+:http_accept_parameter | HTTP Accept header | `Accept: application/xml; version=1` [why do this?](http://blog.steveklabnik.com/posts/2011-07-03-nobody-understands-rest-or-http#i_want_my_api_to_be_versioned)
+custom | takes the request object and must return an integer | lambda {&#124;request&#124; request.headers["HTTP_X_MY_VERSION"].to_i }
 
 
 #### Default Version
 
 When no version is supplied by a client, the version rendered will be the latest version by default. If you want to override this to another version, set the following property:
 ```ruby
-config.default_version = 4
+config.versioncake.default_version = 4
 ```
 
 #### Version String
 
 The extraction strategies use a default string key of `api_version`, but that can be changed:
 ```ruby
-config.view_version_string = "special_version_parameter_name"
+config.versioncake.version_key = "special_version_parameter_name"
 ```
 
 ### Version your views
@@ -213,8 +245,8 @@ When a client makes a request to your controller the latest version of the view
     - edit.html.erb
     - show.html.erb
     - show.json.jbuilder
-    - show.v1.json.jbuilder
-    - show.v2.json.jbuilder
+    - show.json.v1.jbuilder
+    - show.json.v2.jbuilder
     - new.html.erb
     - _form.html.erb
 ```
@@ -248,7 +280,7 @@ Testing can be painful but here are some easy ways to test different versions of
 Allowing more extraction strategies during testing can be helpful when needing to override the version.
 ```ruby
 # config/environments/test.rb
-config.view_version_extraction_strategy = [:query_parameter, :request_parameter, :http_header, :http_accept_parameter]
+config.versioncake.extraction_strategy = [:query_parameter, :request_parameter, :http_header, :http_accept_parameter]
 ```
 
 ### Testing a specific version
@@ -265,23 +297,23 @@ You can also test a specific version through a specific strategy such query_para
 # test/functional/renders_controller_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.v1.html.erb"
+  assert_equal @response.body, "index.html.v1.erb"
 end
 ```
 
 ### Testing all supported versions
 
-You can iterate over all of the supported version numbers by accessing the ```AppName::Application.config.view_versions```.
+You can iterate over all of the supported version numbers by accessing the ```AppName::Application.config.versioncake.supported_version_numbers```.
 
 ```ruby
-AppName::Application.config.view_versions.each do |supported_version|
+AppName::Application.config.versioncake.supported_version_numbers.each do |supported_version|
   before do
     @controller.stubs(:requested_version).returns(supported_version)
   end
   
   test "all versions render the correct template" do
     get :index
-    assert_equal @response.body, "index.v1.html.erb"
+    assert_equal @response.body, "index.html.v1.erb"
   end
 end
 ```
@@ -296,6 +328,9 @@ Thanks to all those who have helped make Version Cake really sweet:
 * Sevag
 * [Billy](https://github.com/bcatherall)
 * [Jérémie Meyer de Ville](https://github.com/jeremiemv)
+* [Michael Elfassy](https://github.com/elfassy)
+* [Kelley Reynolds](https://github.com/kreynolds)
+* [Washington L Braga Jr](https://github.com/huoxito)
 
 # Related Material
 

data/RELEASE.md

@@ -23,5 +23,5 @@ Keeping releases consistent is important so here are the steps to follow when pu
 7. Tag the version ```git tag -a vX.X -m 'Version X.X Stable' && git push --tags```
 
 8. Build the gem ```gem build versioncake.gemspec```
-9. Push the gem to ruby gems ```gem push versioncake-vX.X.X.gem```
+9. Push the gem to ruby gems ```gem push versioncake-X.X.X.gem```
 10. Remove the built gem locally ```rm versioncake-X.X.X.gem```

data/bin/versioncake

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+require 'versioncake'
+
+case ARGV[0]
+  when 'migrate'
+    VersionCake::Cli.new.migrate ARGV[1]
+  else
+    raise 'Unknown command.'
+end

data/gemfiles/rails3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    versioncake (1.3.0)
+    versioncake (2.0.0)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
       railties (>= 3.2)
@@ -29,6 +29,7 @@ GEM
     appraisal (0.5.2)
       bundler
       rake
+    atomic (1.1.14)
     builder (3.0.4)
     colorize (0.5.8)
     coveralls (0.6.7)
@@ -77,8 +78,11 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     test-unit (2.5.5)
     thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
     tilt (1.4.1)
-    tzinfo (0.3.37)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/gemfiles/rails4.0.gemfile.lock

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

data/gemfiles/rails4.1.gemfile

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

data/gemfiles/rails4.1.gemfile.lock

@@ -0,0 +1,87 @@
+PATH
+  remote: ../
+  specs:
+    versioncake (2.0.0)
+      actionpack (>= 3.2)
+      activesupport (>= 3.2)
+      railties (>= 3.2)
+      tzinfo
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (4.1.0.beta1)
+      actionview (= 4.1.0.beta1)
+      activesupport (= 4.1.0.beta1)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.0.beta1)
+      activesupport (= 4.1.0.beta1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activesupport (4.1.0.beta1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    appraisal (0.5.2)
+      bundler
+      rake
+    atomic (1.1.14)
+    builder (3.2.2)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
+    docile (1.1.2)
+    erubis (2.7.0)
+    i18n (0.6.9)
+    json (1.8.1)
+    metaclass (0.0.2)
+    mime-types (2.0)
+    minitest (5.2.1)
+    mocha (1.0.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.8.4)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    railties (4.1.0.beta1)
+      actionpack (= 4.1.0.beta1)
+      activesupport (= 4.1.0.beta1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.1)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    test-unit (2.5.5)
+    thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
+    tins (0.13.1)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 4.1.0.beta1)
+  activesupport (~> 4.1.0.beta1)
+  appraisal
+  coveralls
+  mocha
+  railties (~> 4.1.0.beta1)
+  rake
+  test-unit
+  versioncake!

data/lib/versioncake/cli.rb

@@ -0,0 +1,60 @@
+module VersionCake
+  class Cli
+    RAILS_VIEW_PATH = 'app/views'
+    HANDLERS = %w(
+      haml
+      erb
+      jbuilder
+      rabl
+      builder
+    )
+
+    def migrate(path)
+      path = RAILS_VIEW_PATH unless path
+      raise ArgumentError.new("No directory exists for '#{path}'") unless File.exists? path
+
+      files_to_rename = []
+      Dir.glob(File.join(path, '**/*.*')).each do |filename|
+        if has_version_in_name?(filename) && new_name = v1_to_v2_filename(filename)
+          files_to_rename << [filename, new_name]
+        end
+      end
+
+      if files_to_rename.empty?
+        puts 'No files to rename'
+      end
+
+      files_to_rename.each do |names|
+        old_name, new_name = names
+        puts "Renaming #{old_name} to #{new_name}"
+        File.rename(old_name, new_name)
+      end
+
+      files_to_rename
+    end
+
+    def v1_to_v2_filename(path)
+      filename = File.basename(path)
+      if m = filename.match(/(\.v[0-9]+)/)
+        version_str = m[0]
+        new_path = path.sub version_str, ''
+
+        if new_path.end_with? *HANDLERS
+          # handler exists at the end, need to put the version before it
+          parts = new_path.split('.')
+          new_path = parts.insert(parts.length-1, version_str.delete('.')).join('.')
+        else
+          # no handler, version is the last extension
+          new_path << version_str
+        end
+
+        path != new_path ? new_path : nil
+      end
+    end
+
+    def has_version_in_name?(filename)
+      filename =~ /v[0-9]+/
+    end
+
+  end
+end

data/lib/versioncake/configuration.rb

@@ -2,47 +2,47 @@ require 'active_support/core_ext/module/attribute_accessors.rb'
 require 'active_support/core_ext/array/wrap.rb'
 
 module VersionCake
-  module Configuration
+  class Configuration
 
     SUPPORTED_VERSIONS_DEFAULT = (1..10)
+    VERSION_KEY_DEFAULT = 'api_version'
 
-    mattr_reader :supported_version_numbers
+    attr_reader :extraction_strategies, :supported_version_numbers
+    attr_accessor :default_version, :version_key
 
-    mattr_accessor :extraction_strategies
-    self.extraction_strategies = []
-
-    mattr_accessor :default_version
-    self.default_version = nil
+    def initialize
+      @version_key                   = VERSION_KEY_DEFAULT
+      self.supported_version_numbers = SUPPORTED_VERSIONS_DEFAULT
+      self.extraction_strategy       = :query_parameter
+    end
 
-    def self.extraction_strategy=(val)
-      @@extraction_strategies.clear
+    def extraction_strategy=(val)
+      @extraction_strategies = []
       Array.wrap(val).each do |configured_strategy|
-        @@extraction_strategies << VersionCake::ExtractionStrategy.lookup(configured_strategy)
+        @extraction_strategies << VersionCake::ExtractionStrategy.lookup(configured_strategy)
       end
     end
 
-    def self.supported_version_numbers=(val)
-      @@supported_version_numbers = val.respond_to?(:to_a) ? val.to_a : Array.wrap(val)
-      @@supported_version_numbers.sort!.reverse!
+    def supported_version_numbers=(val)
+      @supported_version_numbers = val.respond_to?(:to_a) ? val.to_a : Array.wrap(val)
+      @supported_version_numbers.sort!.reverse!
     end
 
-    def self.supported_versions(requested_version_number=nil)
-      supported_version_numbers.collect do |supported_version_number|
+    def supported_versions(requested_version_number=nil)
+      @supported_version_numbers.collect do |supported_version_number|
         if requested_version_number.nil? || supported_version_number <= requested_version_number
           :"v#{supported_version_number}"
         end
       end
     end
 
-    def self.supports_version?(version)
-      supported_version_numbers.include? version
+    def supports_version?(version)
+      @supported_version_numbers.include? version
     end
 
-    def self.latest_version
-      supported_version_numbers.first
+    def latest_version
+      @supported_version_numbers.first
     end
 
-    self.extraction_strategy       = :query_parameter
-    self.supported_version_numbers = SUPPORTED_VERSIONS_DEFAULT
   end
 end

data/lib/versioncake/railtie.rb

@@ -1,23 +1,7 @@
 require 'rails'
 
-class ActionViewVersions < Rails::Railtie
-  initializer "view_versions" do |app|
-    ActiveSupport.on_load(:action_view) do
-      if app.config.respond_to?(:view_versions)
-        VersionCake::Configuration.supported_version_numbers = app.config.view_versions
-      end
-
-      if app.config.respond_to?(:view_version_extraction_strategy)
-        VersionCake::Configuration.extraction_strategy = app.config.view_version_extraction_strategy
-      end
-
-      if app.config.respond_to?(:view_version_string)
-        VersionCake::ExtractionStrategy.version_string = app.config.view_version_string
-      end
-
-      if app.config.respond_to?(:default_version)
-        VersionCake::Configuration.default_version = app.config.default_version
-      end
-    end
+module VersionCake
+  class Railtie < ::Rails::Railtie
+    config.versioncake = VersionCake::Configuration.new
   end
 end

data/lib/versioncake/strategies/extraction_strategy.rb

@@ -1,15 +1,15 @@
-require 'active_support/core_ext/class/attribute_accessors.rb'
 require 'active_support/core_ext/string/inflections.rb'
 
 module VersionCake
   class ExtractionStrategy
 
-    cattr_accessor :version_string
-    @@version_string = 'api_version'
-
     def extract(request)
       version = execute(request)
-      return version.to_i if version
+      return version.to_i if version && /[0-9]+/.match(version)
+    end
+
+    def version_key
+      VersionCake::Railtie.config.versioncake.version_key
     end
 
     def execute(request)

data/lib/versioncake/strategies/http_accept_parameter_strategy.rb

@@ -3,7 +3,7 @@ module VersionCake
 
     def execute(request)
       if request.headers.key?("HTTP_ACCEPT") &&
-          match = request.headers["HTTP_ACCEPT"].match(/#{@@version_string}=([0-9]+)/)
+          match = request.headers["HTTP_ACCEPT"].match(/#{version_key}=([0-9]+)/)
         match[1]
       end
     end