versioncake 2.1.0 → 2.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjUzNjczOGFiZjY3NDliNmRmYzJhZTI5NDIzNDhhYWM4YTgxMGE2YQ==
+    OTZjMGMyZDYzMThlZTljNzJlYjliY2FkMmYwZGRhOWYyMTc5YjZjNw==
   data.tar.gz: !binary |-
-    YzM4MzAwZjk2MDNlYThjZjRkMWE5NTk1MTM3Mzg3NzlmYmY2NzdlYg==
+    MWVhM2IzMGVlODFhYWFhOTkyNTc2MTYzMzMzMTlmNTExODM4YjAxMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWU4NTRjNzNkMzA4MmRkZTcxYWI2M2MxMmY2NmQwZDM4NTMyYzM0MTEyZDE1
-    N2I2NTY3MzQyMzUxYjgyNjUwYTE1ZGI3NGVlZjU0YjI1MDQ2MzAwMDhmNmQx
-    NGQ5NmU3YjI3MWU5ZWNiMWI4MGVkMzUxNjE1MmU0MzU3OGIzNzU=
+    YTg2MjZkMWI1ODkxMzM1MjJlZWExMDNjZGQyZjYwZjc3N2MwODkzNjM4OGZj
+    NGQxMDY2ZWZiZGZiOWI3MTBiOGE1YzdhZTExOGJmMTIzYjczYjk4ZTNjMTU2
+    NDM2MDMwOTVjMmIzMDBhNmM0YzQxN2JlOTJiZWYyYjQzOGM5NzA=
   data.tar.gz: !binary |-
-    MDJkNTJlM2QxMmE0ZmU2Y2JiNmMyZDk3Y2Q1ZWE5NjU3ZjI4YmU3NzBkZDZj
-    MmJiMDAxMTAyMzYxMTZlMmNiNjVlNjNjMWI5MWM2M2VmM2IzZjkwYzViYmVh
-    MDNiMzY1NjJiN2RjM2I1ODk2Y2IxNzFiZmMyNzM4ODkxOTM4Njg=
+    OTJhNDY0ZDM1MGFlNDI5NDZjN2MyNGNmMGI1NDcwYTc3MzVmNjgwNjJmMGQy
+    NjFmOTg5NzI5ODkwYjY1ODczYzkwODI2NjBhODQyZDY3NTNjNDRjMTZhZjky
+    MjQ2MjEyNjkwODMzZGQ1OGZkZTVlMmYzNWFjZTMxNmI4ZGU5MmI=

data/Gemfile.lock

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

data/gemfiles/rails3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    versioncake (2.1.0)
+    versioncake (2.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 (2.1.0)
+    versioncake (2.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 (2.1.0)
+    versioncake (2.2.0)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
       railties (>= 3.2)

data/lib/versioncake/strategies/extraction_strategy.rb

@@ -5,7 +5,13 @@ module VersionCake
 
     def extract(request)
       version = execute(request)
-      return version.to_i if version && /[0-9]+/.match(version)
+      if version.is_a?(Fixnum)
+        version
+      elsif version.is_a?(String) && /[0-9]+/.match(version)
+        version.to_i
+      else
+        nil
+      end
     end
 
     def version_key

data/lib/versioncake/version.rb

@@ -1,3 +1,3 @@
 module VersionCake
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/test/unit/strategies/extraction_strategy_test.rb

@@ -7,13 +7,27 @@ class ExtractionStrategyTest < ActiveSupport::TestCase
     end
   end
 
-  test "extract will convert the result to integer" do
+  test "custom strategy result will be converted to integer" do
     class TestStrategy < VersionCake::ExtractionStrategy
       def execute(request); "123"; end
     end
     assert_equal 123, TestStrategy.new.extract("request")
   end
 
+  test "custom strategy result will be returned" do
+    class TestStrategy < VersionCake::ExtractionStrategy
+      def execute(request); 123; end
+    end
+    assert_equal 123, TestStrategy.new.extract("request")
+  end
+
+  test "custom strategy will fail if it returns unexpected result" do
+    class TestStrategy < VersionCake::ExtractionStrategy
+      def execute(request); Object.new; end
+    end
+    assert_nil TestStrategy.new.extract("request")
+  end
+
   test "it can lookup a strategy" do
     strategy = VersionCake::ExtractionStrategy.lookup(:query_parameter)
     assert_equal VersionCake::QueryParameterStrategy, strategy.class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: versioncake
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jim Jones
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack