vignette 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6e339a4120f9d2aa60652c739eefe130f89bbf1
-  data.tar.gz: cc3e420a4134dec09e1fe1ce5c91c2b3a5d12d27
+  metadata.gz: 196be79b8ba920292a1e9322f8ab84f4ddfa1fd1
+  data.tar.gz: c7ec87488bf8c8f5cb57dc192e2c011402d3540f
 SHA512:
-  metadata.gz: 7daa2a02433d64a36e53cb0096f071c3d5b232c545af82ece0319390c4956dce75af82367261725050da19939e53fc8c528ec69d731fe81edb367c00b52cfa4d
-  data.tar.gz: 6c1d9144b845a1807d2e42ecfa3785a710d2cd3c3e582988f970599ad72e26fa754f6aa7e69de71bf064a3e985cc5b9ad68d79daa191a2405fbfec3cf3dbc625
+  metadata.gz: e281220e3815bae46954f16b5d0126d1ea601771e51ac69a426449c6351af93b0ff64916636d8f5f092027a462a46a5639e8391cbe9801b4b609f1b0dbaf3300
+  data.tar.gz: 9b2d4e372dc309a4e7509d49eeaaa0d43d4ee9c7df82ecaaf729dc1bc31b93bc62bcfef21318baaa3a0989f5d4f7d1f9394549bd023713bb3ac7716078d0b8a2

data/lib/vignette/filter.rb

@@ -16,9 +16,9 @@ if defined?(Haml)
       # Otherwise, try to use filename and line
       elsif options[:filename] && options[:line]
         if options[:filename] == "(haml)"
-          lines.vignette("(haml:#{options[:line]})")
+          lines.vignette("(haml:#{options[:line]})", expect_consistent_name: false)
         else
-          lines.vignette("(#{Vignette::strip_path(options[:filename])}:#{options[:line]})")
+          lines.vignette("(#{Vignette::strip_path(options[:filename])}:#{options[:line]})", expect_consistent_name: false)
         end
       # If not given, raise an error
       else

data/lib/vignette/object_extensions.rb

@@ -1,5 +1,11 @@
 module ObjectExtensions
 
+  module Merge
+    def merge(store, key, hash)
+
+    end
+  end
+
   # Extensions to the Array object
   module ArrayExtensions
 
@@ -8,32 +14,36 @@ module ObjectExtensions
     end
 
     # Test will select a random object from the Array
-    def vignette(name=nil)
+    def vignette(name=nil, expect_consistent_name: true)
       vignette_crc = self.crc().abs.to_s(16)
 
       key = "vignette_#{vignette_crc}"
       test_name = nil
 
       store = Vignette.get_store
+      v = store[:v] ? JSON(store[:v]) : {}
 
-      test_name = if name.present?
+      test_name = if expect_consistent_name && name.present?
+        name
+      elsif test_hash = v[vignette_crc]
+        test_hash['name']
+      elsif name.present? # this logic looks weird, but this is if we don't expect consistent names *and* we don't have a name in v[]
         name
-      elsif store[:vt] && original_name = JSON(store[:vt])[vignette_crc]
-        original_name
       else
         loc = caller_locations(1,1).first
-        new_name = "(#{Vignette::strip_path(loc.absolute_path)}:#{loc.lineno})"
-
-        store[:vt] = ( store[:vt].present? ? JSON(store[:vt]) : {} ).merge(vignette_crc => new_name).to_json
-
-        new_name
+        "(#{Vignette::strip_path(loc.absolute_path)}:#{loc.lineno})"
       end
 
-      choice = store[key] ||= Kernel.rand(length) # Store key into storage if not available
-      result = self[choice.to_i]
+      result = if v.has_key?(vignette_crc)
+        v[vignette_crc]['v']
+      else
+        # Store key into storage if not available
+        new_value = self[Kernel.rand(length)]
 
-      # Let's store keys where they are (note, this truncates any other tests with the same name)
-      store[:v] = ( store[:v].present? ? JSON(store[:v]) : {} ).merge(test_name => result).to_json
+        store[:v] = v.merge(vignette_crc => { n: test_name, v: new_value, t: Time.now.to_i }).to_json
+
+        new_value
+      end
 
       return result
     end

data/lib/vignette/version.rb

@@ -1,3 +1,3 @@
 module Vignette
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/vignette.rb

@@ -63,6 +63,17 @@ module Vignette
   def self.tests(session=Vignette.session, cookies=Vignette.cookies)
     store = get_store(session, cookies)
     store && store[:v].present? ? JSON(store[:v]) : {}
+    if store && store[:v].present?
+      v = JSON(store[:v])
+
+      name_values = v.values.map { |v| [ v['n'], [ v['t'], v['v'] ] ] }.group_by { |el| el[0] }
+
+      arr = name_values.map { |k,v| [ k.to_sym, v.sort { |a,b| b[1][0] <=> a[1][0] }.first[1][1] ] }
+
+      Hash[arr]
+    else
+      {}
+    end
   end
   
   def self.get_store(session=Vignette.session, cookies=Vignette.cookies)

data/spec/lib/vignette/filter_spec.rb

@@ -20,7 +20,7 @@ describe Haml::Filters::Vignette do
           html = Haml::Engine.new(template).render
 
           expect(html).to match(/\<p\>\s+three\s+\<\/p\>\n/)
-          expect(Vignette.tests).to eq({"(haml:3)" => "three"})
+          expect(Vignette.tests).to eq({:"(haml:3)" => "three"})
         end
       end
     end
@@ -40,7 +40,7 @@ describe Haml::Filters::Vignette do
           html = Haml::Engine.new(template).render
 
           expect(html).to match(/\<p\>\s+three\s+\<\/p\>\n/)
-          expect(Vignette.tests).to eq({"numbers" => "three"})
+          expect(Vignette.tests).to eq({:"numbers" => "three"})
         end
       end
     end
@@ -55,7 +55,7 @@ describe Haml::Filters::Vignette do
           html = Haml::Engine.new(template, filename: template_file).render
 
           expect(html).to match(/\<div\>\s+I like\s+scorpians\s+\<\/div\>/)
-          expect(Vignette.tests).to eq({"(ex.html.haml:3)" => "scorpians"})
+          expect(Vignette.tests).to eq({:"(ex.html.haml:3)" => "scorpians"})
         end
       end
     end

data/spec/lib/vignette_spec.rb

@@ -18,32 +18,61 @@ describe Vignette do
 
         it 'should store tests in session' do
           expect(array.vignette).to eq('b'); line = __LINE__ # for tracking line number
-          expect(Vignette.tests).to eq({"(vignette_spec.rb:#{line})" => 'b'})
+          expect(Vignette.tests).to eq({:"(vignette_spec.rb:#{line})" => 'b'})
         end
 
         it 'should store tests even if we call on different lines' do
           expect(array.vignette).to eq('b'); line = __LINE__
-          expect(Vignette.tests).to eq({"(vignette_spec.rb:#{line})" => 'b'})
+          expect(Vignette.tests).to eq({:"(vignette_spec.rb:#{line})" => 'b'})
 
           expect(array.vignette).to eq('b'); new_line = __LINE__
-          expect(Vignette.tests).to eq({"(vignette_spec.rb:#{line})" => 'b'})
+          expect(Vignette.tests).to eq({:"(vignette_spec.rb:#{line})" => 'b'})
         end
       end
 
       context "for multiple runs" do
-        before(:each) { expect(Kernel).to receive(:rand).and_return(1, 2) }
+        before(:each) { expect(Kernel).to receive(:rand).and_return(1, 2, 0) }
 
         it 'should store tests in session by name' do
-          expect(array.vignette('cat')).to eq('b')
+          expect(array.vignette(:cat)).to eq('b')
           
-          expect(Vignette.tests).to eq({'cat' => 'b'})
-          expect(session).to eq( {'vignette_352441c2' => 1, v: {'cat' => 'b'}.to_json} )
-
-          expect(array.vignette('cat')).to eq('b') # same value
-          expect(session).to eq( {'vignette_352441c2' => 1, v: {'cat' => 'b'}.to_json} )
-
-          expect([11,22,33].vignette('cat')).to eq(33) # new value
-          expect(session).to eq( {'vignette_352441c2' => 1, 'vignette_d4d3e16f' => 2, v: {'cat' => 33}.to_json} )
+          original_time = Time.now
+          second_time = original_time + 1
+          third_time = original_time + 2
+          fourth_time = original_time + 3
+
+          Timecop.freeze(original_time) do
+            expect(Vignette.tests).to eq(cat: 'b') # original choice
+            expect(JSON(session[:v])).to eq( { '352441c2' => { 'n' => 'cat', 'v' => 'b', 't' => original_time.to_i } } )
+          end
+
+          Timecop.freeze(second_time) do
+            expect(Vignette.tests).to eq(cat: 'b') # same value
+            expect(JSON(session[:v])).to eq( { '352441c2' => { 'n' => 'cat', 'v' => 'b', 't' => original_time.to_i } } )
+          end
+          
+          Timecop.freeze(third_time) do
+            expect([11,22,33].vignette(:cat)).to eq(33) # new value
+            expect(JSON(session[:v])).to eq(
+              {
+                '352441c2' => { 'n' => 'cat', 'v' => 'b', 't' => original_time.to_i },
+                'd4d3e16f' => { 'n' => 'cat', 'v' => 33, 't' => third_time.to_i }
+              }
+            )
+            expect(Vignette.tests).to eq(cat: 33)
+          end
+
+          Timecop.freeze(fourth_time) do
+            expect(['mice', 'mooise'].vignette(:cat)).to eq('mice') # new value
+            expect(JSON(session[:v])).to eq(
+              {
+                '2384053' => { 'n' => 'cat', 'v' => 'mice', 't' => fourth_time.to_i },
+                '352441c2' => { 'n' => 'cat', 'v' => 'b', 't' => original_time.to_i },
+                'd4d3e16f' => { 'n' => 'cat', 'v' => 33, 't' => third_time.to_i }
+              }
+            )
+            expect(Vignette.tests).to eq(cat: 'mice')
+          end
         end
       end
     end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@
 require 'pry'
 require 'haml'
 require 'vignette'
+require 'timecop'
 
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate

data/vignette.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "guard-rspec", ">= 4.5.0"
   gem.add_development_dependency "haml", ">= 4.0.6"
   gem.add_development_dependency "pry-byebug", ">= 0"
+  gem.add_development_dependency "timecop", ">= 0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vignette
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Geoff Hayes
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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: Simple, effective A/b testing made easy.
 email:
 - geoff@safeshepherd.com