fix:aws sdk

diff --git a/Gemfile b/Gemfile
index 76ef083..f093162 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,4 @@
+ruby '2.1.6'
 source 'https://rubygems.org'
 gem 'specific_install'
 
@@ -12,9 +13,9 @@ gem 'underscore-rails'
 gem 'rails-timeago'
 gem 'kaminari'
 gem 'sanitize'
-gem 'aws-s3'
+#gem 'aws-s3'
 #gem 'aws-s3', :git => 'https://github.com/bartoszkopinski/aws-s3'
-#gem 'aws-sdk', '~> 2.0'
+gem 'aws-sdk', '~> 2.0'
 gem 'awesome_nested_set', '~> 3.0'
 gem 'validates_existence'
 gem "validate_url"

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 57214ee..be0c189 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -160,7 +160,6 @@ class ApplicationController < ActionController::Base
         :list => list.map{|i| i.attributes}
         # :list => @finder.to_json
       }
-      p res
       render json:  res.to_json
     }
   end

diff --git a/config/initializers/aws.rb b/config/initializers/aws.rb
index bebe2ab..bd3c3fb 100644 (file)
--- a/config/initializers/aws.rb
+++ b/config/initializers/aws.rb
@@ -1,14 +1,14 @@
-#Aws.config.update(
-#  region: Rails.application.secrets.aws_region, 
-#  credentials: Aws::Credentials.new(
-#    Rails.application.secrets.aws_access_key_id, 
-#    Rails.application.secrets.aws_secret_access_key
-#  )
-#)
-require 'aws/s3'
-AWS::S3::Base.establish_connection!(
-  :access_key_id => Rails.application.secrets.aws_access_key_id, 
-  :secret_access_key => Rails.application.secrets.aws_secret_access_key, 
+Aws.config.update(
+  region: Rails.application.secrets.aws_region, 
+  credentials: Aws::Credentials.new(
+    Rails.application.secrets.aws_access_key_id, 
+    Rails.application.secrets.aws_secret_access_key
+  )
 )
+#require 'aws/s3'
+#AWS::S3::Base.establish_connection!(
+#  :access_key_id => Rails.application.secrets.aws_access_key_id, 
+#  :secret_access_key => Rails.application.secrets.aws_secret_access_key, 
+#)
 #AWS::S3::DEFAULT_HOST = "us-east-1.amazonaws.com"
 # :s3_endpoint => "us-east-1.amazonaws.com"

diff --git a/lib/s3_picture.rb b/lib/s3_picture.rb
index 394821a..6e7df83 100644 (file)
--- a/lib/s3_picture.rb
+++ b/lib/s3_picture.rb
@@ -1,6 +1,8 @@
 require 'picture_io'
 class PictureIO
   class S3Picture
+    @@client = Aws::S3::Client.new
+    
     def initialize base_dir = 'pettanr'
       @base = base_dir
     end
@@ -29,7 +31,7 @@ class PictureIO
     def exist?(filename, subdir = nil)
       res = true
       begin
-        res = AWS::S3::S3Object.exist?(dir(subdir) + filename, base)
+        res = @@client.get_object(bucket: self.base, key: dir(subdir) + filename).exist?
       rescue
         raise PictureIO::Error
       end
@@ -39,7 +41,7 @@ class PictureIO
     def put(bindata, filename, subdir = nil)
       res = true
       begin
-        AWS::S3::S3Object.store(dir(subdir) + filename, bindata, base)
+        @@client.put_object(bucket: self.base, key: dir(subdir) + filename, body: bindata)
       rescue
         raise PictureIO::Error
       end
@@ -49,7 +51,7 @@ class PictureIO
     def get(filename, subdir = nil)
       bindata = ''
       begin
-        AWS::S3::S3Object.stream(dir(subdir) + filename, base) do |st|
+        @@client.get_object(bucket: self.base, key: dir(subdir) + filename) do |st|
           bindata += st if st
         end
       rescue
@@ -61,7 +63,7 @@ class PictureIO
     def delete(filename, subdir = nil)
       res = true
       begin
-        AWS::S3::S3Object.delete(dir(subdir) + filename, base)
+        @@client.delete_object(bucket: self.base, key: dir(subdir) + filename)
       rescue
         raise PictureIO::Error
       end