dynamic_paperclip 0.0.4 → 1.0.0a.1

data/test/generators/install_generator_test.rb

@@ -13,8 +13,6 @@ class InstallGeneratorTest < Rails::Generators::TestCase
 
     run_generator
 
-    assert_file "config/initializers/dynamic_paperclip.rb", <<-init
-DynamicPaperclip.config.secret = 'supersecurestring'
-init
+    assert_file "config/initializers/dynamic_paperclip.rb", "DynamicPaperclip.config.secret = 'supersecurestring'"
   end
 end

data/test/tmp/config/initializers/dynamic_paperclip.rb

@@ -1 +1 @@
-DynamicPaperclip.config.secret = 'supersecurestring'
+DynamicPaperclip.config.secret = 'supersecurestring'

data/test/unit/attachment_style_generator_test.rb

@@ -0,0 +1,95 @@
+require 'test_helper'
+
+class Foo < ActiveRecord::Base
+  has_dynamic_attached_file :image,
+    :url    => '/system/:class/:attachment/:id/:style/:filename'
+
+  has_dynamic_attached_file :image_with_id_partition_in_url,
+    :url => '/system/:class/:attachment/:id_partition/:style/:filename'
+end
+
+class DynamicPaperclip::AttachmentStyleGeneratorTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  def app
+    DynamicPaperclip::AttachmentStyleGenerator.new(@app)
+  end
+
+  def setup
+    @app = stub('Application', :call => [200, {}, ''])
+
+    @foo = stub('foo')
+    @attachment = stub('image attachment', :path => File.join(FIXTURES_DIR, 'rails.png'), :content_type => 'image/jpeg')
+    @attachment.stubs(:exists?).returns(true)
+
+    Foo.stubs(:find).with(1).returns @foo
+    @foo.stubs(:image).returns @attachment
+  end
+
+  should 'not process style if it already exists' do
+    @attachment.expects(:exists?).with(:dynamic_42x42).returns(true)
+    @attachment.expects(:process_dynamic_style).never
+
+    get '/system/foos/images/1/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+  end
+
+  should 'process style if it is dynamic and does not exist' do
+    @attachment.expects(:exists?).with(:dynamic_42x42).returns(false)
+    @attachment.expects(:process_dynamic_style).once
+
+    get '/system/foos/images/1/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+  end
+
+  should 'find record when an ID is used' do
+    Foo.expects(:find).with(1).returns @foo
+
+    get '/system/foos/images/1/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+  end
+
+  should 'find record when an ID partition is used' do
+    @foo.stubs(:image_with_id_partition_in_url).returns @attachment
+    Foo.expects(:find).with(10042).returns @foo
+
+    get '/system/foos/image_with_id_partition_in_urls/000/010/042/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+  end
+
+  should 'respond with correct content type' do
+    get '/system/foos/images/1/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+
+    assert_equal 'image/jpeg', last_response.header['Content-Type']
+  end
+
+  should 'respond with correct content-disposition' do
+    get '/system/foos/images/1/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+
+    assert_equal 'inline; filename=rails.png', last_response.header['Content-Disposition']
+  end
+
+  should 'respond with correct content-transfer-encoding' do
+    get '/system/foos/images/1/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+
+    assert_equal 'binary', last_response.header['Content-Transfer-Encoding']
+  end
+
+  should 'respond with FileBody' do
+    file_body = ActionController::DataStreaming::FileBody.new(File.join(FIXTURES_DIR, 'rails.png'))
+    ActionController::DataStreaming::FileBody.expects(:new).with(File.join(FIXTURES_DIR, 'rails.png')).returns(file_body)
+
+    response = app.call(Rack::MockRequest.env_for('/system/foos/images/1/dynamic_42x42/file?s='+DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42')))
+
+    assert_equal file_body, response[2]
+  end
+
+  should 'respond with success' do
+    get '/system/foos/images/1/dynamic_42x42/file', { s: DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42') }
+
+    assert last_response.ok?
+  end
+
+  should '403 with empty body if hash does not match style name' do
+    get '/system/foos/images/1/dynamic_42x42/file', { s: 'this is an invalid hash' }
+
+    assert_equal 403, last_response.status
+    assert_equal '', last_response.body
+  end
+end

data/test/unit/attachment_test.rb

@@ -10,7 +10,7 @@ class AttachmentTest < ActiveSupport::TestCase
   should 'generate correct secure attachment URL when given a style definition' do
     DynamicPaperclip::Config.any_instance.stubs(:secret).returns('abc123')
 
-    assert_equal "/system/photos/images/000/000/001/dynamic_50x50%23/rails.png?s=#{Digest::SHA1.hexdigest("abc123dynamic_50x50%23")}", photos(:rails).image.dynamic_url('50x50#')
+    assert_equal "/system/photos/images/000/000/001/dynamic_50x50%2523/rails.png?s=#{Digest::SHA1.hexdigest("abc123dynamic_50x50%23")}", photos(:rails).image.dynamic_url('50x50#')
   end
 
   should 'raise error if no secret has been configured' do
@@ -34,7 +34,7 @@ class AttachmentTest < ActiveSupport::TestCase
 
     attachment.expects(:reprocess!).with(:dynamic_42x42).once
 
-    attachment.process_dynamic_style '42x42'
+    attachment.process_dynamic_style :dynamic_42x42
 
     assert_equal '42x42', attachment.styles[:dynamic_42x42].geometry
   end

data/test/unit/has_attached_file_test.rb

@@ -1,29 +1,11 @@
 require 'test_helper'
 
-class Foo; end
+class Foo < ActiveRecord::Base; end
 
 class HasAttachedFileTest < Test::Unit::TestCase
-  should 'glob id_partition' do
-    DynamicPaperclip::HasAttachedFile.new Foo, :bar, { url: '/system/foos/bars/:id_partition/:style/:filename' }
+  should 'register dynamic attachment' do
+    DynamicPaperclip::AttachmentRegistry.expects(:register).with(Foo, :bar, { url: '/system/foos/bars/:id_partition/:style/:filename' })
 
-    assert Rails.application.routes.routes.any? do |route|
-      route.path.spec == '/system/foos/bars/*id_partition/:style/:filename(.:format)'
-    end
-  end
-
-  should 'interpolate :class' do
-    DynamicPaperclip::HasAttachedFile.new Foo, :bar, { url: '/system/:class/bars/:id/:style/:filename' }
-
-    assert Rails.application.routes.routes.any? do |route|
-      route.path.spec == '/system/foos/bars/:id/:style/:filename(.:format)'
-    end
-  end
-
-  should "use Paperclip's default URL if none is specified" do
-    DynamicPaperclip::HasAttachedFile.new Foo, :bar, {}
-
-    assert Rails.application.routes.routes.any? do |route|
-      route.path.spec == '/system/foos/:attachment/*id_partition/:style/:filename(.:format)'
-    end
+    DynamicPaperclip::HasAttachedFile.define_on Foo, :bar, { url: '/system/foos/bars/:id_partition/:style/:filename' }
   end
 end

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_paperclip
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 1.0.0a.1
+  prerelease: 5
 platform: ruby
 authors:
 - Jim Ryan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,39 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.5.1
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: Let's your views define attachment styles, and delays processing all
   the way to the first user who requests it.
 email:
@@ -99,13 +147,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/controllers/dynamic_paperclip/attachment_styles_controller.rb
 - lib/dynamic_paperclip/attachment.rb
+- lib/dynamic_paperclip/attachment_registry.rb
+- lib/dynamic_paperclip/attachment_style_generator.rb
 - lib/dynamic_paperclip/config.rb
-- lib/dynamic_paperclip/engine.rb
 - lib/dynamic_paperclip/errors.rb
 - lib/dynamic_paperclip/has_attached_file.rb
 - lib/dynamic_paperclip/paperclip_shim.rb
+- lib/dynamic_paperclip/railtie.rb
 - lib/dynamic_paperclip/style_naming.rb
 - lib/dynamic_paperclip/url_security.rb
 - lib/dynamic_paperclip/version.rb
@@ -114,7 +163,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.md
-- test/controllers/attachment_style_controller_test.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/models/photo.rb
 - test/dummy/config/application.rb
@@ -150,6 +198,7 @@ files:
 - test/integration/dynamic_attachment_styles_test.rb
 - test/test_helper.rb
 - test/tmp/config/initializers/dynamic_paperclip.rb
+- test/unit/attachment_style_generator_test.rb
 - test/unit/attachment_test.rb
 - test/unit/has_attached_file_test.rb
 homepage: http://github.com/room118solutions/dynamic_paperclip
@@ -164,12 +213,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2045189592495985284
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -177,7 +229,6 @@ signing_key:
 specification_version: 3
 summary: Generate Paperclip attachment styles on the fly
 test_files:
-- test/controllers/attachment_style_controller_test.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/models/photo.rb
 - test/dummy/config/application.rb
@@ -213,5 +264,6 @@ test_files:
 - test/integration/dynamic_attachment_styles_test.rb
 - test/test_helper.rb
 - test/tmp/config/initializers/dynamic_paperclip.rb
+- test/unit/attachment_style_generator_test.rb
 - test/unit/attachment_test.rb
 - test/unit/has_attached_file_test.rb

data/app/controllers/dynamic_paperclip/attachment_styles_controller.rb

@@ -1,43 +0,0 @@
-module DynamicPaperclip
-  class AttachmentStylesController < ApplicationController
-    def action_missing(name, *args, &block)
-      if name =~ /^generate_(.+)$/
-        send :generate, $1
-      end
-    end
-
-    private
-
-      def generate(class_name)
-        klass = class_name.camelize.constantize
-        attachment_name = params[:attachment].singularize.to_sym
-
-        # Ensure that we have a valid attachment name and an ID
-        raise Errors::UndefinedAttachment unless klass.attachment_definitions[attachment_name]
-        raise Errors::MissingID unless params[:id] || params[:id_partition]
-
-        id = params[:id] || id_from_partition(params[:id_partition])
-
-        attachment = klass.find(id).send(attachment_name)
-
-        # The definition will be escaped twice in the URL, Rails will unescape it once for us,
-        # so it will already be escaped once, so we don't need to escape it again. We should always
-        # reference dynamic style names after escaping once - that's how they reside on the FS.
-        style_name = StyleNaming.dynamic_style_name_from_definition(params[:definition], false)
-
-        # Validate URL hash against requested style name
-        raise Errors::InvalidHash unless DynamicPaperclip::UrlSecurity.valid_hash?(params[:s], style_name)
-
-        # Only process style if it doesn't exist,
-        # otherwise we may just be fielding a request for
-        # an existing style (i.e. serve_static_assets is true)
-        attachment.process_dynamic_style style_name unless attachment.exists?(style_name)
-
-        send_file attachment.path(style_name), :disposition => 'inline', :type => attachment.content_type
-      end
-
-      def id_from_partition(partition)
-        partition.gsub('/', '').to_i
-      end
-  end
-end

data/lib/dynamic_paperclip/engine.rb

@@ -1,4 +0,0 @@
-module DynamicPaperclip
-  class Engine < ::Rails::Engine
-  end
-end

data/test/controllers/attachment_style_controller_test.rb

@@ -1,129 +0,0 @@
-require 'test_helper'
-
-class Foo < ActiveRecord::Base
-  has_dynamic_attached_file :image,
-    :url    => '/system/:class/:attachment/:id/:style/:filename'
-
-  has_dynamic_attached_file :image_with_id_partition_in_url,
-    :url => '/system/:class/:attachment/:id_partition/:style/:filename'
-end
-
-class DynamicPaperclip::AttachmentStylesControllerTest < ActionController::TestCase
-  setup do
-    @foo = stub('foo')
-    @attachment = stub('image attachment', :path => File.join(FIXTURES_DIR, 'rails.png'), :content_type => 'image/jpeg')
-    @attachment.stubs(:exists?).returns(true)
-
-    Foo.stubs(:find).with('1').returns @foo
-    @foo.stubs(:image).returns @attachment
-  end
-
-  should 'raise error if attachment is not defined on class' do
-    assert_raises(DynamicPaperclip::Errors::UndefinedAttachment) {
-      get :generate_foo,
-          :attachment => 'bars',
-          :id         => '1',
-          :style      => 'style',
-          :filename   => 'file',
-          :use_route  => :dynamic_paperclip_engine
-    }
-  end
-
-  should 'raise error if no ID is given' do
-    assert_raises(DynamicPaperclip::Errors::MissingID) {
-      get :generate_foo,
-          :attachment => 'images',
-          :style      => 'style',
-          :filename   => 'file',
-          :use_route  => :dynamic_paperclip_engine
-      }
-  end
-
-  should 'not process style if it already exists' do
-    @attachment.expects(:exists?).with(:dynamic_42x42).returns(true)
-    @attachment.expects(:process_dynamic_style).never
-
-    get :generate_foo,
-        :attachment => 'images',
-        :id         => '1',
-        :definition => '42x42',
-        :filename   => 'file',
-        :s          => DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42'),
-        :use_route  => :dynamic_paperclip_engine
-  end
-
-  should 'process style if it is dynamic and does not exist' do
-    @attachment.expects(:exists?).with(:dynamic_42x42).returns(false)
-    @attachment.expects(:process_dynamic_style).once
-
-    get :generate_foo,
-        :attachment => 'images',
-        :id         => '1',
-        :definition => '42x42',
-        :filename   => 'file',
-        :s          => DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42'),
-        :use_route  => :dynamic_paperclip_engine
-  end
-
-  should 'find record when an ID is used' do
-    Foo.expects(:find).with('1').returns @foo
-
-    get :generate_foo,
-        :attachment => 'images',
-        :id         => '1',
-        :definition => '42x42',
-        :filename   => 'file',
-        :s          => DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42'),
-        :use_route  => :dynamic_paperclip_engine
-  end
-
-  should 'find record when an ID partition is used' do
-    @foo.stubs(:image_with_id_partition_in_url).returns @attachment
-    Foo.expects(:find).with(10042).returns @foo
-
-    get :generate_foo,
-        :attachment   => 'image_with_id_partition_in_urls',
-        :id_partition => '000/010/042',
-        :definition   => '42x42',
-        :filename     => 'file',
-        :s            => DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42'),
-        :use_route    => :dynamic_paperclip_engine
-  end
-
-  should 'respond with correct content type' do
-    get :generate_foo,
-        :attachment => 'images',
-        :id         => '1',
-        :definition => '42x42',
-        :filename   => 'file',
-        :s          => DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42'),
-        :use_route  => :dynamic_paperclip_engine
-
-    assert_equal 'image/jpeg', @response.header['Content-Type']
-  end
-
-  should 'send image to client with correct content type and disposition' do
-    @controller.stubs(:render)
-    @controller.expects(:send_file).with(@attachment.path, :disposition => 'inline', :type => @attachment.content_type)
-
-    get :generate_foo,
-        :attachment => 'images',
-        :id         => '1',
-        :definition => '42x42',
-        :filename   => 'file',
-        :s          => DynamicPaperclip::UrlSecurity.generate_hash('dynamic_42x42'),
-        :use_route  => :dynamic_paperclip_engine
-  end
-
-  should 'raise error if hash does not match style name' do
-    assert_raises(DynamicPaperclip::Errors::InvalidHash) do
-      get :generate_foo,
-          :attachment => 'images',
-          :id         => '1',
-          :definition => '42x42',
-          :filename   => 'file',
-          :s          => 'this is an invalid hash',
-          :use_route  => :dynamic_paperclip_engine
-      end
-  end
-end