thumbor_rails 1.0.1 → 1.1.0

data/README.md

@@ -11,7 +11,7 @@ thumbor_rails is a client to make easier to use the thumbor imaging service (htt
 You can use this gem by putting the following inside your Gemfile:
 
 ```
-gem "thumbor_rails", "1.0.1"
+gem "thumbor_rails", "1.1.0"
 ```
 
 Now generate the thumbor basic client configuration:

data/lib/thumbor_rails/version.rb

@@ -1,3 +1,3 @@
 module ThumborRails
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/lib/thumbor_rails.rb

@@ -5,7 +5,7 @@ module ThumborRails
   @@server_url = 'http://thumbor.example.com'
 
   mattr_accessor :security_key
-  @@security_key = 'MY_SECURITY_KEY'
+  @@security_key = nil
 
   mattr_accessor :force_no_protocol_in_source_url
   @@force_no_protocol_in_source_url = false

data/spec/thumbor_rails/helpers_spec.rb

@@ -1,50 +1,77 @@
 require 'spec_helper'
 
 describe ThumborRails::Helpers do
+  let(:params) { { } }
+
   include ThumborRails::Helpers
 
-  describe "#thumbor_url" do
-    it 'should generate a basic encrypted url' do
-      expect(thumbor_url('http://test.img')).to eq('http://thumbor.example.com/yPVDsGJsQKjKky_cdbkNuIpc9-A=/http://test.img')
+  before do
+    ThumborRails.setup do |config|
+      config.security_key = 'MY_SECURITY_KEY'
+    end
+  end
+
+  describe 'interpolate thumbor hosts with %d to 0-3, like Rails asset_host' do
+    subject { thumbor_url('http://test.img') }
+    let!(:original_url) { ThumborRails.server_url }
+    before { ThumborRails.server_url = server_url }
+    after { ThumborRails.server_url = original_url }
+
+    context 'when url is set to "http://thumbor%d.com"' do
+      let(:server_url) { 'http://thumbor%d.com' }
+      it { should eq('http://thumbor3.com/yPVDsGJsQKjKky_cdbkNuIpc9-A=/http://test.img') }
+    end
+  end
+
+  describe 'automatically remove the protocol in source urls' do
+    subject { thumbor_url("#{protocol}test.img", unsafe: true) }
+    before { ThumborRails.force_no_protocol_in_source_url = true }
+    after { ThumborRails.force_no_protocol_in_source_url = false }
+
+    context 'when http' do
+      let(:protocol) { 'http://' }
+      it { should eq "http://thumbor.example.com/unsafe/test.img" }
     end
 
-    it 'should allow unsafe urls' do
-      expect(thumbor_url('http://test.img', unsafe: true)).to eq('http://thumbor.example.com/unsafe/http://test.img')
+    context 'when https' do
+      let(:protocol) { 'https://' }
+      it { should eq "http://thumbor.example.com/unsafe/test.img" }
     end
 
-    it 'should pass arguments to thumbor' do
-      expect(thumbor_url('http://test.img', unsafe: true, width: 100, height: 200)).to eq('http://thumbor.example.com/unsafe/100x200/http://test.img')
+    context 'when no protocol' do
+      let(:protocol) { 'www.' }
+      it { should eq "http://thumbor.example.com/unsafe/www.test.img" }
     end
+  end
+
+  describe '#thumbor_url' do
+    subject { thumbor_url('http://test.img', params) }
 
-    it 'should interpolate thumbor hosts with %d to 0-3, like Rails asset_host' do
-      original_url = ThumborRails.server_url
-      begin
-        ThumborRails.server_url = "http://thumbor%d.com"
-        expect(thumbor_url('http://test.img')).to eq('http://thumbor3.com/yPVDsGJsQKjKky_cdbkNuIpc9-A=/http://test.img')
-      ensure
-        ThumborRails.server_url = original_url
-      end
+    context 'basic encrypted url' do
+      it { should eq('http://thumbor.example.com/yPVDsGJsQKjKky_cdbkNuIpc9-A=/http://test.img') }
     end
 
-    it 'should automatically remove the protocol in source urls if configured to do so' do
-      begin
-        ThumborRails.force_no_protocol_in_source_url = true
-        expect(thumbor_url('http://test.img', unsafe: true)).to eq('http://thumbor.example.com/unsafe/test.img')
-        expect(thumbor_url('https://test.img', unsafe: true)).to eq('http://thumbor.example.com/unsafe/test.img')
-        expect(thumbor_url('www.test.img', unsafe: true)).to eq('http://thumbor.example.com/unsafe/www.test.img')
-      ensure
-        ThumborRails.force_no_protocol_in_source_url = false
-      end
+    context 'allow unsafe urls' do
+      let(:params) { { unsafe: true } }
+      it { should eq('http://thumbor.example.com/unsafe/http://test.img') }
+    end
+
+    context 'pass arguments to thumbor' do
+      let(:params) { { unsafe: true, width: 100, height: 200 } }
+      it { should eq('http://thumbor.example.com/unsafe/100x200/http://test.img') }
     end
   end
 
   describe '#thumbor_image_tag' do
-    it 'should return a simple image' do
-      expect(thumbor_image_tag('http://myimg.jpg')).to eq('<img alt="Myimg" src="http://thumbor.example.com/Q-1lWnxlCLnkzXWWM5xTAs1QEBM=/http://myimg.jpg" />')
+    subject { thumbor_image_tag('http://myimg.jpg', params) }
+
+    context 'unsafe disabled' do
+      it { should eq('<img alt="Myimg" src="http://thumbor.example.com/Q-1lWnxlCLnkzXWWM5xTAs1QEBM=/http://myimg.jpg" />') }
     end
 
-    it 'should pass arguments to thumbor' do
-      expect(thumbor_image_tag('http://myimg.jpg', unsafe: true)).to eq('<img alt="Myimg" src="http://thumbor.example.com/unsafe/http://myimg.jpg" />')
+    context 'unsafe enabled' do
+      let(:params) { { unsafe: true } }
+      it { should eq('<img alt="Myimg" src="http://thumbor.example.com/unsafe/http://myimg.jpg" />') }
     end
   end
 end

metadata

@@ -1,69 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: thumbor_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Rafael Caricio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-thumbor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: thumbor_rails is a client for the thumbor imaging service (http://github.com/globocom/thumbor)
@@ -74,40 +83,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - lib/generators/thumbor_rails/install_generator.rb
 - lib/generators/thumbor_rails/templates/config/initializers/thumbor_rails.rb
-- lib/thumbor_rails.rb
 - lib/thumbor_rails/helpers.rb
 - lib/thumbor_rails/version.rb
+- lib/thumbor_rails.rb
+- README.md
 - spec/spec_helper.rb
 - spec/thumbor_rails/helpers_spec.rb
 - spec/thumbor_rails_spec.rb
 homepage: https://github.com/rafaelcaricio/thumbor_rails
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options:
-- "--main"
+- --main
 - README.md
 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: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: thumbor_rails is a client to manage and generate urls for the thumbor imaging
   service (http://github.com/globocom/thumbor) for Ruby and Rails projects.
 test_files:

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: bad68a7ed8543235144e2705d07c387e3d7f1e57
-  data.tar.gz: 7fd9a6ad0ebe2cc28476556c4db8809b25c3e5cc
-SHA512:
-  metadata.gz: 4c0c700222289d6e6abd0b68a8f1e433ed2b9baab97fe50b734f70405be2fb2b90f2d91e96817555de06b42e8e9a99d20a731502d93837c34d76ec23d3d020ba
-  data.tar.gz: 0b234e44156f368e60f87922cb477ed1697198a8314ecad863d3addd469780e22ee5640a13417ecf56525fb3509e6dff8ce5f7a258479011a40635ff9184a42a