Merge pull request unmantained-activeadmin-plugins#5 from matjack1/master

Dragonfly version 0.9.15

Author: stefanoverna

.gitignore

@@ -0,0 +1,3 @@
+.bundle
+bin
+

Gemfile

@@ -1,14 +1,6 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-# Declare your gem's dependencies in simple_form_fancy_uploads.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
 gemspec
 
-group :development, :test do
- gem 'simplecov', require: false
- gem 'sqlite3'
- gem 'rspec-rails', '~> 2.8.1'
- gem 'webrat'
-end
+gem 'activeadmin', github: 'gregbell/active_admin', branch: 'master'
 

Gemfile.lock

@@ -1,170 +1,162 @@
+GIT
+ remote: git://github.com/gregbell/active_admin.git
+ revision: f21cff30e7212706a39710e2c70ad0af8087ccea
+ branch: master
+ specs:
+ activeadmin (1.0.0.pre)
+ arbre (~> 1.0)
+ bourbon
+ coffee-rails
+ devise (~> 3.2)
+ formtastic (~> 2.3.0.rc2)
+ inherited_resources (~> 1.3)
+ jquery-rails
+ jquery-ui-rails
+ kaminari (~> 0.15)
+ rails (>= 3.2, < 4.1)
+ ransack (~> 1.0)
+ sass-rails
+
 PATH
  remote: .
  specs:
  activeadmin-dragonfly (0.0.2)
  activeadmin
- dragonfly
+ dragonfly (= 0.9.15)
 
 GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
  specs:
- actionmailer (3.2.1)
- actionpack (= 3.2.1)
- mail (~> 2.4.0)
- actionpack (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- builder (~> 3.0.0)
+ actionmailer (4.0.2)
+ actionpack (= 4.0.2)
+ mail (~> 2.5.4)
+ actionpack (4.0.2)
+ activesupport (= 4.0.2)
+ builder (~> 3.1.0)
  erubis (~> 2.7.0)
- journey (~> 1.0.1)
- rack (~> 1.4.0)
- rack-cache (~> 1.1)
- rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activeadmin (0.5.0)
- arbre (>= 1.0.1)
- bourbon (>= 1.0.0)
- devise (>= 1.1.2)
- fastercsv
- formtastic (>= 2.0.0)
- inherited_resources (>= 1.3.1)
- jquery-rails (>= 1.0.0)
- kaminari (>= 0.13.0)
- meta_search (>= 0.9.2)
- rails (>= 3.0.0)
- sass (>= 3.1.0)
- activemodel (3.2.1)
- activesupport (= 3.2.1)
- builder (~> 3.0.0)
- activerecord (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- arel (~> 3.0.0)
- tzinfo (~> 0.3.29)
- activeresource (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- activesupport (3.2.1)
- i18n (~> 0.6)
- multi_json (~> 1.0)
+ rack (~> 1.5.2)
+ rack-test (~> 0.6.2)
+ activemodel (4.0.2)
+ activesupport (= 4.0.2)
+ builder (~> 3.1.0)
+ activerecord (4.0.2)
+ activemodel (= 4.0.2)
+ activerecord-deprecated_finders (~> 1.0.2)
+ activesupport (= 4.0.2)
+ arel (~> 4.0.0)
+ activerecord-deprecated_finders (1.0.3)
+ activesupport (4.0.2)
+ i18n (~> 0.6, >= 0.6.4)
+ minitest (~> 4.2)
+ multi_json (~> 1.3)
+ thread_safe (~> 0.1)
+ tzinfo (~> 0.3.37)
  arbre (1.0.1)
  activesupport (>= 3.0.0)
- arel (3.0.2)
- bcrypt-ruby (3.0.1)
- bourbon (2.1.1)
- sass (>= 3.1)
- builder (3.0.0)
- devise (2.1.2)
+ arel (4.0.1)
+ atomic (1.1.14)
+ bcrypt-ruby (3.1.2)
+ bourbon (3.1.8)
+ sass (>= 3.2.0)
+ thor
+ builder (3.1.4)
+ coffee-rails (4.0.1)
+ coffee-script (>= 2.2.0)
+ railties (>= 4.0.0, < 5.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.6.3)
+ devise (3.2.2)
  bcrypt-ruby (~> 3.0)
  orm_adapter (~> 0.1)
- railties (~> 3.1)
- warden (~> 1.2.1)
- diff-lcs (1.1.3)
- dragonfly (0.9.12)
+ railties (>= 3.2.6, < 5)
+ thread_safe (~> 0.1)
+ warden (~> 1.2.3)
+ dragonfly (0.9.15)
+ multi_json (~> 1.0)
  rack
  erubis (2.7.0)
- fastercsv (1.5.5)
- formtastic (2.2.1)
+ execjs (2.0.2)
+ formtastic (2.3.0.rc2)
  actionpack (>= 3.0)
- has_scope (0.5.1)
- hike (1.2.1)
- i18n (0.6.0)
- inherited_resources (1.3.1)
- has_scope (~> 0.5.0)
- responders (~> 0.6)
- journey (1.0.1)
- jquery-rails (2.1.3)
- railties (>= 3.1.0, < 5.0)
- thor (~> 0.14)
- json (1.6.5)
- kaminari (0.14.1)
+ has_scope (0.6.0.rc)
+ actionpack (>= 3.2, < 5)
+ activesupport (>= 3.2, < 5)
+ hike (1.2.3)
+ i18n (0.6.9)
+ inherited_resources (1.4.1)
+ has_scope (~> 0.6.0.rc)
+ responders (~> 1.0.0.rc)
+ jquery-rails (3.0.4)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ jquery-ui-rails (4.1.1)
+ railties (>= 3.1.0)
+ kaminari (0.15.1)
  actionpack (>= 3.0.0)
  activesupport (>= 3.0.0)
- mail (2.4.4)
- i18n (>= 0.4.0)
+ mail (2.5.4)
  mime-types (~> 1.16)
  treetop (~> 1.4.8)
- meta_search (1.1.3)
- actionpack (~> 3.1)
- activerecord (~> 3.1)
- activesupport (~> 3.1)
- polyamorous (~> 0.5.0)
- mime-types (1.19)
- multi_json (1.0.4)
- nokogiri (1.5.0)
- orm_adapter (0.4.0)
- polyamorous (0.5.0)
- activerecord (~> 3.0)
+ mime-types (1.25.1)
+ minitest (4.7.5)
+ multi_json (1.8.4)
+ orm_adapter (0.5.0)
+ polyamorous (0.6.4)
+ activerecord (>= 3.0)
  polyglot (0.3.3)
- rack (1.4.1)
- rack-cache (1.1)
- rack (>= 0.4)
- rack-ssl (1.3.2)
- rack
- rack-test (0.6.1)
+ rack (1.5.2)
+ rack-test (0.6.2)
  rack (>= 1.0)
- rails (3.2.1)
- actionmailer (= 3.2.1)
- actionpack (= 3.2.1)
- activerecord (= 3.2.1)
- activeresource (= 3.2.1)
- activesupport (= 3.2.1)
- bundler (~> 1.0)
- railties (= 3.2.1)
- railties (3.2.1)
- actionpack (= 3.2.1)
- activesupport (= 3.2.1)
- rack-ssl (~> 1.3.2)
+ rails (4.0.2)
+ actionmailer (= 4.0.2)
+ actionpack (= 4.0.2)
+ activerecord (= 4.0.2)
+ activesupport (= 4.0.2)
+ bundler (>= 1.3.0, < 2.0)
+ railties (= 4.0.2)
+ sprockets-rails (~> 2.0.0)
+ railties (4.0.2)
+ actionpack (= 4.0.2)
+ activesupport (= 4.0.2)
  rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (0.9.2.2)
- rdoc (3.12)
- json (~> 1.4)
- responders (0.9.3)
- railties (~> 3.1)
- rspec (2.8.0)
- rspec-core (~> 2.8.0)
- rspec-expectations (~> 2.8.0)
- rspec-mocks (~> 2.8.0)
- rspec-core (2.8.0)
- rspec-expectations (2.8.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.8.0)
- rspec-rails (2.8.1)
+ thor (>= 0.18.1, < 2.0)
+ rake (10.1.1)
+ ransack (1.1.0)
  actionpack (>= 3.0)
- activesupport (>= 3.0)
- railties (>= 3.0)
- rspec (~> 2.8.0)
- sass (3.2.1)
- simplecov (0.5.4)
- multi_json (~> 1.0.3)
- simplecov-html (~> 0.5.3)
- simplecov-html (0.5.3)
- sprockets (2.1.2)
+ activerecord (>= 3.0)
+ polyamorous (~> 0.6.0)
+ responders (1.0.0)
+ railties (>= 3.2, < 5)
+ sass (3.2.13)
+ sass-rails (4.0.1)
+ railties (>= 4.0.0, < 5.0)
+ sass (>= 3.1.10)
+ sprockets-rails (~> 2.0.0)
+ sprockets (2.10.1)
  hike (~> 1.2)
+ multi_json (~> 1.0)
  rack (~> 1.0)
  tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.5)
- thor (0.14.6)
- tilt (1.3.3)
- treetop (1.4.12)
+ sprockets-rails (2.0.1)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ sprockets (~> 2.8)
+ thor (0.18.1)
+ thread_safe (0.1.3)
+ atomic
+ tilt (1.4.1)
+ treetop (1.4.15)
  polyglot
  polyglot (>= 0.3.1)
- tzinfo (0.3.34)
- warden (1.2.1)
- rack (>= 1.0)
- webrat (0.7.3)
- nokogiri (>= 1.2.0)
+ tzinfo (0.3.38)
+ warden (1.2.3)
  rack (>= 1.0)
- rack-test (>= 0.5.3)
 
 PLATFORMS
  ruby
 
 DEPENDENCIES
+ activeadmin!
  activeadmin-dragonfly!
- rspec-rails (~> 2.8.1)
- simplecov
- sqlite3
- webrat

activeadmin-dragonfly.gemspec

@@ -9,12 +9,13 @@ Gem::Specification.new do |s|
  s.version = ActiveAdmin::Dragonfly::VERSION
  s.authors = ["Stefano Verna"]
  s.email = ["stefano.verna@gmail.com"]
- s.homepage = "http://github.com/cantierecreativo/railsyard-dragonfly"
+ s.homepage = "http://github.com/cantierecreativo/activeadmin-dragonfly"
  s.summary = "Adds a new :dragonfly field type to ActiveAdmin"
  s.description = "Adds a new :dragonfly field type to ActiveAdmin"
 
  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
 
  s.add_dependency "activeadmin"
- s.add_dependency "dragonfly"
+ s.add_dependency "dragonfly", "0.9.15"
 end
+