gluttonberg-core 2.5.6 → 2.5.7

data/lib/gluttonberg/library/processor/audio.rb

@@ -7,12 +7,12 @@ module Gluttonberg
 
         def self.process(asset_obj)
           if asset_obj.asset_type.asset_category.name == "audio"
-            collect_mp3_info(asset)
+            self.collect_mp3_info(asset_obj)
           end
         end
 
         # Collect mp3 files info using Mp3Info gem
-        def collect_mp3_info(asset)
+        def self.collect_mp3_info(asset)
           audio = AudioAssetAttribute.find( :first , :conditions => {:asset_id => asset.id})
 
           begin

data/lib/gluttonberg/library/storage/s3.rb

@@ -36,8 +36,8 @@ module Gluttonberg
             s3_server_url = S3::ClassMethods.s3_server_url
             s3_bucket = S3::ClassMethods.s3_bucket_name
             if !key_id.blank? && !key_val.blank? && !s3_server_url.blank? && !s3_bucket.blank?
-              s3 = Aws::S3.new(key_id, key_val, {:server => s3_server_url})
-              bucket = s3.bucket(s3_bucket)
+              s3 = AWS::S3.new({ :access_key_id => key_id, :secret_access_key => key_val , :server => s3_server_url})
+              bucket = s3.buckets[s3_bucket]
             else
               nil
             end
@@ -50,16 +50,17 @@ module Gluttonberg
               local_file = "public/user_assets/" + asset_hash + "/" + file_name
               key_for_s3 = "user_assets/" + asset_hash + "/" + file_name
               date = Time.now+1.years
-              key = bucket.key(key_for_s3, true)
+              key = bucket.objects[key_for_s3]
               asset = Gluttonberg::Asset.where(:asset_hash => asset_hash).first
               unless asset.blank?
                 puts " Copying #{local_file} to #{S3::ClassMethods.s3_bucket_name}"
+
                 unless asset.mime_type.blank?
-                  key.put(File.open(local_file), 'public-read', {"Expires" => date.rfc2822, "content-type" => asset.mime_type})
+                  key.write(File.open(local_file), {:expires => date.rfc2822, :content_type => asset.mime_type , :acl => :public_read })
                 else
-                  key.put(File.open(local_file), 'public-read', {"Expires" => date.rfc2822})
+                  key.write(File.open(local_file) , {:expires => date.rfc2822 , :acl => :public_read })
                 end
-                Gluttonberg::Asset.update_attributes(:copied_to_s3 => true)
+                asset.update_attributes(:copied_to_s3 => true)
                 puts "Copied"
               end
             end
@@ -112,7 +113,7 @@ module Gluttonberg
 
           def remove_file_from_tmp_storage
             if File.exists?(tmp_directory)
-              puts "Remove assset folder from tmp storage (tmp_directory)"
+              puts "Remove assset folder from tmp storage (#{tmp_directory})"
               FileUtils.rm_r(tmp_directory)
             end
           end
@@ -146,11 +147,11 @@ module Gluttonberg
               folder = self.asset_hash
               date = Time.now+1.years
               puts "Copying #{file_name} (#{local_file}) to #{S3::ClassMethods.s3_bucket_name}"
-              key = bucket.key(self.directory + "/" + file_name, true)
+              key = bucket.objects[self.directory + "/" + file_name]
               unless self.mime_type.blank?
-                key.put(File.open(local_file), 'public-read', {"Expires" => date.rfc2822, "content-type" => self.mime_type})
+                key.write(File.open(local_file), {:expires => date.rfc2822, :content_type => self.mime_type , :acl => :public_read })
               else
-                key.put(File.open(local_file), 'public-read', {"Expires" => date.rfc2822})
+                key.write(File.open(local_file) , {:expires => date.rfc2822 , :acl => :public_read })
               end
               self.update_column(:copied_to_s3 , true)
               puts "Copied"
@@ -166,7 +167,7 @@ module Gluttonberg
           def remove_asset_folder_from_s3
             bucket = bucket_handle
             unless bucket.blank?
-              bucket.delete_folder(self.directory)
+              bucket.objects.with_prefix(self.directory).delete_all
             end
           end
 
@@ -177,14 +178,18 @@ module Gluttonberg
           def download_orginal_file_from_s3
             FileUtils.mkdir(self.tmp_directory) unless File.exists?(self.tmp_directory)
             bucket = bucket_handle
-            key = bucket.key(self.location_on_disk)
-            File.open(self.tmp_location_on_disk, "w") do |f|
-              f.write(key.get)
+            key = bucket.objects[self.location_on_disk]
+            File.open(self.tmp_location_on_disk, "w", encoding: "ASCII-8BIT") do |f|
+              key.read do |chunk|
+                f.write(chunk)
+              end
             end
-            key = bucket.key(self.original_file_on_disk)
+            key = bucket.objects[self.original_file_on_disk]
             if key.exists?
-              File.open(self.tmp_original_file_on_disk, "w") do |f|
-                f.write(key.get)
+              File.open(self.tmp_original_file_on_disk, "w", encoding: "ASCII-8BIT") do |f|
+                key.read do |chunk|
+                  f.write(chunk)
+                end
               end
             end
           end

data/lib/gluttonberg/version.rb

@@ -1,3 +1,3 @@
 module Gluttonberg
-  VERSION = "2.5.6"
+  VERSION = "2.5.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gluttonberg-core
 version: !ruby/object:Gem::Version
-  version: 2.5.6
+  version: 2.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: authlogic
@@ -286,6 +286,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.1.3
 description: ! 'The Gluttonberg goal has always been to create a Content Management
   System that''s great for users, content manager and developers. The focus of Gluttonberg
   2.5 has been two-fold: a refined management user interface to make maintaining your