content_caching 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1679fedaa5b108b96b43f10266fee6f6eba073fb
-  data.tar.gz: 8e60f670e6594729e3480ca7835ab85ad1ab26a8
+  metadata.gz: a36bd6b06053f12e231871a8c057559441c3f3e4
+  data.tar.gz: c685675c7ec7574ba9de79f29904049d69955715
 SHA512:
-  metadata.gz: 8b66af44f6a4b91c63138533e4eeccf49d936f38741ed76795a79133e875a0641a195384f2cb0570c61149b47aa25eb069c193da777042b80888d5007b9cbe85
-  data.tar.gz: d6c2b251a47b19e563f34e10a54b78cd4fca0771aa901ce56e24492b402d90ea48c4196692b9f3a5a83d70c3f7d149d5ec8469f1d44dea76f9437fa747ed0604
+  metadata.gz: b2dd9092d8e7743c54cfbae415bb32bb314a082561a55d67586abcb47b14149d5d9009eb7d9aef2f1404e20992c423e11cc8122bf486218aa0783f0b5ea64703
+  data.tar.gz: a5bc7d09c79ef0b887f11226e965a5b104ac27dbb29e3951d9eb1aa065a1eb6bcb8a781cb5ec56190e3118902f36fad98ccc33935d9a79236dba0645b2c14bd9

data/.ruby-version

@@ -0,0 +1 @@
+2.2.3

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 script: bundle exec rspec
 rvm:
-  - 2.0.0
-  - 2.1.0
+  - 2.2.3
   - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### VERSION 0.2.0
+
+* Enhancements
+  * Switch AWS library to the official one.
+
+### VERSION 0.1.1
+
+* Enhancements
+  * Travis CI files
+  * Update bundler version
+
 ### VERSION 0.1.0
 
 * bug fix

data/UPGRADE.md

@@ -0,0 +1 @@
+# Upgrading

data/content_caching.gemspec

@@ -15,12 +15,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '> 1.3'
-  spec.add_development_dependency 'rake',    '~> 10.3'
-  spec.add_development_dependency 'rspec',   '~> 2.14'
-  spec.add_development_dependency 'webmock', '~> 1.18'
+  spec.add_development_dependency 'bundler', '> 1.0'
+  spec.add_development_dependency 'rake',    '~> 10.4'
+  spec.add_development_dependency 'rspec',   '~> 3.3'
+  spec.add_development_dependency 'webmock', '~> 1.21'
   spec.add_development_dependency 'vcr',     '~> 2.9'
   spec.add_development_dependency 'right_http_connection', '~> 1.4'
 
-  spec.add_dependency 'aws', '~> 2.10'
+  spec.add_dependency 'aws-sdk-resources', '~> 2.1'
+  spec.add_dependency 'retryable_block', '0.0.1'
 end

data/lib/content_caching/adapters/aws.rb

@@ -1,8 +1,9 @@
-require 'aws'
+require 'aws-sdk-resources' # This lib is accessible through ::Aws...
 
 module ContentCaching
   module Adapter
     class Aws
+      include RetryableBlock
 
       T_1_DAY = 86400.freeze
 
@@ -13,39 +14,36 @@ module ContentCaching
       end
 
       def store document_path, content
-        retry_3_times do
+        retryable(3) do
           content.rewind if content.respond_to?(:rewind)
-          s3_interface.put self.options[:directory], document_path,
-            (content.respond_to?(:read) ? content.read : content)
+          bucket.put_object key: document_path,
+            body: (content.respond_to?(:read) ? content.read : content)
         end
       end
 
       def url document_path
-        s3_interface.get_link self.options[:directory], document_path, T_1_DAY
+        bucket.object(document_path).presigned_url :get, expires_in: T_1_DAY
       end
 
       def delete document_path
-        retry_3_times do
-          s3_interface.delete self.options[:directory], document_path
+        retryable(3) do
+          bucket.object(document_path).delete
         end
       end
 
       private
 
-      def s3_interface
-        @s3_interface ||= ::Aws::S3Interface.new self.options[:aws_access_key_id],
-                                                 self.options[:aws_secret_access_key]
+      def bucket
+        ::Aws::S3::Resource.new(
+          credentials: aws_credentials,
+          region: self.options[:region]
+        ).bucket self.options[:directory]
       end
 
-      def retry_3_times
-        tries = 0
-        begin
-          yield
-        rescue
-          (tries += 1) <3 ? retry : raise
-        end
+      def aws_credentials
+       :: Aws::Credentials.new self.options[:aws_access_key_id],
+                             self.options[:aws_secret_access_key]
       end
-
     end
   end
 end

data/lib/content_caching/adapters/aws_adapter.rb

@@ -28,7 +28,6 @@ module ContentCaching
       def adapter
         @adapter ||= Aws::new(@options)
       end
-
     end
   end
 end

data/lib/content_caching/adapters/fs_adapter.rb

@@ -37,7 +37,6 @@ module ContentCaching
       def adapter
         @adapter ||= Fs::new
       end
-
     end
   end
 end

data/lib/content_caching/version.rb

@@ -1,3 +1,3 @@
 module ContentCaching
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/content_caching_spec.rb

@@ -94,6 +94,5 @@ module ContentCaching
         end
       end
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: content_caching
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Joel AZEMAR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: aws
+  name: aws-sdk-resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: retryable_block
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 description: Library for help and speed up views render manipulation based on aws
   and local storage
 email:
@@ -119,12 +133,14 @@ files:
 - ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- UPGRADE.md
 - content_caching.gemspec
 - lib/content_caching.rb
 - lib/content_caching/adapters/abstract.rb
@@ -163,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Library for help and speed up views render manipulation