tvdeyen-fleximage 1.0.9 → 1.1.1

data/.gitignore

@@ -0,0 +1,28 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+TAGS
+*.sw[op]
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+*.gem
+Gemfile.lock
+
+## PROJECT::SPECIFIC
+test/rails_root/log/*
+test/rails_root/public/uploads/*
+test/rails_root/tmp/**/*
+*.sqlite3

data/Gemfile

@@ -0,0 +1,8 @@
+source 'http://rubygems.org'
+
+gemspec
+
+group :test do
+	gem 'rails', '~> 3.2.1'
+	gem 'sqlite3'
+end

data/README.rdoc

@@ -1,36 +1,7 @@
 For all istructions refers to git://github.com/Squeegy/fleximage.
-I add a rails3_view.rb to manage template in rails3.
 
-#rails3_view.rb
+This version of fleximage runs with Rails 3.x incuding Rails 3.2.
 
-module ActionView
-  module TemplateHandlers
-    class Rails3View < TemplateHandler
-      include Compilable
-      class TemplateDidNotReturnImage < RuntimeError #:nodoc:
-      end
+NOTE:
 
-      def compile(template)
-        <<-CODE
-        @template_format = :flexi
-        controller.response.content_type ||= Mime::JPG    
-        result = #{template.source}
-        requested_format = (params[:format] || :jpg).to_sym
-        begin
-          # Raise an error if object returned from template is not an image record
-          unless result.class.include?(Fleximage::Model::InstanceMethods)
-            raise TemplateDidNotReturnImage, ".flexi template was expected to return a model instance that acts_as_fleximage, but got an instance of instead."
-          end
-          # Figure out the proper format
-          raise 'Image must be requested with an image type format.  jpg, gif and png only are supported.' unless [:jpg, :gif, :png].include?(requested_format)
-          result.output_image(:format => requested_format)
-        rescue Exception => e
-          e
-        end
-        CODE
-      ensure
-        GC.start
-      end
-    end
-  end
-end
+I removed Amazon S3 support.

data/Rakefile

@@ -1,18 +1,20 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rubygems'
+#!/usr/bin/env rake
 
-desc 'Default: run unit tests.'
-task :default => :test
+require 'rake/testtask'
 
-desc 'Test the fleximage plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/unit/**/*_test.rb'
-  t.verbose = true
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
 
 desc 'Generate documentation for the fleximage plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
@@ -23,27 +25,14 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "tvdeyen-fleximage"
-    gem.summary = <<EOF
-Rails plugin for uploading images as resources, with support for resizing, text
-stamping, and other special effects.
-EOF
-    gem.description = <<EOF
-Fleximage is a Rails plugin that tries to make image uploading and rendering
-super easy.
-EOF
-    gem.email = "tvdeyen@gmail.com"
-    gem.homepage = "http://github.com/tvdeyen/fleximage"
-    gem.authors = `git log --pretty=format:"%an"`.split("\n").uniq.sort
-    gem.add_dependency "rmagick"
-    gem.add_dependency "aws-s3"
-    gem.add_development_dependency "rails", ">=3.0.0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available."
-  puts "Install it with: gem install jeweler"
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the fleximage plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/unit/**/*_test.rb'
+  t.verbose = true
 end
+
+Bundler::GemHelper.install_tasks

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.1.0

data/lib/dsl_accessor.rb

@@ -11,7 +11,9 @@ class Class
       when Proc     then writer
       else raise TypeError, "DSL Error: writer should be a symbol or proc. but got `#{options[:writer].class}'"
       end
-    write_inheritable_attribute(:"#{name}_writer", writer)
+    class_attribute :"#{name}_writer"
+    class_attribute :"#{name}_value"
+    self.send(:"#{name}_writer=", writer)
 
     default =
       case options[:default]
@@ -22,28 +24,29 @@ class Class
       when Proc     then options[:default]
       else Proc.new{options[:default]}
       end
-    write_inheritable_attribute(:"#{name}_default", default)
+    class_attribute :"#{name}_default"
+    self.send(:"#{name}_default=", default)
 
     self.class.class_eval do
       define_method("#{name}=") do |value|
-        writer = read_inheritable_attribute(:"#{name}_writer")
+        writer = self.send(:"#{name}_writer")
         value  = writer.call(value) if writer
-        write_inheritable_attribute(:"#{name}", value)
+        self.send(:"#{name}_value=", value)
       end
 
       define_method(name) do |*values|
         if values.empty?
           # getter method
           key = :"#{name}"
-          if !inheritable_attributes.has_key?(key)
-            default = read_inheritable_attribute(:"#{name}_default")
+          if !self.respond_to?(key)
+            default = self.send(:"#{name}_default")
             value   = default ? default.call(self) : nil
-            __send__("#{name}=", value)
+            self.send("#{name}_value=", value)
           end
-          read_inheritable_attribute(key)
+          self.send("#{key}_value")
         else
           # setter method
-          __send__("#{name}=", *values)
+          __send__("#{name}_value=", *values)
         end
       end
     end

data/lib/fleximage.rb

@@ -1,7 +1,6 @@
 require 'open-uri'
 require 'base64'
 require 'digest/sha1'
-require 'aws/s3'
 
 require 'RMagick' unless defined?(Magick)
 

data/lib/fleximage/model.rb

@@ -18,9 +18,6 @@ module Fleximage
     #
     # * +image_directory+: (String, no default) Where the master images are stored, directory path relative to your 
     #   app root.
-    # * <tt>s3_bucket</tt>: Name of the bucket on Amazon S3 where your master images are stored.  To use this you must 
-    #   call <tt>establish_connection!</tt> on the aws/s3 gem form your app's initilization to authenticate with your
-    #   S3 account.
     # * +use_creation_date_based_directories+: (Boolean, default +true+) If true, master images will be stored in
     #   directories based on creation date.  For example: <tt>"#{image_directory}/2007/11/24/123.png"</tt> for an
     #   image with an id of 123 and a creation date of November 24, 2007.  Turing this off would cause the path
@@ -89,7 +86,6 @@ module Fleximage
         
         # Internal method to ask this class if it stores image in the DB.
         def self.db_store?
-          return false if s3_store?
           if respond_to?(:columns)
             columns.find do |col|
               col.name == 'image_file_data'
@@ -99,16 +95,12 @@ module Fleximage
           end
         end
         
-        def self.s3_store?
-          !!s3_bucket
-        end
-        
         def self.file_store?
-          !db_store? && !s3_store?
+          !db_store?
         end
         
         def self.has_store?
-          respond_to?(:columns) && (db_store? || s3_store? || image_directory)
+          respond_to?(:columns) && (db_store? || image_directory)
         end
         
         # validation callback
@@ -124,9 +116,6 @@ module Fleximage
         # Where images get stored
         dsl_accessor :image_directory
         
-        # Amazon S3 bucket where the master images are stored
-        dsl_accessor :s3_bucket
-        
         # Put uploads from different days into different subdirectories
         dsl_accessor :use_creation_date_based_directories, :default => true
         
@@ -219,20 +208,11 @@ module Fleximage
         # execute configuration block
         yield if block_given?
         
-        # Create S3 bucket if it's not present
-        if s3_bucket
-          begin
-            AWS::S3::Bucket.find(s3_bucket)
-          rescue AWS::S3::NoSuchBucket
-            AWS::S3::Bucket.create(s3_bucket)
-          end
-        end
-        
         # set the image directory from passed options
         image_directory options[:image_directory] if options[:image_directory]
         
         # Require the declaration of a master image storage directory
-        if respond_to?(:validate) && !image_directory && !db_store? && !s3_store? && !default_image && !default_image_path
+        if respond_to?(:validate) && !image_directory && !db_store? && !default_image && !default_image_path
           raise "No place to put images!  Declare this via the :image_directory => 'path/to/directory' option\n"+
                 "Or add a database column named image_file_data for DB storage\n"+
                 "Or set :virtual to true if this class has no image store at all\n"+
@@ -456,8 +436,6 @@ module Fleximage
       def has_saved_image?
         if self.class.db_store?
           !!image_file_data
-        elsif self.class.s3_store?
-          AWS::S3::S3Object.exists?("#{id}.#{self.class.image_storage_format}", self.class.s3_bucket)
         elsif self.class.file_store?
           File.exists?(file_path)
         end
@@ -502,16 +480,7 @@ module Fleximage
           if image_file_data && image_file_data.present?
             @output_image = Magick::Image.from_blob(image_file_data).first
           end
-          
-        elsif self.class.s3_store?
-          # Load image from S3
-          filename = "#{id}.#{self.class.image_storage_format}"
-          bucket   = self.class.s3_bucket
-          
-          if AWS::S3::S3Object.exists?(filename, bucket)
-            @output_image = Magick::Image.from_blob(AWS::S3::S3Object.value(filename, bucket)).first
-          end
-        
+                  
         else
           # Load the image from the disk
           @output_image = Magick::Image.read(file_path).first
@@ -555,8 +524,6 @@ module Fleximage
         
         if self.class.db_store?
           update_attribute :image_file_data, nil unless frozen?
-        elsif self.class.s3_store?
-          AWS::S3::S3Object.delete "#{id}.#{self.class.image_storage_format}", self.class.s3_bucket
         else
           File.delete(file_path) if File.exists?(file_path)
         end
@@ -616,10 +583,6 @@ module Fleximage
               # Write master image file
               @uploaded_image.write(file_path)
               
-            elsif self.class.s3_store?
-              blob = StringIO.new(@uploaded_image.to_blob)
-              AWS::S3::S3Object.store("#{id}.#{self.class.image_storage_format}", blob, self.class.s3_bucket)
-              
             end
           end
           

data/test/rails_root/README.rdoc

@@ -0,0 +1,261 @@
+== Welcome to Rails
+
+Rails is a web-application framework that includes everything needed to create
+database-backed web applications according to the Model-View-Control pattern.
+
+This pattern splits the view (also called the presentation) into "dumb"
+templates that are primarily responsible for inserting pre-built data in between
+HTML tags. The model contains the "smart" domain objects (such as Account,
+Product, Person, Post) that holds all the business logic and knows how to
+persist themselves to a database. The controller handles the incoming requests
+(such as Save New Account, Update Product, Show Post) by manipulating the model
+and directing data to the view.
+
+In Rails, the model is handled by what's called an object-relational mapping
+layer entitled Active Record. This layer allows you to present the data from
+database rows as objects and embellish these data objects with business logic
+methods. You can read more about Active Record in
+link:files/vendor/rails/activerecord/README.html.
+
+The controller and view are handled by the Action Pack, which handles both
+layers by its two parts: Action View and Action Controller. These two layers
+are bundled in a single package due to their heavy interdependence. This is
+unlike the relationship between the Active Record and Action Pack that is much
+more separate. Each of these packages can be used independently outside of
+Rails. You can read more about Action Pack in
+link:files/vendor/rails/actionpack/README.html.
+
+
+== Getting Started
+
+1. At the command prompt, create a new Rails application:
+       <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
+
+2. Change directory to <tt>myapp</tt> and start the web server:
+       <tt>cd myapp; rails server</tt> (run with --help for options)
+
+3. Go to http://localhost:3000/ and you'll see:
+       "Welcome aboard: You're riding Ruby on Rails!"
+
+4. Follow the guidelines to start developing your application. You can find
+the following resources handy:
+
+* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
+* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
+
+
+== Debugging Rails
+
+Sometimes your application goes wrong. Fortunately there are a lot of tools that
+will help you debug it and get it back on the rails.
+
+First area to check is the application log files. Have "tail -f" commands
+running on the server.log and development.log. Rails will automatically display
+debugging and runtime information to these files. Debugging info will also be
+shown in the browser on requests from 127.0.0.1.
+
+You can also log your own messages directly into the log file from your code
+using the Ruby logger class from inside your controllers. Example:
+
+  class WeblogController < ActionController::Base
+    def destroy
+      @weblog = Weblog.find(params[:id])
+      @weblog.destroy
+      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
+    end
+  end
+
+The result will be a message in your log file along the lines of:
+
+  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
+
+More information on how to use the logger is at http://www.ruby-doc.org/core/
+
+Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
+several books available online as well:
+
+* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
+* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
+
+These two books will bring you up to speed on the Ruby language and also on
+programming in general.
+
+
+== Debugger
+
+Debugger support is available through the debugger command when you start your
+Mongrel or WEBrick server with --debugger. This means that you can break out of
+execution at any point in the code, investigate and change the model, and then,
+resume execution! You need to install ruby-debug to run the server in debugging
+mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
+
+  class WeblogController < ActionController::Base
+    def index
+      @posts = Post.all
+      debugger
+    end
+  end
+
+So the controller will accept the action, run the first line, then present you
+with a IRB prompt in the server window. Here you can do things like:
+
+  >> @posts.inspect
+  => "[#<Post:0x14a6be8
+          @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
+       #<Post:0x14a6620
+          @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
+  >> @posts.first.title = "hello from a debugger"
+  => "hello from a debugger"
+
+...and even better, you can examine how your runtime objects actually work:
+
+  >> f = @posts.first
+  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
+  >> f.
+  Display all 152 possibilities? (y or n)
+
+Finally, when you're ready to resume execution, you can enter "cont".
+
+
+== Console
+
+The console is a Ruby shell, which allows you to interact with your
+application's domain model. Here you'll have all parts of the application
+configured, just like it is when the application is running. You can inspect
+domain models, change values, and save to the database. Starting the script
+without arguments will launch it in the development environment.
+
+To start the console, run <tt>rails console</tt> from the application
+directory.
+
+Options:
+
+* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
+  made to the database.
+* Passing an environment name as an argument will load the corresponding
+  environment. Example: <tt>rails console production</tt>.
+
+To reload your controllers and models after launching the console run
+<tt>reload!</tt>
+
+More information about irb can be found at:
+link:http://www.rubycentral.org/pickaxe/irb.html
+
+
+== dbconsole
+
+You can go to the command line of your database directly through <tt>rails
+dbconsole</tt>. You would be connected to the database with the credentials
+defined in database.yml. Starting the script without arguments will connect you
+to the development database. Passing an argument will connect you to a different
+database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
+PostgreSQL and SQLite 3.
+
+== Description of Contents
+
+The default directory structure of a generated Ruby on Rails application:
+
+  |-- app
+  |   |-- assets
+  |       |-- images
+  |       |-- javascripts
+  |       `-- stylesheets
+  |   |-- controllers
+  |   |-- helpers
+  |   |-- mailers
+  |   |-- models
+  |   `-- views
+  |       `-- layouts
+  |-- config
+  |   |-- environments
+  |   |-- initializers
+  |   `-- locales
+  |-- db
+  |-- doc
+  |-- lib
+  |   `-- tasks
+  |-- log
+  |-- public
+  |-- script
+  |-- test
+  |   |-- fixtures
+  |   |-- functional
+  |   |-- integration
+  |   |-- performance
+  |   `-- unit
+  |-- tmp
+  |   |-- cache
+  |   |-- pids
+  |   |-- sessions
+  |   `-- sockets
+  `-- vendor
+      |-- assets
+          `-- stylesheets
+      `-- plugins
+
+app
+  Holds all the code that's specific to this particular application.
+
+app/assets
+  Contains subdirectories for images, stylesheets, and JavaScript files.
+
+app/controllers
+  Holds controllers that should be named like weblogs_controller.rb for
+  automated URL mapping. All controllers should descend from
+  ApplicationController which itself descends from ActionController::Base.
+
+app/models
+  Holds models that should be named like post.rb. Models descend from
+  ActiveRecord::Base by default.
+
+app/views
+  Holds the template files for the view that should be named like
+  weblogs/index.html.erb for the WeblogsController#index action. All views use
+  eRuby syntax by default.
+
+app/views/layouts
+  Holds the template files for layouts to be used with views. This models the
+  common header/footer method of wrapping views. In your views, define a layout
+  using the <tt>layout :default</tt> and create a file named default.html.erb.
+  Inside default.html.erb, call <% yield %> to render the view using this
+  layout.
+
+app/helpers
+  Holds view helpers that should be named like weblogs_helper.rb. These are
+  generated for you automatically when using generators for controllers.
+  Helpers can be used to wrap functionality for your views into methods.
+
+config
+  Configuration files for the Rails environment, the routing map, the database,
+  and other dependencies.
+
+db
+  Contains the database schema in schema.rb. db/migrate contains all the
+  sequence of Migrations for your schema.
+
+doc
+  This directory is where your application documentation will be stored when
+  generated using <tt>rake doc:app</tt>
+
+lib
+  Application specific libraries. Basically, any kind of custom code that
+  doesn't belong under controllers, models, or helpers. This directory is in
+  the load path.
+
+public
+  The directory available for the web server. Also contains the dispatchers and the
+  default HTML files. This should be set as the DOCUMENT_ROOT of your web
+  server.
+
+script
+  Helper scripts for automation and generation.
+
+test
+  Unit and functional tests along with fixtures. When using the rails generate
+  command, template test files will be generated for you and placed in this
+  directory.
+
+vendor
+  External libraries that the application depends on. Also includes the plugins
+  subdirectory. If the app has frozen rails, those gems also go here, under
+  vendor/rails/. This directory is in the load path.