paperclip-meta 0.4.0 → 0.4.1

data/lib/paperclip-meta/attachment.rb

@@ -1,6 +1,13 @@
 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
@@ -71,29 +78,14 @@ module Paperclip
 
         # 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
+          Base64.encode64(Marshal.dump(meta))
         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
+          Marshal.load(Base64.decode64(meta))
         end
-
       end
-
     end
-
   end
 end

data/lib/paperclip-meta/version.rb

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

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

@@ -41,7 +41,9 @@ describe "Geometry saver plugin" do
     end
 
     it 'should save file size with meta data ' do
-      @image.big_image.size(:small).should == 3526
+      path = File.join(File.dirname(__FILE__), "../tmp/fixtures/tmp/small/#{@image.id}.jpg")
+      size = File.stat(path).size
+      @image.big_image.size(:small).should == size
     end
 
     it 'should access normal paperclip method when no style passed' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-meta
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70335412175260 !ruby/object:Gem::Requirement
+  requirement: &70164674632380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70335412175260
+  version_requirements: *70164674632380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70335412173700 !ruby/object:Gem::Requirement
+  requirement: &70164674631540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335412173700
+  version_requirements: *70164674631540
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70335412172380 !ruby/object:Gem::Requirement
+  requirement: &70164674630340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335412172380
+  version_requirements: *70164674630340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70335412171460 !ruby/object:Gem::Requirement
+  requirement: &70164674629500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335412171460
+  version_requirements: *70164674629500
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70335412170640 !ruby/object:Gem::Requirement
+  requirement: &70164674628180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335412170640
+  version_requirements: *70164674628180
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70335412169360 !ruby/object:Gem::Requirement
+  requirement: &70164674627200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335412169360
+  version_requirements: *70164674627200
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70335412168500 !ruby/object:Gem::Requirement
+  requirement: &70164674625540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70335412168500
+  version_requirements: *70164674625540
 description: Add width, height and size methods to paperclip thumbnails
 email:
 - y8@ya.ru