paperclip-meta 0.3.1 → 0.4.0

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 .bundle
+.rvmrc
 Gemfile.lock
 pkg/*
 spec/tmp/*/**

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby
+  - rbx-18mode
+  - rbx-19mode

data/README.rdoc

@@ -1,4 +1,5 @@
-=Paperclip Meta
+=Paperclip Meta {<img src="https://secure.travis-ci.org/y8/paperclip-meta.png" />}[http://travis-ci.org/y8/paperclip-meta]
+
 
 Simple gem to let paperclip play nice with thumbnails width, height and size.
 

data/init.rb

@@ -1,2 +1,4 @@
-# FIXME: What this file for?
-require File.join(File.dirname(__FILE__), "lib", "paperclip-meta")
+require File.join(File.dirname(__FILE__), "lib", "paperclip-meta")
+require 'paperclip-meta/railtie'
+
+Paperclip::Meta::Railtie.insert

data/lib/paperclip-meta.rb

@@ -1,91 +1,4 @@
 require "paperclip"
 require "paperclip-meta/version"
-
-module Paperclip
-  module Meta
-    # TODO: Move most of paperclip-meta crap here.
-  end
-
-  # TODO: Make paperclip-meta less monkey-style.
-  class Attachment
-    alias :original_post_process_styles :post_process_styles
-    alias :original_save :save
-
-    # If attachment deleted - destroy meta data
-    def save
-      if (not @queued_for_delete.empty?) and @queued_for_write.empty?
-        instance_write(:meta, meta_encode({})) if instance.respond_to?(:"#{name}_meta=")
-      end
-      original_save
-    end
-
-    # If model has #{name}_meta column we getting sizes of processed
-    # thumbnails and saving it to #{name}_meta column.
-    def post_process_styles(*style_args)
-      # Check arity of :original_post_process_styles to maintain compatibility with
-      # Paperclip 2.3.9 and older.
-      method(:original_post_process_styles).arity == 0 ? original_post_process_styles : original_post_process_styles(*style_args)
-
-      if 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(file) }
-          rescue NotIdentifiedByImageMagickError => e
-            meta[style] = {}
-          end
-        end
-
-        instance_write(:meta, meta_encode(meta))
-      end
-    end
-
-    # Define meta accessors methods
-    [:width, :height, :size].each do |meth|
-      define_method(meth) do |*args|
-        style = args.first || default_style
-        meta_read(style, meth)
-      end
-    end
-
-    # Returns image dimesions ("WxH") for given style name. If style name not given,
-    # returns dimesions for default_style.
-    def image_size(style = default_style)
-      "#{width(style)}x#{height(style)}"
-    end
-
-    private
-    # Returns meta data for given style
-    def meta_read(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
-        end
-      end
-    end
-
-    # Return encoded metadata as String
-    def meta_encode(meta)
-      # Use Base64 class if aviliable, to prevent
-      # ActiveSupport deprecation warnings.
-      if Module.const_defined? "Base64"
-        ::Base64.encode64(Marshal.dump(meta))
-      else
-       ActiveSupport::Base64.encode64(Marshal.dump(meta))
-      end
-    end
-
-    # Return decoded metadata as Object
-    def meta_decode(meta)
-      # Use Base64 class if aviliable, to prevent
-      # ActiveSupport deprecation warnings.
-      if Module.const_defined? "Base64"
-        Marshal.load(::Base64.decode64(meta))
-      else
-        Marshal.load(ActiveSupport::Base64.decode64(meta))
-      end
-    end
-  end
-end
+require 'paperclip-meta/railtie'
+require 'paperclip-meta/attachment'

data/lib/paperclip-meta/attachment.rb

@@ -0,0 +1,99 @@
+module Paperclip
+  module Meta
+    module Attachment
+
+      def self.included(base)
+        base.send :include, InstanceMethods
+        base.alias_method_chain :save, :meta_data
+        base.alias_method_chain :post_process_styles, :meta_data
+        base.alias_method_chain :size, :meta_data
+      end
+
+      module InstanceMethods
+
+        def save_with_meta_data
+          if (not @queued_for_delete.empty?) and @queued_for_write.empty?
+            instance_write(:meta, meta_encode({})) if instance.respond_to?(:"#{name}_meta=")
+          end
+          save_without_meta_data
+        end
+
+        def post_process_styles_with_meta_data(*style_args)
+          post_process_styles_without_meta_data(*style_args)
+
+          if 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(file) }
+              rescue NotIdentifiedByImageMagickError => e
+                meta[style] = {}
+              end
+            end
+
+            unless meta == {}
+              instance.send("#{name}_meta=", meta_encode(meta))
+              instance.class.update_all({ "#{name}_meta" => meta_encode(meta) }, instance.class.primary_key => instance.id)
+            end
+          end
+        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
+        end
+
+        # Define meta accessors methods
+        [:width, :height ].each do |meth|
+          define_method(meth) do |*args|
+            style = args.first || default_style
+            meta_read(style, meth)
+          end
+        end
+
+        # Returns image dimesions ("WxH") for given style name. If style name not given,
+        # returns dimesions for default_style.
+        def image_size(style = default_style)
+          "#{width(style)}x#{height(style)}"
+        end
+
+        private
+
+        # Returns meta data for given style
+        def meta_read(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
+            end
+          end
+        end
+
+        # Return encoded metadata as String
+        def meta_encode(meta)
+          # Use Base64 class if aviliable, to prevent
+          # ActiveSupport deprecation warnings.
+          if Module.const_defined? "Base64"
+            ::Base64.encode64(Marshal.dump(meta))
+          else
+           ActiveSupport::Base64.encode64(Marshal.dump(meta))
+          end
+        end
+
+        # Return decoded metadata as Object
+        def meta_decode(meta)
+          # Use Base64 class if aviliable, to prevent
+          # ActiveSupport deprecation warnings.
+          if Module.const_defined? "Base64"
+            Marshal.load(::Base64.decode64(meta))
+          else
+            Marshal.load(ActiveSupport::Base64.decode64(meta))
+          end
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/paperclip-meta/railtie.rb

@@ -0,0 +1,24 @@
+require 'paperclip-meta'
+
+module Paperclip
+    module Meta
+
+      if defined? Rails::Railtie
+        require 'rails'
+        class Railtie < Rails::Railtie
+          initializer 'paperclip_meta.insert_into_active_record' do
+            ActiveSupport.on_load :active_record do
+              Paperclip::Meta::Railtie.insert
+            end
+          end
+        end
+      end
+
+      class Railtie
+        def self.insert
+          Paperclip::Attachment.send(:include, Paperclip::Meta::Attachment)
+        end
+      end
+
+  end
+end

data/lib/paperclip-meta/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Meta
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

data/paperclip-meta.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
 
   # Development depensencies
   s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "rake"
   s.add_development_dependency "paperclip"
   s.add_development_dependency "rspec"
   s.add_development_dependency "activerecord"

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

@@ -33,6 +33,28 @@ describe "Geometry saver plugin" do
     img.big_image.height(:small).should == 100
   end
 
+  describe 'file size' do
+    before do
+      @image = Image.new
+      @image.big_image = @big_image
+      @image.save!
+    end
+
+    it 'should save file size with meta data ' do
+      @image.big_image.size(:small).should == 3526
+    end
+
+    it 'should access normal paperclip method when no style passed' do
+      @image.big_image.should_receive(:size_without_meta_data).once.and_return(1234)
+      @image.big_image.size.should == 1234
+    end
+
+    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
@@ -53,4 +75,5 @@ describe "Geometry saver plugin" do
     lambda { img.save! }.should_not raise_error
     img.small_image.width(:small).should be_nil
   end
+
 end

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ ActiveRecord::Base.logger = Logger.new(nil)
 load(File.join(File.dirname(__FILE__), 'schema.rb'))
 
 Paperclip::Railtie.insert
+Paperclip::Meta::Railtie.insert
 
 class Image < ActiveRecord::Base
   has_attached_file :small_image,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-meta
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70281062647600 !ruby/object:Gem::Requirement
+  requirement: &70335412175260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70281062647600
+  version_requirements: *70335412175260
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70335412173700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70335412173700
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70281062647060 !ruby/object:Gem::Requirement
+  requirement: &70335412172380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70281062647060
+  version_requirements: *70335412172380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70281062646360 !ruby/object:Gem::Requirement
+  requirement: &70335412171460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70281062646360
+  version_requirements: *70335412171460
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70281062645580 !ruby/object:Gem::Requirement
+  requirement: &70335412170640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70281062645580
+  version_requirements: *70335412170640
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70281062644620 !ruby/object:Gem::Requirement
+  requirement: &70335412169360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70281062644620
+  version_requirements: *70335412169360
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70281062643560 !ruby/object:Gem::Requirement
+  requirement: &70335412168500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281062643560
+  version_requirements: *70335412168500
 description: Add width, height and size methods to paperclip thumbnails
 email:
 - y8@ya.ru
@@ -86,12 +97,15 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.rdoc
 - Rakefile
 - init.rb
 - lib/paperclip-meta.rb
+- lib/paperclip-meta/attachment.rb
+- lib/paperclip-meta/railtie.rb
 - lib/paperclip-meta/version.rb
 - paperclip-meta.gemspec
 - spec/fixtures/big.jpg