dragonfly 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 318cb26946caa19202dc1c572f4b64014a35e08a
-  data.tar.gz: 5ef7ed322415297775465630d3ae4bc65cfefdf9
+  metadata.gz: 3173e1aab6116013a04d816d1d72f2fb8240c270
+  data.tar.gz: e95788e8d9991755c3dade169c491aec280bb67b
 SHA512:
-  metadata.gz: fa6361437c7a1e6e9b0d963d989d171f3fe3518d224b91666ca61a93729f0147bfad254e898231b86215e280125850ad9bcda2dc2c60b17bf6387274a29967fa
-  data.tar.gz: 541b9b2ac910788a66af52937abb7d6674798dfdbd6de385fe5095e7fa8db6c82c5588ff6e1fe2a11bed8dcb7e00158b378fb9585aab723d39ad5d8fed764cc7
+  metadata.gz: 298a37955543216a2621700a1e7f80558a580073e99665ff4eac98632095db517e8140581c495eb22eaef3034b0edb7510d6b272d5baf42c06455ddceee9ec08
+  data.tar.gz: 8825e3ae315540658faf2874e394ebc83f43be665f01eb0be741b71687e59f54445e22163352765abcfafbf2a2b7a8d0ba513b6d9c3cc47b8cfa9746cdaf4223

data/.travis.yml

@@ -6,7 +6,7 @@ rvm:
   - "2.2"
   - "2.3"
   - "2.4"
-  - "jruby"
+  - "jruby-9.1.9.0"
 script: bundle exec rspec spec
 before_install:
   - gem install bundler

data/History.md

@@ -1,3 +1,11 @@
+1.1.4 (2017-12-31)
+===================
+Fixes
+-----
+- Fixed data uris not working for long strings (reported dlibanori)
+- Removed syntax warnings (swamp09)
+- Correct ActiveRecord hook with `ActiveSupport.on_load` (efatsi)
+
 1.1.3 (2017-06-02)
 ===================
 Fixes

data/README.md

@@ -1,5 +1,8 @@
 Dragonfly
 ===========
+
+[![Build Status](https://travis-ci.org/markevans/dragonfly.svg?branch=master)](https://travis-ci.org/markevans/dragonfly)
+
 Hello!!
 Dragonfly is a highly customizable ruby gem for handling images and other attachments and is already in use on thousands of websites.
 
@@ -10,7 +13,7 @@ class User < ActiveRecord::Base  # model
 end
 ```
 ```erb
-<%= image_tag @user.photo.thumb('300x200#').url  # view  %>
+<%= image_tag @user.photo.thumb('300x200#').url if @user.photo_stored? # view %>
 ```
 
 ... or generate text images on-demand in Sinatra ...
@@ -44,7 +47,7 @@ Installation
 
 or in your Gemfile
 ```ruby
-gem 'dragonfly', '~> 1.1.3'
+gem 'dragonfly', '~> 1.1.4'
 ```
 
 Require with

data/dev/rails_template.rb

@@ -25,16 +25,16 @@ gsub_file 'app/views/photos/_form.html.erb', /^.*:image_.*$/, ''
 inject_into_file 'app/views/photos/_form.html.erb', :before => %(<div class="actions">\n) do
   %(
     <div class="field">
-      <%= f.label :image %><br>
-      <%= f.file_field :image %>
+      <%= form.label :image %><br>
+      <%= form.file_field :image %>
     </div>
 
-    <%= image_tag @photo.image.thumb('100x100').url if @photo.image_uid %>
+    <%= image_tag @photo.image.thumb('100x100').url if @photo.image_stored? %>
   )
 end
 
 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? %>
+ <%= image_tag @photo.image.thumb('300x300').url if @photo.image_stored? %>
 )

data/lib/dragonfly/job/fetch_url.rb

@@ -80,7 +80,7 @@ module Dragonfly
       end
 
       def update_from_data_uri
-        mime_type, b64_data = uri.scan(/\Adata:([^;]+);base64,(.*)$/)[0]
+        mime_type, b64_data = uri.scan(/\Adata:([^;]+);base64,(.*)\Z/m)[0]
         if mime_type && b64_data
           data = Base64.decode64(b64_data)
           ext = app.ext_for(mime_type)

data/lib/dragonfly/model/class_methods.rb

@@ -86,7 +86,7 @@ module Dragonfly
             unless Utils.blank?(string)
               begin
                 dragonfly_attachments[attribute].retained_attrs = Serializer.json_b64_decode(string)
-              rescue Serializer::BadString => e
+              rescue Serializer::BadString
                 Dragonfly.warn("couldn't update attachment with serialized retained_#{attribute} string #{string.inspect}")
               end
             end

data/lib/dragonfly/routed_endpoint.rb

@@ -24,9 +24,9 @@ module Dragonfly
         Dragonfly.warn("can't handle return value from routed endpoint: #{value.inspect}")
         plain_response(500, "Server Error")
       end
-    rescue Job::NoSHAGiven => e
+    rescue Job::NoSHAGiven
       plain_response(400, "You need to give a SHA parameter")
-    rescue Job::IncorrectSHA => e
+    rescue Job::IncorrectSHA
       plain_response(400, "The SHA parameter you gave is incorrect")
     end
 

data/lib/dragonfly/server.rb

@@ -28,11 +28,11 @@ module Dragonfly
     attr_reader :url_format, :fetch_file_whitelist, :fetch_url_whitelist
 
     def add_to_fetch_file_whitelist(patterns)
-      fetch_file_whitelist.push *patterns
+      fetch_file_whitelist.push(*patterns)
     end
 
     def add_to_fetch_url_whitelist(patterns)
-      fetch_url_whitelist.push *patterns
+      fetch_url_whitelist.push(*patterns)
     end
 
     def url_format=(url_format)

data/lib/dragonfly/url_mapper.rb

@@ -24,7 +24,7 @@ module Dragonfly
 
     def initialize(url_format)
       @url_format = url_format
-      raise BadUrlFormat, "bad url format #{url_format}" if url_format[/[\w_]:[\w_]/]
+      raise BadUrlFormat, "bad url format #{url_format}" if url_format[/\w:\w/]
       init_segments
       init_url_regexp
     end
@@ -43,7 +43,7 @@ module Dragonfly
     end
 
     def params_in_url
-      @params_in_url ||= url_format.scan(/\:[\w_]+/).map{|f| f.tr(':','') }
+      @params_in_url ||= url_format.scan(/\:\w+/).map{|f| f.tr(':','') }
     end
 
     def url_for(params)
@@ -51,7 +51,7 @@ module Dragonfly
       url = url_format.dup
       segments.each do |seg|
         value = params[seg.param]
-        value ? url.sub!(/:[\w_]+/, Utils.uri_escape_segment(value.to_s)) : url.sub!(/.:[\w_]+/, '')
+        value ? url.sub!(/:\w+/, Utils.uri_escape_segment(value.to_s)) : url.sub!(/.:\w+/, '')
         params.delete(seg.param)
       end
       url << "?#{Rack::Utils.build_query(params)}" if params.any?
@@ -62,7 +62,7 @@ module Dragonfly
 
     def init_segments
       @segments = []
-      url_format.scan(/([^\w_]):([\w_]+)/).each do |seperator, param|
+      url_format.scan(/([^\w]):(\w+)/).each do |seperator, param|
         segments << Segment.new(
           param,
           seperator,
@@ -73,7 +73,7 @@ module Dragonfly
 
     def init_url_regexp
       i = -1
-      regexp_string = url_format.gsub(/[^\w_]:[\w_]+/) do
+      regexp_string = url_format.gsub(/[^\w]:\w+/) do
         i += 1
         segments[i].regexp_string
       end

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/lib/rails/generators/dragonfly/templates/initializer.rb.erb

@@ -20,7 +20,7 @@ Dragonfly.logger = Rails.logger
 Rails.application.middleware.use Dragonfly::Middleware
 
 # Add model functionality
-if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.extend Dragonfly::Model
-  ActiveRecord::Base.extend Dragonfly::Model::Validations
+ActiveSupport.on_load(:active_record) do
+  extend Dragonfly::Model
+  extend Dragonfly::Model::Validations
 end

data/spec/dragonfly/job/fetch_url_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'base64'
 
 describe Dragonfly::Job::FetchUrl do
 
@@ -162,6 +163,18 @@ describe Dragonfly::Job::FetchUrl do
       job.ext.should == 'txt'
     end
 
+    it "accepts long base64 encoded data uris with newline" do
+      str = 'hello' * 10
+      job.fetch_url!("data:text/plain;base64,#{Base64.encode64(str)}")
+      job.data.should == str
+    end
+
+    it "accepts long base64 encoded data uris without newline" do
+      str = 'hello' * 10
+      job.fetch_url!("data:text/plain;base64,#{Base64.strict_encode64(str)}")
+      job.data.should == str
+    end
+
     it "doesn't accept other data uris" do
       expect {
         job.fetch_url!("data:text/html;charset=utf-8,<stuff />").apply

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack