Merge pull request #4 from metaware/storage-gem

rely on only google-cloud-storage gem, fixes: #3
carrierwaveuploader · Jan 6, 2017 · 6867021 · 6867021
2 parents 0c6883f + ebb7d87
commit 6867021
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/carrierwave-google-storage.gemspec b/carrierwave-google-storage.gemspec
@@ -11,17 +11,21 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Use gcloud for Google Cloud Storage support in CarrierWave.}
   spec.description   = %q{A slimmer alternative to using Fog for Google Cloud Storage support in CarrierWave. Heavily inspired from carrierwave-aws}
-  spec.homepage      = "https://github.com/metaware/carrierwave-google-cloud"
+  spec.homepage      = "https://github.com/metaware/carrierwave-google-storage"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'google-cloud', '~> 0.20.0'
+  spec.add_dependency 'google-cloud-storage', '~> 0.21.0'
   spec.add_dependency 'carrierwave', '~> 0.11.2'
-  spec.add_dependency 'activemodel', ">= 3.2.0"
+  if RUBY_VERSION >= "2.2.2"
+    spec.add_dependency 'activemodel', ">= 3.2.0"
+  else
+    spec.add_dependency 'activemodel', "~> 4.2.7"
+  end
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

diff --git a/lib/carrierwave-google-storage.rb b/lib/carrierwave-google-storage.rb
@@ -1,4 +1,4 @@
-require 'google-cloud'
+require 'google-cloud-storage'
 require 'carrierwave'
 require 'carrierwave/google/storage/version'
 require 'carrierwave/storage/gcloud'