versioncake 1.3.0 → 2.0.0

data/test/unit/configuration_test.rb

@@ -2,48 +2,44 @@ require './test/test_helper'
 
 class ConfigurationTest < ActiveSupport::TestCase
   setup do
-    @previous_versions = VersionCake::Configuration.supported_version_numbers
-  end
-
-  teardown do
-    VersionCake::Configuration.supported_version_numbers = @previous_versions
+    @config = VersionCake::Configuration.new
   end
 
   test "supported_version_numbers can be set with range" do
-    VersionCake::Configuration.supported_version_numbers = (1..7)
-    assert_equal [7,6,5,4,3,2,1], VersionCake::Configuration.supported_version_numbers
+    @config.supported_version_numbers = (1..7)
+    assert_equal [7,6,5,4,3,2,1], @config.supported_version_numbers
   end
 
   test "supported_version_numbers can be set with an unordered array" do
-    VersionCake::Configuration.supported_version_numbers = [2,4,1,5,3,6,7]
-    assert_equal [7,6,5,4,3,2,1], VersionCake::Configuration.supported_version_numbers
+    @config.supported_version_numbers = [2,4,1,5,3,6,7]
+    assert_equal [7,6,5,4,3,2,1], @config.supported_version_numbers
   end
 
   test "supported_version_numbers can be set with a single value" do
-    VersionCake::Configuration.supported_version_numbers = 19
-    assert_equal [19], VersionCake::Configuration.supported_version_numbers
+    @config.supported_version_numbers = 19
+    assert_equal [19], @config.supported_version_numbers
   end
 
   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 VersionCake::Configuration.supports_version? supported_version
+    @config.supported_version_numbers = (1..7)
+    @config.supported_version_numbers.each do |supported_version|
+      assert @config.supports_version? supported_version
     end
   end
 
   test "supports_version? is not true for other versions" do
-    VersionCake::Configuration.supported_version_numbers = (1..7)
+    @config.supported_version_numbers = (1..7)
     [-2,-1,0,8,9,10].each do |unsupported_version|
-      assert !VersionCake::Configuration.supports_version?(unsupported_version)
+      assert !@config.supports_version?(unsupported_version)
     end
   end
 
   test "latest_version retrieves the highest supported version" do
-    VersionCake::Configuration.supported_version_numbers = [4,1,3,9,2,54]
-    assert_equal 54, VersionCake::Configuration.latest_version
+    @config.supported_version_numbers = [4,1,3,9,2,54]
+    assert_equal 54, @config.latest_version
   end
 
   test "default supported_version_numbers should be a logic set of version numbers" do
-    assert_equal VersionCake::Configuration::SUPPORTED_VERSIONS_DEFAULT, (1..10)
+    assert_equal (1..10).to_a.reverse, @config.supported_version_numbers
   end
 end

data/test/unit/strategies/extraction_strategy_test.rb

@@ -7,11 +7,11 @@ class ExtractionStrategyTest < ActiveSupport::TestCase
     end
   end
 
-  test "extract will convert the the result to integer" do
+  test "extract will convert the result to integer" do
     class TestStrategy < VersionCake::ExtractionStrategy
       def execute(request); "123"; end
     end
-    assert_equal TestStrategy.new.extract("request"), 123
+    assert_equal 123, TestStrategy.new.extract("request")
   end
 
   test "it can lookup a strategy" do

data/test/unit/strategies/path_parameter_strategy_test.rb

@@ -0,0 +1,17 @@
+require './test/test_helper'
+
+class PathParameterStrategyTest < ActiveSupport::TestCase
+  setup do
+    @strategy = VersionCake::PathParameterStrategy.new
+  end
+
+  test "a request with an api_version path parameter retrieves the version" do
+    request = stub(:path_parameters => {:api_version => '11', :other => 'parameter'})
+    assert_equal 11, @strategy.extract(request)
+  end
+
+  test "a request without an api_version path parameter returns nil" do
+    request = stub(:path_parameters => {:other => 'parameter', :another => 'parameter'})
+    assert_nil @strategy.extract(request)
+  end
+end

data/test/unit/strategies/query_parameter_strategy_test.rb

@@ -10,6 +10,11 @@ class QueryParameterStrategyTest < ActiveSupport::TestCase
     assert_equal 11, @strategy.extract(request)
   end
 
+  test "a request with an Integer api_version parameter retrieves the version" do
+    request = stub(:query_parameters => {:api_version => 11, :other => 'parameter'})
+    assert_equal 11, @strategy.extract(request)
+  end
+
   test "a request without an api_version parameter returns nil" do
     request = stub(:query_parameters => {:other => 'parameter', :another => 'parameter'})
     assert_nil @strategy.extract(request)

data/test/unit/versioned_request_test.rb

@@ -22,7 +22,7 @@ class VersionedRequestTest < ActiveSupport::TestCase
 
   test "a request for a deprecated version raises an exception" do
     VersionCake::VersionedRequest.any_instance.stubs(:apply_strategies => 2)
-    VersionCake::Configuration.stubs(:supports_version? => false)
+    VersionCake::Configuration.any_instance.stubs(:supports_version? => false)
     assert_raise ActionController::RoutingError do
       VersionCake::VersionedRequest.new(stub())
     end

data/test/unit/view_additions_test.rb

@@ -0,0 +1,35 @@
+require './test/test_helper'
+
+class ViewAdditionsTest < ActiveSupport::TestCase
+  setup do
+    @resolver = ActionView::PathResolver.new
+  end
+
+  test "it retrieves the correct handler and format when only handler and format are present" do
+    handler, format = @resolver.extract_handler_and_format('application.html.erb', nil)
+    assert_equal 'text/html', format.to_s
+  end
+
+  test "it retrieves the correct handler and format when only handler, format and version are present" do
+    handler, format = @resolver.extract_handler_and_format('application.json.v1.jbuilder', nil)
+    assert_equal 'application/json', format.to_s
+  end
+
+  test "it retrieves the correct handler and format when only handler, format and locale are present" do
+    handler, format = @resolver.extract_handler_and_format('application.en.json.jbuilder', nil)
+    assert_equal 'application/json', format.to_s
+  end
+
+  test "it retrieves the correct handler and format when only handler, format, locale and version are present" do
+    handler, format = @resolver.extract_handler_and_format('application.en.json.v1.jbuilder', nil)
+    assert_equal 'application/json', format.to_s
+  end
+
+  if ActionPack::VERSION::MAJOR == 4 && ActionPack::VERSION::MINOR >= 1
+    test "it retrieves the correct handler and format when only handler, format, variant and version are present" do
+      handler, format = @resolver.extract_handler_and_format('application.json+tablet.v1.jbuilder', nil)
+      assert_equal 'application/json', format.to_s
+    end
+  end
+
+end

data/versioncake.gemspec

@@ -5,6 +5,7 @@ require "versioncake/version"
 Gem::Specification.new do |s|
   s.name        = "versioncake"
   s.version     = VersionCake::VERSION
+  s.license     = 'MIT'
   s.authors     = ["Jim Jones", "Ben Willis"]
   s.email       = ["jim.jones1@gmail.com", "benjamin.willis@gmail.com"]
   s.homepage    = "https://github.com/bwillis/versioncake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: versioncake
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jim Jones
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -141,7 +141,8 @@ description: Render versioned views automagically based on the clients requested
 email:
 - jim.jones1@gmail.com
 - benjamin.willis@gmail.com
-executables: []
+executables:
+- versioncake
 extensions: []
 extra_rdoc_files: []
 files:
@@ -155,12 +156,16 @@ files:
 - README.md
 - RELEASE.md
 - Rakefile
+- bin/versioncake
 - gemfiles/rails3.2.gemfile
 - gemfiles/rails3.2.gemfile.lock
 - gemfiles/rails4.0.gemfile
 - gemfiles/rails4.0.gemfile.lock
+- gemfiles/rails4.1.gemfile
+- gemfiles/rails4.1.gemfile.lock
 - images/versioncake-logo450x100.png
 - lib/versioncake.rb
+- lib/versioncake/cli.rb
 - lib/versioncake/configuration.rb
 - lib/versioncake/controller_additions.rb
 - lib/versioncake/railtie.rb
@@ -168,6 +173,7 @@ files:
 - lib/versioncake/strategies/extraction_strategy.rb
 - lib/versioncake/strategies/http_accept_parameter_strategy.rb
 - lib/versioncake/strategies/http_header_strategy.rb
+- lib/versioncake/strategies/path_parameter_strategy.rb
 - lib/versioncake/strategies/query_parameter_strategy.rb
 - lib/versioncake/strategies/request_parameter_strategy.rb
 - lib/versioncake/version.rb
@@ -175,8 +181,8 @@ files:
 - lib/versioncake/view_additions.rb
 - test/app/controllers/renders_controller.rb
 - test/app/views/renders/index.html.erb
-- test/app/views/renders/index.v1.html.erb
-- test/app/views/renders/index.v2.html.erb
+- test/app/views/renders/index.html.v1.erb
+- test/app/views/renders/index.html.v2.erb
 - test/config.ru
 - test/config/application.rb
 - test/config/routes.rb
@@ -187,24 +193,34 @@ files:
 - test/fixtures/partials/another_versioned_partial.erb
 - test/fixtures/partials/another_versioned_partial.v1.erb
 - test/fixtures/templates/unversioned.html.erb
+- test/fixtures/templates/v1_extension_scheme.v3.html.erb
+- test/fixtures/templates/v1_extension_scheme.v6.json
 - test/fixtures/templates/versioned.html.erb
-- test/fixtures/templates/versioned.v1.html.erb
-- test/fixtures/templates/versioned.v2.html.erb
-- test/fixtures/templates/versioned.v3.html.erb
+- test/fixtures/templates/versioned.html.v1.erb
+- test/fixtures/templates/versioned.html.v2.erb
+- test/fixtures/templates/versioned.html.v3.erb
+- test/fixtures/test_cases.yml
+- test/functional/custom_strategy_controller_test.rb
+- test/functional/multiple_strategy_controller_test.rb
 - test/functional/renders_controller_test.rb
+- test/functional/strategy_controller_test.rb
 - test/script/rails
 - test/template/render_test.rb
 - test/test_helper.rb
+- test/unit/cli_test.rb
 - test/unit/configuration_test.rb
 - test/unit/strategies/extraction_strategy_test.rb
 - test/unit/strategies/http_accept_parameter_strategy_test.rb
 - test/unit/strategies/http_header_strategy_test.rb
+- test/unit/strategies/path_parameter_strategy_test.rb
 - test/unit/strategies/query_parameter_strategy_test.rb
 - test/unit/strategies/request_parameter_strategy_test.rb
 - test/unit/versioned_request_test.rb
+- test/unit/view_additions_test.rb
 - versioncake.gemspec
 homepage: https://github.com/bwillis/versioncake
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/test/app/views/renders/index.v1.html.erb

@@ -1 +0,0 @@
-index.v1.html.erb

data/test/app/views/renders/index.v2.html.erb

@@ -1 +0,0 @@
-index.v2.html.erb