shrinker 0.1.0 → 0.1.1

data/lib/shrinker/config.rb

@@ -44,6 +44,12 @@ module Shrinker
 
     # setting boolean to replace links only in anchor tags href inside html
     config_setting :anchors_only_in_html
+    
+    # how long should url tokens be, default 6
+    config_setting :token_length_target
+    
+    # how should it generate new tokens: longer (default), random
+    config_setting :token_length_strategy
 
     def ==(config)
       self.class.settings.each { |setting| send(setting) == config.send(setting) }

data/lib/shrinker/token.rb

@@ -7,17 +7,34 @@ module Shrinker
     def fetch_unique_token(backend, options = {})
       need_token = true
 
+      round = 0
       while need_token
-        token      = generate(options)
+        token      = generate(round, options)
         need_token = backend.used_token?(token)
+        round += 1
       end
 
       token
     end
 
-    def generate(options = {})
-      prefix = options[:prefix]
-      Digest::MD5.hexdigest("#{prefix}__#{rand(99999)}")[-12..-1]
+    def generate(round, options = {})
+      length   = Shrinker.config.token_length_target || 6
+      strategy = Shrinker.config.token_length_strategy || "longer"
+      
+      prefix = options[:prefix].to_s
+      if !prefix || prefix.length == 0
+        # need soemthing
+        prefix = rand(99999999).to_s
+      end
+      
+      extra = ""
+      if strategy.to_s == "random"
+        extra= "__#{rand(99999999999)}"
+      else
+        length += round
+      end
+      
+      Digest::MD5.hexdigest("#{prefix}#{extra}")[-1*length..-1]
     end
   end
 end

data/lib/shrinker/version.rb

@@ -3,7 +3,7 @@ module Shrinker
 
     MAJOR = 0
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
     PRE   = nil
 
     def self.to_s

data/spec/lib/token_spec.rb

@@ -2,16 +2,62 @@ require 'spec_helper'
 
 describe Shrinker::Token do
   describe "#generate" do
-    it "allows passing a prefix" do
+    before do
+      Shrinker.config.reset!
       Shrinker::Token.stub(:rand).and_return('random')
-      Digest::MD5.should_receive(:hexdigest).with("something__random").and_return("abcdefghijklmnopqrstuvwxyz")
+    end
+
+    after do
+      Shrinker.config.reset!
+    end
+    
+    it "should use the length config setting" do      
+      Shrinker.configure do
+        token_length_target 4
+      end
+      
+      Digest::MD5.should_receive(:hexdigest).with("something").and_return("abcdefghijklmnopqrstuvwxyz")
+      Shrinker::Token.generate(0, prefix: 'something').should == "wxyz"
+    end
+    
+    it "should use longer than defualt if that is the strategy (default)" do
+      Shrinker.configure do
+        token_length_target 4
+      end
+      
+      Digest::MD5.should_receive(:hexdigest).with("something").and_return("abcdefghijklmnopqrstuvwxyz")
+      Shrinker::Token.generate(1, prefix: 'something').should == "vwxyz"
+    end
+    
+    it "should default to 6 length" do
+      Digest::MD5.should_receive(:hexdigest).with("something").and_return("abcdefghijklmnopqrstuvwxyz")
 
-      Shrinker::Token.generate(prefix: 'something').should == "opqrstuvwxyz"
+      Shrinker::Token.generate(0, prefix: 'something').should == "uvwxyz"
+    end
+    
+    it "should use the random strategy if asked" do
+      Shrinker.configure do
+        token_length_strategy :random
+        token_length_target 6
+      end
+      
+      Digest::MD5.should_receive(:hexdigest).with("something__random").and_return("abcdefghijklmnopqrstuvwxyz")
+      Shrinker::Token.generate(0, prefix: 'something').should == "uvwxyz"
+    end
+    
+    it "should not get longer if strategy random" do
+      Shrinker.configure do
+        token_length_strategy :random
+        token_length_target 6
+      end
+      
+      Digest::MD5.should_receive(:hexdigest).with("something__random").and_return("abcdefghijklmnopqrstuvwxyz")
+      Shrinker::Token.generate(1, prefix: 'something').should == "uvwxyz"
     end
   end
 
   describe "#fetch_uniq_token" do
-    let(:backend) { stub }
+    let(:backend) { double }
 
     it "returns an unique token" do
       backend.stub(:used_token?).and_return(true, false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shrinker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: