versioncake 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad6b180d713a358c8dca71c1ee7d13763b33d61c
-  data.tar.gz: 6b3a64e7b6af7ebf8839d27c8f427c0dcdf1030d
+  metadata.gz: ab0ef110750d5d6c29da0ac41b7f16c1419ebb80
+  data.tar.gz: 73d8a03d11d238326a7da5846cf43e3a3986a477
 SHA512:
-  metadata.gz: c13e158b7af821d0099ac548bc20f723554b335383088b857e886b7483fea4cae52880087b9713745e7450fd160787323471e59169c953eb9d0ed6fc796a2248
-  data.tar.gz: 9d371dcb0558ec42eeb179141c908e7c9a4b6c2831c6836e0063412772b5cfb9dc397db6f79af65e41db6f2d981c8be6eafb94f90d87439b2fe173b20c881fca
+  metadata.gz: 247f480c40da96d017f03226043292ec8846fa46a4e900934eb434d7df2c162139bae51a79e9cb2646cff4af9b4ee0693463549a46709855d46b763d592445bf
+  data.tar.gz: 869e0fc8d10302248570520a888e3fc7d5d082a4ddfbf4cf57cf0a5f9d7a02d508874097328a2cde360afa449a5ca3a3249db47a00d7f8194ae0170e57ed5f74

data/.travis.yml

@@ -3,3 +3,12 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ruby-head
+
+gemfile:
+  - gemfiles/rails3.2.gemfile
+  - gemfiles/rails4.0.rc1.gemfile
+
+matrix:
+  exclude:
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails4.0.rc1.gemfile

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "rails3.2" do
+  gem('actionpack',     '~> 3.2.0')
+  gem('activesupport',  '~> 3.2.0')
+  gem('railties',       '~> 3.2.0')
+end
+
+appraise "rails4.0.rc1" do
+  gem('actionpack',     '4.0.0.rc1')
+  gem('activesupport',  '4.0.0.rc1')
+  gem('railties',       '4.0.0.rc1')
+end

data/CHANGELOG.md

@@ -1,14 +1,29 @@
 ## Unreleased Changes
 
-[Full Changelog](https://github.com/bwillis/versioncake/compare/v1.1...master)
+[Full Changelog](https://github.com/bwillis/versioncake/compare/v1.2...master)
 
-* No significant changes.
+## 1.2.0 (May 26, 2013)
+
+[Full Changelog](https://github.com/bwillis/versioncake/compare/v1.1...v1.2)
+
+Bug Fixes:
+
+* None
+
+Enhancements:
+
+* Support Rails 4
+* Adding Rails version testing with [Appraisals](https://github.com/thoughtbot/appraisal)
+* Added contribution guide
+
+Deprecations:
+
+* None
 
 ## 1.1.0 (May 18, 2013)
 
 [Full Changelog](https://github.com/bwillis/versioncake/compare/v1.0...v1.1)
 
-
 Bug Fixes:
 
 * HttpAcceptParameterStrategy will now accept multiple digit versions

data/CONTRIBUTING.md

@@ -0,0 +1,18 @@
+# Contributing
+
+We really like when people not only discover something they want added/fixed/removed in Version Cake, but also when they do it themselves. Here are some steps to get you on your way to contributing to Version Cake:
+
+* Fork the repo.
+* Setup for developing: `bundle && rake` - make sure all tests are passing
+* Add a test and make your change
+* Make sure all tests are passing
+* Add any additional notes to README.md or documentation
+* Commit/push/submit pull request
+* At this point someone will review, comment on your pull request and (hopefully) accept it very quickly
+
+# Test Other Supported Rails versions
+
+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`
+* Run all the tests for the supported Rails versions: `bundle exec rake appraisal test`

data/Gemfile

@@ -1,15 +1,3 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
-
-gem 'rack'
-gem 'multi_json'
-gem 'tzinfo'
-gem 'coveralls', require: false
-
-group :development do
-  # for travis-ci.org
-  gem "rake"
-  gem 'test-unit'
-  gem 'mocha', '~> 0.12.0', :require => false
-end

data/Gemfile.lock

@@ -1,64 +1,68 @@
 PATH
   remote: .
   specs:
-    versioncake (1.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
+    versioncake (1.2.0)
+      actionpack (>= 3.2)
+      activesupport (>= 3.2)
+      railties (>= 3.2)
+      tzinfo
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    builder (3.0.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    builder (3.0.4)
     colorize (0.5.8)
-    coveralls (0.6.3)
+    coveralls (0.6.7)
       colorize
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       thor
     erubis (2.7.0)
-    hike (1.2.1)
+    hike (1.2.2)
     i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.5)
+    json (1.8.0)
     metaclass (0.0.1)
-    mime-types (1.21)
-    mocha (0.12.3)
+    mime-types (1.23)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    rack (1.4.1)
+    multi_json (1.7.3)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -66,24 +70,23 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    test-unit (2.5.2)
-    thor (0.16.0)
-    tilt (1.3.3)
-    tzinfo (0.3.33)
+    test-unit (2.5.5)
+    thor (0.18.1)
+    tilt (1.4.1)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  appraisal
   coveralls
-  mocha (~> 0.12.0)
-  multi_json
-  rack
+  mocha
   rake
   test-unit
-  tzinfo
   versioncake!

data/README.md

@@ -31,6 +31,10 @@ Check out https://github.com/bwillis/350-rest-api-versioning for a comparison of
 gem install versioncake
 ```
 
+### Requirements
+
+Rails >= v3.2 is supported in versioncake =< v1.1. Rails 4 support is included versioncake >= v1.2.
+
 ## Example
 
 In this simple example we will outline the code that is introduced to support a change in a version.

data/Rakefile

@@ -5,6 +5,7 @@ require 'bundler'
 Bundler.setup
 
 require 'rake/testtask'
+require 'appraisal'
 
 Bundler::GemHelper.install_tasks
 

data/gemfiles/rails3.2.gemfile

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

data/gemfiles/rails3.2.gemfile.lock

@@ -0,0 +1,95 @@
+PATH
+  remote: ../
+  specs:
+    versioncake (1.2.0)
+      actionpack (>= 3.2)
+      activesupport (>= 3.2)
+      railties (>= 3.2)
+      tzinfo
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    builder (3.0.4)
+    colorize (0.5.8)
+    coveralls (0.6.7)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
+    erubis (2.7.0)
+    hike (1.2.2)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.8.0)
+    metaclass (0.0.1)
+    mime-types (1.23)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.7.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.4)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    test-unit (2.5.5)
+    thor (0.18.1)
+    tilt (1.4.1)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 3.2.0)
+  activesupport (~> 3.2.0)
+  appraisal
+  coveralls
+  mocha
+  railties (~> 3.2.0)
+  rake
+  test-unit
+  versioncake!

data/gemfiles/rails4.0.rc1.gemfile

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

data/gemfiles/rails4.0.rc1.gemfile.lock

@@ -0,0 +1,78 @@
+PATH
+  remote: ../
+  specs:
+    versioncake (1.2.0)
+      actionpack (>= 3.2)
+      activesupport (>= 3.2)
+      railties (>= 3.2)
+      tzinfo
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activesupport (4.0.0.rc1)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (0.5.2)
+      bundler
+      rake
+    atomic (1.1.9)
+    builder (3.1.4)
+    colorize (0.5.8)
+    coveralls (0.6.7)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
+    erubis (2.7.0)
+    i18n (0.6.4)
+    metaclass (0.0.1)
+    mime-types (1.23)
+    minitest (4.7.4)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.7.3)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    railties (4.0.0.rc1)
+      actionpack (= 4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.0.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    test-unit (2.5.5)
+    thor (0.18.1)
+    thread_safe (0.1.0)
+      atomic
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (= 4.0.0.rc1)
+  activesupport (= 4.0.0.rc1)
+  appraisal
+  coveralls
+  mocha
+  railties (= 4.0.0.rc1)
+  rake
+  test-unit
+  versioncake!

data/lib/versioncake/strategies/http_accept_parameter_strategy.rb

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

data/lib/versioncake/strategies/http_header_strategy.rb

@@ -2,7 +2,7 @@ module VersionCake
   class HttpHeaderStrategy < ExtractionStrategy
 
     def execute(request)
-      if request.headers.has_key? "HTTP_X_#{@@version_string.upcase}"
+      if request.headers.key? "HTTP_X_#{@@version_string.upcase}"
         request.headers["HTTP_X_#{@@version_string.upcase}"]
       end
     end

data/lib/versioncake/strategies/query_parameter_strategy.rb

@@ -2,7 +2,7 @@ module VersionCake
   class QueryParameterStrategy < ExtractionStrategy
 
     def execute(request)
-      if request.query_parameters.has_key? @@version_string.to_sym
+      if request.query_parameters.key? @@version_string.to_sym
         request.query_parameters[@@version_string.to_sym]
       end
     end

data/lib/versioncake/version.rb

@@ -1,3 +1,3 @@
 module VersionCake
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/config/application.rb

@@ -6,6 +6,10 @@ Bundler.require :default, Rails.env
 
 module RendersTest
   class Application < Rails::Application
+
+    config.secret_key_base = "secret"
+    config.eager_load = false
+
     config.active_support.deprecation = :stderr
     config.view_versions = (1..3)
     config.view_version_extraction_strategy = :http_header

data/test/functional/renders_controller_test.rb

@@ -47,7 +47,7 @@ class RendersControllerTest < ActionController::TestCase
 
   test "requested version is blank when the version is not set" do
     get :index
-    assert_blank @controller.requested_version
+    assert @controller.requested_version.blank?
   end
 
   test "set_version can be called to override the requested version" do
@@ -56,7 +56,7 @@ class RendersControllerTest < ActionController::TestCase
   end
 end
 
-class ParameterStragegyTest < ActionController::TestCase
+class ParameterStrategyTest < ActionController::TestCase
   tests RendersController
 
   setup do

data/test/test_helper.rb

@@ -11,7 +11,7 @@ ENV["RAILS_ENV"] = 'test'
 require 'rails/test_help'
 require 'test/unit'
 
-require "mocha"
+require 'mocha/setup'
 
 require File.expand_path('../config/application', __FILE__)
 

data/test/unit/configuration_test.rb

@@ -27,14 +27,14 @@ class ConfigurationTest < ActiveSupport::TestCase
   test "supports_version? is only true for given supported versions" do
     VersionCake::Configuration.supported_version_numbers = (1..7)
     VersionCake::Configuration.supported_version_numbers.each do |supported_version|
-      assert_true VersionCake::Configuration.supports_version? supported_version
+      assert VersionCake::Configuration.supports_version? supported_version
     end
   end
 
   test "supports_version? is not true for other versions" do
     VersionCake::Configuration.supported_version_numbers = (1..7)
     [-2,-1,0,8,9,10].each do |unsupported_version|
-      assert_false VersionCake::Configuration.supports_version? unsupported_version
+      assert !VersionCake::Configuration.supports_version?(unsupported_version)
     end
   end
 

data/test/unit/versioned_request_test.rb

@@ -31,7 +31,7 @@ class VersionedRequestTest < ActiveSupport::TestCase
   test "has a method to determine if requesting the latest version" do
     VersionCake::VersionedRequest.any_instance.stubs(:apply_strategies => nil)
     versioned_request = VersionCake::VersionedRequest.new(stub())
-    assert_true versioned_request.is_latest_version
+    assert versioned_request.is_latest_version
   end
 
   test "has a method to retrieve the extracted version" do

data/versioncake.gemspec

@@ -16,11 +16,15 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('actionpack', '>= 3.0')
-  s.add_dependency('activesupport', '>= 3.0')
-  s.add_dependency('railties', '>= 3.0')
+  s.add_dependency('actionpack',    '>= 3.2')
+  s.add_dependency('activesupport', '>= 3.2')
+  s.add_dependency('railties',      '>= 3.2')
+  s.add_dependency('tzinfo')
 
-  s.add_development_dependency "test-unit"
-  s.add_development_dependency "mocha"
+  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'coveralls'
+  s.add_development_dependency 'rake'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: versioncake
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jim Jones
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -17,42 +17,56 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        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
@@ -81,6 +95,48 @@ dependencies:
     - - '>='
       - !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.
 email:
 - jim.jones1@gmail.com
@@ -91,11 +147,17 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- Appraisals
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
+- gemfiles/rails3.2.gemfile
+- gemfiles/rails3.2.gemfile.lock
+- gemfiles/rails4.0.rc1.gemfile
+- gemfiles/rails4.0.rc1.gemfile.lock
 - images/versioncake-logo450x100.png
 - lib/versioncake.rb
 - lib/versioncake/configuration.rb