paperclip-meta 0.4.3 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: eaa72aa228c4f1d2b1efcb50f2cf3b0d04470ad4
+  data.tar.gz: 48ba30bf86c2b7a832bf3001466a31b03cdd31f8
+SHA512:
+  metadata.gz: c195bfb171c919f72926f4deb4a64b79e8ffab1cc65b653f68d6c3c139fc62044c9a632e888d645655a8608c4ad07be608dff821bcb1993a652de6c8c000f1ac
+  data.tar.gz: b5014f6904e9ddcdcc35995d80ef58d29f0adbae1dc6d632e4f37508b78fee4e2ffaa6b79ecefb48736d69feb6063d4374de813d7b193fa4505fd10394fde927

data/.gitignore

@@ -3,4 +3,4 @@
 .rvmrc
 Gemfile.lock
 pkg/*
-spec/tmp/*/**
+spec/tmp/*/**

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.1.0

data/.travis.yml

@@ -1,6 +1,5 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - rbx-18mode
-  - rbx-19mode
+  - 2.0.0
+  - 2.1.0
+  - rbx

data/Gemfile

@@ -1,8 +1,15 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activerecord-jdbcsqlite3-adapter", :platform => "jruby"
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+end
 
-# Specify your gem's dependencies in paperclip-meta.gemspec
+platforms :rbx do
+  gem 'json'
+  gem 'rubysl', '~> 2.0'
+end
+
+# See paperclip-meta.gemspec
 gemspec
 
-gem "paperclip", :git => "git://github.com/thoughtbot/paperclip.git"
+gem 'paperclip'

data/README.md

@@ -0,0 +1,62 @@
+# Paperclip Meta 
+
+[![Gem Version](https://badge.fury.io/rb/paperclip-meta.png)](http://badge.fury.io/rb/paperclip-meta)
+[![Build Status](https://travis-ci.org/teeparham/paperclip-meta.png)](https://travis-ci.org/teeparham/paperclip-meta)
+
+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.
+
+### Setup
+
+Add paperclip-meta to Gemfile:
+
+```ruby
+gem 'paperclip-meta'
+```
+
+Create migration to add a *_meta column:
+
+```ruby
+class AddMetaToAvatar < ActiveRecord::Migration
+  def self.up
+    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.
+
+Now you can use meta-magic:
+
+```
+  <%= 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
+
+The meta column is simple hash:
+
+```ruby
+: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`
+
+You can pass the image style to these methods. If a style is not passed, default_style will be used.

data/lib/paperclip-meta.rb

@@ -1,4 +1,3 @@
-require "paperclip"
-require "paperclip-meta/version"
+require 'paperclip-meta/version'
 require 'paperclip-meta/railtie'
-require 'paperclip-meta/attachment'
+require 'paperclip-meta/attachment'

data/lib/paperclip-meta/attachment.rb

@@ -1,14 +1,6 @@
 module Paperclip
   module Meta
     module Attachment
-      # Use Base64 class if aviliable, to prevent
-      # ActiveSupport deprecation warnings.
-      begin
-        require "base64"
-      rescue LoadError
-        Base64 = ActiveSupport::Base64
-      end
-
       def self.included(base)
         base.send :include, InstanceMethods
         base.alias_method_chain :save, :meta_data
@@ -17,60 +9,60 @@ module Paperclip
       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=")
+          if @queued_for_delete.any? && @queued_for_write.empty? && instance.respond_to?(:"#{name}_meta=")
+            instance_write(:meta, meta_encode({}))
           end
           save_without_meta_data
         end
 
         def post_process_styles_with_meta_data(*style_args)
           post_process_styles_without_meta_data(*style_args)
+          return unless instance.respond_to?(:"#{name}_meta=")
 
-          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 }
-              rescue Paperclip::Errors::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)
+          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
+
+          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
+        # 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
+        def height(*args)
+          meta_read((args.first || default_style), :height)
+        end
+
+        def width(*args)
+          meta_read((args.first || default_style), :width)
         end
 
-        # Returns image dimesions ("WxH") for given style name. If style name not given,
-        # returns dimesions for default_style.
+        # Return image dimesions ("WxH") for given style name. If style name not given,
+        # return dimesions for default_style.
         def image_size(style = default_style)
           "#{width(style)}x#{height(style)}"
         end
 
         private
 
-        # Returns meta data for given style
+        # Return 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))
+            if (meta = meta_decode(instance_read(:meta)))
               meta.key?(style) ? meta[style][item] : nil
             end
           end

data/lib/paperclip-meta/railtie.rb

@@ -3,10 +3,9 @@ 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
+      if defined? ::Rails::Railtie
+        class Railtie < ::Rails::Railtie
+          initializer :paperclip_meta do
             ActiveSupport.on_load :active_record do
               Paperclip::Meta::Railtie.insert
             end
@@ -21,4 +20,4 @@ module Paperclip
       end
 
   end
-end
+end

data/lib/paperclip-meta/version.rb

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

data/paperclip-meta.gemspec

@@ -5,28 +5,24 @@ require "paperclip-meta/version"
 Gem::Specification.new do |s|
   s.name        = "paperclip-meta"
   s.version     = Paperclip::Meta::VERSION
-  s.authors     = ["Alexey Bondar"]
-  s.email       = ["y8@ya.ru"]
-  s.homepage    = "http://github.com/y8/paperclip-meta"
-  s.summary     = %q{Thumbnail dimensions for paperclip}
-  s.description = %q{Add width, height and size methods to paperclip thumbnails}
-
-  s.rubyforge_project = "paperclip-meta"
+  s.authors     = ["Alexey Bondar", "Tee Parham"]
+  s.email       = ["y8@ya.ru", "tee@neighborland.com"]
+  s.homepage    = "http://github.com/teeparham/paperclip-meta"
+  s.summary     = %q{Add width, height, and size to paperclip images}
+  s.description = %q{Add width, height and size methods to paperclip images}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # Development depensencies
-  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.required_ruby_version = ">= 1.9.3"
+
+  s.add_dependency "paperclip", "~> 3.0"
+
+  s.add_development_dependency "bundler", "~> 1.5"
   s.add_development_dependency "rake"
-  s.add_development_dependency "paperclip"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "activerecord"
-  s.add_development_dependency "activerecord-jdbcsqlite3-adapter" if RUBY_PLATFORM == 'java'
-  s.add_development_dependency "sqlite3-ruby"
-
-  # Runtime dependencies
-  s.add_runtime_dependency "paperclip"
+  s.add_development_dependency "activerecord", "~> 4.0"
+  s.add_development_dependency "sqlite3", "~> 1.3"
 end

data/spec/schema.rb

@@ -1,5 +1,5 @@
-ActiveRecord::Schema.define :version => 0 do
-  create_table "images", :force => true do |t|
+ActiveRecord::Schema.define do
+  create_table :images do |t|
     t.string  :small_image_file_name
     t.string  :small_image_content_type
     t.integer :small_image_updated_at

data/spec/spec_helper.rb

@@ -1,17 +1,14 @@
-require 'rubygems'
 require 'bundler/setup'
-Bundler.require(:default, :development)
-
-# Prepare activerecord
+Bundler.require(:default)
 require "active_record"
 
-# Connect to sqlite
 ActiveRecord::Base.establish_connection(
-  "adapter" => "sqlite3",
-  "database" => ":memory:"
+  adapter: "sqlite3",
+  database: ":memory:"
 )
 
-ActiveRecord::Base.logger = Logger.new(nil)
+ActiveRecord::Base.logger = Logger.new(STDERR) if ENV["VERBOSE"]
+
 load(File.join(File.dirname(__FILE__), 'schema.rb'))
 
 ActiveRecord::Base.send(:include, Paperclip::Glue)

metadata

@@ -1,144 +1,149 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-meta
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Alexey Bondar
+- Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: paperclip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70167845502500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.5'
   type: :development
   prerelease: false
-  version_requirements: *70167845502500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70167845499680 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70167845499680
-- !ruby/object:Gem::Dependency
-  name: paperclip
-  requirement: &70167845514480 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70167845514480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70167845512660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70167845512660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70167845509000 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *70167845509000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &70167845523120 !ruby/object:Gem::Requirement
-    none: false
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70167845523120
-- !ruby/object:Gem::Dependency
-  name: paperclip
-  requirement: &70167845521820 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70167845521820
-description: Add width, height and size methods to paperclip thumbnails
+        version: '1.3'
+description: Add width, height and size methods to paperclip images
 email:
 - y8@ya.ru
+- tee@neighborland.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
-- README.rdoc
+- README.md
 - 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
-- rails/init.rb
 - spec/fixtures/big.jpg
 - spec/fixtures/big.zip
 - spec/fixtures/small.png
 - spec/paperclip-meta/paperclip-meta_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
-homepage: http://github.com/y8/paperclip-meta
+homepage: http://github.com/teeparham/paperclip-meta
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: paperclip-meta
-rubygems_version: 1.8.10
+rubyforge_project: 
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
-summary: Thumbnail dimensions for paperclip
+specification_version: 4
+summary: Add width, height, and size to paperclip images
 test_files:
 - spec/fixtures/big.jpg
 - spec/fixtures/big.zip

data/README.rdoc

@@ -1,55 +0,0 @@
-=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.
-
-Paperclip Meta will get image dimensions right after post_process_styles using paperclips own Geometry.from_file. This should make paperclip-meta storage independent.
-
-==Quick Start
-
-Add paperclip-meta to Gemfile:
-
-  gem 'paperclip-meta'
-
-Create migration:
-
-  class AddMetaToAvatar < ActiveRecord::Migration
-    def self.up
-      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.
-
-Now you can use meta-magic:
-
-  <%= 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
-
-Meta column is simple hash:
-
-  :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`
-
-You can pass thumbnail style to all these methods. If style not passed, default_style will be used.
-
-==TODO
-
-* It will be nice to write some tests. :D

data/init.rb

@@ -1,4 +0,0 @@
-require File.join(File.dirname(__FILE__), "lib", "paperclip-meta")
-require 'paperclip-meta/railtie'
-
-Paperclip::Meta::Railtie.insert

data/rails/init.rb

@@ -1,2 +0,0 @@
-require 'paperclip-meta/railtie'
-Paperclip::Meta::Railtie.insert