dragonfly 1.0.12 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba96d8739fae1bd6383eefdca4c8b9ac0d92adb
-  data.tar.gz: 729dce87ad0b0af4625c5e346d824fab9da722e2
+  metadata.gz: 84cc06b313ddc9f160196e61b36307ea6654d979
+  data.tar.gz: 181e3671a18a1d2c56cd97134cab2969ccdb4bcd
 SHA512:
-  metadata.gz: f02d90058a7576744d706e56df923b306645505196e896b30c2eac19a5e833ddf2f803ffebc3e34640a01231e6fd4557677e7a5aec2f2d811288e768fac3d077
-  data.tar.gz: 2f916377721b7b7c2316c5da4a23ddd697cdedc49a5e2f2e3cb1119c33a935704dd6c03c0534e574b3ca52a565cc91c88114ac43da327ec737155b7a3b699ba7
+  metadata.gz: 6f4d6a4787d47bd693cffa4499ff1160e2632625c1de3d89b565b4144bbbed89ac52d9340f2dd052f9aab75b3d7b505c2495b013df0858eebfffa26d58ad8ed3
+  data.tar.gz: e66731899aa80963b5cb478a04860680f3a428b1e581b10425da4fe1bda9f4b068d7f15ac2263ffea9609485cf4df11dffff6144124259bf5cbc9863f56e2500

data/.travis.yml

@@ -1,11 +1,11 @@
 language: ruby
 rvm:
-  - "1.8.7"
-  - "1.9.2"
   - "1.9.3"
   - "2.0.0"
   - "2.1"
   - "2.2"
+  - "2.3.0"
   - "jruby"
-  - "rbx-2"
 script: bundle exec rspec spec
+before_install:
+  - gem install bundler

data/Gemfile

@@ -6,7 +6,3 @@ group :development do
   gem 'pry'
   gem 'rake'
 end
-
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx' && RUBY_VERSION >= '2.0'
-  gem "rubysl", "~> 2.0", :group => :development
-end

data/History.md

@@ -1,3 +1,15 @@
+1.1.0 (2016-10-24)
+===================
+Fixes
+-----
+- Fetch a URL with basic auth if it's present in the URI (Ben Pickles)
+- Fix rack version problem for older rubies (rack 2.0 only works for ruby >= 2.2.2)
+- Updated deprecated syntax in tests for WebMock, RSpec
+
+Changes
+--------
+- Dropped official support for Ruby <= 1.9.2 and Rubinius
+
 1.0.12 (2015-09-16)
 ===================
 Features

data/README.md

@@ -44,7 +44,7 @@ Installation
 
 or in your Gemfile
 ```ruby
-gem 'dragonfly', '~> 1.0.12'
+gem 'dragonfly', '~> 1.1.0'
 ```
 
 Require with
@@ -73,13 +73,17 @@ Issues
 ======
 Please use the <a href="http://github.com/markevans/dragonfly/issues">github issue tracker</a> if you have any issues.
 
+Known Issues
+============
+There are known issues when using with json gem version 1.5.2 which can potentially cause an "incorrect sha" error for files with non-ascii characters in the name. Please see https://github.com/markevans/dragonfly/issues/387 for more information.
+
 Suggestions/Questions
 =====================
 <a href="http://groups.google.com/group/dragonfly-users">Google group dragonfly-users</a>
 
 Ruby Versions
 =============
-Dragonfly has been tested with ruby versions 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.x, 2.2.x, jruby 1.7.8 and rubinius 2.2.
+See [Travis-CI](https://travis-ci.org/markevans/dragonfly) for tested versions.
 
 Upgrading from v0.9 to v1.0
 ===========================

data/dev/rails_template.rb

@@ -10,11 +10,14 @@ route %(
 route "root :to => 'photos#index'"
 run "rm -rf public/index.html"
 
-inject_into_file 'app/models/photo.rb', :after => "class Photo < ActiveRecord::Base\n" do
-  %(
-    attr_accessible :image rescue nil
-    dragonfly_accessor :image
-  )
+possible_base_classes = ['ActiveRecord::Base', 'ApplicationRecord']
+possible_base_classes.each do |base_class|
+  inject_into_file 'app/models/photo.rb', :after => "class Photo < #{base_class}\n" do
+    %(
+      attr_accessible :image rescue nil
+      dragonfly_accessor :image
+    )
+  end
 end
 
 gsub_file 'app/views/photos/_form.html.erb', /^.*:image_.*$/, ''
@@ -35,4 +38,3 @@ gsub_file "app/controllers/photos_controller.rb", "permit(", "permit(:image, "
 append_file 'app/views/photos/show.html.erb', %(
  <%= image_tag @photo.image.thumb('300x300').url if @photo.image_uid? %>
 )
-

data/dragonfly.gemspec

@@ -21,30 +21,25 @@ Gem::Specification.new do |spec|
     "README.md"
   ]
 
-  spec.add_runtime_dependency("rack", [">= 1.3.0"])
-  spec.add_runtime_dependency("multi_json", ["~> 1.0"])
-  spec.add_runtime_dependency("addressable", ["~> 2.3"])
-
-  spec.add_development_dependency("rspec", ["~> 2.5"])
-  spec.add_development_dependency("webmock")
-  if RUBY_VERSION < '1.9.3'
-    spec.add_development_dependency("activemodel", '~> 3.2')
-    spec.add_development_dependency("i18n", '~> 0.6.11')
+  # Rack 2.0 only works with ruby >= 2.2.2
+  if RUBY_VERSION < "2.2.2"
+    rack_version = "~> 1.3"
+    activemodel_version = "~> 4.2"
   else
-    spec.add_development_dependency("activemodel")
+    rack_version = ">= 1.3"
+    activemodel_version = nil
   end
+
+  # Runtime dependencies
+  spec.add_runtime_dependency("rack", rack_version)
+  spec.add_runtime_dependency("multi_json", "~> 1.0")
+  spec.add_runtime_dependency("addressable", "~> 2.3")
+
+  # Development dependencies
+  spec.add_development_dependency("rspec", "~> 2.5")
+  spec.add_development_dependency("webmock")
+  spec.add_development_dependency("activemodel", activemodel_version)
   if RUBY_PLATFORM == "java"
     spec.add_development_dependency("jruby-openssl")
   end
-  spec.post_install_message =<<-POST_INSTALL_MESSAGE
-================================================================================
-
-You've installed Dragonfly hooray!!
-
-Quite a few things have changed since version 0.9.
-Please check the documentation at <http://markevans.github.io/dragonfly>
-and see upgrade notes at <https://github.com/markevans/dragonfly/wiki/Upgrading-from-0.9-to-1.0> if upgrading.
-
-================================================================================
-POST_INSTALL_MESSAGE
 end

data/lib/dragonfly/job/fetch_url.rb

@@ -65,9 +65,17 @@ module Dragonfly
 
       def get(url)
         url = parse_url(url)
+
         http = Net::HTTP.new(url.host, url.port)
         http.use_ssl = true if url.scheme == 'https'
-        response = http.get(url.request_uri)
+
+        request = Net::HTTP::Get.new(url.request_uri)
+
+        if url.user || url.password
+          request.basic_auth(url.user, url.password)
+        end
+
+        http.request(request)
       end
 
       def update_from_data_uri

data/lib/dragonfly/utils.rb

@@ -34,7 +34,7 @@ module Dragonfly
     end
 
     def uri_escape_segment(string)
-      Rack::Utils.escape_path(string)
+      URI.encode_www_form_component(string).gsub('+','%20')
     end
 
     def uri_unescape(string)

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = '1.0.12'
+  VERSION = '1.1.0'
 end

data/spec/dragonfly/app_spec.rb

@@ -147,18 +147,18 @@ describe Dragonfly::App do
     let (:app) { test_app }
 
     it "should allow just storing content" do
-      app.datastore.should_receive(:write).with do |content, opts|
-        content.data.should == "HELLO"
-      end
+      app.datastore.should_receive(:write).with(
+        satisfy{|content| content.data == 'HELLO'},
+        anything
+      )
       app.store("HELLO")
     end
 
     it "passes meta and options through too" do
-      app.datastore.should_receive(:write).with do |content, opts|
-        content.data.should == "HELLO"
-        content.meta.should == {'d' => 3}
-        opts.should == {:a => :b}
-      end
+      app.datastore.should_receive(:write).with(
+        satisfy{|content| content.data == 'HELLO' && content.meta == {'d' => 3} },
+        {a: :b}
+      )
       app.store("HELLO", {'d' => 3}, {:a => :b})
     end
   end

data/spec/dragonfly/job/fetch_url_spec.rb

@@ -30,6 +30,12 @@ describe Dragonfly::Job::FetchUrl do
     job.data.should == "secure result!"
   end
 
+  it 'should also work with basic auth' do
+    stub_request(:get, 'http://example.com').with(basic_auth: ['user', 'pass']).to_return(:body => 'basic auth')
+    job.fetch_url!('http://user:pass@example.com')
+    job.data.should == 'basic auth'
+  end
+
   [
     "place.com",
     "http://place.com",

data/spec/dragonfly/model/model_spec.rb

@@ -1031,9 +1031,10 @@ describe "models" do
     it "should return the saved stuff if assigned and retained" do
       @item.preview_image = 'hello'
       @item.preview_image.name = 'dog.biscuit'
-      @app.datastore.should_receive(:write).with do |content, opts|
-        content.data.should == 'hello'
-      end.and_return('new/uid')
+      @app.datastore.should_receive(:write).with(
+        satisfy{|content| content.data == 'hello' },
+        anything
+      ).and_return('new/uid')
       @item.preview_image.retain!
       Dragonfly::Serializer.json_b64_decode(@item.retained_preview_image).should == {
         'uid' => 'new/uid',

data/spec/functional/urls_spec.rb

@@ -3,9 +3,10 @@ require 'spec_helper'
 describe "urls" do
 
   def job_should_match(array)
-    Dragonfly::Response.should_receive(:new).with do |job, env|
-      job.to_a.should == array
-    end.and_return(double('response', :to_response => [200, {'Content-Type' => 'text/plain'}, ["OK"]]))
+    Dragonfly::Response.should_receive(:new).with(
+      satisfy{|job| job.to_a == array },
+      instance_of(Hash)
+    ).and_return(double('response', :to_response => [200, {'Content-Type' => 'text/plain'}, ["OK"]]))
   end
 
   let (:app) {

data/spec/support/simple_matchers.rb

@@ -57,4 +57,8 @@ RSpec::Matchers.define :increase_num_tempfiles do
     puts "Num tempfiles increased: #{num_tempfiles_before} -> #{num_tempfiles_after}" if increased
     increased
   end
+
+  def supports_block_expectations?
+    true
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.1.0
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -243,16 +243,7 @@ homepage: http://github.com/markevans/dragonfly
 licenses:
 - MIT
 metadata: {}
-post_install_message: |
-  ================================================================================
-
-  You've installed Dragonfly hooray!!
-
-  Quite a few things have changed since version 0.9.
-  Please check the documentation at <http://markevans.github.io/dragonfly>
-  and see upgrade notes at <https://github.com/markevans/dragonfly/wiki/Upgrading-from-0.9-to-1.0> if upgrading.
-
-  ================================================================================
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -268,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ideal gem for handling attachments in Rails, Sinatra and Rack applications.