split_cacheable 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22e06b2f81c3e8f5389c47602d567ee68a545063
-  data.tar.gz: 5359958686cab76e5217bd85dac85f1aa273e64c
+  metadata.gz: 514a9d878ce909f2c3de0c556c52caf32804cc75
+  data.tar.gz: 0ddd41fcdb78e194904ab73a07cd69c7d83ee66d
 SHA512:
-  metadata.gz: b4e8a6305f0d4a2266787f536a15c75c463f477d1b41d236a9ca35318041b7cec51ce1e41dda972e83fca4e8592989ae063f59cfa17175b39e11c7ab38fe9610
-  data.tar.gz: 26048216a8d1f48fb6d674b12946ce373d82f0fa40fb1d6f655fc22326125cc2348ed2dbe584713c7e8d2a909bb2688b3f65e551cadb49be32a48c76d09bbee0
+  metadata.gz: f781f6ea770b92cfdc324e6683f56eb849bb17df545c9ee1f19b65d19aff7baae0d349333afcb5306e8f3be11ac16320fed8ca2e7ecac77ad620a116360b4e0e
+  data.tar.gz: 4e1510714732bc8d7c5a240acbfc418323a89854e9d098085fcbe89d1a6ed59aaee0e12505470fba6fc0db8f72b09fba3e4fec5513af3c6f979b26c86b6c912d

data/lib/split_cacheable/version.rb

@@ -1,5 +1,5 @@
 module Split
 	module Cacheable
-		VERSION = "1.0.2"
+		VERSION = "1.0.3"
 	end
 end

data/lib/split_cacheable.rb

@@ -80,10 +80,13 @@ module Split
                 when 0
                     return [DEFAULT_KEY]
                 when 1
+                    test_variations[0].unshift(DEFAULT_KEY)
                     return test_variations[0]
                 else
                     first_test = test_variations.shift
-                    return first_test.product(*test_variations).map{|a| a.join("/")}
+                    all_variations = first_test.product(*test_variations).map{|a| a.join("/")}
+                    all_variations.unshift(DEFAULT_KEY)
+                    return all_variations
                 end
             end
         end

data/spec/cacheable_spec.rb

@@ -1,29 +1,39 @@
 require 'spec_helper'
 
 describe Split::Cacheable do
-    ALL_VARIATIONS = ["test_1/old/test_2/left", "test_1/old/test_2/right", "test_1/new/test_2/left", "test_1/new/test_2/right"]
+    ALL_VARIATIONS = [Split::Cacheable::Adapter::DEFAULT_KEY, "test_1/old/test_2/left", "test_1/old/test_2/right", "test_1/new/test_2/left", "test_1/new/test_2/right"]
 
     it "should return the default variation if there is no request" do
-        Split::Cacheable::Adapter.new(TestControllerWithoutRequest.new, :index).get_current_variations.should eql Split::Cacheable::Adapter::DEFAULT_KEY
+        expect(Split::Cacheable::Adapter.new(TestControllerWithoutRequest.new, :index).get_current_variations).to eql Split::Cacheable::Adapter::DEFAULT_KEY
     end
 
     it "should return a possible active variation if the controller has a request" do
-        ALL_VARIATIONS.should include(Split::Cacheable::Adapter.new(TestControllerWithRequest.new, :index).get_current_variations)
+        expect(ALL_VARIATIONS).to include(Split::Cacheable::Adapter.new(TestControllerWithRequest.new, :index).get_current_variations)
     end
 
     it "should return all active tests for a controller/action combination" do
-        Split::Cacheable::Adapter.new(TestControllerWithRequest.new, :index).active_tests.should eql [{:only=>[:index], :except=>[], :test_name=>:test_1}, {:only=>[], :except=>[:show], :test_name=>:test_2}]
-    end
-
-    it "should return all possible variations of the cachekey" do
-        Split::Cacheable::Adapter.new(TestControllerWithoutRequest.new, :index).get_all_possible_variations.should eql ALL_VARIATIONS
+        expect(Split::Cacheable::Adapter.new(TestControllerWithRequest.new, :index).active_tests).to eql [{:only=>[:index], :except=>[], :test_name=>:test_1}, {:only=>[], :except=>[:show], :test_name=>:test_2}]
     end
 
     it "should disregard tests that don't pass the :if Proc" do
         controller = TestControllerWithRequestAndProc.new
-        Split::Cacheable::Adapter.new(controller, :index).get_current_variations.should eql Split::Cacheable::Adapter::DEFAULT_KEY
+        expect(Split::Cacheable::Adapter.new(controller, :index).get_current_variations).to eql Split::Cacheable::Adapter::DEFAULT_KEY
 
         controller.instance_variable_set("@mobile_device", true)
-        ALL_VARIATIONS.should include(Split::Cacheable::Adapter.new(TestControllerWithRequest.new, :index).get_current_variations)
+        expect(ALL_VARIATIONS).to include(Split::Cacheable::Adapter.new(TestControllerWithRequest.new, :index).get_current_variations)
+    end
+
+    describe "get_all_possible_variations method" do
+        it "should return all possible variations of the cachekey" do
+            expect(Split::Cacheable::Adapter.new(TestControllerWithoutRequest.new, :index).get_all_possible_variations).to eql ALL_VARIATIONS
+        end
+
+        it "should return the default key when there are no variations" do
+            expect(Split::Cacheable::Adapter.new(TestControllerWithNoVariations.new, :index).get_all_possible_variations).to eql [Split::Cacheable::Adapter::DEFAULT_KEY]
+        end
+
+        it "should return one test plus the default key when there is one test" do
+            expect(Split::Cacheable::Adapter.new(TestControllerWithOneVariation.new, :index).get_all_possible_variations).to eql [Split::Cacheable::Adapter::DEFAULT_KEY, "test_1/old", "test_1/new"]
+        end
     end
 end

data/spec/spec_helper.rb

@@ -47,6 +47,13 @@ class TestControllerWithoutRequest
     end
 end
 
+class TestControllerWithNoVariations < TestControllerWithoutRequest
+end
+
+class TestControllerWithOneVariation < TestControllerWithoutRequest
+    cacheable_ab_test :test_1, :only => :index
+end
+
 class TestControllerWithRequest < TestControllerWithoutRequest
     cacheable_ab_test :test_1, :only => :index
     cacheable_ab_test :test_2, :except => :show

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: split_cacheable
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Daniel Schwartz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: split
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: We use action caching in Rails 3 to cache both our standard and mobile site.