dynamic_paperclip 1.0.0a.3 → 1.0.0.alpha.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 520ff66ae208d8c9fd390b036848638a68712442
+  data.tar.gz: 361cb3f76ed5bc35d812833a5c312b12c6e7fbce
+SHA512:
+  metadata.gz: f49d318831c5c3ad14573450fdcb21ab52efdc0c5cc9ca7c72803d4b4f2c484b607b7a088f0cd148532cf903bfd5393d4c4f7fb7275e20e9d6b78b7330a248e9
+  data.tar.gz: 820b5db8650c4e48ed966d1383cdf10ddc217fc48d2d81f50683906c00de269ca538abf9f19f90ba3318024410e00a2e0b294bed0a4ab1c29e52745272471246

data/README.md

@@ -135,7 +135,7 @@ Which will return the following url (assuming a JPG avatar and a User ID of 42):
 
 When the first request comes in for that URL, Dynamic Paperclip's Rack middleware will intercept the request,
 validate that "secrethash" to ensure that the dynamic URL was generated by your application and not some third-party,
-then simply tell Paperclip to process that style by extracting the definition from the stye name,
+then simply tell Paperclip to process that style by extracting the definition from the style name,
 and then finally send the processed file back to your visitor's browser.
 
 On subsequent requests, the attachment will already exist, and your HTTP server will simply return it without

data/Rakefile

@@ -36,5 +36,9 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task :default => :test
+
+require 'appraisal'
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+  task :default => :appraisal
+end

data/lib/dynamic_paperclip/attachment.rb

@@ -10,14 +10,18 @@ module DynamicPaperclip
       # Add existing dynamic styles
       if instance.persisted?
         path_with_wildcard = path('dynamic_*')
-        style_position = path_with_wildcard.index('dynamic_*')
 
-        Dir.glob(path_with_wildcard) do |file|
-          style_name = file[style_position..-1].split('/').first
+        # Could be nil if the attachment doesn't exist
+        if path_with_wildcard
+          style_position = path_with_wildcard.index('dynamic_*')
 
-          # In the event that the style name is used as the filename,
-          # we want to remove the extension for our style name
-          add_dynamic_style! File.basename(style_name, File.extname(style_name))
+          Dir.glob(path_with_wildcard) do |file|
+            style_name = file[style_position..-1].split('/').first
+
+            # In the event that the style name is used as the filename,
+            # we want to remove the extension for our style name
+            add_dynamic_style! File.basename(style_name, File.extname(style_name))
+          end
         end
       end
     end

data/lib/dynamic_paperclip/attachment_style_generator.rb

@@ -20,7 +20,7 @@ module DynamicPaperclip
 
           # The definition will be escaped twice in the URL, so we need to unescape it once.
           # 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(URI.unescape(match[:definition]), false)
+          style_name = StyleNaming.dynamic_style_name_from_definition(CGI.unescape(match[:definition]), false)
 
           # Validate URL hash against requested style name
           if DynamicPaperclip::UrlSecurity.valid_hash?(request.params['s'], style_name)

data/lib/dynamic_paperclip/style_naming.rb

@@ -4,7 +4,7 @@ module DynamicPaperclip
     # only supports strings at the moment
     def self.dynamic_style_name_from_definition(options, uri_escape=true)
       if options.is_a?(String)
-        "dynamic_#{uri_escape ? URI.escape(options) : options}".to_sym
+        "dynamic_#{uri_escape ? CGI.escape(options) : options}".to_sym
       else
         raise 'Only String options are supported with dynamic attachments'
       end
@@ -13,7 +13,7 @@ module DynamicPaperclip
     # Reverse of #dynamic_style_name_from_definition,
     # given a dynamic style name, extracts the definition (style options)
     def self.style_definition_from_dynamic_style_name(name)
-      URI.unescape name[8..-1]
+      CGI.unescape name[8..-1]
     end
   end
 end

data/lib/dynamic_paperclip/version.rb

@@ -1,3 +1,3 @@
 module DynamicPaperclip
-  VERSION = "1.0.0a.3"
+  VERSION = "1.0.0.alpha.4"
 end

data/test/dummy/app/models/photo.rb

@@ -1,3 +1,7 @@
 class Photo < ActiveRecord::Base
   has_dynamic_attached_file :image, styles: { thumb: '100x100#' }
+
+  if Gem::Version.new(Paperclip::VERSION) >= Gem::Version.new('4')
+    do_not_validate_attachment_file_type :image
+  end
 end

data/test/dummy/config/application.rb

@@ -1,8 +1,9 @@
-require File.expand_path('../boot', __FILE__)
-
 require 'rails/all'
 
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
+
 require "dynamic_paperclip"
 
 module Dummy
@@ -11,16 +12,6 @@ module Dummy
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -29,31 +20,6 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable escaping HTML in JSON.
-    config.active_support.escape_html_entities_in_json = true
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end
-

data/test/dummy/config/environment.rb

@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the Rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
+# Initialize the Rails application.
 Dummy::Application.initialize!

data/test/dummy/config/environments/test.rb

@@ -1,5 +1,5 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -7,31 +7,30 @@ Dummy::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = false
 
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_files  = true
+  config.static_cache_control = "public, max-age=3600"
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 end

data/test/dummy/config/initializers/secret_token.rb

@@ -1,7 +1,12 @@
 # Be sure to restart your server when you modify this file.
 
-# Your secret key for verifying the integrity of signed cookies.
+# Your secret key is used for verifying the integrity of signed cookies.
 # If you change this key, all old signed cookies will become invalid!
+
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '959ab32349c805bdfd234602c492d9b06bcb9277a650fd6b9fe0670cc1f78ce67a133b90a4ce193401870b30a2194f23652b2a8f41dd50d92cd6a01222325f7a'
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure your secret_key_base is kept private
+# if you're sharing your code publicly.
+Dummy::Application.config.secret_key_base = '1308728b934efe940ce301800d4c83287bf7931b6ac3b9bbf68ce053b9faacde9de2052fe243fb5fd6d5e361b53ae353146c4469e59a51c4bdccafdcb068350d'

data/test/dummy/config/initializers/session_store.rb

@@ -1,8 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
 Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration")
-# Dummy::Application.config.session_store :active_record_store

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -1,14 +1,14 @@
 # Be sure to restart your server when you modify this file.
-#
+
 # This file contains settings for ActionController::ParamsWrapper which
 # is enabled by default.
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
 end
 
-# Disable root element in JSON by default.
-ActiveSupport.on_load(:active_record) do
-  self.include_root_in_json = false
-end
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+#  self.include_root_in_json = true
+# end