paperclip-meta 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaa72aa228c4f1d2b1efcb50f2cf3b0d04470ad4
-  data.tar.gz: 48ba30bf86c2b7a832bf3001466a31b03cdd31f8
+  metadata.gz: aabd2e01ad47d7f22e378b79e409a9798a4778c9
+  data.tar.gz: 9ea6f76f9f3fcd8aec42555ece5570363d4f7f78
 SHA512:
-  metadata.gz: c195bfb171c919f72926f4deb4a64b79e8ffab1cc65b653f68d6c3c139fc62044c9a632e888d645655a8608c4ad07be608dff821bcb1993a652de6c8c000f1ac
-  data.tar.gz: b5014f6904e9ddcdcc35995d80ef58d29f0adbae1dc6d632e4f37508b78fee4e2ffaa6b79ecefb48736d69feb6063d4374de813d7b193fa4505fd10394fde927
+  metadata.gz: 85a9971fd625ad0efc89959e6e04663dd1fabe2f079bfdaaa867913cac834a60a3609713da04d06ed464fecc5fe61528a6d00b4039a14232f522a4e8409e9d03
+  data.tar.gz: 880f048a350568ec742879385ea8c1559648c78cc74909a2124d510b2e1568edfd6475a9b59e75257649843af392330adc3f0cd201a39fa27ff07a32aa3d19c9

data/README.md

@@ -5,8 +5,7 @@
 
 Add width, height, and size to paperclip images.
 
-Paperclip Meta gets image dimensions after post_process_styles using paperclips own Geometry.from_file.
-This should make paperclip-meta storage independent.
+Paperclip Meta gets image dimensions after `post_process_styles` using paperclip's `Geometry.from_file`.
 
 ### Setup
 
@@ -19,25 +18,21 @@ gem 'paperclip-meta'
 Create migration to add a *_meta column:
 
 ```ruby
-class AddMetaToAvatar < ActiveRecord::Migration
-  def self.up
+class AddAvatarMetaToUsers < ActiveRecord::Migration
+  def change
     add_column :users, :avatar_meta, :text
   end
-
-  def self.down
-    remove_column :users, :avatar_meta
-  end
 end
 ```
 
-Rebuild all thumbnails to fill meta column if you already have some attachments.
+Rebuild all thumbnails to populate the meta column if you already have some attachments.
 
-Now you can use meta-magic:
+Now you can grab the size from the paperclip attachment:
 
 ```
-  <%= image_tag @user.avatar.url, :size => @user.avatar.image_size %>
-  <%= image_tag @user.avatar.url(:medium), :size => @user.avatar.image_size(:medium) %>
-  <%= image_tag @user.avatar.url(:thumb), :size => @user.avatar.image_size(:thumb) %>
+<%= image_tag user.avatar.url, size: user.avatar.image_size %>
+<%= image_tag user.avatar.url(:medium), size: user.avatar.image_size(:medium) %>
+<%= image_tag user.avatar.url(:thumb), size: user.avatar.image_size(:thumb) %>
 ```
 
 ### Internals
@@ -45,18 +40,28 @@ Now you can use meta-magic:
 The meta column is simple hash:
 
 ```ruby
-:style => {
-  :width => 100,
-  :height => 100,
-  :size => 42000
+style: {
+  width:  100,
+  height: 100,
+  size:   42000
 }
 ```
 
 This hash will be marshaled and base64 encoded before writing to model attribute.
 
-Meta methods provided:
-  - width `@user.avatar.width(:thumb)`
-  - height `@user.avatar.height(:medium)`
-  - size `@user.avatar.size`
+`height`, `width`, and `size` methods are provided:
+
+```ruby
+user.avatar.width(:thumb)
+=> 100
+user.avatar.height(:medium)
+=> 200
+user.avatar.size
+=> '60x70'
+```
+
+You can pass the image style to these methods. If a style is not passed, the default style will be used.
+
+### Alternatives
 
-You can pass the image style to these methods. If a style is not passed, default_style will be used.
+https://github.com/thoughtbot/paperclip/wiki/Extracting-image-dimensions

data/Rakefile

@@ -1,8 +1,7 @@
-require "bundler/gem_tasks"
-require "rspec/core"
+require 'bundler/gem_tasks'
+require 'rspec/core'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-# spec is default task
-task :default => :spec
+task default: :spec

data/lib/paperclip-meta/attachment.rb

@@ -10,7 +10,7 @@ module Paperclip
 
       module InstanceMethods
         def save_with_meta_data
-          if @queued_for_delete.any? && @queued_for_write.empty? && instance.respond_to?(:"#{name}_meta=")
+          if @queued_for_delete.any? && @queued_for_write.empty?
             instance_write(:meta, meta_encode({}))
           end
           save_without_meta_data
@@ -24,7 +24,7 @@ module Paperclip
           @queued_for_write.each do |style, file|
             begin
               geo = Geometry.from_file file
-              meta[style] = {:width => geo.width.to_i, :height => geo.height.to_i, :size => file.size }
+              meta[style] = { width: geo.width.to_i, height: geo.height.to_i, size: file.size }
             rescue Paperclip::Errors::NotIdentifiedByImageMagickError
               meta[style] = {}
             end
@@ -33,22 +33,19 @@ module Paperclip
           return if meta == {}
 
           instance.send("#{name}_meta=", meta_encode(meta))
-          instance.class
-            .where(instance.class.primary_key => instance.id)
-            .update_all("#{name}_meta" => meta_encode(meta))
         end
 
         # Use meta info for style if required
-        def size_with_meta_data(passed_style = nil)
-          passed_style ? meta_read(passed_style, :size) : size_without_meta_data
+        def size_with_meta_data(style = nil)
+          style ? meta_read(style, :size) : size_without_meta_data
         end
 
-        def height(*args)
-          meta_read((args.first || default_style), :height)
+        def height(style = default_style)
+          meta_read style, :height
         end
 
-        def width(*args)
-          meta_read((args.first || default_style), :width)
+        def width(style = default_style)
+          meta_read style, :width
         end
 
         # Return image dimesions ("WxH") for given style name. If style name not given,

data/lib/paperclip-meta/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Meta
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/paperclip-meta.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
   s.add_dependency "paperclip", "~> 3.0"
 
   s.add_development_dependency "bundler", "~> 1.5"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rake", "~> 10.1"
+  s.add_development_dependency "rspec", "~> 2.14"
   s.add_development_dependency "activerecord", "~> 4.0"
   s.add_development_dependency "sqlite3", "~> 1.3"
 end

data/spec/paperclip-meta/paperclip-meta_spec.rb

@@ -1,49 +1,38 @@
 require 'spec_helper'
 
-describe "Geometry saver plugin" do
-  before(:each) do
-    small_path = File.join(File.dirname(__FILE__), '..', 'fixtures', 'small.png')
-    big_path = File.join(File.dirname(__FILE__), '..', 'fixtures', 'big.jpg')
-    not_path = File.join(File.dirname(__FILE__), '..', 'fixtures', 'big.zip')
-    @big_image = File.open(big_path)
-    @small_image = File.open(small_path)
-    @big_size = Paperclip::Geometry.from_file(big_path)
-    @small_size = Paperclip::Geometry.from_file(small_path)
-    @not_image = File.open(not_path)
-  end
-
+describe "Attachment" do
   it "saves image geometry for original image" do
-    img = Image.new
-    img.small_image = @small_image
-    img.save!
-
-    img.reload # Ensure that updates really saved to db
-
-    img.small_image.width eq(@small_size.width)
-    img.small_image.height eq(@small_size.height)
+    img = Image.create(small_image: small_image)
+    img.reload
+    geometry = geometry_for(small_path)
+    img.small_image.width.should == geometry.width
+    img.small_image.height.should == geometry.height
   end
 
   it "saves geometry for styles" do
-    img = Image.new
-    img.small_image = @small_image
-    img.big_image = @big_image
-    img.save!
+    img = Image.create(small_image: small_image, big_image: big_image)
+    img.big_image.width(:thumb).should == 100
+    img.big_image.height(:thumb).should == 100
+  end
 
-    img.big_image.width(:small).should == 100
-    img.big_image.height(:small).should == 100
+  it "sets geometry on update" do
+    img = Image.create!
+    img.small_image = small_image
+    img.save
+    geometry = geometry_for(small_path)
+    img.small_image.width.should == geometry.width
+    img.small_image.height.should == geometry.height
   end
 
   describe 'file size' do
     before do
-      @image = Image.new
-      @image.big_image = @big_image
-      @image.save!
+      @image = Image.create(big_image: big_image)
     end
 
     it 'should save file size with meta data ' do
-      path = File.join(File.dirname(__FILE__), "../tmp/fixtures/tmp/small/#{@image.id}.jpg")
+      path = File.join(File.dirname(__FILE__), "../tmp/fixtures/tmp/thumb/#{@image.id}.jpg")
       size = File.stat(path).size
-      @image.big_image.size(:small).should == size
+      @image.big_image.size(:thumb).should == size
     end
 
     it 'should access normal paperclip method when no style passed' do
@@ -54,28 +43,44 @@ describe "Geometry saver plugin" do
     it 'should have access to original file size' do
       @image.big_image.size.should == 37042
     end
-
   end
 
   it "clears geometry fields when image is destroyed" do
-    img = Image.new
-    img.small_image = @small_image
-    img.big_image = @big_image
-    img.save!
-
-    img.big_image.width(:small).should == 100
+    img = Image.create(small_image: small_image, big_image: big_image)
+    img.big_image.width(:thumb).should == 100
 
     img.big_image = nil
     img.save!
 
-    img.big_image.width(:small).should be_nil
+    img.big_image.width(:thumb).should be_nil
   end
 
   it "does not fails when file is not an image" do
     img = Image.new
-    img.small_image = @not_image
-    lambda { img.save! }.should_not raise_error
-    img.small_image.width(:small).should be_nil
+    img.small_image = not_image
+    -> { img.save! }.should_not raise_error
+    img.small_image.width(:thumb).should be_nil
+  end
+
+  private
+
+  def small_path
+    File.join(File.dirname(__FILE__), '..', 'fixtures', 'small.png')
+  end
+
+  def small_image
+    File.open(small_path)
   end
 
-end
+  def geometry_for(path)
+    Paperclip::Geometry.from_file(path)
+  end
+
+  def big_image
+    File.open(File.join(File.dirname(__FILE__), '..', 'fixtures', 'big.jpg'))
+  end
+
+  def not_image
+    File.open(File.join(File.dirname(__FILE__), '..', 'fixtures', 'big.zip'))
+  end
+end

data/spec/spec_helper.rb

@@ -7,7 +7,11 @@ ActiveRecord::Base.establish_connection(
   database: ":memory:"
 )
 
-ActiveRecord::Base.logger = Logger.new(STDERR) if ENV["VERBOSE"]
+if ENV["VERBOSE"]
+  ActiveRecord::Base.logger = Logger.new(STDERR)
+else
+  Paperclip.options[:log] = false
+end
 
 load(File.join(File.dirname(__FILE__), 'schema.rb'))
 
@@ -24,5 +28,5 @@ class Image < ActiveRecord::Base
     :storage => :filesystem,
     :path => "./spec/tmp/fixtures/tmp/:style/:id.:extension",
     :url => "./spec/tmp/fixtures/tmp/:style/:id.extension",
-    :styles => { :small => "100x100#" }
+    :styles => { :thumb => "100x100#" }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-meta
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Alexey Bondar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -43,30 +43,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement