dragonfly 0.9.15 → 1.0

data/spec/support/argument_matchers.rb

@@ -2,18 +2,17 @@ def string_matching(regexp)
   Spec::Mocks::ArgumentMatchers::RegexpMatcher.new(regexp)
 end
 
-class TempObjectArgumentMatcher
-  def initialize(data, opts)
+class ContentArgumentMatcher
+  def initialize(data)
     @data = data
-    @opts = opts
   end
   def ==(actual)
-    actual.is_a?(Dragonfly::TempObject) &&
-      actual.data == @data &&
-      @opts.all?{|k,v| actual.send(k) == v }
+    actual.is_a?(Dragonfly::Content) &&
+      actual.data == @data
   end
 end
 
-def a_temp_object_with_data(data, opts={})
-  TempObjectArgumentMatcher.new(data, opts)
+def content_with_data(data)
+  ContentArgumentMatcher.new(data)
 end
+

data/spec/support/image_matchers.rb

@@ -1,13 +1,6 @@
 def image_properties(image)
-  if image.is_a?(Tempfile)
-    tempfile = image
-  else
-    tempfile = Tempfile.new('image')
-    tempfile.binmode
-    tempfile.write(image.is_a?(Dragonfly::TempObject) ? image.data : image)
-    tempfile.close
-  end
-  details = `identify #{tempfile.path}`
+  details = `identify #{image.path}`
+  raise "couldn't identify #{image.path} in image_properties" if details.empty?
   # example of details string:
   # myimage.png PNG 200x100 200x100+0+0 8-bit DirectClass 31.2kb
   filename, format, geometry, geometry_2, depth, image_class, size = details.split(' ')
@@ -15,44 +8,29 @@ def image_properties(image)
   {
     :filename => filename,
     :format => format.downcase,
-    :width => width,
-    :height => height,
+    :width => width.to_i,
+    :height => height.to_i,
     :depth => depth,
     :image_class => image_class,
-    :size => size
+    :size => size.to_i
   }
 end
 
-RSpec::Matchers.define :have_width do |width|
-  match do |given|
-    width.should === image_properties(given)[:width].to_i
-  end
-end
-
-RSpec::Matchers.define :have_height do |height|
-  match do |given|
-    height.should === image_properties(given)[:height].to_i
-  end
-end
+[:width, :height, :format, :size].each do |property|
 
-RSpec::Matchers.define :have_format do |format|
-  match do |given|
-    image_properties(given)[:format].should == format
+  RSpec::Matchers.define "have_#{property}" do |value|
+    match do |actual|
+      value.should === image_properties(actual)[property]
+    end
+    failure_message_for_should do |actual|
+      "expected image to have #{property} #{value.inspect}, but it had #{image_properties(actual)[property].inspect}"
+    end
   end
-end
 
-RSpec::Matchers.define :have_size do |size|
-  match do |given|
-    image_properties(given)[:size].should == size
-  end
 end
 
 RSpec::Matchers.define :equal_image do |other|
   match do |given|
-    image_data = given.open.read
-    other_image_data = other.open.read
-    given.close
-    other.close
-    image_data == other_image_data
+    given.data == other.data
   end
 end

data/spec/support/model_helpers.rb

@@ -0,0 +1,97 @@
+require 'active_model'
+require 'dragonfly/model/validations'
+
+# Generic activemodel model
+class MyModel
+
+  extend Dragonfly::Model
+
+  # Callbacks
+  extend ActiveModel::Callbacks
+  define_model_callbacks :save, :destroy
+
+  include ActiveModel::Dirty
+
+  class << self
+    attr_writer :attribute_names
+    def attribute_names
+      @attribute_names ||= (superclass.attribute_names if superclass.respond_to?(:attribute_names))
+    end
+
+    attr_accessor :name
+
+    def create!(attrs={})
+      new(attrs).save!
+    end
+
+    def find(id)
+      new(instances[id])
+    end
+
+    def instances
+      @instances ||= {}
+    end
+  end
+
+  def initialize(attrs={})
+    attrs.each do |key, value|
+      send("#{key}=", value)
+    end
+  end
+
+  attr_accessor :id
+
+  def to_hash
+    self.class.attribute_names.inject({}) do |hash, attr|
+      hash[attr] = send(attr)
+      hash
+    end
+  end
+
+  def save
+    run_save_callbacks {
+      self.id ||= rand(1000)
+      self.class.instances[id] = self.to_hash
+    }
+  end
+  def save!
+    save
+    self
+  end
+
+  def destroy
+    run_destroy_callbacks {}
+  end
+
+  private
+
+  def run_save_callbacks(&block)
+    if respond_to?(:run_callbacks) # Rails 4
+      run_callbacks :save, &block
+    else
+      _run_save_callbacks(&block)
+    end
+  end
+
+  def run_destroy_callbacks(&block)
+    if respond_to?(:run_callbacks) # Rails 4
+      run_callbacks :destroy, &block
+    else
+      _run_destroy_callbacks(&block)
+    end
+  end
+end
+
+module ModelHelpers
+  def new_model_class(name="TestModel", *attribute_names, &block)
+    klass = Class.new(MyModel) do
+      self.name = name
+      include ActiveModel::Validations # Doing this here because it needs 'name' to be set
+      self.attribute_names = attribute_names
+      define_attribute_methods attribute_names
+      attr_accessor *attribute_names
+    end
+    klass.class_eval(&block) if block
+    klass
+  end
+end

data/spec/support/simple_matchers.rb

@@ -51,3 +51,15 @@ RSpec::Matchers.define :be_a_text_response do
     given_response.content_type.should == 'text/plain'
   end
 end
+
+RSpec::Matchers.define :have_keys do |*keys|
+  match do |given|
+    given.keys.map{|sym| sym.to_s }.sort == keys.map{|sym| sym.to_s }.sort
+  end
+end
+
+RSpec::Matchers.define :match_steps do |steps|
+  match do |given|
+    given.map{|step| step.class } == steps
+  end
+end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 0.9.15
-  prerelease: 
+  version: '1.0'
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   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: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,175 +34,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: cucumber-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fog
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: github-markup
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: couchrest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rack-cache
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !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.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -214,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -222,102 +69,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bluecloth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "Dragonfly is a framework that enables on-the-fly processing for any
-  content type.\n  It is especially suited to image handling. Its uses range from
-  image thumbnails to standard attachments to on-demand text generation."
+description: |-
+  Dragonfly is a framework that enables on-the-fly processing for any content type.
+    It is especially suited to image handling. Its uses range from image thumbnails to standard attachments to on-demand text generation.
 email: mark@new-bamboo.co.uk
 executables: []
 extensions: []
@@ -327,162 +92,111 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rspec
-- .yardopts
+- .travis.yml
 - Gemfile
 - History.md
 - LICENSE
 - README.md
-- Rakefile
-- config.ru
-- docs.watchr
+- dev/grid.jpg
+- dev/irbrc.rb
+- dev/rails_template.rb
+- dev/test.ru
+- dev/test_rails
 - dragonfly.gemspec
-- extra_docs/Analysers.md
-- extra_docs/Caching.md
-- extra_docs/Configuration.md
-- extra_docs/Couch.md
-- extra_docs/DataStorage.md
-- extra_docs/Encoding.md
-- extra_docs/ExampleUseCases.md
-- extra_docs/GeneralUsage.md
-- extra_docs/Generators.md
-- extra_docs/Heroku.md
-- extra_docs/ImageMagick.md
-- extra_docs/Index.md
-- extra_docs/MimeTypes.md
-- extra_docs/Models.md
-- extra_docs/Mongo.md
-- extra_docs/Processing.md
-- extra_docs/Rack.md
-- extra_docs/Rails2.md
-- extra_docs/Rails3.md
-- extra_docs/ServingRemotely.md
-- extra_docs/Sinatra.md
-- extra_docs/URLs.md
-- features/images.feature
-- features/no_processing.feature
-- features/rails.feature
-- features/steps/common_steps.rb
-- features/steps/dragonfly_steps.rb
-- features/steps/rails_steps.rb
-- features/support/env.rb
-- features/support/setup.rb
-- fixtures/rails/files/app/models/album.rb
-- fixtures/rails/files/app/views/albums/new.html.erb
-- fixtures/rails/files/app/views/albums/show.html.erb
-- fixtures/rails/files/config/initializers/dragonfly.rb
-- fixtures/rails/files/features/manage_album_images.feature
-- fixtures/rails/files/features/step_definitions/helper_steps.rb
-- fixtures/rails/files/features/step_definitions/image_steps.rb
-- fixtures/rails/files/features/step_definitions/web_steps.rb
-- fixtures/rails/files/features/support/paths.rb
-- fixtures/rails/files/features/text_images.feature
-- fixtures/rails/template.rb
-- irbrc.rb
 - lib/dragonfly.rb
-- lib/dragonfly/active_model_extensions.rb
-- lib/dragonfly/active_model_extensions/attachment.rb
-- lib/dragonfly/active_model_extensions/attachment_class_methods.rb
-- lib/dragonfly/active_model_extensions/class_methods.rb
-- lib/dragonfly/active_model_extensions/instance_methods.rb
-- lib/dragonfly/active_model_extensions/validations.rb
-- lib/dragonfly/analyser.rb
-- lib/dragonfly/analysis/file_command_analyser.rb
-- lib/dragonfly/analysis/image_magick_analyser.rb
 - lib/dragonfly/app.rb
-- lib/dragonfly/config/heroku.rb
-- lib/dragonfly/config/image_magick.rb
-- lib/dragonfly/config/rails.rb
 - lib/dragonfly/configurable.rb
+- lib/dragonfly/content.rb
 - lib/dragonfly/cookie_monster.rb
 - lib/dragonfly/core_ext/array.rb
 - lib/dragonfly/core_ext/hash.rb
 - lib/dragonfly/core_ext/object.rb
-- lib/dragonfly/data_storage.rb
-- lib/dragonfly/data_storage/couch_data_store.rb
-- lib/dragonfly/data_storage/file_data_store.rb
-- lib/dragonfly/data_storage/mongo_data_store.rb
-- lib/dragonfly/data_storage/s3data_store.rb
-- lib/dragonfly/encoder.rb
-- lib/dragonfly/encoding/image_magick_encoder.rb
-- lib/dragonfly/function_manager.rb
-- lib/dragonfly/generation/image_magick_generator.rb
-- lib/dragonfly/generator.rb
+- lib/dragonfly/file_data_store.rb
 - lib/dragonfly/has_filename.rb
 - lib/dragonfly/hash_with_css_style_keys.rb
-- lib/dragonfly/image_magick/analyser.rb
-- lib/dragonfly/image_magick/config.rb
-- lib/dragonfly/image_magick/encoder.rb
-- lib/dragonfly/image_magick/generator.rb
-- lib/dragonfly/image_magick/processor.rb
-- lib/dragonfly/image_magick/utils.rb
-- lib/dragonfly/image_magick_utils.rb
+- lib/dragonfly/image_magick/analysers/image_properties.rb
+- lib/dragonfly/image_magick/generators/convert.rb
+- lib/dragonfly/image_magick/generators/plain.rb
+- lib/dragonfly/image_magick/generators/plasma.rb
+- lib/dragonfly/image_magick/generators/text.rb
+- lib/dragonfly/image_magick/plugin.rb
+- lib/dragonfly/image_magick/processors/convert.rb
+- lib/dragonfly/image_magick/processors/encode.rb
+- lib/dragonfly/image_magick/processors/thumb.rb
 - lib/dragonfly/job.rb
-- lib/dragonfly/job_builder.rb
-- lib/dragonfly/job_definitions.rb
 - lib/dragonfly/job_endpoint.rb
-- lib/dragonfly/loggable.rb
+- lib/dragonfly/memory_data_store.rb
 - lib/dragonfly/middleware.rb
-- lib/dragonfly/processing/image_magick_processor.rb
-- lib/dragonfly/processor.rb
-- lib/dragonfly/rails/images.rb
+- lib/dragonfly/model.rb
+- lib/dragonfly/model/attachment.rb
+- lib/dragonfly/model/attachment_class_methods.rb
+- lib/dragonfly/model/class_methods.rb
+- lib/dragonfly/model/instance_methods.rb
+- lib/dragonfly/model/validations.rb
 - lib/dragonfly/railtie.rb
+- lib/dragonfly/register.rb
 - lib/dragonfly/response.rb
 - lib/dragonfly/routed_endpoint.rb
 - lib/dragonfly/serializer.rb
 - lib/dragonfly/server.rb
 - lib/dragonfly/shell.rb
-- lib/dragonfly/simple_cache.rb
+- lib/dragonfly/spec/data_store_examples.rb
 - lib/dragonfly/temp_object.rb
 - lib/dragonfly/url_attributes.rb
 - lib/dragonfly/url_mapper.rb
 - lib/dragonfly/utils.rb
 - lib/dragonfly/version.rb
+- lib/dragonfly/whitelist.rb
+- lib/rails/generators/dragonfly/USAGE
+- lib/rails/generators/dragonfly/dragonfly_generator.rb
+- lib/rails/generators/dragonfly/templates/initializer.rb.erb
 - samples/DSC02119.JPG
 - samples/a.jp2
 - samples/beach.jpg
 - samples/beach.png
 - samples/egg.png
+- samples/gif.gif
 - samples/round.gif
 - samples/sample.docx
 - samples/taj.jpg
 - samples/white pixel.png
-- spec/dragonfly/active_model_extensions/model_spec.rb
-- spec/dragonfly/active_model_extensions/spec_helper.rb
-- spec/dragonfly/analyser_spec.rb
-- spec/dragonfly/analysis/file_command_analyser_spec.rb
 - spec/dragonfly/app_spec.rb
 - spec/dragonfly/configurable_spec.rb
+- spec/dragonfly/content_spec.rb
 - spec/dragonfly/cookie_monster_spec.rb
 - spec/dragonfly/core_ext/array_spec.rb
 - spec/dragonfly/core_ext/hash_spec.rb
-- spec/dragonfly/data_storage/couch_data_store_spec.rb
-- spec/dragonfly/data_storage/file_data_store_spec.rb
-- spec/dragonfly/data_storage/mongo_data_store_spec.rb
-- spec/dragonfly/data_storage/s3_data_store_spec.rb
-- spec/dragonfly/data_storage/shared_data_store_examples.rb
-- spec/dragonfly/function_manager_spec.rb
+- spec/dragonfly/file_data_store_spec.rb
 - spec/dragonfly/has_filename_spec.rb
 - spec/dragonfly/hash_with_css_style_keys_spec.rb
-- spec/dragonfly/image_magick/analyser_spec.rb
-- spec/dragonfly/image_magick/encoder_spec.rb
-- spec/dragonfly/image_magick/generator_spec.rb
-- spec/dragonfly/image_magick/processor_spec.rb
-- spec/dragonfly/job_builder_spec.rb
-- spec/dragonfly/job_definitions_spec.rb
+- spec/dragonfly/image_magick/analysers/image_properties_spec.rb
+- spec/dragonfly/image_magick/generators/convert_spec.rb
+- spec/dragonfly/image_magick/generators/plain_spec.rb
+- spec/dragonfly/image_magick/generators/plasma_spec.rb
+- spec/dragonfly/image_magick/generators/text_spec.rb
+- spec/dragonfly/image_magick/plugin_spec.rb
+- spec/dragonfly/image_magick/processors/convert_spec.rb
+- spec/dragonfly/image_magick/processors/thumb_spec.rb
 - spec/dragonfly/job_endpoint_spec.rb
 - spec/dragonfly/job_spec.rb
-- spec/dragonfly/loggable_spec.rb
+- spec/dragonfly/memory_data_store_spec.rb
 - spec/dragonfly/middleware_spec.rb
+- spec/dragonfly/model/model_spec.rb
+- spec/dragonfly/model/validations_spec.rb
+- spec/dragonfly/register_spec.rb
 - spec/dragonfly/routed_endpoint_spec.rb
 - spec/dragonfly/serializer_spec.rb
 - spec/dragonfly/server_spec.rb
 - spec/dragonfly/shell_spec.rb
-- spec/dragonfly/simple_cache_spec.rb
 - spec/dragonfly/temp_object_spec.rb
-- spec/dragonfly/url_attributes.rb
+- spec/dragonfly/url_attributes_spec.rb
 - spec/dragonfly/url_mapper_spec.rb
-- spec/functional/deprecations_spec.rb
-- spec/functional/image_magick_app_spec.rb
+- spec/dragonfly/utils_spec.rb
+- spec/dragonfly/whitelist_spec.rb
+- spec/dragonfly_spec.rb
+- spec/fixtures/deprecated_stored_content/eggs.bonus
+- spec/fixtures/deprecated_stored_content/eggs.bonus.meta
+- spec/functional/configuration_spec.rb
 - spec/functional/model_urls_spec.rb
 - spec/functional/remote_on_the_fly_spec.rb
 - spec/functional/shell_commands_spec.rb
@@ -491,86 +205,71 @@ files:
 - spec/spec_helper.rb
 - spec/support/argument_matchers.rb
 - spec/support/image_matchers.rb
+- spec/support/model_helpers.rb
 - spec/support/simple_matchers.rb
-- spec/test_imagemagick.ru
 - tmp/.gitignore
-- yard/handlers/configurable_attr_handler.rb
-- yard/setup.rb
-- yard/templates/default/fulldoc/html/css/common.css
-- yard/templates/default/layout/html/layout.erb
-- yard/templates/default/module/html/configuration_summary.erb
-- yard/templates/default/module/setup.rb
 homepage: http://github.com/markevans/dragonfly
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ideal gem for handling attachments in Rails, Sinatra and Rack applications.
 test_files:
-- features/images.feature
-- features/no_processing.feature
-- features/rails.feature
-- features/steps/common_steps.rb
-- features/steps/dragonfly_steps.rb
-- features/steps/rails_steps.rb
-- features/support/env.rb
-- features/support/setup.rb
-- spec/dragonfly/active_model_extensions/model_spec.rb
-- spec/dragonfly/active_model_extensions/spec_helper.rb
-- spec/dragonfly/analyser_spec.rb
-- spec/dragonfly/analysis/file_command_analyser_spec.rb
 - spec/dragonfly/app_spec.rb
 - spec/dragonfly/configurable_spec.rb
+- spec/dragonfly/content_spec.rb
 - spec/dragonfly/cookie_monster_spec.rb
 - spec/dragonfly/core_ext/array_spec.rb
 - spec/dragonfly/core_ext/hash_spec.rb
-- spec/dragonfly/data_storage/couch_data_store_spec.rb
-- spec/dragonfly/data_storage/file_data_store_spec.rb
-- spec/dragonfly/data_storage/mongo_data_store_spec.rb
-- spec/dragonfly/data_storage/s3_data_store_spec.rb
-- spec/dragonfly/data_storage/shared_data_store_examples.rb
-- spec/dragonfly/function_manager_spec.rb
+- spec/dragonfly/file_data_store_spec.rb
 - spec/dragonfly/has_filename_spec.rb
 - spec/dragonfly/hash_with_css_style_keys_spec.rb
-- spec/dragonfly/image_magick/analyser_spec.rb
-- spec/dragonfly/image_magick/encoder_spec.rb
-- spec/dragonfly/image_magick/generator_spec.rb
-- spec/dragonfly/image_magick/processor_spec.rb
-- spec/dragonfly/job_builder_spec.rb
-- spec/dragonfly/job_definitions_spec.rb
+- spec/dragonfly/image_magick/analysers/image_properties_spec.rb
+- spec/dragonfly/image_magick/generators/convert_spec.rb
+- spec/dragonfly/image_magick/generators/plain_spec.rb
+- spec/dragonfly/image_magick/generators/plasma_spec.rb
+- spec/dragonfly/image_magick/generators/text_spec.rb
+- spec/dragonfly/image_magick/plugin_spec.rb
+- spec/dragonfly/image_magick/processors/convert_spec.rb
+- spec/dragonfly/image_magick/processors/thumb_spec.rb
 - spec/dragonfly/job_endpoint_spec.rb
 - spec/dragonfly/job_spec.rb
-- spec/dragonfly/loggable_spec.rb
+- spec/dragonfly/memory_data_store_spec.rb
 - spec/dragonfly/middleware_spec.rb
+- spec/dragonfly/model/model_spec.rb
+- spec/dragonfly/model/validations_spec.rb
+- spec/dragonfly/register_spec.rb
 - spec/dragonfly/routed_endpoint_spec.rb
 - spec/dragonfly/serializer_spec.rb
 - spec/dragonfly/server_spec.rb
 - spec/dragonfly/shell_spec.rb
-- spec/dragonfly/simple_cache_spec.rb
 - spec/dragonfly/temp_object_spec.rb
-- spec/dragonfly/url_attributes.rb
+- spec/dragonfly/url_attributes_spec.rb
 - spec/dragonfly/url_mapper_spec.rb
-- spec/functional/deprecations_spec.rb
-- spec/functional/image_magick_app_spec.rb
+- spec/dragonfly/utils_spec.rb
+- spec/dragonfly/whitelist_spec.rb
+- spec/dragonfly_spec.rb
+- spec/fixtures/deprecated_stored_content/eggs.bonus
+- spec/fixtures/deprecated_stored_content/eggs.bonus.meta
+- spec/functional/configuration_spec.rb
 - spec/functional/model_urls_spec.rb
 - spec/functional/remote_on_the_fly_spec.rb
 - spec/functional/shell_commands_spec.rb
@@ -579,6 +278,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/argument_matchers.rb
 - spec/support/image_matchers.rb
+- spec/support/model_helpers.rb
 - spec/support/simple_matchers.rb
-- spec/test_imagemagick.ru
 has_rdoc: