Skip to content

Commit

Permalink
Bump gem to 2.0.0 for Rails 4 support (not backwards compatible)
Browse files Browse the repository at this point in the history
  • Loading branch information
rochers committed Jan 11, 2014
1 parent d5465a1 commit 86d2f9e
Show file tree
Hide file tree
Showing 5 changed files with 147 additions and 138 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG
@@ -1,3 +1,6 @@
= Version 2.0.0 (rochers)
* Added support for Rails 4

= Version 1.2.7 (wip)
* Implemented raw file type handling (roomthirteen)

Expand Down
7 changes: 4 additions & 3 deletions Gemfile
@@ -1,4 +1,5 @@
source "http://rubygems.org"
ruby '2.1.0'

# Declare your gem's dependencies in attachinary.gemspec.
# Bundler will treat runtime dependencies like base dependencies, and
Expand All @@ -8,14 +9,14 @@ gemspec
# used by the dummy application
gem 'jquery-rails'
gem 'cloudinary'
gem 'simple_form', '~> 2.0.0'
gem 'simple_form', '~> 3.0.0'

group :assets do
gem 'coffee-rails', '~> 3.2.1'
gem 'coffee-rails', '~> 4.0.0'
end

group :mongoid do
gem 'mongoid', '~> 3.0.0'
gem 'mongoid', '~> 4.0.0alpha2'
end


Expand Down
263 changes: 135 additions & 128 deletions Gemfile.lock
@@ -1,181 +1,187 @@
PATH
remote: .
specs:
attachinary (1.2.6)
cloudinary (~> 1.0.41)
rails (~> 3.2)
attachinary (2.0.0)
cloudinary (~> 1.0.66)
rails (~> 4.0.0)

GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.13)
actionpack (= 3.2.13)
mail (~> 2.5.3)
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
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.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
addressable (2.3.4)
arel (3.0.2)
aws_cf_signer (0.1.1)
builder (3.0.4)
capybara (2.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)
addressable (2.3.5)
arel (4.0.1)
atomic (1.1.14)
awesome_print (1.1.0)
aws_cf_signer (0.1.2)
bson (2.1.0)
builder (3.1.4)
capybara (2.2.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-webkit (1.0.0)
capybara-webkit (1.1.0)
capybara (~> 2.0, >= 2.0.2)
json
cloudinary (1.0.58)
celluloid (0.15.2)
timers (~> 1.1.0)
cloudinary (1.0.67)
aws_cf_signer
rest-client
coderay (1.0.9)
coffee-rails (3.2.2)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.2)
database_cleaner (1.0.1)
diff-lcs (1.2.4)
coffee-script-source (1.6.3)
connection_pool (1.2.0)
database_cleaner (1.2.0)
diff-lcs (1.2.5)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (3.6.2)
execjs (2.0.2)
factory_girl (4.3.0)
activesupport (>= 3.0.0)
factory_girl_rails (3.6.0)
factory_girl (~> 3.6.0)
factory_girl_rails (4.3.0)
factory_girl (~> 4.3.0)
railties (>= 3.0.0)
ffi (1.8.1)
ffi (1.9.3)
formatador (0.2.4)
guard (1.8.0)
guard (2.2.5)
formatador (>= 0.2.4)
listen (>= 1.0.0)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
thor (>= 0.14.6)
guard-rspec (3.0.1)
guard (>= 1.8)
rspec (~> 2.13)
hike (1.2.2)
i18n (0.6.1)
journey (1.0.4)
jquery-rails (3.0.0)
listen (~> 2.1)
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
guard-rspec (4.2.4)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
hike (1.2.3)
i18n (0.6.9)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.0)
launchy (2.3.0)
json (1.8.1)
launchy (2.4.2)
addressable (~> 2.3)
listen (1.1.4)
listen (2.4.0)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
lumberjack (1.0.3)
lumberjack (1.0.4)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.1)
mime-types (1.23)
mongoid (3.0.23)
activemodel (~> 3.1)
moped (~> 1.2)
origin (~> 1.0)
tzinfo (~> 0.3.22)
moped (1.5.0)
multi_json (1.7.4)
nokogiri (1.5.9)
origin (1.1.0)
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.5.2)
minitest (4.7.5)
mongoid (4.0.0.alpha2)
activemodel (>= 4.0.0)
moped (~> 2.0.beta5)
origin (~> 2.1)
tzinfo (>= 0.3.37)
moped (2.0.0.beta5)
bson (~> 2.1)
connection_pool (~> 1.2)
optionable (~> 0.2.0)
multi_json (1.8.4)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
optionable (0.2.0)
origin (2.1.0)
polyglot (0.3.3)
pry (0.9.12.2)
coderay (~> 1.0.5)
pry (0.9.12.4)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.3)
rack
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.13)
actionmailer (= 3.2.13)
actionpack (= 3.2.13)
activerecord (= 3.2.13)
activeresource (= 3.2.13)
activesupport (= 3.2.13)
bundler (~> 1.0)
railties (= 3.2.13)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
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, < 2.0)
rake (10.0.4)
rb-fsevent (0.9.3)
rb-inotify (0.9.0)
ffi (>= 0.5.0)
rb-kqueue (0.2.0)
thor (>= 0.18.1, < 2.0)
rake (10.1.1)
rb-fsevent (0.9.4)
rb-inotify (0.9.3)
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.13.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.7)
rspec-expectations (2.14.4)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.13.1)
rspec-rails (2.13.2)
rspec-mocks (2.14.4)
rspec-rails (2.14.1)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
simple_form (2.0.4)
actionpack (~> 3.0)
activemodel (~> 3.0)
slop (3.4.5)
sprockets (2.2.2)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
simple_form (3.0.1)
actionpack (>= 4.0.0, < 4.1)
activemodel (>= 4.0.0, < 4.1)
slop (3.4.7)
sprockets (2.10.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
sprockets-rails (2.0.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.8)
thor (0.18.1)
thread_safe (0.1.3)
atomic
tilt (1.4.1)
treetop (1.4.12)
timers (1.1.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
tzinfo (0.3.38)
valid_attribute (1.3.1)
xpath (2.0.0)
nokogiri (~> 1.3)
Expand All @@ -185,18 +191,19 @@ PLATFORMS

DEPENDENCIES
attachinary!
awesome_print
capybara
capybara-webkit
cloudinary
coffee-rails (~> 3.2.1)
coffee-rails (~> 4.0.0)
database_cleaner
factory_girl_rails (~> 3.0)
factory_girl_rails
guard-rspec
jquery-rails
launchy
mongoid (~> 3.0.0)
mongoid (~> 4.0.0alpha2)
rb-fsevent (~> 0.9.1)
rspec-rails (~> 2.5)
simple_form (~> 2.0.0)
rspec-rails
simple_form (~> 3.0.0)
sqlite3
valid_attribute
10 changes: 4 additions & 6 deletions attachinary.gemspec
Expand Up @@ -16,17 +16,15 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,db,lib,vendor}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
s.test_files = Dir["test/**/*"]

s.add_dependency 'rails', '>= 3.2'
s.add_dependency 'cloudinary', '~> 1.0.41'

# s.add_dependency "jquery-rails"
s.add_dependency 'rails', '~> 4.0.0'
s.add_dependency 'cloudinary', '~> 1.0.66'

s.add_development_dependency 'sqlite3'
s.add_development_dependency 'rspec-rails', '~> 2.5'
s.add_development_dependency 'rspec-rails'
s.add_development_dependency 'valid_attribute'
s.add_development_dependency 'capybara'
s.add_development_dependency 'capybara-webkit'
s.add_development_dependency 'factory_girl_rails', '~> 3.0'
s.add_development_dependency 'factory_girl_rails'
s.add_development_dependency 'launchy'
s.add_development_dependency 'database_cleaner'
s.add_development_dependency 'rb-fsevent', '~> 0.9.1'
Expand Down
2 changes: 1 addition & 1 deletion lib/attachinary/version.rb
@@ -1,3 +1,3 @@
module Attachinary
VERSION = "1.2.6"
VERSION = "2.0.0"
end

0 comments on commit 86d2f9e

Please sign in to comment.