dynamic_image 1.0.4 → 2.0.0.beta1

data/lib/dynamic_image/routing.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+module DynamicImage
+  # = DynamicImage Routing
+  #
+  # Extends +ActionDispatch::Routing::Mapper+ and provides a shortcut for
+  # defining routes for +DynamicImage::Controller+.
+  module Routing
+    # Declares an image resource.
+    #
+    #   image_resources :avatars
+    def image_resources(resource_name, options={})
+      options = {
+        path:        "#{resource_name}/:digest(/:size)",
+        constraints: { size: /\d+x\d+/ },
+        only:        [:show]
+      }.merge(options)
+      resources resource_name, options do
+        get :uncropped, on: :member
+        get :original, on: :member
+      end
+    end
+  end
+end

data/lib/dynamic_image/version.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+module DynamicImage
+  VERSION = "2.0.0.beta1"
+end

data/lib/dynamic_image.rb

@@ -1,78 +1,21 @@
-require 'tempfile'
-require 'digest/sha1'
-require 'open-uri'
+# encoding: utf-8
 
-# Gem dependencies
-require 'RMagick'
+require 'mini_magick'
+require 'dis'
 require 'vector2d'
-require 'rails'
-require 'action_controller'
-require 'active_support'
-require 'active_record'
 
-require 'binary_storage'
-
-if Rails::VERSION::MAJOR >= 3
-  # Load the engine
-  require 'dynamic_image/engine' if defined?(Rails)
-end
-
-require 'dynamic_image/active_record_extensions'
-require 'dynamic_image/filterset'
+require 'dynamic_image/belongs_to'
+require 'dynamic_image/controller'
+require 'dynamic_image/digest_verifier'
+require 'dynamic_image/errors'
 require 'dynamic_image/helper'
+require 'dynamic_image/image_sizing'
+require 'dynamic_image/metadata'
+require 'dynamic_image/model'
+require 'dynamic_image/processed_image'
+require 'dynamic_image/railtie'
+require 'dynamic_image/routing'
 
 module DynamicImage
-  @@dirty_memory = false
-  @@page_caching = true
-
-  class << self
-
-    def dirty_memory=(flag)
-      @@dirty_memory = flag
-    end
-
-    def dirty_memory
-      @@dirty_memory
-    end
-
-    def page_caching=(flag)
-      @@page_caching = flag
-    end
-
-    def page_caching
-      @@page_caching
-    end
-
-    def max_size
-      @@max_size ||= "2000x2000"
-    end
-
-    def max_size=(new_max_size)
-      @@max_size = new_max_size
-    end
-
-    def crash_size
-      @@crash_size ||= "10000x10000"
-    end
-
-    def crash_size=(new_crash_size)
-      @@crash_size = new_crash_size
-    end
-
-    # RMagick stores image data internally, Ruby doesn't see the used memory.
-    # This method performs garbage collection if @@dirty_memory has been flagged.
-    # More details here: http://rubyforge.org/forum/message.php?msg_id=1995
-    def clean_dirty_memory(options={})
-      options.symbolize_keys!
-      if @@dirty_memory || options[:force]
-        gc_disabled = GC.enable
-        GC.start
-        GC.disable if gc_disabled
-        @@dirty_memory = false
-        true
-      else
-        false
-      end
-    end
-  end
+  cattr_accessor :digest_verifier
 end

data/lib/rails/generators/dynamic_image/resource/resource_generator.rb

@@ -0,0 +1,74 @@
+# encoding: utf-8
+
+require 'rails/generators'
+require 'rails/generators/rails/resource/resource_generator'
+
+module DynamicImage
+  module Generators
+    class ResourceGenerator < Rails::Generators::ResourceGenerator
+      desc "Creates a DynamicImage resource"
+
+      def initialize(args, *options)
+        super(inject_dynamic_image_attributes(args), *options)
+      end
+
+      def add_controller_extension
+        inject_into_file(
+          File.join('app/controllers', class_path, "#{file_name.pluralize}_controller.rb"),
+          after: "ApplicationController\n"
+        ) do
+          "  include DynamicImage::Controller\n\n" +
+          "  private\n\n" +
+          "  def model\n" +
+          "    #{class_name}\n" +
+          "  end\n"
+        end
+      end
+
+      def add_model_extension
+        inject_into_file(
+          File.join('app/models', class_path, "#{file_name}.rb"),
+          after: "ActiveRecord::Base\n"
+        ) do
+          "  include DynamicImage::Model\n"
+        end
+      end
+
+      def alter_resource_routes
+        gsub_file(
+          File.join('config', 'routes.rb'),
+          " resources :#{file_name.pluralize}",
+          " image_resources :#{file_name.pluralize}"
+        )
+      end
+
+      private
+
+      def inject_dynamic_image_attributes(args)
+        if args.any?
+          args = [args[0]] + dynamic_image_attributes + args[1..args.length]
+        else
+          args
+        end
+      end
+
+      def dynamic_image_attributes
+        %w{
+          content_hash:string
+          content_type:string
+          content_length:integer
+          filename:string
+          colorspace:string
+          real_width:integer
+          real_height:integer
+          crop_width:integer
+          crop_height:integer
+          crop_start_x:integer
+          crop_start_y:integer
+          crop_gravity_x:integer
+          crop_gravity_y:integer
+        }
+      end
+    end
+  end
+end

metadata

@@ -1,120 +1,153 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dynamic_image
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
+version: !ruby/object:Gem::Version
+  version: 2.0.0.beta1
 platform: ruby
-authors: 
-- "Inge J\xC3\xB8rgensen"
+authors:
+- Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-07-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rmagick
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 2
-        - 13
-        - 2
-        version: 2.13.2
+date: 2014-09-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+- !ruby/object:Gem::Dependency
   name: vector2d
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.8.1
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.8.1
+- !ruby/object:Gem::Dependency
+  name: dis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
-  version_requirements: *id002
-description: 
-email: inge@elektronaut.no
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+description: DynamicImage is a Rails plugin that simplifies image uploading and processing
+email:
+- inge@elektronaut.no
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.md
-files: 
-- LICENSE
+extra_rdoc_files: []
+files:
+- MIT-LICENSE
 - README.md
 - Rakefile
-- VERSION
-- app/controllers/images_controller.rb
-- app/models/image.rb
-- config/routes.rb
-- dynamic_image.gemspec
-- dynamic_image.sublime-project
-- dynamic_image.sublime-workspace
-- init.rb
-- install.rb
-- lib/binary_storage.rb
-- lib/binary_storage/active_record_extensions.rb
-- lib/binary_storage/blob.rb
 - lib/dynamic_image.rb
-- lib/dynamic_image/active_record_extensions.rb
-- lib/dynamic_image/engine.rb
-- lib/dynamic_image/filterset.rb
+- lib/dynamic_image/belongs_to.rb
+- lib/dynamic_image/controller.rb
+- lib/dynamic_image/digest_verifier.rb
+- lib/dynamic_image/errors.rb
 - lib/dynamic_image/helper.rb
-- lib/generators/dynamic_image/USAGE
-- lib/generators/dynamic_image/dynamic_image_generator.rb
-- lib/generators/dynamic_image/templates/migrations/create_images.rb
-- uninstall.rb
-homepage: http://github.com/elektronaut/dynamic_image
-licenses: []
-
+- lib/dynamic_image/image_sizing.rb
+- lib/dynamic_image/metadata.rb
+- lib/dynamic_image/model.rb
+- lib/dynamic_image/model/dimensions.rb
+- lib/dynamic_image/model/validations.rb
+- lib/dynamic_image/processed_image.rb
+- lib/dynamic_image/railtie.rb
+- lib/dynamic_image/routing.rb
+- lib/dynamic_image/version.rb
+- lib/rails/generators/dynamic_image/resource/resource_generator.rb
+homepage: https://github.com/elektronaut/dynamic_image
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-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 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: 1.9.2
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">"
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
-summary: DynamicImage is a rails plugin providing transparent uploading and processing of image files.
+specification_version: 4
+summary: Rails plugin that simplifies image uploading and processing
 test_files: []
-

data/VERSION

@@ -1 +0,0 @@
-1.0.4

data/app/controllers/images_controller.rb

@@ -1,79 +0,0 @@
-class ImagesController < ActionController::Base
-
-  after_filter :cache_dynamic_image
-  after_filter :run_garbage_collection_for_dynamic_image_controller
-
-  unloadable
-
-  public
-
-    # Return the requested image. Rescale, filter and cache it where appropriate.
-    def render_dynamic_image
-
-      render_missing_image and return unless Image.exists?(params[:id])
-      image = Image.find(params[:id])
-
-      minTime = Time.rfc2822(request.env["HTTP_IF_MODIFIED_SINCE"]) rescue nil
-      if minTime && image.created_at? && image.created_at <= minTime
-        render :text => '304 Not Modified', :status => 304
-        return
-      end
-
-      unless image.data?
-        logger.warn "Image #{image.id} exists, but has no data"
-        render_missing_image and return
-      end
-
-      if size = params[:size]
-          if size =~ /^x[\d]+$/ || size =~ /^[\d]+x$/
-          if params[:original]
-            image.cropped = false
-          end
-              size = Vector2d.new(size)
-            image_size = Vector2d.new(image.size)
-            size = image_size.constrain_both(size).round.to_s
-        end
-          imagedata = image.get_processed(size, params[:filterset])
-        else
-          imagedata = image
-          end
-
-      DynamicImage.dirty_memory = true # Flag memory for GC
-
-      if image
-        response.headers['Cache-Control'] = nil
-        response.headers['Last-Modified'] = imagedata.created_at.httpdate if imagedata.created_at?
-        send_data(
-          imagedata.data,
-          :filename    => image.filename,
-          :type        => image.content_type,
-          :disposition => 'inline'
-        )
-      end
-
-    end
-
-  protected
-
-    def render_missing_image
-      if self.respond_to?(:render_error)
-        render_error 404
-      else
-        render :status => 404, :text => "404: Image not found"
-      end
-    end
-
-    # Enforce caching of dynamic images, even if caching is turned off
-    def cache_dynamic_image
-      cache_setting = ActionController::Base.perform_caching
-      ActionController::Base.perform_caching = true
-      cache_page
-      ActionController::Base.perform_caching = cache_setting
-    end
-
-    # Perform garbage collection if necessary
-    def run_garbage_collection_for_dynamic_image_controller
-      DynamicImage.clean_dirty_memory
-    end
-
-end