thumbor-versionable 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc7d72ea111430056c3d0da5c67699bada5a9ca9
-  data.tar.gz: e997545bd7b6bd32dea144c35ffeb4b970d82189
+  metadata.gz: 6f82b68991d1d6f29cb3153c40fd9305374ed286
+  data.tar.gz: bf1c30ea332c410b95a854ea094ff1d9855f6a12
 SHA512:
-  metadata.gz: bc253689155895a3540c6871ff04cb06f7f83eed48e2d2db4e6b3e3831024b32cd5590c1f9ecaa3f190efd47cc03d27d788fa162616c2f7eb0f1f3106bc51efa
-  data.tar.gz: 78a254349334b45a636e5ceb9e912bab6e633af274c73016546ce5ef0e6f7c366fca0cb03b4564d9ede1b8eaf6f4d9537ae2408125c440426f9dddebab87caf0
+  metadata.gz: 211c0713a1e5ee18d498c68cd0f0a4b65176b96f45fbd2e201a202572cc0a19826a4804c9575c2d53c469812d04fd79565fc0d80c129fe1049e39c381d4cb6b3
+  data.tar.gz: 881fb2d23a4f37f1bb56bb27e8f536e569b1d11a5589d1a1ec4be893e5cecf729af932fbd29b247a2508a0b59be638856abd1a683457a8cb0a32d5392cb98c4a

data/.rubocop.yml

@@ -3,10 +3,6 @@ AllCops:
     - 'vendor/**/*'
     - 'spec/fixtures/**/*'
 
-Style/AlignHash:
-  EnforcedHashRocketStyle: separator
-  EnforcedColonStyle: separator
-
 Style/CollectionMethods:
   # Mapping from undesired method to desired_method
   # e.g. to use `detect` over `find`:
@@ -21,11 +17,6 @@ Style/CollectionMethods:
     detect: 'find'
     select: 'find_all'
 
-Style/GuardClause:
-  Description: "Check for conditionals that can be replaced with guard clauses"
-  StyleGuide: "https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals"
-  Enabled: true
-
 # I don't want to write documentation for every class
 Style/Documentation:
   Description: "Document classes and non-namespace modules."
@@ -62,33 +53,11 @@ Style/ClassCheck:
   Description: 'Enforces consistent use of `Object#is_a?` or `Object#kind_of?`.'
   Enabled: false
 
-Metrics/AbcSize:
-  Description: >-
-                 A calculated magnitude based on number of assignments,
-                 branches, and conditions.
-  Enabled: false
-
-Metrics/LineLength:
-  Description: 'Limit lines to 100 characters.'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#80-character-limits'
-  Enabled: true
-  Max: 100
-
-Style/AlignHash:
-  Description: >-
-                 Align the elements of a hash literal if they span more than
-                 one line.
-  Enabled: false
-
 Style/TrailingBlankLines:
   Description: 'Checks trailing blank lines and final newline.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#newline-eof'
   Enabled: false
 
-Style/IndentHash:
-  Description: 'Checks the indentation of the first key in a hash literal.'
-  Enabled: false
-
 Lint/UnusedMethodArgument:
   Description: 'Checks for unused method arguments.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars'

data/README.md

@@ -22,7 +22,7 @@ thumbor-versionable can be installed to use with any Ruby web framework. The fir
 Or include it in your project's Gemfile with Bundler:
 
 ```ruby
-gem 'thumbor-versionable', github: 'vjustov/thumbor-versionable'
+gem 'thumbor-versionable', '~> 0.2.3'
 ```
 
 If you are using rails, that's it! if you are using anything else you will have to require the gem whenever you want to use it.

data/lib/versionable/version.rb

@@ -8,6 +8,8 @@ module Versionable
     SMART = 'smart'.freeze
     UNSAFE = 'unsafe'.freeze
     META = 'meta'.freeze
+    HALIGNEMENTS = %w(left center right).freeze
+    VALIGNEMENTS = %w(top middle bottom).freeze
 
     attr_reader :width, :height
     def initialize(image, parameters, &blk)
@@ -32,10 +34,8 @@ module Versionable
 
     def calculate_metadata
       {
-         width: @width = width != 0 ? width : (image.width * height) / \
-                                              image.height,
-         height: @height = height != 0 ? height : (image.height * width) / \
-                                                  image.width
+        width: calculate_width,
+        height: calculate_height
       }
     end
 
@@ -43,12 +43,22 @@ module Versionable
 
     attr_reader :image, :fit_in, :smart, :filters
 
+    def calculate_width
+      @width = width != 0 ? width : (image.width * height) / image.height
+    end
+
+    def calculate_height
+      @height = height != 0 ? height : (image.height * width) / image.width
+    end
+
     def options_url
       [
         meta,
         crop,
         fit_in,
         measurements,
+        horizontal_align,
+        vertical_align,
         smart,
         filters,
         decoded_url
@@ -69,6 +79,14 @@ module Versionable
       @filters << { name => values }
     end
 
+    def horizontal_align(value = nil)
+      value && HALIGNEMENTS.include?("#{value}") ? @halign = value : @halign
+    end
+
+    def vertical_align(value = nil)
+      value && VALIGNEMENTS.include?("#{value}") ? @valign = value : @valign
+    end
+
     # Serves as getter and setter.
     def crop(hash = {})
       if hash.empty?

data/lib/versionable.rb

@@ -3,7 +3,7 @@ module Versionable
     attr_reader :config
 
     def version
-      '0.2.3'
+      '0.2.4'
     end
 
     def configure(&blk)
@@ -21,7 +21,7 @@ module Versionable
     def versionable(accessor, column, &blk)
       instance_eval <<-EOF
       define_method(accessor) do
-        @#{accessor} ||= Versionable::Image.new(self, :#{column}, :#{accessor}, &blk)
+        @#{accessor} ||= Image.new(self, :#{column}, :#{accessor}, &blk)
       end
       EOF
     end

data/spec/image_spec.rb

@@ -25,11 +25,11 @@ describe Versionable::Image do
   it 'should be rendered as a json' do
     expect(image).to respond_to(:to_json)
     expect(image.to_json).to eq(
-     '{"url":"https://s3.amazonaws.com/ksr/assets/moo.png","form_thumbnail":{"url":"ht' \
-     'tp://thumbor_server.net/JCvCnwX3k3NBcHOF_HICTy9dEk8=/100x150/filters:quality(50)' \
-     '/https://s3.amazonaws.com/ksr/assets/moo.png"},"form_thumbnail_2":{"url":"http:/' \
-     '/thumbor_server.net/pzNWZlQuWGNjwy2Ix-83Nc4gswY=/100x150/https://s3.amazonaws.co' \
-     'm/ksr/assets/moo.png"}}')
+      '{"url":"https://s3.amazonaws.com/ksr/assets/moo.png","form_thumbnail":' \
+      '{"url":"http://thumbor_server.net/JCvCnwX3k3NBcHOF_HICTy9dEk8=/100x150' \
+      '/filters:quality(50)/https://s3.amazonaws.com/ksr/assets/moo.png"},"fo' \
+      'rm_thumbnail_2":{"url":"http://thumbor_server.net/pzNWZlQuWGNjwy2Ix-83' \
+      'Nc4gswY=/100x150/https://s3.amazonaws.com/ksr/assets/moo.png"}}')
   end
 
   context 'when the image is valid' do

data/spec/version_spec.rb

@@ -1,26 +1,43 @@
 require 'spec_helper'
 
 describe Versionable::Version do
-  let(:version) do
+  let(:version_full) do
     described_class.new OpenStruct.new(
       url: 'https://s3.amazonaws.com/ksr/assets/moo.png'
-      ), width: 100, height: 150
+    ), width: 100, height: 150 do
+      crop from: { x: 10, y: 35 }, to: { x: 34, y: 50 }
+      horizontal_align :center
+      vertical_align :top
+    end
   end
 
-  it 'should responds to :url' do
-    expect(version).to respond_to(:url)
+  let(:version_empty) do
+    described_class.new OpenStruct.new(
+      url: 'https://s3.amazonaws.com/ksr/assets/moo.png'
+    ), {}
   end
 
-  it 'should correctly constructs the url' do
-    expect(version.url).to eq(
-      'http://thumbor_server.net/pzNWZlQuWGNjwy2Ix-83Nc4gswY=/100' \
-      'x150/https://s3.amazonaws.com/ksr/assets/moo.png'
+  it 'respond to :url' do
+    expect(version_full).to respond_to(:url)
+    expect(version_empty).to respond_to(:url)
+  end
+
+  it 'constructs the url' do
+    expect(version_empty.url).to eq('http://thumbor_server.net/' \
+      'rJFxkUxO6j6rXB3HpjAQN2nNS0g=/0x0/https://s3.amazonaws.co' \
+      'm/ksr/assets/moo.png'
+      )
+
+    expect(version_full.url).to eq(
+      'http://thumbor_server.net/2k_eIg_cVtazzmoB3o_8q4hUlx0=/10x35:' \
+      '34x50/100x150/center/top/https://s3.amazonaws.com/ksr/assets/' \
+      'moo.png'
       )
   end
 
   context 'when the image is valid' do
     it 'correctly calculate it metadata' do
-      expect(version.calculate_metadata).to eq(
+      expect(version_full.calculate_metadata).to eq(
         width: 100, height: 150
         )
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thumbor-versionable
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Viktor Justo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec