dragonfly 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f679f5471b494a363b6ad8b63abe134ab56169e0
-  data.tar.gz: 16e5bddb9fabf32fe9f494025aa1d9ec052f9421
+  metadata.gz: 3e466fa10768e501d79f3b6239d45b22d2e5a076
+  data.tar.gz: 72fde21f3ab21c60720fab09cfc7548de18bfd1e
 SHA512:
-  metadata.gz: ce1fb089fa71ad9f0ac5ba3a2841de04510c1a9241a99a404be6886a62a1574a594c3fb07efe629e66528d8fdb92b973e67f1f6db4328506cebd6fbec108ba8b
-  data.tar.gz: e53fb3a2d1da7c4cd64ab58ca10f4fa39f3167da1a10c7273f36e8ba65e3b142c2df8e29095d06cef1d54d4de2e95be83e9f6f86d52ad1dd5ebbc91e274b85ba
+  metadata.gz: d0243d1ce6216d43b2449ac5d4e6296ee82d291c32501a1f3b0540b41d1906f9795a58ef1383df52b2fae6e14086debbc0368724a1b6c7a6e487e5f0cc17b709
+  data.tar.gz: f18f63bd5c9e1b2f0e0fc3609eaced84d22efb4689267d27f9ff944c3ec168e90e477b86cef9f953e6e068435e030dc23bcc8d38b8a155be663e1b5aa62437d4

data/.travis.yml

@@ -5,4 +5,5 @@ rvm:
   - "1.9.3"
   - "2.0.0"
   - "jruby"
+  - "rbx-2"
 script: bundle exec rspec spec

data/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 gemspec
 gem 'pry', :group => :development
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx' && RUBY_VERSION >= '2.0'
+  gem "rubysl", "~> 2.0", :group => :development
+end

data/History.md

@@ -1,3 +1,10 @@
+1.0.2 (2013-12-20)
+===================
+Fixes
+-----
+- more secure generation of secret in rails generator
+- ensure popen3 doesn't hang
+
 1.0.1 (2013-11-28)
 ===================
 Changes

data/README.md

@@ -37,7 +37,14 @@ Documentation
 
 <a href="http://rubydoc.info/github/markevans/dragonfly/frames">RDoc documentation is here</a>
 
-Dragonfly has changed somewhat since version 0.9 - if for whatever reason you can't upgrade, then
+Upgrading from v0.9 to v1.0
+===========================
+Dragonfly has changed somewhat since version 0.9.
+See [the Upgrading wiki](http://github.com/markevans/dragonfly/wiki/Upgrading-from-0.9-to-1.0) for notes on changes, and feel free to add anything you come across while upgrading!
+
+Changes are listed in [History.md](https://github.com/markevans/dragonfly/blob/master/History.md)
+
+If for whatever reason you can't upgrade, then
 <a href="http://markevans.github.io/dragonfly/v0.9.15">the docs for version 0.9.x are here</a>.
 
 Installation
@@ -47,7 +54,7 @@ Installation
 
 or in your Gemfile
 ```ruby
-gem 'dragonfly', '~> 1.0.0'
+gem 'dragonfly', '~> 1.0.2'
 ```
 
 Require with
@@ -57,7 +64,7 @@ require 'dragonfly'
 
 Ruby Versions
 =============
-Dragonfly has been tested with ruby versions 1.8.7, 1.9.2, 1.9.3, 2.0.0 and jruby 1.7.8.
+Dragonfly has been tested with ruby versions 1.8.7, 1.9.2, 1.9.3, 2.0.0, jruby 1.7.8 and rubinius 2.2.
 
 Plugins / add-ons
 =================

data/dragonfly.gemspec

@@ -37,13 +37,12 @@ Gem::Specification.new do |spec|
   spec.post_install_message =<<-POST_INSTALL_MESSAGE
 ================================================================================
 
-Please check the documentation at <http://markevans.github.io/dragonfly/>.
+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.
 
-DEPRECATED: dragonfly/rails/images is now deprecated.
-Please refer to <http://markevans.github.io/dragonfly/rails/> for instructions to setup
-with Rails
---------------------------------------------------------------------------------
+================================================================================
 POST_INSTALL_MESSAGE
 end

data/lib/dragonfly/model/attachment_class_methods.rb

@@ -46,8 +46,8 @@ module Dragonfly
           end
 
           def method_missing(meth, *args, &block)
-            if meth.to_s =~ /^storage_(.*)$/
-              raise NoMethodError, "#{meth} is deprecated - use storage_options instead"
+            if key = meth.to_s[/^storage_(.*)$/, 1]
+              raise NoMethodError, "#{meth} is deprecated - use storage_options{|a| {#{key}: ...} } instead"
             else
               super
             end

data/lib/dragonfly/shell.rb

@@ -44,6 +44,7 @@ module Dragonfly
 
       def run_command(command)
         Open3.popen3 command do |stdin, stdout, stderr, wait_thread|
+          stdin.close_write # make sure it doesn't hang
           status = wait_thread.value
           raise CommandFailed, "Command failed (#{command}) with exit status #{status.exitstatus} and stderr #{stderr.read}" unless status.success?
           stdout.read

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/rails/generators/dragonfly/dragonfly_generator.rb

@@ -8,7 +8,7 @@ class DragonflyGenerator < Rails::Generators::Base
   private
 
   def generate_secret
-    rand(1e32).to_s(36)
+    SecureRandom.hex(32)
   end
 
   if RUBY_VERSION > "1.9"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -228,14 +228,13 @@ metadata: {}
 post_install_message: |
   ================================================================================
 
-  Please check the documentation at <http://markevans.github.io/dragonfly/>.
+  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.
 
-  DEPRECATED: dragonfly/rails/images is now deprecated.
-  Please refer to <http://markevans.github.io/dragonfly/rails/> for instructions to setup
-  with Rails
-  --------------------------------------------------------------------------------
+  ================================================================================
 rdoc_options: []
 require_paths:
 - lib