Loose dependency on paperclip to allow for older versions as needed. 3.4.x should be sufficent for integration w/ BrowserSpree

Author: Peak

Gemfile

@@ -12,7 +12,8 @@ gem 'bluecloth', :groups=>[:development, :test] # For YARD
 
 gem "thin" # To avoid annoying Ruby 1.9.3/Rails/Webrick warnings - See http://stackoverflow.com/questions/7082364/what-does-warn-could-not-determine-content-length-of-response-body-mean-and-h
 
-gem 'paperclip', '~> 3.4.1'
+# Uncomment to confirm that older versions work (for compaitiblity with Spree 2.2.4/bcms_spree)
+# gem 'paperclip', '~> 3.4.1'
 # For testing behavior in production
 group :production do
  gem 'uglifier'

Gemfile.lock

@@ -11,7 +11,7 @@ PATH
  jquery-rails (~> 3.1)
  jquery-ui-rails (~> 4.1)
  panoramic
- paperclip (~> 3.5.1)
+ paperclip (~> 3.4)
  rails (~> 4.0.0)
  sass-rails
  simple_form (>= 3.0.0.rc, < 3.1)
@@ -57,10 +57,9 @@ GEM
  childprocess (>= 0.3.6)
  cucumber (>= 1.1.1)
  rspec-expectations (>= 2.7.0)
- atomic (1.1.14)
- bcrypt-ruby (3.1.2)
+ bcrypt (3.1.7)
  bluecloth (2.2.0)
- bootstrap-sass (3.1.0.2)
+ bootstrap-sass (3.2.0.2)
  sass (~> 3.2)
  builder (3.1.4)
  capybara (2.1.0)
@@ -71,19 +70,28 @@ GEM
  xpath (~> 2.0)
  childprocess (0.3.9)
  ffi (~> 1.0, >= 1.0.11)
- chunky_png (1.3.0)
- ckeditor_rails (4.3.1)
+ chunky_png (1.3.1)
+ ckeditor_rails (4.3.4)
  railties (>= 3.0)
  climate_control (0.0.3)
  activesupport (>= 3.0)
- cocaine (0.5.3)
+ cocaine (0.5.4)
  climate_control (>= 0.0.3, < 1.0)
- compass (0.12.2)
+ compass (1.0.1)
  chunky_png (~> 1.2)
- fssm (>= 0.2.7)
- sass (~> 3.1)
- compass-rails (1.1.3)
+ compass-core (~> 1.0.1)
+ compass-import-once (~> 1.0.5)
+ rb-fsevent (>= 0.9.3)
+ rb-inotify (>= 0.9)
+ sass (>= 3.3.13, < 3.5)
+ compass-core (1.0.1)
+ multi_json (~> 1.0)
+ sass (>= 3.3.0, < 3.5)
+ compass-import-once (1.0.5)
+ sass (>= 3.2, < 3.5)
+ compass-rails (1.1.7)
  compass (>= 0.12.2)
+ sprockets (<= 2.11.0)
  cucumber (1.3.6)
  builder (>= 2.1.2)
  diff-lcs (>= 1.1.3)
@@ -96,8 +104,8 @@ GEM
  nokogiri (>= 1.5.0)
  daemons (1.1.9)
  database_cleaner (1.2.0)
- devise (3.2.2)
- bcrypt-ruby (~> 3.0)
+ devise (3.3.0)
+ bcrypt (~> 3.0)
  orm_adapter (~> 0.1)
  railties (>= 3.2.6, < 5)
  thread_safe (~> 0.1)
@@ -115,18 +123,17 @@ GEM
  faye-websocket (0.4.7)
  eventmachine (>= 0.12.0)
  ffi (1.9.0)
- fssm (0.2.10)
  gherkin (2.12.1)
  multi_json (~> 1.3)
  hashie (2.0.5)
  hike (1.2.3)
  http_parser.rb (0.5.3)
- i18n (0.6.9)
- jquery-rails (3.1.0)
+ i18n (0.6.11)
+ jquery-rails (3.1.2)
  railties (>= 3.0, < 5.0)
  thor (>= 0.14, < 2.0)
- jquery-ui-rails (4.1.1)
- railties (>= 3.1.0)
+ jquery-ui-rails (4.2.1)
+ railties (>= 3.2.16)
  launchy (2.3.0)
  addressable (~> 2.3)
  m (1.3.2)
@@ -190,17 +197,20 @@ GEM
  rake (>= 0.8.7)
  thor (>= 0.18.1, < 2.0)
  rake (10.1.1)
+ rb-fsevent (0.9.4)
+ rb-inotify (0.9.5)
+ ffi (>= 0.5.0)
  rspec-expectations (2.14.1)
  diff-lcs (>= 1.1.3, < 2.0)
  ruby-prof (0.13.0)
- sass (3.2.14)
+ sass (3.4.5)
  sass-rails (4.0.1)
  railties (>= 4.0.0, < 5.0)
  sass (>= 3.1.10)
  sprockets-rails (~> 2.0.0)
- simple_form (3.0.1)
- actionpack (>= 4.0.0, < 4.1)
- activemodel (>= 4.0.0, < 4.1)
+ simple_form (3.1.0.rc2)
+ actionpack (~> 4.0)
+ activemodel (~> 4.0)
  single_test (0.6.0)
  rake
  sprockets (2.10.1)
@@ -222,21 +232,20 @@ GEM
  eventmachine (>= 0.12.6)
  rack (>= 1.0.0)
  thor (0.18.1)
- thread_safe (0.1.3)
- atomic
+ thread_safe (0.3.4)
  tilt (1.4.1)
- tins (1.0.0)
+ tins (1.3.3)
  treetop (1.4.15)
  polyglot
  polyglot (>= 0.3.1)
- tzinfo (0.3.38)
+ tzinfo (0.3.41)
  uglifier (2.1.2)
  execjs (>= 0.3.0)
  multi_json (~> 1.0, >= 1.0.2)
- underscore-rails (1.5.2)
+ underscore-rails (1.7.0)
  warden (1.2.3)
  rack (>= 1.0)
- will_paginate (3.0.5)
+ will_paginate (3.0.7)
  xpath (2.0.0)
  nokogiri (~> 1.3)
  yard (0.8.7)

browsercms.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
  s.add_dependency("underscore-rails", "~> 1.4")
  s.add_dependency("jquery-rails", "~> 3.1")
  s.add_dependency("jquery-ui-rails", "~> 4.1")
- s.add_dependency("paperclip", "~> 3.5.1")
+ s.add_dependency("paperclip", "~> 3.4")
  s.add_dependency("panoramic")
  s.add_dependency("will_paginate", "~>3.0.0")
  s.add_dependency("actionpack-page_caching", "~>1.0")