shrinker 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4720887620ed4865e0db88f090a986a8c7765986
+  data.tar.gz: da07d703c35ec3fbce6e7df05745fae92aa96f7b
+SHA512:
+  metadata.gz: 9e6d0cb30cdfb02dff5edc695286942068c124702aabfaa4d63dd7bf03890075e3f5c40955d2ad1e1299c6e1ef2a5bdb33171a5bc0d264d5e0a1185b935671c3
+  data.tar.gz: baef8736cc4853e4990f296338f28c1778e48ca3117d8e4ebd081de7ba4a63aacc7a60d3d63bbd7fb422e588cbb0e58e14719a1fa1561121fd1dec51ce3d7b6a

data/.rspec

@@ -1,2 +1 @@
 --color
---debugger

data/.ruby-gemset

@@ -0,0 +1 @@
+shrinker

data/.ruby-version

@@ -0,0 +1 @@
+2.1.5

data/Gemfile

@@ -4,6 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rspec'
-gem 'debugger'
+gem 'byebug'
 gem 'redis'
-gem 'mail'
+gem 'mail'

data/README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
 ```ruby
 Shrinker.configure do
   backend 'Redis'
-  backend_options client: {port: 6388, host: '192.168.12.22'}
+  backend_options client: {port: 6388, host: '192.168.12.22'} # or connection: Redis.current
   expanded_domain /(www.)?google.com/ # this also works with protocol
   exclude_path /assets|images/
   anchors\_only\_in_html true         # With the mime only replace the links inside an anchor
@@ -37,8 +37,8 @@ Usage on a text:
 ```ruby
 
 text = <<-EV
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
-  Nunc quis rutrum http://www.google.com?something=true&else=false dolor. 
+  Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+  Nunc quis rutrum http://www.google.com?something=true&else=false dolor.
   Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
   Curabitur ullamcorper nisl non dolor http://google.fr?something=true venenatis consequat.
   Morbi odio libero, tincidunt quis tempus a, fringilla vitae augue.
@@ -49,9 +49,9 @@ EV
 
 new_text = Shrinker::Parser::Text.replace(text, {:user_id => 123})
 
-new_text # => 
-# Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
-# Nunc quis rutrum http://go.com/token1 dolor. 
+new_text # =>
+# Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+# Nunc quis rutrum http://go.com/token1 dolor.
 # Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
 # Curabitur ullamcorper nisl non dolor http://google.fr?something=true venenatis consequat.
 # Morbi odio libero, tincidunt quis tempus a, fringilla vitae augue.

data/lib/shrinker/backend/redis.rb

@@ -6,6 +6,7 @@ module Shrinker
       def initialize(options = {})
         super
         @client_options = options[:client] || {}
+        @client         = options[:connection]
         @namespace      = options[:namespace] || '_shrinker'
       end
 
@@ -36,7 +37,7 @@ module Shrinker
         @client ||= begin
           ::Redis.new(@client_options)
         end
-      end 
+      end
 
       def delete(token)
         client.del(key(token))
@@ -53,4 +54,4 @@ module Shrinker
       end
     end
   end
-end
+end

data/lib/shrinker/config.rb

@@ -15,12 +15,12 @@ module Shrinker
 
       class_eval <<-EV, __FILE__, __LINE__ + 1
         attr_reader :#{name}
-        
+
         def #{name}(value = nil)
           return @#{name} if value.nil?
           @#{name} = value
           value
-        end          
+        end
       EV
     end
 
@@ -44,15 +44,17 @@ 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) }
+      self.class.settings.each { |setting| return false unless send(setting) == config.send(setting) }
+
+      true
     end
 
     def reset!

data/lib/shrinker/parser/text.rb

@@ -18,4 +18,4 @@ module Shrinker
       end
     end
   end
-end
+end

data/lib/shrinker/version.rb

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

data/spec/lib/backend/redis_spec.rb

@@ -18,36 +18,46 @@ describe Shrinker::Backend::Redis do
     subject { Shrinker::Backend::Redis.new(options) }
 
     it "uses the options" do
-      Redis.should_receive(:new).with(options[:client])
+      expect(Redis).to receive(:new).with(options[:client])
 
       subject.send(:client)
     end
+
+    it "does not instantiate a redis if we pass it " do
+      redis_connection = double
+
+      subject = Shrinker::Backend::Redis.new(options.merge(connection: redis_connection))
+
+      expect(Redis).to receive(:new).with(options[:client]).never
+
+      expect(subject.send(:client)).to eql(redis_connection)
+    end
   end
 
   context "with a default client setup" do
     let(:client) { Redis.new }
-    before { subject.stub(:client) { client} }
+    before { allow(subject).to receive(:client) { client} }
 
     describe "#store" do
       it "stores the raw_url with the token key" do
-        Shrinker::Serializer.should_receive(:to_json).with('someurl', {}).and_return("tobestored")
+        expect(Shrinker::Serializer).to receive(:to_json).with('someurl', {}).and_return("tobestored")
 
         subject.store('someurl', 'token')
 
-        client.get("_shrinker::token").should == 'tobestored'
+        expect(client.get("_shrinker::token")).to eql 'tobestored'
       end
 
       it "stores the raw_url with the attributes" do
-        Shrinker::Serializer.should_receive(:to_json).with('someurl', {:user_id => 123}).and_return("tobestored")
+        expect(Shrinker::Serializer).to receive(:to_json).with('someurl', {:user_id => 123}).and_return("tobestored")
 
         subject.store('someurl', 'token', :user_id => 123)
-        client.get("_shrinker::token").should == 'tobestored'
+        expect(client.get("_shrinker::token")).to eql 'tobestored'
       end
 
       it "sets the ttl when present" do
-        Shrinker::Serializer.should_receive(:to_json).with('someurl', {}).and_return("tobestored")
-        subject.stub(:ttl) { 32 }
-        client.should_receive(:setex).with("_shrinker::token", 32, "tobestored")
+        expect(Shrinker::Serializer).to receive(:to_json).with('someurl', {}).and_return("tobestored")
+        allow(subject).to receive(:ttl) { 32 }
+        expect(client).to receive(:setex).with("_shrinker::token", 32, "tobestored")
 
         subject.store('someurl', 'token')
       end
@@ -56,7 +66,7 @@ describe Shrinker::Backend::Redis do
     describe "#fetch" do
       it "fetches using the token key" do
         client.set("_shrinker::token", '{"url": "someurl", "attributes": {}}')
-        subject.fetch("token").should == {'url' => "someurl", 'attributes' => {}}
+        expect(subject.fetch("token")).to eql({'url' => "someurl", 'attributes' => {}})
       end
     end
 
@@ -66,12 +76,12 @@ describe Shrinker::Backend::Redis do
       it "returns true when the token is used" do
         client.set("_shrinker::token", '{"url": "someurl", "attributes": {}}')
 
-        subject.used_token?('token').should be_true
+        expect(subject.used_token?('token')).to eql(true)
       end
 
       it "returns false" do
-        subject.used_token?('token').should be_false
+        expect(subject.used_token?('token')).to eql(false)
       end
     end
   end
-end
+end

data/spec/lib/config_spec.rb

@@ -21,16 +21,16 @@ describe Shrinker::Config do
   end
 
   it 'should return the config object for manipulation' do
-    config.is_a?(Shrinker::Config).should be_true
-    Shrinker.configure.is_a?(Shrinker::Config).should be_true
+    expect(config.is_a?(Shrinker::Config)).to eql(true)
+    expect(Shrinker.configure.is_a?(Shrinker::Config)).to eql(true)
   end
 
   it 'should yield to the config if a block is present' do
-    lambda{
+    expect {
       Shrinker.configure do
         raise self.class.name
       end
-    }.should raise_error('Shrinker::Config')
+    }.to raise_error('Shrinker::Config')
   end
 
   it 'allows passing the backend' do
@@ -39,14 +39,14 @@ describe Shrinker::Config do
       backend_options({:key => 'value'})
     end
 
-    Shrinker::Backend::FakeBackend.should_receive(:new).with({:key => 'value'})
+    allow(Shrinker::Backend::FakeBackend).to receive(:new).with({:key => 'value'})
     Shrinker.send(:backend)
   end
 
   describe "#merge!" do
     it "merges a hash" do
       config.merge!(backend_options: {something: true})
-      config.backend_options.should == {something: true}
+      expect(config.backend_options).to eql({something: true})
     end
 
     it "merges an instance of Config" do
@@ -59,8 +59,8 @@ describe Shrinker::Config do
         expanded_pattern 'second_pattern'
       end
       config.merge!(other_config)
-      config.expanded_pattern.should == 'second_pattern'
-      config.shrinked_pattern.should == 'shrinked_pattern'
+      expect(config.expanded_pattern).to eql('second_pattern')
+      expect(config.shrinked_pattern).to eql('shrinked_pattern')
     end
   end
-end
+end

data/spec/lib/easy_url_spec.rb

@@ -3,24 +3,24 @@ require 'spec_helper'
 describe Shrinker::EasyUrl do
   describe "#to_s" do
     it "returns itself with no params" do
-      Shrinker::EasyUrl.new("test").to_s.should == 'test'
+      expect(Shrinker::EasyUrl.new("test").to_s).to eql('test')
     end
 
     it "returns itself with params" do
-      Shrinker::EasyUrl.new("test?something=2").to_s.should == 'test?something=2'
+      expect(Shrinker::EasyUrl.new("test?something=2").to_s).to eql('test?something=2')
     end
 
     it "returns itself without the params when deleting it" do
       easy_url = Shrinker::EasyUrl.new("test?something=2")
       easy_url.params.delete(:something)
-      easy_url.to_s.should == 'test'
+      expect(easy_url.to_s).to eql('test')
     end
 
     it "keeps the other params when deleting some" do
       easy_url = Shrinker::EasyUrl.new("test?something=2&else=3")
       easy_url.params.delete(:something)
-      easy_url.params[:else].should == '3'
-      easy_url.to_s.should == 'test?else=3'
+      expect(easy_url.params[:else]).to eql('3')
+      expect(easy_url.to_s).to eql('test?else=3')
     end
   end
-end
+end

data/spec/lib/extractor_spec.rb

@@ -17,9 +17,9 @@ describe Shrinker::Extractor do
 
     it "returns an EasyUrl instance" do
       easy_url = Shrinker::Extractor.unshrink("token", config)
-      easy_url.should be_instance_of(Shrinker::EasyUrl)
-      easy_url.to_s.should       == "someurl"
-      easy_url.attributes.should == {"test" => 'ab'}
+      expect(easy_url).to be_instance_of(Shrinker::EasyUrl)
+      expect(easy_url.to_s).to eql("someurl")
+      expect(easy_url.attributes).to eql({"test" => 'ab'})
     end
 
     it "raise UrlNotFound when not existing" do
@@ -31,7 +31,7 @@ describe Shrinker::Extractor do
 
   describe "#config" do
     it "returns the default config by default" do
-      Shrinker::Extractor.new.send(:config).should == Shrinker.config
+      expect(Shrinker::Extractor.new.send(:config)).to eql Shrinker.config
     end
   end
-end
+end

data/spec/lib/parser/mime_spec.rb

@@ -13,7 +13,7 @@ describe Shrinker::Parser::Mime do
 
       Plain text message goes in this part. Notice that it
       has a blank line before it starts, meaning that this
-      part has no additional headers. 
+      part has no additional headers.
       Here is a link to http://my-example.com/test?params=1
 
       --theBoundaryString
@@ -22,7 +22,7 @@ describe Shrinker::Parser::Mime do
       Content-Disposition: inline
       Content-Base: "http://somewebsite.com/"
 
-      <body><font size=4>This</font> is a 
+      <body><font size=4>This</font> is a
       <i>test</i>.
       --theBoundaryString--
     MYMIME
@@ -39,11 +39,11 @@ describe Shrinker::Parser::Mime do
     end
 
     it "replace the content in the mime" do
-      Shrinker::Parser::Url.should_receive(:replace).with('my-example.com/test?params=1', {}, config).and_return("replace1")
-      Shrinker::Parser::Url.should_receive(:replace).with('somewebsite.com', {}, config).never
+      expect(Shrinker::Parser::Url).to receive(:replace).with('my-example.com/test?params=1', {}, config).and_return("replace1")
+      expect(Shrinker::Parser::Url).to receive(:replace).with('somewebsite.com', {}, config).never
 
       replaced_mime = Shrinker::Parser::Mime::replace(mime, {}, config)
-      replaced_mime.should include("Here is a link to http://replace1")
+      expect(replaced_mime).to include("Here is a link to http://replace1")
     end
 
     context "when mime is multipart" do
@@ -51,22 +51,23 @@ describe Shrinker::Parser::Mime do
 
       it "replace only anchor tags when setting anchors_only_in_html to true" do
         config.anchors_only_in_html true
+        config.around_pattern /href="(?:https?:\/\/)?($url)"/
 
-        Shrinker::Parser::Url.should_receive(:replace).with("my-example.com/a?something=true", {}, instance_of(Shrinker::Config)).and_return('replace1')
-        Shrinker::Parser::Url.should_receive(:replace).with("www.my-example.com/donec-lobortis-lacus-vel-urna-variuo--4?clicked=abcdef", {}, instance_of(Shrinker::Config)).and_return('replace2')
-        Shrinker::Parser::Url.should_receive(:replace).with('www.my-example.com/class-aptent-taciti-sociosqu-ad-litader.jpg', {}, instance_of(Shrinker::Config)).never
-        Shrinker::Parser::Url.should_receive(:replace).with('www.my-example.com/safe', {}, instance_of(Shrinker::Config)).never
-        Shrinker::Parser::Url.should_receive(:replace).with('my-example.com/none', {}, instance_of(Shrinker::Config)).never
+        expect(Shrinker::Parser::Url).to receive(:replace).with("my-example.com/a?something=true", {}, config).and_return('replace1')
+        expect(Shrinker::Parser::Url).to receive(:replace).with("www.my-example.com/donec-lobortis-lacus-vel-urna-variuo--4?clicked=abcdef", {}, config).and_return('replace2')
+        expect(Shrinker::Parser::Url).to receive(:replace).with('www.my-example.com/class-aptent-taciti-sociosqu-ad-litader.jpg', {}, config).never
+        expect(Shrinker::Parser::Url).to receive(:replace).with('www.my-example.com/safe', {}, config).never
+        expect(Shrinker::Parser::Url).to receive(:replace).with('my-example.com/none', {}, config).never
 
         replaced_mime = Shrinker::Parser::Mime::replace(mime, {}, config)
       end
 
       it "replace every urls when not setting anchors_only_in_html" do
-        Shrinker::Parser::Url.should_receive(:replace).with("my-example.com/a?something=true", {}, instance_of(Shrinker::Config)).and_return('replace1')
-        Shrinker::Parser::Url.should_receive(:replace).with("www.my-example.com/donec-lobortis-lacus-vel-urna-variuo--4?clicked=abcdef", {}, instance_of(Shrinker::Config)).and_return('replace2')
-        Shrinker::Parser::Url.should_receive(:replace).with('www.my-example.com/class-aptent-taciti-sociosqu-ad-litader.jpg', {}, instance_of(Shrinker::Config)).and_return('replace3')
-        Shrinker::Parser::Url.should_receive(:replace).with('www.my-example.com/safe', {}, instance_of(Shrinker::Config)).and_return('replace4')
-        Shrinker::Parser::Url.should_receive(:replace).with('my-example.com/none', {}, instance_of(Shrinker::Config)).and_return('replace5')
+        expect(Shrinker::Parser::Url).to receive(:replace).with("my-example.com/a?something=true", {}, config).and_return('replace1')
+        expect(Shrinker::Parser::Url).to receive(:replace).with("www.my-example.com/donec-lobortis-lacus-vel-urna-variuo--4?clicked=abcdef", {}, config).and_return('replace2')
+        expect(Shrinker::Parser::Url).to receive(:replace).with('www.my-example.com/class-aptent-taciti-sociosqu-ad-litader.jpg', {}, config).and_return('replace3')
+        expect(Shrinker::Parser::Url).to receive(:replace).with('www.my-example.com/safe', {}, config).and_return('replace4')
+        expect(Shrinker::Parser::Url).to receive(:replace).with('my-example.com/none', {}, config).and_return('replace5')
 
         replaced_mime = Shrinker::Parser::Mime::replace(mime, {}, config)
       end
@@ -90,25 +91,28 @@ describe Shrinker::Parser::Mime do
     it "replace only anchor tags when setting anchors_only_in_html to true" do
       config.anchors_only_in_html true
 
-      Shrinker::Parser::Url.should_receive(:replace).with("www.somwebsite.com/glencoe-il/t/office-help--0000", {}, instance_of(Shrinker::Config)).and_return('replace1')
-      Shrinker::Parser::Url.should_receive(:replace).with("www.somwebsite.com/notifications", {}, instance_of(Shrinker::Config)).and_return('replace2')
-      Shrinker::Parser::Url.should_receive(:replace).with("www.somwebsite.com/go/defdbf1191f17112776a6adb4c201b277af845278971e81b532089d1b96926300347343b15580afba7a7cc41567b9608161d", {}, instance_of(Shrinker::Config)).and_return('replace3')
-      Shrinker::Parser::Url.should_receive(:replace).with("www.somwebsite.com/go/5f25b2b15ec6b450c3c5af71102616e07413381a718f1b5d21e7ff9e26d6fc216e9c05ab2b8a40195a16c8603be5860170eb", {}, instance_of(Shrinker::Config)).and_return('replace4')
-      Shrinker::Parser::Url.should_receive(:replace).with('www.somwebsite.com/core/assets/email/somwebsite-sky-header.jpg', {}, instance_of(Shrinker::Config)).never
+      config_for_html = config.dup
+      config_for_html.around_pattern /href="(?:https?:\/\/)?($url)"/
+
+      expect(Shrinker::Parser::Url).to receive(:replace).with("www.somwebsite.com/glencoe-il/t/office-help--0000", {}, config).and_return('replace1')
+      expect(Shrinker::Parser::Url).to receive(:replace).with("www.somwebsite.com/notifications", {}, config).and_return('replace2')
+      expect(Shrinker::Parser::Url).to receive(:replace).with("www.somwebsite.com/go/defdbf1191f17112776a6adb4c201b277af845278971e81b532089d1b96926300347343b15580afba7a7cc41567b9608161d", {}, config_for_html).and_return('replace3')
+      expect(Shrinker::Parser::Url).to receive(:replace).with("www.somwebsite.com/go/5f25b2b15ec6b450c3c5af71102616e07413381a718f1b5d21e7ff9e26d6fc216e9c05ab2b8a40195a16c8603be5860170eb", {}, config_for_html).and_return('replace4')
+      expect(Shrinker::Parser::Url).to receive(:replace).with('www.somwebsite.com/core/assets/email/somwebsite-sky-header.jpg', {}, config_for_html).never
 
       replaced_mime = Shrinker::Parser::Mime::replace(multipart_mime, {}, config)
     end
 
     it "replace every urls when not setting anchors_only_in_html" do
-      Shrinker::Parser::Url.should_receive(:replace).with("www.somwebsite.com/glencoe-il/t/office-help--0000", {}, instance_of(Shrinker::Config)).and_return('replace1')
-      Shrinker::Parser::Url.should_receive(:replace).with("www.somwebsite.com/notifications", {}, instance_of(Shrinker::Config)).and_return('replace2')
-      Shrinker::Parser::Url.should_receive(:replace).with("www.somwebsite.com/go/defdbf1191f17112776a6adb4c201b277af845278971e81b532089d1b96926300347343b15580afba7a7cc41567b9608161d", {}, instance_of(Shrinker::Config)).and_return('replace3')
-      Shrinker::Parser::Url.should_receive(:replace).with("www.somwebsite.com/go/5f25b2b15ec6b450c3c5af71102616e07413381a718f1b5d21e7ff9e26d6fc216e9c05ab2b8a40195a16c8603be5860170eb", {}, instance_of(Shrinker::Config)).and_return('replace4')
-      Shrinker::Parser::Url.should_receive(:replace).with('www.somwebsite.com/core/assets/email/somwebsite-sky-header.jpg', {}, instance_of(Shrinker::Config)).never
+      expect(Shrinker::Parser::Url).to receive(:replace).with("www.somwebsite.com/glencoe-il/t/office-help--0000", {}, config).and_return('replace1')
+      expect(Shrinker::Parser::Url).to receive(:replace).with("www.somwebsite.com/notifications", {}, config).and_return('replace2')
+      expect(Shrinker::Parser::Url).to receive(:replace).with("www.somwebsite.com/go/defdbf1191f17112776a6adb4c201b277af845278971e81b532089d1b96926300347343b15580afba7a7cc41567b9608161d", {}, config).and_return('replace3')
+      expect(Shrinker::Parser::Url).to receive(:replace).with("www.somwebsite.com/go/5f25b2b15ec6b450c3c5af71102616e07413381a718f1b5d21e7ff9e26d6fc216e9c05ab2b8a40195a16c8603be5860170eb", {}, config).and_return('replace4')
+      expect(Shrinker::Parser::Url).to receive(:replace).with('www.somwebsite.com/core/assets/email/somwebsite-sky-header.jpg', {}, config).never
 
       replaced_mime = Shrinker::Parser::Mime::replace(multipart_mime, {}, config)
     end
 
   end
 
-end
+end

data/spec/lib/parser/text_spec.rb

@@ -16,8 +16,8 @@ describe Shrinker::Parser::Text do
 
       it "replaces proper occurences" do
         content = <<-EV
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
-          Nunc quis rutrum <a href="http://www.google.com?something=true&else=false">dolor</a>. 
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+          Nunc quis rutrum <a href="http://www.google.com?something=true&else=false">dolor</a>.
           <a href="www.google.com?params=abcdef" style="text-align:center;">http://google.com/safe</a>
           Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
           Curabitur ullamcorper nisl non dolor <a href="http://google.fr?something=true">venenatis</a> consequat.
@@ -26,17 +26,17 @@ describe Shrinker::Parser::Text do
           Aenean placerat ullamcorper lorem vel feugiat.
         EV
 
-        Shrinker::Parser::Url.should_receive(:replace).with('www.google.com?something=true&else=false', {}, config).and_return("replace1")
-        Shrinker::Parser::Url.should_receive(:replace).with('www.google.com?params=abcdef', {}, config).and_return("replace2")
-        Shrinker::Parser::Url.should_receive(:replace).with('google.com/safe', {}, config).never
-        Shrinker::Parser::Url.should_receive(:replace).with('google.fr?something=true', {}, config).never
-        Shrinker::Parser::Url.should_receive(:replace).with('google.com/somepath?something=true', {}, config).and_return("replace3")
+        allow(Shrinker::Parser::Url).to receive(:replace).with('www.google.com?something=true&else=false', {}, config).and_return("replace1")
+        allow(Shrinker::Parser::Url).to receive(:replace).with('www.google.com?params=abcdef', {}, config).and_return("replace2")
+        allow(Shrinker::Parser::Url).to receive(:replace).with('google.com/safe', {}, config).never
+        allow(Shrinker::Parser::Url).to receive(:replace).with('google.fr?something=true', {}, config).never
+        allow(Shrinker::Parser::Url).to receive(:replace).with('google.com/somepath?something=true', {}, config).and_return("replace3")
 
         replaced_text = Shrinker::Parser::Text::replace(content, {}, config)
 
         expected_replaced_text = <<-EV
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
-          Nunc quis rutrum <a href="http://replace1">dolor</a>. 
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+          Nunc quis rutrum <a href="http://replace1">dolor</a>.
           <a href="replace2" style="text-align:center;">http://google.com/safe</a>
           Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
           Curabitur ullamcorper nisl non dolor <a href="http://google.fr?something=true">venenatis</a> consequat.
@@ -45,18 +45,18 @@ describe Shrinker::Parser::Text do
           Aenean placerat ullamcorper lorem vel feugiat.
         EV
 
-        replaced_text.should == expected_replaced_text
+        expect(replaced_text).to eql(expected_replaced_text)
       end
 
       it "does not do anything when there is no occurence" do
         content = <<-EV
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.
           Curabitur ullamcorper nisl non dolor http://google.fr?something=true venenatis consequat.
           Aenean placerat ullamcorper lorem vel feugiat.
         EV
 
         replaced_text = Shrinker::Parser::Text::replace(content, {}, config)
-        replaced_text.should == content
+        expect(replaced_text).to eql(content)
       end
     end
 
@@ -72,8 +72,8 @@ describe Shrinker::Parser::Text do
 
       it "replaces proper occurences" do
         content = <<-EV
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
-          Nunc quis rutrum http://www.google.com?something=true&else=false dolor. 
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+          Nunc quis rutrum http://www.google.com?something=true&else=false dolor.
           Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
           Curabitur ullamcorper nisl non dolor http://google.fr?something=true venenatis consequat.
           Morbi odio libero, tincidunt quis tempus a, fringilla vitae augue.
@@ -81,15 +81,15 @@ describe Shrinker::Parser::Text do
           Aenean placerat ullamcorper lorem vel feugiat.
         EV
 
-        Shrinker::Parser::Url.should_receive(:replace).with('http://www.google.com?something=true&else=false', {}, config).and_return("https://replace1")
-        Shrinker::Parser::Url.should_receive(:replace).with('google.fr?something=true', {}, config).never
-        Shrinker::Parser::Url.should_receive(:replace).with('http://google.com/somepath?something=true', {}, config).never
+        allow(Shrinker::Parser::Url).to receive(:replace).with('http://www.google.com?something=true&else=false', {}, config).and_return("https://replace1")
+        allow(Shrinker::Parser::Url).to receive(:replace).with('google.fr?something=true', {}, config).never
+        allow(Shrinker::Parser::Url).to receive(:replace).with('http://google.com/somepath?something=true', {}, config).never
 
         replaced_text = Shrinker::Parser::Text::replace(content, {}, config)
 
         expected_replaced_text = <<-EV
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
-          Nunc quis rutrum https://replace1 dolor. 
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+          Nunc quis rutrum https://replace1 dolor.
           Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
           Curabitur ullamcorper nisl non dolor http://google.fr?something=true venenatis consequat.
           Morbi odio libero, tincidunt quis tempus a, fringilla vitae augue.
@@ -97,14 +97,14 @@ describe Shrinker::Parser::Text do
           Aenean placerat ullamcorper lorem vel feugiat.
         EV
 
-        replaced_text.should == expected_replaced_text
+        expect(replaced_text).to eql(expected_replaced_text)
       end
     end
   end
 
   describe "#config" do
     it "returns the default config by default" do
-      Shrinker::Parser::Text.new.send(:config).should == Shrinker.config
+      expect(Shrinker::Parser::Text.new.send(:config) == Shrinker.config).to eql(true)
     end
   end
-end
+end

data/spec/lib/parser/url_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Shrinker::Parser::Url do
   describe "#replace" do
-    before { Shrinker::Token.stub(:fetch_unique_token).and_return("thetoken") }
+    before { allow(Shrinker::Token).to receive(:fetch_unique_token).and_return("thetoken") }
 
     context "without protocol" do
       let(:config) do
@@ -17,38 +17,38 @@ describe Shrinker::Parser::Url do
       end
 
       it "replace the link" do
-        Shrinker::Parser::Url::replace("www.google.com?something=else", {:user_id => 10}, config).should == "goo.ln/thetoken"
+        expect(Shrinker::Parser::Url::replace("www.google.com?something=else", {:user_id => 10}, config)).to eql("goo.ln/thetoken")
       end
 
       it "store the old link" do
-        Shrinker::Backend::Redis.any_instance.should_receive(:store).with("www.google.com?something=else", 'thetoken', {:user_id => 10})
+        expect_any_instance_of(Shrinker::Backend::Redis).to receive(:store).with("www.google.com?something=else", 'thetoken', {:user_id => 10})
 
         Shrinker::Parser::Url::replace("www.google.com?something=else", {:user_id => 10}, config)
       end
 
       describe "does not do anything" do
         before do
-          Shrinker::Backend::Redis.any_instance.should_receive(:store).never
+          expect_any_instance_of(Shrinker::Backend::Redis).to receive(:store).never
         end
 
         it "returns the text if it does not match an url" do
-          Shrinker::Parser::Url::replace("sometext", {}, config).should == "sometext"
+          expect(Shrinker::Parser::Url::replace("sometext", {}, config)).to eql("sometext")
         end
 
         it "returns the text if it does not match the domain" do
-          Shrinker::Parser::Url::replace("www.google.fr", {}, config).should == "www.google.fr"
+          expect(Shrinker::Parser::Url::replace("www.google.fr", {}, config)).to eql("www.google.fr")
         end
 
         it "does not replace the link if there is a shrinker=false" do
-          Shrinker::Parser::Url::replace("www.google.com?shrinker=false&something=else", {}, config).should == "www.google.com?something=else"
+          expect(Shrinker::Parser::Url::replace("www.google.com?shrinker=false&something=else", {}, config)).to eql("www.google.com?something=else")
         end
 
         it "does not replace the link if its excluded" do
-          Shrinker::Parser::Url::replace("www.google.com/assets/logo.png?something=else", {}, config).should == "www.google.com/assets/logo.png?something=else"
+          expect(Shrinker::Parser::Url::replace("www.google.com/assets/logo.png?something=else", {}, config)).to eql("www.google.com/assets/logo.png?something=else")
         end
       end
     end
-    
+
     context "with full url dynamic pattern" do
       let(:config) do
         config = Shrinker::Config.new
@@ -61,16 +61,16 @@ describe Shrinker::Parser::Url do
       end
 
       it "replace the link" do
-        Shrinker::Parser::Url::replace("www.google.com?something=else", {:user_id => 10}, config).should == "www.google.com/x/thetoken"
+        expect(Shrinker::Parser::Url::replace("www.google.com?something=else", {:user_id => 10}, config)).to eql("www.google.com/x/thetoken")
       end
 
       it "store the old link" do
-        Shrinker::Backend::Redis.any_instance.should_receive(:store).with("www.google.com?something=else", 'thetoken', {:user_id => 10})
+        allow_any_instance_of(Shrinker::Backend::Redis).to receive(:store).with("www.google.com?something=else", 'thetoken', {:user_id => 10})
 
         Shrinker::Parser::Url::replace("www.google.com?something=else", {:user_id => 10}, config)
       end
     end
-    
+
     context "with partial url dynamic pattern" do
       let(:config) do
         config = Shrinker::Config.new
@@ -83,11 +83,11 @@ describe Shrinker::Parser::Url do
       end
 
       it "replace the link" do
-        Shrinker::Parser::Url::replace("xyz.google.com?something=else", {:user_id => 10}, config).should == "xyz.other.com/thetoken"
+        expect(Shrinker::Parser::Url::replace("xyz.google.com?something=else", {:user_id => 10}, config)).to eql("xyz.other.com/thetoken")
       end
 
       it "store the old link" do
-        Shrinker::Backend::Redis.any_instance.should_receive(:store).with("www.google.com?something=else", 'thetoken', {:user_id => 10})
+        allow_any_instance_of(Shrinker::Backend::Redis).to receive(:store).with("www.google.com?something=else", 'thetoken', {:user_id => 10})
 
         Shrinker::Parser::Url::replace("www.google.com?something=else", {:user_id => 10}, config)
       end
@@ -105,14 +105,14 @@ describe Shrinker::Parser::Url do
       end
 
       it "replace the link" do
-        Shrinker::Parser::Url::replace("http://www.google.com?something=else", {:user_id => 10}, config).should == "https://goo.ln/thetoken"
+        expect(Shrinker::Parser::Url::replace("http://www.google.com?something=else", {:user_id => 10}, config)).to eql("https://goo.ln/thetoken")
       end
 
       it "store the old link" do
-        Shrinker::Backend::Redis.any_instance.should_receive(:store).with("http://www.google.com?something=else", 'thetoken', {:user_id => 10})
+        allow_any_instance_of(Shrinker::Backend::Redis).to receive(:store).with("http://www.google.com?something=else", 'thetoken', {:user_id => 10})
 
         Shrinker::Parser::Url::replace("http://www.google.com?something=else", {:user_id => 10}, config)
       end
     end
   end
-end
+end

data/spec/lib/serializer_spec.rb

@@ -3,21 +3,21 @@ require 'spec_helper'
 describe Shrinker::Serializer do
   describe "#hash" do
     it "returns a hash containing the url" do
-      Shrinker::Serializer::to_hash('someurl').should == {:url => 'someurl', :attributes => {}}
+      expect(Shrinker::Serializer::to_hash('someurl')).to eql({:url => 'someurl', :attributes => {}})
     end
 
     it "returns a hash containing the attributes" do
-      Shrinker::Serializer::to_hash('someurl', {:user_id => 12}).should == {:url => 'someurl', :attributes => {:user_id => 12}}
+      expect(Shrinker::Serializer::to_hash('someurl', {:user_id => 12})).to eql({:url => 'someurl', :attributes => {:user_id => 12}})
     end
   end
 
   describe "#json" do
     it "returns a json containing the url" do
-      Shrinker::Serializer::to_json('someurl').should == {:url => 'someurl', :attributes => {}}.to_json
+      expect(Shrinker::Serializer::to_json('someurl')).to eql({:url => 'someurl', :attributes => {}}.to_json)
     end
 
     it "returns a json containing the attributes" do
-      Shrinker::Serializer::to_json('someurl', {:user_id => 12}).should == {:url => 'someurl', :attributes => {:user_id => 12}}.to_json
+      expect(Shrinker::Serializer::to_json('someurl', {:user_id => 12})).to eql({:url => 'someurl', :attributes => {:user_id => 12}}.to_json)
     end
   end
-end
+end

data/spec/lib/shrinker_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe Shrinker do
   describe ".unshrink" do
     it "delegates the method to the Extractor" do
-      Shrinker::Extractor.should_receive(:unshrink).with('token', Shrinker.config)
+      allow(Shrinker::Extractor).to receive(:unshrink).with('token', Shrinker.config)
 
       Shrinker.unshrink('token')
     end
   end
-end
+end

data/spec/lib/token_spec.rb

@@ -4,55 +4,55 @@ describe Shrinker::Token do
   describe "#generate" do
     before do
       Shrinker.config.reset!
-      Shrinker::Token.stub(:rand).and_return('random')
+      allow(Shrinker::Token).to receive(:rand).and_return('random')
     end
 
     after do
       Shrinker.config.reset!
     end
-    
-    it "should use the length config setting" do      
+
+    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"
+
+      allow(Digest::MD5).to receive(:hexdigest).with("something").and_return("abcdefghijklmnopqrstuvwxyz")
+      expect(Shrinker::Token.generate(0, prefix: 'something')).to eql("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"
+
+      allow(Digest::MD5).to receive(:hexdigest).with("something").and_return("abcdefghijklmnopqrstuvwxyz")
+      expect(Shrinker::Token.generate(1, prefix: 'something')).to eql("vwxyz")
     end
-    
+
     it "should default to 6 length" do
-      Digest::MD5.should_receive(:hexdigest).with("something").and_return("abcdefghijklmnopqrstuvwxyz")
+      allow(Digest::MD5).to receive(:hexdigest).with("something").and_return("abcdefghijklmnopqrstuvwxyz")
 
-      Shrinker::Token.generate(0, prefix: 'something').should == "uvwxyz"
+      expect(Shrinker::Token.generate(0, prefix: 'something')).to eql("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"
+
+      allow(Digest::MD5).to receive(:hexdigest).with("something__random").and_return("abcdefghijklmnopqrstuvwxyz")
+      expect(Shrinker::Token.generate(0, prefix: 'something')).to eql("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"
+
+      allow(Digest::MD5).to receive(:hexdigest).with("something__random").and_return("abcdefghijklmnopqrstuvwxyz")
+      expect(Shrinker::Token.generate(1, prefix: 'something')).to eql("uvwxyz")
     end
   end
 
@@ -60,11 +60,11 @@ describe Shrinker::Token do
     let(:backend) { double }
 
     it "returns an unique token" do
-      backend.stub(:used_token?).and_return(true, false)
+      allow(backend).to receive(:used_token?).and_return(true, false)
 
-      Shrinker::Token.should_receive(:generate).twice.and_return('abcdef')
+      allow(Shrinker::Token).to receive(:generate).twice.and_return('abcdef')
 
-      Shrinker::Token.fetch_unique_token(backend).should == 'abcdef'
+      expect(Shrinker::Token.fetch_unique_token(backend)).to eql('abcdef')
     end
   end
-end
+end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: shrinker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - jrichardlai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2014-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Find links in a text and shorten them
@@ -34,9 +31,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rvmrc
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -70,27 +68,26 @@ files:
 - spec/support/fixtures/multipart_mime.txt
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Find links in a text and shorten them
 test_files:
 - spec/lib/backend/redis_spec.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3-p194@shrinker --install --create