tvdeyen-fleximage 1.1.1 → 1.2.0

data/lib/fleximage.rb

@@ -7,7 +7,6 @@ require 'RMagick' unless defined?(Magick)
 # Apply a few RMagick patches
 require 'fleximage/rmagick_image_patch'
 
-# Load dsl_accessor from lib
 require 'dsl_accessor'
 
 # Load Operators
@@ -53,5 +52,5 @@ ActionController::Base.class_eval{ include Fleximage::AviaryController }
 
 # Register mime types
 Mime::Type.register "image/jpeg", :jpg, ["image/pjpeg"], ["jpeg"]
-Mime::Type.register "image/gif", :gif
-Mime::Type.register "image/png", :png
+Mime::Type.register "image/gif", :gif if Rails.version.to_f <= 3.1
+Mime::Type.register "image/png", :png if Rails.version.to_f <= 3.1

data/lib/fleximage/model.rb

@@ -119,7 +119,7 @@ module Fleximage
         # Put uploads from different days into different subdirectories
         dsl_accessor :use_creation_date_based_directories, :default => true
         
-        # The format are master images are stored in
+        # The format that master images are stored in
         dsl_accessor :image_storage_format, :default => Proc.new { :png }
         
         # Require a valid image.  Defaults to true.  Set to false if its ok to have no image for
@@ -166,13 +166,13 @@ module Fleximage
         # Image too small message
         # Should include {{minimum}}
         def self.image_too_small_message(str = nil)
-          fb = "is too small (Minimum: {{minimum}})"
+          fb = "is too small (Minimum: %{minimum})"
           if str.nil?
             minimum_size = Fleximage::Operator::Base.size_to_xy(validates_image_size).join('x')
             if @image_too_small_message
-              @image_too_small_message.gsub("{{minimum}}", minimum_size)
+              @image_too_small_message.gsub("%{minimum}", minimum_size)
             else
-              translate_error_message("image_too_small", fb.gsub("{{minimum}}", minimum_size), :minimum => minimum_size)
+              translate_error_message("image_too_small", fb.gsub("%{minimum}", minimum_size), :minimum => minimum_size)
             end
           else
             @image_too_small_message = str

data/lib/fleximage/version.rb

@@ -0,0 +1,3 @@
+module Fleximage
+  VERSION = '1.2.0'
+end

data/test/rails_root/app/locales/de.yml

@@ -4,4 +4,4 @@ de:
       messages:
         missing_image: ist erforderlich
         invalid_image: war nicht lesbar
-        image_too_small: "ist zu klein (Minimalgröße: {{minimum}})"
+        image_too_small: "ist zu klein (Minimalgröße: %{minimum})"

data/test/rails_root/app/locales/en.yml

@@ -5,4 +5,4 @@ en:
         photo_custom_error:
           missing_image: needs to be attached
           invalid_image: seems to be broken
-          image_too_small: "must be bigger (min. size: {{minimum}})"
+          image_too_small: "must be bigger (min. size: %{minimum})"

data/test/rails_root/app/models/photo_custom_error.rb

@@ -5,6 +5,6 @@ class PhotoCustomError < ActiveRecord::Base
     validates_image_size '2x2'
     missing_image_message "needs to be attached"
     invalid_image_message "seems to be broken"
-    image_too_small_message "must be bigger (min. size: {{minimum}})"
+    image_too_small_message "must be bigger (min. size: %{minimum})"
   end
 end

data/test/test_helper.rb

@@ -9,12 +9,7 @@ silence_warnings { RAILS_ENV = ENV['RAILS_ENV'] }
 # Run the migrations
 ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
  
-# Setup the fixtures path
-Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
-$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)
- 
 require File.dirname(__FILE__) + '/mock_file'
-require File.dirname(__FILE__) + '/s3_stubs'
 require 'open-uri'
 
 unless Magick::QuantumDepth == 16
@@ -31,9 +26,6 @@ class Test::Unit::TestCase #:nodoc:
       Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
     end
   end
- 
-  self.use_transactional_fixtures = true
-  self.use_instantiated_fixtures  = false
   
   def files(name)
     case name

data/test/unit/basic_model_test.rb

@@ -33,8 +33,4 @@ class FleximageBasicModelTest < Test::Unit::TestCase
     p = PhotoBare.create(:image_file => files(:photo))
     assert_equal '/tmp', p.directory_path
   end
-
-  def test_should_confirm_presence_of_a_store_when_using_s3
-    assert PhotoS3.has_store?
-  end
 end

data/test/unit/file_upload_from_local_test.rb

@@ -10,14 +10,14 @@ class FleximageFileUploadFromLocalTest < Test::Unit::TestCase
     p = PhotoBare.new
     assert !p.save, 'Record expected to not be allowed to save'
     assert_equal 1, p.errors.size
-    assert_equal 'is required', p.errors.on(:image_file)
+    assert_equal 'is required', p.errors.messages[:image_file].join()
   end
   
   def test_should_require_an_valid_image
     p = PhotoBare.new(:image_file => files(:not_a_photo))
     assert !p.save, 'Record expected to not be allowed to save'
     assert_equal 1, p.errors.size
-    assert_equal 'was not a readable image', p.errors.on(:image_file)
+    assert_equal 'was not a readable image', p.errors.messages[:image_file].join()
   end
   
   def test_should_correct_colorspace_and_dpi

data/test/unit/file_upload_from_url_test.rb

@@ -12,7 +12,7 @@ class FleximageFileUploadFromUrlTest < Test::Unit::TestCase
     p = PhotoBare.new(:image_file_url => 'http://www.google.com/')
     assert !p.save, 'Record expected to be invalid after upload via URL'
     assert_equal 1, p.errors.size
-    assert_equal 'was not a readable image', p.errors.on(:image_file_url)
+    assert_equal 'was not a readable image', p.errors.messages[:image_file_url].join()
   rescue SocketError
     print '!'
   end
@@ -21,7 +21,7 @@ class FleximageFileUploadFromUrlTest < Test::Unit::TestCase
     p = PhotoBare.new(:image_file_url => 'foo')
     assert !p.save, 'Record expected to be invalid after upload via URL'
     assert_equal 1, p.errors.size
-    assert_equal 'was not a readable image', p.errors.on(:image_file_url)
+    assert_equal 'was not a readable image', p.errors.messages[:image_file_url].join()
   rescue SocketError
     print '!'
   end

data/test/unit/file_upload_to_db_test.rb

@@ -14,14 +14,14 @@ class FleximageFileUploadToDbTest < Test::Unit::TestCase
     p = PhotoDb.new
     assert !p.save, 'Record expected to not be allowed to save'
     assert_equal 1, p.errors.size
-    assert_equal 'is required', p.errors.on(:image_file)
+    assert_equal 'is required', p.errors.messages[:image_file].join()
   end
   
   def test_should_require_an_valid_image
     p = PhotoDb.new(:image_file => files(:not_a_photo))
     assert !p.save, 'Record expected to not be allowed to save'
     assert_equal 1, p.errors.size
-    assert_equal 'was not a readable image', p.errors.on(:image_file)
+    assert_equal 'was not a readable image', p.errors.messages[:image_file].join()
   end
   
   def test_should_retrieve_a_stored_image

data/test/unit/i18n_messages_test.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require File.dirname(__FILE__) + '/../../test/test_helper'
 
 
@@ -5,30 +7,30 @@ class I18nMessagesTest < Test::Unit::TestCase
   def test_should_have_default_message
     p = PhotoBare.new
     p.save
-    assert_equal "is required", p.errors["image_file"]
+    assert_equal "is required", p.errors["image_file"].join()
     
     p = PhotoBare.new(:image_file => files(:not_a_photo))
     p.save
-    assert_equal "was not a readable image", p.errors["image_file"]
+    assert_equal "was not a readable image", p.errors["image_file"].join()
     
     p = PhotoBare.new(:image_file => files(:i1x1))
     p.save
-    assert_equal "is too small (Minimum: 2x2)", p.errors["image_file"]
+    assert_equal "is too small (Minimum: 2x2)", p.errors["image_file"].join()
   end
   
   def test_should_have_german_message
     I18n.locale = "de"
     p = PhotoBare.new
     p.save
-    assert_equal "ist erforderlich", p.errors["image_file"]
+    assert_equal "ist erforderlich", p.errors["image_file"].join()
     
     p = PhotoBare.new(:image_file => files(:not_a_photo))
     p.save
-    assert_equal "war nicht lesbar", p.errors["image_file"]
+    assert_equal "war nicht lesbar", p.errors["image_file"].join()
     
     p = PhotoBare.new(:image_file => files(:i1x1))
     p.save
-    assert_equal "ist zu klein (Minimalgröße: 2x2)", p.errors["image_file"]
+    assert_equal "ist zu klein (Minimalgröße: 2x2)", p.errors["image_file"].join()
   ensure
     I18n.locale = "en"
   end
@@ -36,14 +38,14 @@ class I18nMessagesTest < Test::Unit::TestCase
   def test_should_have_model_specific_message
     p = PhotoCustomError.new
     assert !p.save
-    assert_equal "needs to be attached", p.errors["image_file"]
+    assert_equal "needs to be attached", p.errors["image_file"].join()
     
     p = PhotoCustomError.new(:image_file => files(:not_a_photo))
     p.save
-    assert_equal "seems to be broken", p.errors["image_file"]
+    assert_equal "seems to be broken", p.errors["image_file"].join()
     
     p = PhotoCustomError.new(:image_file => files(:i1x1))
     assert !p.save
-    assert_equal "must be bigger (min. size: 2x2)", p.errors["image_file"]
+    assert_equal "must be bigger (min. size: 2x2)", p.errors["image_file"].join()
   end
 end

data/test/unit/minimum_image_size_test.rb

@@ -26,7 +26,7 @@ class MinimumImageSizeTest < Test::Unit::TestCase
   def test_should_not_save_small_image
     p = BigPhoto.new(:image_file => files(:i1x1))
     assert !p.save
-    assert p.errors["image_file"].match(/is too small/)
+    assert p.errors["image_file"].join().match(/is too small/)
   end
   
   def test_should_save_big_image
@@ -51,6 +51,6 @@ class MinimumImageSizeTest < Test::Unit::TestCase
   def test_should_include_minimum_dimensions_in_message
     p = BigPhoto.new(:image_file => files(:i1x1))
     p.save
-    assert_equal "is too small (Minimum: 80x60)", p.errors["image_file"]
+    assert_equal "is too small (Minimum: 80x60)", p.errors["image_file"].join()
   end
 end

data/tvdeyen-fleximage.gemspec

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
+require File.join(File.dirname(__FILE__), 'lib/fleximage/version')
 
 Gem::Specification.new do |s|
   s.name = "tvdeyen-fleximage"
-  s.version = "1.1.1"
+  s.version = Fleximage::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ahmed Adam", "Alex Wayne", "Andrew White", "Carsten Fregin", "Duccio", "Fernando Kosh", "Heiner Wohner", "JJ Buckley", "Jason Lee", "Joshua Abbott", "Koji Ando", "Kouhei Sutou", "Lasse Jansen", "Lo\u{ef}c Guitaut", "Markus Schwed", "Martin Vielsmaier", "Squeegy", "Thomas von Deyen", "Vannoy", "Wolfgang Klinger", "Wolfgang K\u{f6}lbl", "josei", "masche842", "ralph"]
-  s.date = "2012-02-15"
+  s.authors = `git log --format='%aN' | sort -u`.split("\n")
+  s.date = "2012-04-06"
   s.description = "Fleximage is a Rails plugin that tries to make image uploading and rendering\nsuper easy.\n"
   s.email = "tvdeyen@gmail.com"
   s.extra_rdoc_files = [
@@ -19,6 +20,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = "1.8.10"
   s.summary = "Rails plugin for uploading images as resources, with support for resizing, text stamping, and other special effects."
 
-  s.add_runtime_dependency(%q<rmagick>, [">= 0"])
+  s.add_runtime_dependency(%q<rmagick>, [">= 2"])
+  s.add_runtime_dependency(%q<dsl_accessor>, ["~> 0.4.0"])
   s.add_development_dependency(%q<rails>, ["~> 3.2.1"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tvdeyen-fleximage
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -32,22 +32,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000 Z
+date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70293806355060 !ruby/object:Gem::Requirement
+  requirement: &70108112024400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *70293806355060
+  version_requirements: *70108112024400
+- !ruby/object:Gem::Dependency
+  name: dsl_accessor
+  requirement: &70108112023660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70108112023660
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70293806354560 !ruby/object:Gem::Requirement
+  requirement: &70108112022880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +66,7 @@ dependencies:
         version: 3.2.1
   type: :development
   prerelease: false
-  version_requirements: *70293806354560
+  version_requirements: *70108112022880
 description: ! 'Fleximage is a Rails plugin that tries to make image uploading and
   rendering
 
@@ -74,10 +85,8 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - autotest.rb
 - init.rb
-- lib/dsl_accessor.rb
 - lib/fleximage.rb
 - lib/fleximage/aviary_controller.rb
 - lib/fleximage/blank.rb
@@ -97,6 +106,7 @@ files:
 - lib/fleximage/operator/unsharp_mask.rb
 - lib/fleximage/rails3_view.rb
 - lib/fleximage/rmagick_image_patch.rb
+- lib/fleximage/version.rb
 - lib/fleximage/view.rb
 - lib/tasks/fleximage_tasks.rake
 - test/fixtures/100x1.jpg
@@ -194,13 +204,11 @@ files:
 - test/rails_root/public/robots.txt
 - test/rails_root/public/stylesheets/scaffold.css
 - test/rails_root/script/rails
-- test/rails_root/vendor/plugins/fleximage/init.rb
 - test/test_helper.rb
 - test/unit/abstract_test.rb
 - test/unit/basic_model_test.rb
 - test/unit/blank_test.rb
 - test/unit/default_image_path_option_test.rb
-- test/unit/dsl_accessor_test.rb
 - test/unit/file_upload_from_local_test.rb
 - test/unit/file_upload_from_strings_test.rb
 - test/unit/file_upload_from_url_test.rb
@@ -233,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3475540245412168316
+      hash: -1294711722270480675
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -242,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Rails plugin for uploading images as resources, with support for resizing,

data/VERSION

@@ -1 +0,0 @@
-1.1.0

data/lib/dsl_accessor.rb

@@ -1,55 +0,0 @@
-require 'active_support' unless defined?(ActiveSupport)
-
-class Class
-  def dsl_accessor(name, options = {})
-    raise TypeError, "DSL Error: options should be a hash. but got `#{options.class}'" unless options.is_a?(Hash)
-    writer = options[:writer] || options[:setter]
-    writer =
-      case writer
-      when NilClass then Proc.new{|value| value}
-      when Symbol   then Proc.new{|value| __send__(writer, value)}
-      when Proc     then writer
-      else raise TypeError, "DSL Error: writer should be a symbol or proc. but got `#{options[:writer].class}'"
-      end
-    class_attribute :"#{name}_writer"
-    class_attribute :"#{name}_value"
-    self.send(:"#{name}_writer=", writer)
-
-    default =
-      case options[:default]
-      when NilClass then nil
-      when []       then Proc.new{[]}
-      when {}       then Proc.new{{}}
-      when Symbol   then Proc.new{__send__(options[:default])}
-      when Proc     then options[:default]
-      else Proc.new{options[:default]}
-      end
-    class_attribute :"#{name}_default"
-    self.send(:"#{name}_default=", default)
-
-    self.class.class_eval do
-      define_method("#{name}=") do |value|
-        writer = self.send(:"#{name}_writer")
-        value  = writer.call(value) if writer
-        self.send(:"#{name}_value=", value)
-      end
-
-      define_method(name) do |*values|
-        if values.empty?
-          # getter method
-          key = :"#{name}"
-          if !self.respond_to?(key)
-            default = self.send(:"#{name}_default")
-            value   = default ? default.call(self) : nil
-            self.send("#{name}_value=", value)
-          end
-          self.send("#{key}_value")
-        else
-          # setter method
-          __send__("#{name}_value=", *values)
-        end
-      end
-    end
-  end
-end
-

data/test/rails_root/vendor/plugins/fleximage/init.rb

@@ -1,2 +0,0 @@
-init_path = "#{Rails.root}/../../init.rb"
-silence_warnings { eval(IO.read(init_path), binding, init_path) }

data/test/unit/dsl_accessor_test.rb

@@ -1,120 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
-
-class DslAccessorTest < Test::Unit::TestCase
-  class CoolActiveRecord
-    dsl_accessor :primary_key
-    dsl_accessor :table_name
-  end
-
-  class Item < CoolActiveRecord
-  end
-
-  class LegacyItem < CoolActiveRecord
-    primary_key :itcd
-    table_name  :item
-  end
-
-
-  def test_accessor_without_initialization
-    assert_equal nil, Item.primary_key
-    assert_equal nil, Item.table_name
-
-    Item.primary_key :itcd
-    Item.table_name  :item
-
-    assert_equal :itcd, Item.primary_key
-    assert_equal :item, Item.table_name
-  end
-
-  def test_accessor_with_initialization
-    assert_equal :itcd, LegacyItem.primary_key
-    assert_equal :item, LegacyItem.table_name
-
-    LegacyItem.primary_key :item_id
-    LegacyItem.table_name  :item_table
-
-    assert_equal :item_id,    LegacyItem.primary_key
-    assert_equal :item_table, LegacyItem.table_name
-  end
-end
-
-
-class DslDefaultAccessorTest < Test::Unit::TestCase
-
-  class CoolActiveRecord
-    dsl_accessor :primary_key, :default=>"id"
-    dsl_accessor :table_name,  :default=>proc{|klass| klass.name.demodulize.underscore.pluralize}
-  end
-
-  class Item < CoolActiveRecord
-  end
-
-  class User < CoolActiveRecord
-  end
-
-  class Folder
-    dsl_accessor :array_folder, :default=>[]
-    dsl_accessor :hash_folder,  :default=>{}
-  end
-
-  class SubFolder < Folder
-  end
-
-  def test_default_accessor_with_string
-    assert_equal "id", Item.primary_key
-    assert_equal "id", User.primary_key
-  end
-
-  def test_default_accessor_with_proc
-    assert_equal "items", Item.table_name
-    assert_equal "users", User.table_name
-  end
-
-  def test_default_accessor_should_duplicate_empty_array_or_hash
-    Folder.array_folder << 1
-    Folder.hash_folder[:name] = "maiha"
-
-    assert_equal([1], Folder.array_folder)
-    assert_equal({:name=>"maiha"}, Folder.hash_folder)
-
-    assert_equal([], SubFolder.array_folder)
-    assert_equal({}, SubFolder.hash_folder)
-  end
-end
-
-
-class DslOverwritenDefaultAccessorTest < Test::Unit::TestCase
-  class CoolActiveRecord
-    dsl_accessor :primary_key, :default=>"id"
-    dsl_accessor :table_name,  :default=>proc{|klass| klass.name.demodulize.underscore.pluralize}
-  end
-
-  class Item < CoolActiveRecord
-    primary_key :item_id
-    table_name  :item_table
-  end
-
-  def test_overwrite_default_accessor
-    assert_equal :item_id,    Item.primary_key
-    assert_equal :item_table, Item.table_name
-  end
-end
-
-
-class DslWriterAccessorTest < Test::Unit::TestCase
-  class Item
-    dsl_accessor :primary_key, :writer=>proc{|value| value.to_s}
-  end
-
-  def test_string_writer
-    assert_equal "", Item.primary_key
-
-    Item.primary_key :id
-    assert_equal "id", Item.primary_key
-
-    Item.primary_key "id"
-    assert_equal "id", Item.primary_key
-  end
-end
-
-