paperclip-meta 0.2 → 0.3.1

data/.gitignore

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

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--backtrace

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in paperclip-meta.gemspec
+gemspec

data/README.rdoc

@@ -9,7 +9,7 @@ Paperclip Meta will get image dimensions right after post_process_styles using p
 Add paperclip-meta to Gemfile:
 
   gem 'paperclip-meta'
-  
+
 Create migration:
 
   class AddMetaToAvatar < ActiveRecord::Migration
@@ -23,7 +23,7 @@ Create migration:
   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 %>
@@ -43,11 +43,11 @@ Meta column is simple hash:
 This hash will be marshaled and base64 encoded before writing to model attribute.
 
 Meta methods provided:
-  - width
-  - height
-  - size
+  - width `@user.avatar.width(:thumb)`
+  - height `@user.avatar.height(:medium)`
+  - size `@user.avatar.size`
 
-You can pass thumbnail style to all this methods. If style not passed, default_style will be used.
+You can pass thumbnail style to all these methods. If style not passed, default_style will be used.
 
 ==TODO
 

data/Rakefile

@@ -1,34 +1,8 @@
-require 'rake'
-require 'rake/testtask'
-require 'rspec/core'
+require "bundler/gem_tasks"
+require "rspec/core"
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
 
-begin
-  include_files = ["README*", "LICENSE", "Rakefile", "init.rb", "{lib,test}/**/*"].map do |glob|
-    Dir[glob]
-  end.flatten
-  
-  require "jeweler"
-  Jeweler::Tasks.new do |s|
-    s.name              = "paperclip-meta"
-    s.version           = "0.1"
-    s.author            = "Alexey Bondar"
-    s.email             = "y8@ya.ru"
-    s.homepage          = "http://github.com/y8/paperclip-meta"
-    s.description       = "Add width, height and size methods to paperclip thumbnails"
-    s.summary           = "Thumbnail dimensions for paperclip"
-    s.platform          = Gem::Platform::RUBY
-    s.files             = include_files
-    s.require_path      = "lib"
-    s.rubyforge_project = "paperclip-meta"
-    s.has_rdoc          = false
-    s.add_dependency 'paperclip'    
-  end
-  
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+# spec is default task
+task :default => :spec

data/init.rb

@@ -1 +1,2 @@
+# FIXME: What this file for?
 require File.join(File.dirname(__FILE__), "lib", "paperclip-meta")

data/lib/paperclip-meta.rb

@@ -1,20 +1,30 @@
+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
-      unless @queued_for_delete.empty?
-        instance_write(:meta, ActiveSupport::Base64.encode64(Marshal.dump({}))) if instance.respond_to?(:"#{name}_meta=")
+      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
-      original_post_process_styles
+    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 = {}
@@ -28,11 +38,11 @@ module Paperclip
           end
         end
 
-        instance_write(:meta, ActiveSupport::Base64.encode64(Marshal.dump(meta)))
+        instance_write(:meta, meta_encode(meta))
       end
     end
 
-    # Meta access methods
+    # Define meta accessors methods
     [:width, :height, :size].each do |meth|
       define_method(meth) do |*args|
         style = args.first || default_style
@@ -40,17 +50,42 @@ module Paperclip
       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 = Marshal.load(ActiveSupport::Base64.decode64(instance_read(:meta)))
+        if meta = meta_decode(instance_read(:meta))
           meta.key?(style) ? meta[style][item] : nil
         end
       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

data/lib/paperclip-meta/version.rb

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

data/paperclip-meta.gemspec

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+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.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.add_development_dependency "paperclip"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "activerecord"
+  s.add_development_dependency "sqlite3-ruby"
+
+  # Runtime dependencies
+  s.add_runtime_dependency "paperclip"
+end

data/spec/spec_helper.rb

@@ -1,26 +1,20 @@
-$LOAD_PATH << "." unless $LOAD_PATH.include?(".")
+require 'rubygems'
+require 'bundler/setup'
+Bundler.require(:default, :development)
 
-begin
-  require "bundler"
-  Bundler.setup
-rescue Bundler::GemNotFound
-  raise RuntimeError, "Bundler couldn't find some gems." +
-    "Did you run `bundle install`?"
-end
-
-Bundler.require
-require 'logger'
-Paperclip::Railtie.insert
+# Prepare activerecord
+require "active_record"
 
+# Connect to sqlite
 ActiveRecord::Base.establish_connection(
-  "adapter" => "sqlite3", 
+  "adapter" => "sqlite3",
   "database" => ":memory:"
 )
 
 ActiveRecord::Base.logger = Logger.new(nil)
+load(File.join(File.dirname(__FILE__), 'schema.rb'))
 
-load(File.dirname(__FILE__) + '/schema.rb')
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
+Paperclip::Railtie.insert
 
 class Image < ActiveRecord::Base
   has_attached_file :small_image,

metadata

@@ -1,87 +1,133 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: paperclip-meta
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  version: "0.2"
+version: !ruby/object:Gem::Version
+  version: 0.3.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Alexey Bondar
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-30 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70281062647600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *70281062647600
+- !ruby/object:Gem::Dependency
   name: paperclip
+  requirement: &70281062647060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70281062647060
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70281062646360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70281062646360
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70281062645580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70281062645580
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &70281062644620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70281062644620
+- !ruby/object:Gem::Dependency
+  name: paperclip
+  requirement: &70281062643560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70281062643560
 description: Add width, height and size methods to paperclip thumbnails
-email: y8@ya.ru
+email:
+- y8@ya.ru
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
 - init.rb
 - lib/paperclip-meta.rb
+- lib/paperclip-meta/version.rb
+- paperclip-meta.gemspec
+- 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
-has_rdoc: true
 homepage: http://github.com/y8/paperclip-meta
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: paperclip-meta
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Thumbnail dimensions for paperclip
-test_files: 
+test_files:
+- 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