paperclip-meta 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09bf77a5e70ee81ee3351672d693240dbd66f77a
-  data.tar.gz: 9c39a349cbd84204781a34f2543233cc87237c2f
+  metadata.gz: 87d602bc919395b882cfca317ccfb2ab02b69e98
+  data.tar.gz: c47a819d68995c5a2023bf4c6c68ad2a821a9713
 SHA512:
-  metadata.gz: d772a6566f2aad7f0fe991f5a33dd5dfeea6bdeae9dd8153f450719b3965e1e958b92ff9f0f952dab0ffde8ccd0bf1d8b55c38eb667bac1dead97d07857a5e2f
-  data.tar.gz: 3cdf009ec88e3495c2bb82ce0f446648fb2345c15b8435f443abac7e339531ea560404b89fa7e76fca409b6449a05f11710733fd82a2b9b707e6a12eb81993e3
+  metadata.gz: 003cca26c110f4b95373db5500d0257523d0006d1508b880ec063d1590f69bead4b3ad326805a1e5bb0507101db9ad63b891f1458a182c234ee626e1988becdb
+  data.tar.gz: c4a1a5c6778cbf778614542641c5382473f17a861eb719d0bf3c580e4e08c57fe09daf3c9c990b8437966b67dd4f8b585a69da718d70825ce68828318ebd0383

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.0
+ruby-2.1.1

data/.travis.yml

@@ -1,8 +1,11 @@
 rvm:
-  - 1.9.3
+  - 2.1
   - 2.0.0
-  - 2.1.0
-  - rbx
+  - 1.9.3
+  - rbx-2
 gemfile:
-  - spec/gemfiles/Gemfile.paperclip-3
   - spec/gemfiles/Gemfile.paperclip-4
+  - spec/gemfiles/Gemfile.paperclip-3
+matrix:
+  allow_failures:
+    - rvm: rbx-2

data/Gemfile

@@ -4,11 +4,6 @@ platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
 end
 
-platforms :rbx do
-  gem 'json'
-  gem 'rubysl', '~> 2.0'
-end
-
 # See paperclip-meta.gemspec
 gemspec
 

data/lib/paperclip-meta/attachment.rb

@@ -16,36 +16,27 @@ module Paperclip
           save_without_meta_data
         end
 
-        def post_process_styles_with_meta_data(*style_args)
-          post_process_styles_without_meta_data(*style_args)
+        def post_process_styles_with_meta_data(*styles)
+          post_process_styles_without_meta_data(*styles)
           return unless instance.respond_to?(:"#{name}_meta=")
 
-          meta = {}
-          @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 }
-            rescue Paperclip::Errors::NotIdentifiedByImageMagickError
-              meta[style] = {}
-            end
-          end
-
+          meta = populate_meta(@queued_for_write)
           return if meta == {}
 
-          instance.send("#{name}_meta=", meta_encode(meta))
+          write_meta(meta)
         end
 
         # Use meta info for style if required
         def size_with_meta_data(style = nil)
-          style ? meta_read(style, :size) : size_without_meta_data
+          style ? read_meta(style, :size) : size_without_meta_data
         end
 
         def height(style = default_style)
-          meta_read style, :height
+          read_meta style, :height
         end
 
         def width(style = default_style)
-          meta_read style, :width
+          read_meta style, :width
         end
 
         # Return image dimesions ("WxH") for given style name. If style name not given,
@@ -56,11 +47,29 @@ module Paperclip
 
         private
 
+        def populate_meta(queue)
+          meta = {}
+          queue.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 }
+            rescue Paperclip::Errors::NotIdentifiedByImageMagickError
+              meta[style] = {}
+            end
+          end
+          meta
+        end
+
+        def write_meta(meta)
+          merge_existing_meta_hash meta
+          instance.send("#{name}_meta=", meta_encode(meta))
+        end
+
         # Return meta data for given style
-        def meta_read(style, item)
+        def read_meta(style, item)
           if instance.respond_to?(:"#{name}_meta") && instance_read(:meta)
             if (meta = meta_decode(instance_read(:meta)))
-              meta.key?(style) ? meta[style][item] : nil
+              meta[style] && meta[style][item]
             end
           end
         end
@@ -74,6 +83,13 @@ module Paperclip
         def meta_decode(meta)
           Marshal.load(Base64.decode64(meta))
         end
+
+        # Retain existing meta values that will not be recalculated when
+        # reprocessing a subset of styles
+        def merge_existing_meta_hash(meta)
+          return unless (original_meta = instance.send("#{name}_meta"))
+          meta.reverse_merge! meta_decode(original_meta)
+        end
       end
     end
   end

data/lib/paperclip-meta/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Meta
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/spec/attachment_spec.rb

@@ -7,6 +7,7 @@ describe "Attachment" do
     geometry = geometry_for(small_path)
     assert_equal geometry.width, img.small_image.width
     assert_equal geometry.height, img.small_image.height
+    assert_equal "50x64", img.small_image.image_size
   end
 
   it "saves geometry for styles" do
@@ -15,6 +16,12 @@ describe "Attachment" do
     assert_equal 100, img.big_image.height(:thumb)
   end
 
+  it "saves original style geometry" do
+    img = Image.create(small_image: small_image)
+    assert_equal 50, img.small_image.width(:original)
+    assert_equal 64, img.small_image.height(:original)
+  end
+
   it "sets geometry on update" do
     img = Image.create!
     img.small_image = small_image
@@ -24,7 +31,7 @@ describe "Attachment" do
     assert_equal geometry.height, img.small_image.height
   end
 
-  describe 'file size' do
+  describe '#size' do
     before do
       @image = Image.create(big_image: big_image)
     end
@@ -68,12 +75,56 @@ describe "Attachment" do
     assert_nil img.small_image.height
   end
 
+  it "preserves metadata when reprocessing a specific style" do
+    img = Image.new
+    img.big_image = big_image
+    img.save!
+    assert_equal 500, img.big_image.width(:large)
+    img.big_image.reprocess!(:thumb)
+    assert_equal 500, img.big_image.width(:large)
+  end
+
+  it "preserves metadata for unprocessed styles" do
+    img = Image.new
+    img.big_image = big_image
+    img.save!
+
+    # set big image meta to fake values for :large & missing :thumb
+    hash = { large: { height: 1, width: 2, size: 3 } }
+    img.update_column(:big_image_meta, img.big_image.send(:meta_encode, hash))
+
+    assert_equal 1, img.big_image.height(:large)
+    assert_equal 2, img.big_image.width(:large)
+    assert_equal 3, img.big_image.size(:large)
+    assert_nil img.big_image.height(:thumb)
+    assert_nil img.big_image.height(:original)
+    img.big_image.reprocess!(:thumb)
+    assert_equal 1, img.big_image.height(:large)
+    assert_equal 2, img.big_image.width(:large)
+    assert_equal 3, img.big_image.size(:large)
+    assert_equal 100, img.big_image.height(:thumb)
+    assert_equal 100, img.big_image.width(:thumb)
+    assert_equal 277, img.big_image.height(:original) # original is always reprocessed
+  end
+
+  it "replaces metadata when attachment changes" do
+    img = Image.new
+    img.big_image = big_image
+    img.save!
+    img.big_image = small_image
+    img.save!
+    assert_equal "50x64", img.big_image.image_size
+    assert_equal "100x100", img.big_image.image_size(:thumb)
+    assert_equal "500x500", img.big_image.image_size(:large)
+  end
+
   private
 
   def small_path
     File.join(File.dirname(__FILE__), 'fixtures', 'small.png')
   end
 
+  # 50x64
   def small_image
     File.open(small_path)
   end
@@ -82,6 +133,7 @@ describe "Attachment" do
     Paperclip::Geometry.from_file(path)
   end
 
+  # 600x277
   def big_image
     File.open(File.join(File.dirname(__FILE__), 'fixtures', 'big.jpg'))
   end

data/spec/spec_helper.rb

@@ -32,7 +32,7 @@ class Image < ActiveRecord::Base
     storage: :filesystem,
     path: "./spec/tmp/fixtures/tmp/:style/:id.:extension",
     url: "./spec/tmp/fixtures/tmp/:style/:id.extension",
-    styles: { thumb: "100x100#" }
+    styles: { thumb: "100x100#", large: "500x500#" }
 
   # paperclip 4.0 requires a validator
   validates_attachment_content_type :small_image, content_type: /\Aimage/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-meta
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexey Bondar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Add width, height, and size to paperclip images