gluttonberg-core 2.5.5 → 2.5.6

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

@@ -0,0 +1,76 @@
+module Gluttonberg
+  module Library
+    module Storage
+      module Filesystem
+
+        module ClassMethods
+          # It run when the engine is loaded. It makes sure that all the required
+          # directories for storing assets are in the public dir, creating them if
+          # they are missing. It also stores the various paths so they can be
+          # retreived using the assets_dir method.
+          def self.storage_setup
+            Library.set_asset_root("public/user_assets", "public/user_assets", "public/test_assets")
+            FileUtils.mkdir(Library.root) unless File.exists?(Library.root) || File.symlink?(Library.root)
+          end
+        end
+
+        module InstanceMethods
+
+          # The generated directory where this file is located. If it is an image
+          # it’s thumbnails will be stored here as well.
+          def directory
+            Filesystem::ClassMethods.storage_setup if Library.root.blank?
+            Library.root + "/" + self.asset_hash
+          end
+
+          def tmp_directory
+            Filesystem::ClassMethods.storage_setup if Library.tmp_root.blank?
+            Library.tmp_root + "/" + self.asset_hash
+          end
+
+          def assets_directory_public_url
+            "/user_assets"
+          end
+
+          def make_backup
+            unless File.exist?(original_file_on_disk)
+              FileUtils.cp location_on_disk, original_file_on_disk
+              FileUtils.chmod(0755,original_file_on_disk)
+            end
+          end
+
+          def remove_file_from_storage
+            if File.exists?(directory)
+              FileUtils.rm_r(directory)
+            end
+          end
+
+          def remove_file_from_tmp_storage
+            # just dummy method. As we don't need to remove because tmp and actual folder is same for filesystem
+          end
+
+          def update_file_on_storage
+            if file
+              FileUtils.mkdir(directory) unless File.exists?(directory)
+              FileUtils.cp file.tempfile.path, location_on_disk
+              FileUtils.chmod(0755, location_on_disk)
+
+              #  new file has been upload, if its image generate thumbnails, if mp3 collect sound info.
+              asset_processing
+            end
+          end
+
+          def move_tmp_file_to_actual_directory(file_name , tmp_file_dirty=true)
+            if self.file_dirty == true
+              self.file_dirty = false
+            end
+          end
+
+          # def write_file_to_disc(src_file_path , )
+          # end
+        end #InstanceMethods
+
+      end #Filesystem
+    end #Storage
+  end #Library
+end #Gluttonberg

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

@@ -0,0 +1,196 @@
+module Gluttonberg
+  module Library
+    module Storage
+      module S3
+        module ClassMethods
+          # It run when the engine is loaded. It makes sure that all the required
+          # directories for storing assets are in the public dir, creating them if
+          # they are missing. It also stores the various paths so they can be
+          # retreived using the assets_dir method.
+          TEMP_ASSET_DIRECTORY = "tmp/user_assets"
+          def self.storage_setup
+            Library.set_asset_root("user_assets", TEMP_ASSET_DIRECTORY, "public/test_assets")
+            FileUtils.mkdir(Library.root) unless File.exists?(Library.root) || File.symlink?(Library.root)
+            FileUtils.mkdir(Library.tmp_root) unless File.exists?(Library.tmp_root) || File.symlink?(Library.tmp_root)
+          end
+
+          def self.s3_server_url
+            Gluttonberg::Setting.get_setting("s3_server_url")
+          end
+
+          def self.s3_bucket_name
+            Gluttonberg::Setting.get_setting("s3_bucket")
+          end
+
+          def self.s3_server_key_id
+            Gluttonberg::Setting.get_setting("s3_key_id")
+          end
+
+          def self.s3_server_access_key
+            Gluttonberg::Setting.get_setting("s3_access_key")
+          end
+
+          def self.bucket_handle
+            key_id = S3::ClassMethods.s3_server_key_id
+            key_val = S3::ClassMethods.s3_server_access_key
+            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)
+            else
+              nil
+            end
+          end
+
+          #takes file from public/assets folder and upload to s3 if s3 info is given in CMS settings
+          def self.migrate_file_to_s3(asset_hash , file_name)
+            bucket = bucket_handle
+            unless bucket.blank?
+              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)
+              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})
+                else
+                  key.put(File.open(local_file), 'public-read', {"Expires" => date.rfc2822})
+                end
+                Gluttonberg::Asset.update_attributes(:copied_to_s3 => true)
+                puts "Copied"
+              end
+            end
+          end
+
+        end
+
+        module InstanceMethods
+
+          def bucket_handle
+            unless @bucket.blank?
+              @bucket
+            else
+              @bucket = S3::ClassMethods.bucket_handle
+            end
+          end
+
+          # The generated directory where this file is located.
+          def directory
+            S3::ClassMethods.storage_setup if Library.root.blank?
+            Library.root + "/" + self.asset_hash
+          end
+
+          # The generated tmp directory where we will locate this file temporarily for processing.
+          def tmp_directory
+            S3::ClassMethods.storage_setup if Library.tmp_root.blank?
+            Library.tmp_root + "/" + self.asset_hash
+          end
+
+          def s3_bucket_root_url
+            "http://#{S3::ClassMethods.s3_server_url}/#{S3::ClassMethods.s3_bucket_name}"
+          end
+
+          def assets_directory_public_url
+            "#{s3_bucket_root_url}/user_assets"
+          end
+
+          def make_backup
+            unless File.exist?(tmp_original_file_on_disk)
+              FileUtils.cp tmp_location_on_disk, tmp_original_file_on_disk
+              FileUtils.chmod(0755,tmp_original_file_on_disk)
+              move_tmp_file_to_actual_directory("original_" + file_name , true)
+            end
+          end
+
+          def remove_file_from_storage
+            remove_file_from_tmp_storage
+            remove_asset_folder_from_s3
+          end
+
+          def remove_file_from_tmp_storage
+            if File.exists?(tmp_directory)
+              puts "Remove assset folder from tmp storage (tmp_directory)"
+              FileUtils.rm_r(tmp_directory)
+            end
+          end
+
+          def update_file_on_storage
+            if file
+              FileUtils.mkdir(tmp_directory) unless File.exists?(tmp_directory)
+              FileUtils.cp file.tempfile.path, tmp_location_on_disk
+              FileUtils.chmod(0755, tmp_location_on_disk)
+
+              move_tmp_file_to_actual_directory(file_name , false)
+              #  new file has been upload, if its image generate thumbnails, if mp3 collect sound info.
+              asset_processing
+              # delete local tmp folder
+              remove_file_from_tmp_storage
+            end
+          end
+
+          def move_tmp_file_to_actual_directory(file_name , tmp_file_dirty=true)
+            if self.file_dirty == true || tmp_file_dirty == true
+              copy_file_to_s3(file_name)
+              self.file_dirty = false
+            end
+          end
+
+          #takes file from tmp folder and upload to s3 if s3 info is given in CMS settings
+          def copy_file_to_s3(file_name)
+            bucket = bucket_handle
+            unless bucket.blank?
+              local_file = self.tmp_directory + "/" + file_name
+              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)
+              unless self.mime_type.blank?
+                key.put(File.open(local_file), 'public-read', {"Expires" => date.rfc2822, "content-type" => self.mime_type})
+              else
+                key.put(File.open(local_file), 'public-read', {"Expires" => date.rfc2822})
+              end
+              self.update_column(:copied_to_s3 , true)
+              puts "Copied"
+            end
+          end
+
+
+
+          # TODO
+          def remove_file_from_s3(file_name)
+          end
+
+          def remove_asset_folder_from_s3
+            bucket = bucket_handle
+            unless bucket.blank?
+              bucket.delete_folder(self.directory)
+            end
+          end
+
+          def download_asset_to_tmp_file
+            download_orginal_file_from_s3
+          end
+
+          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)
+            end
+            key = bucket.key(self.original_file_on_disk)
+            if key.exists?
+              File.open(self.tmp_original_file_on_disk, "w") do |f|
+                f.write(key.get)
+              end
+            end
+          end
+
+        end #InstanceMethods
+      end #S3
+    end #Storage
+  end #Library
+end #Gluttonberg

data/lib/gluttonberg/library/storage.rb

@@ -0,0 +1,11 @@
+library = Pathname(__FILE__).dirname.expand_path
+require File.join(library, "storage", "s3")
+require File.join(library, "storage", "filesystem")
+
+
+module Gluttonberg
+  module Library
+    module Storage
+    end
+  end
+end

data/lib/gluttonberg/library.rb

@@ -1,44 +1,47 @@
 library = Pathname(__FILE__).dirname.expand_path
 require File.join(library, "library", "attachment_mixin")
 require File.join(library, "library", "quick_magick")
+require File.join(library, "library", "storage")
+require File.join(library, "library", "processor")
+require File.join(library, "library", "config")
 
 module Gluttonberg
-  # The library module encapsulates the few bits of functionality that lives 
-  # outside of the library models and controllers. It contains some 
+  # The library module encapsulates the few bits of functionality that lives
+  # outside of the library models and controllers. It contains some
   # configuration details and is responsible for bootstrapping the various bits
   # of meta-data used when categorising uploaded assets.
 
   module Library
     UNCATEGORISED_CATEGORY = 'uncategorised'
-      
+
     @@assets_root = nil
     @@test_assets_root = nil
-    
+    @@tmp_assets_root = nil
+
     def self.bootstrap
       build_default_asset_types
     end
-    
-    # Is run when the slice is loaded. It makes sure that all the required 
-    # directories for storing assets are in the public dir, creating them if
-    # they are missing. It also stores the various paths so they can be 
-    # retreived using the assets_dir method.
-    def self.setup
-      #logger.info("AssetLibrary is checking for asset folder")
-      @@assets_root = "public/user_assets"
-      @@test_assets_root = "public/test_assets"
-      FileUtils.mkdir(root) unless File.exists?(root) || File.symlink?(root)      
+
+    def self.set_asset_root(asset_root , tmp_asset_root , test_asset_root)
+      @@assets_root = asset_root
+      @@tmp_assets_root = tmp_asset_root
+      @@test_assets_root = test_asset_root
     end
-    
+
     # Returns the path to the directory where assets are stored.
     def self.root
       if ::Rails.env == "test"
         @@test_assets_root
-      else  
+      else
         @@assets_root
-      end  
+      end
+    end
+
+    def self.tmp_root
+      @@tmp_assets_root
     end
 
-    # This method is mainly for administrative purposes. It will rebuild the 
+    # This method is mainly for administrative purposes. It will rebuild the
     # table of asset types, then recategorise each asset.
     def self.rebuild
       Asset.clear_all_asset_types
@@ -56,79 +59,79 @@ module Gluttonberg
     # Adds a the inbuilt asset types to the database.
     def self.build_default_asset_types
       begin
-          # ensure that all the categories exist
-          AssetCategory.build_defaults
-          ensure_type('Unknown Image', 'image', AssetCategory.image_category)
-          ensure_type('Unknown Video', 'video', AssetCategory.video_category)
-          ensure_type('Unknown Audio', 'audio', AssetCategory.audio_category)
-          ensure_type('Unknown File',   'multi-part model message unknown', AssetCategory.uncategorised_category)
-
-          ensure_type('Jpeg Image', 'image/jpeg image/pjpeg', AssetCategory.image_category)
-          ensure_type('Gif Image', 'image/gif', AssetCategory.image_category)
-          ensure_type('Png Image', 'image/png', AssetCategory.image_category)
-          ensure_type('Tiff Image', 'image/tiff', AssetCategory.image_category)
-          ensure_type('Adobe Photoshop Image', 'image/vnd.adobe.photoshop', AssetCategory.image_category)
-          ensure_type('Autocad Image', 'image/vnd.dwg', AssetCategory.image_category)
-          ensure_type('Autocad Image', 'image/vnd.dxf', AssetCategory.image_category)
-          ensure_type('Icon Image', 'image/vnd.microsoft.icon', AssetCategory.image_category)
-          ensure_type('Bitmap Image', 'image/x-bmp image/bmp image/x-win-bmp', AssetCategory.image_category)
-          ensure_type('Paintshop Pro Image', 'image/x-paintshoppro', AssetCategory.image_category)
-          ensure_type('Mobile Image (plb,psb,pvb)', 'application/vnd.3gpp.pic-bw-large application/vnd.3gpp.pic-bw-small application/vnd.3gpp.pic-bw-var', AssetCategory.image_category)
-
-          ensure_type('Moile Audio (3gpp,3gpp2)', 'audio/3gpp audio/3gpp2', AssetCategory.audio_category)
-          ensure_type('Dolby Digital Audio (ac3)', 'audio/ac3', AssetCategory.audio_category)
-          ensure_type('Mpeg Audio (mpga,mp2,mp3,mp4,mpa)', 'audio/mpeg audio/mpeg4-generic audio/mp4 audio/mpa-robust', AssetCategory.audio_category) # @mpga,mp2,mp3
-          ensure_type('Aiff Audio (aif,aifc,aiff)', 'audio/x-aiff', AssetCategory.audio_category)
-          ensure_type('Midi Audio (mid,midi,kar)', 'audio/x-midi', AssetCategory.audio_category)
-          ensure_type('Real Audio (rm,ram,ra)', 'audio/x-pn-realaudio audio/x-realaudio', AssetCategory.audio_category)
-          ensure_type('Wav Audio (wav)', 'audio/x-wav', AssetCategory.audio_category)
-          ensure_type('Ogg Vorbis Audio (ogg)', 'application/ogg', AssetCategory.audio_category)
-
-          ensure_type('Mobile Video', 'video/3gpp video/3gpp-tt video/3gpp2', AssetCategory.video_category) #  @3gp,3gpp 'RFC3839,DRAFT:draft-gellens-mime-bucket
-          ensure_type('Digital Video', 'video/DV', AssetCategory.video_category) #  RFC3189
-          ensure_type('Compressed Video', 'application/mpeg4-iod-xmt application/mpeg4-iod application/mpeg4-generic video/mp4  application/mp4 video/MPV video/mpeg4-generic video/mpeg video/MP2T video/H261 video/H263 video/H263-1998 video/H263-2000 video/H264 video/MP1S video/MP2P', AssetCategory.video_category) #  RFC3555
-          ensure_type('Jpeg Video', 'video/JPEG video/MJ2', AssetCategory.video_category) #  RFC3555
-          ensure_type('Quicktime Video', 'video/quicktime', AssetCategory.video_category)
-          ensure_type('Uncompressed Video', 'video/raw', AssetCategory.video_category)
-          ensure_type('Mpeg Playlist (mxu,m4u)', 'video/vnd.mpegurl', AssetCategory.video_category)
-          ensure_type('Avi Video (avi)', 'video/x-msvideo', AssetCategory.video_category)
-          ensure_type('Flash Video', 'video/x-flv', AssetCategory.video_category)
-        
-          ensure_type('M4v Video', 'video/x-m4v', AssetCategory.video_category)  
-          
-          #document category
-          ensure_type('Generic Document', 'application/x-csh application/x-dvi application/oda application/pgp-encrypted application/pgp-keys application/pgp-signature', AssetCategory.document_category)
-          ensure_type('Calendar Document', 'text/calendar text/x-vcalendar', AssetCategory.document_category)
-          ensure_type('Comma Seperated Values Document (csv)', 'text/csv text/comma-separated-values', AssetCategory.document_category)
-          ensure_type('Tab Seperated Values Text Document', 'text/tab-separated-values', AssetCategory.document_category)
-          ensure_type('Web Document', 'text/html', AssetCategory.document_category)
-          ensure_type('Plain Text Document', 'text/plain', AssetCategory.document_category)
-          ensure_type('Rich Text Document', 'text/richtext text/rtf', AssetCategory.document_category)
-          ensure_type('Sgml Document', 'text/sgml', AssetCategory.document_category)
-          ensure_type('Wap Document', 'text/vnd.wap.wml text/vnd.wap.wmlscript', AssetCategory.document_category)
-          ensure_type('XML Document', 'text/xml text/xml-external-parsed-entity', AssetCategory.document_category)
-          ensure_type('V-Card Document (vcf)', 'text/x-vcard', AssetCategory.document_category)
-          ensure_type('Apple Macintosh Document (hqx)', 'application/mac-binhex40', AssetCategory.document_category)      
-          ensure_type('Adobe Acrobat Document (pdf)', 'application/pdf', AssetCategory.document_category)
-          ensure_type('Microsoft Word Document (doc,dot,docx)', 'application/msword application/word', AssetCategory.document_category)
-          ensure_type('Microsoft Powerpoint Document (ppt,pps,pot,pptx)', 'application/vnd.ms-powerpoint application/powerpoint', AssetCategory.document_category)
-          ensure_type('Microsoft Excel Document (xls,xlt,xlsx)', 'application/vnd.ms-excel application/excel', AssetCategory.document_category)
-          ensure_type('Microsoft Works Document', 'application/vnd.ms-works', AssetCategory.document_category)
-          ensure_type('Microsoft Project Document (mpp)', 'application/vnd.ms-project', AssetCategory.document_category)
-          ensure_type('Microsoft Visio Document (vsd,vst,vsw,vss)', 'application/vnd.visio', AssetCategory.document_category)
-          ensure_type('HTML Help Document (chm)', 'application/x-chm', AssetCategory.document_category)
-          
-          
+        # ensure that all the categories exist
+        AssetCategory.build_defaults
+        ensure_type('Unknown Image', 'image', AssetCategory.image_category)
+        ensure_type('Unknown Video', 'video', AssetCategory.video_category)
+        ensure_type('Unknown Audio', 'audio', AssetCategory.audio_category)
+        ensure_type('Unknown File',   'multi-part model message unknown', AssetCategory.uncategorised_category)
+
+        ensure_type('Jpeg Image', 'image/jpeg image/pjpeg', AssetCategory.image_category)
+        ensure_type('Gif Image', 'image/gif', AssetCategory.image_category)
+        ensure_type('Png Image', 'image/png', AssetCategory.image_category)
+        ensure_type('Tiff Image', 'image/tiff', AssetCategory.image_category)
+        ensure_type('Adobe Photoshop Image', 'image/vnd.adobe.photoshop', AssetCategory.image_category)
+        ensure_type('Autocad Image', 'image/vnd.dwg', AssetCategory.image_category)
+        ensure_type('Autocad Image', 'image/vnd.dxf', AssetCategory.image_category)
+        ensure_type('Icon Image', 'image/vnd.microsoft.icon', AssetCategory.image_category)
+        ensure_type('Bitmap Image', 'image/x-bmp image/bmp image/x-win-bmp', AssetCategory.image_category)
+        ensure_type('Paintshop Pro Image', 'image/x-paintshoppro', AssetCategory.image_category)
+        ensure_type('Mobile Image (plb,psb,pvb)', 'application/vnd.3gpp.pic-bw-large application/vnd.3gpp.pic-bw-small application/vnd.3gpp.pic-bw-var', AssetCategory.image_category)
+
+        ensure_type('Moile Audio (3gpp,3gpp2)', 'audio/3gpp audio/3gpp2', AssetCategory.audio_category)
+        ensure_type('Dolby Digital Audio (ac3)', 'audio/ac3', AssetCategory.audio_category)
+        ensure_type('Mpeg Audio (mpga,mp2,mp3,mp4,mpa)', 'audio/mpeg audio/mpeg4-generic audio/mp4 audio/mpa-robust', AssetCategory.audio_category) # @mpga,mp2,mp3
+        ensure_type('Aiff Audio (aif,aifc,aiff)', 'audio/x-aiff', AssetCategory.audio_category)
+        ensure_type('Midi Audio (mid,midi,kar)', 'audio/x-midi', AssetCategory.audio_category)
+        ensure_type('Real Audio (rm,ram,ra)', 'audio/x-pn-realaudio audio/x-realaudio', AssetCategory.audio_category)
+        ensure_type('Wav Audio (wav)', 'audio/x-wav', AssetCategory.audio_category)
+        ensure_type('Ogg Vorbis Audio (ogg)', 'application/ogg', AssetCategory.audio_category)
+
+        ensure_type('Mobile Video', 'video/3gpp video/3gpp-tt video/3gpp2', AssetCategory.video_category) #  @3gp,3gpp 'RFC3839,DRAFT:draft-gellens-mime-bucket
+        ensure_type('Digital Video', 'video/DV', AssetCategory.video_category) #  RFC3189
+        ensure_type('Compressed Video', 'application/mpeg4-iod-xmt application/mpeg4-iod application/mpeg4-generic video/mp4  application/mp4 video/MPV video/mpeg4-generic video/mpeg video/MP2T video/H261 video/H263 video/H263-1998 video/H263-2000 video/H264 video/MP1S video/MP2P', AssetCategory.video_category) #  RFC3555
+        ensure_type('Jpeg Video', 'video/JPEG video/MJ2', AssetCategory.video_category) #  RFC3555
+        ensure_type('Quicktime Video', 'video/quicktime', AssetCategory.video_category)
+        ensure_type('Uncompressed Video', 'video/raw', AssetCategory.video_category)
+        ensure_type('Mpeg Playlist (mxu,m4u)', 'video/vnd.mpegurl', AssetCategory.video_category)
+        ensure_type('Avi Video (avi)', 'video/x-msvideo', AssetCategory.video_category)
+        ensure_type('Flash Video', 'video/x-flv', AssetCategory.video_category)
+
+        ensure_type('M4v Video', 'video/x-m4v', AssetCategory.video_category)
+
+        #document category
+        ensure_type('Generic Document', 'application/x-csh application/x-dvi application/oda application/pgp-encrypted application/pgp-keys application/pgp-signature', AssetCategory.document_category)
+        ensure_type('Calendar Document', 'text/calendar text/x-vcalendar', AssetCategory.document_category)
+        ensure_type('Comma Seperated Values Document (csv)', 'text/csv text/comma-separated-values', AssetCategory.document_category)
+        ensure_type('Tab Seperated Values Text Document', 'text/tab-separated-values', AssetCategory.document_category)
+        ensure_type('Web Document', 'text/html', AssetCategory.document_category)
+        ensure_type('Plain Text Document', 'text/plain', AssetCategory.document_category)
+        ensure_type('Rich Text Document', 'text/richtext text/rtf', AssetCategory.document_category)
+        ensure_type('Sgml Document', 'text/sgml', AssetCategory.document_category)
+        ensure_type('Wap Document', 'text/vnd.wap.wml text/vnd.wap.wmlscript', AssetCategory.document_category)
+        ensure_type('XML Document', 'text/xml text/xml-external-parsed-entity', AssetCategory.document_category)
+        ensure_type('V-Card Document (vcf)', 'text/x-vcard', AssetCategory.document_category)
+        ensure_type('Apple Macintosh Document (hqx)', 'application/mac-binhex40', AssetCategory.document_category)
+        ensure_type('Adobe Acrobat Document (pdf)', 'application/pdf', AssetCategory.document_category)
+        ensure_type('Microsoft Word Document (doc,dot,docx)', 'application/msword application/word', AssetCategory.document_category)
+        ensure_type('Microsoft Powerpoint Document (ppt,pps,pot,pptx)', 'application/vnd.ms-powerpoint application/powerpoint', AssetCategory.document_category)
+        ensure_type('Microsoft Excel Document (xls,xlt,xlsx)', 'application/vnd.ms-excel application/excel', AssetCategory.document_category)
+        ensure_type('Microsoft Works Document', 'application/vnd.ms-works', AssetCategory.document_category)
+        ensure_type('Microsoft Project Document (mpp)', 'application/vnd.ms-project', AssetCategory.document_category)
+        ensure_type('Microsoft Visio Document (vsd,vst,vsw,vss)', 'application/vnd.visio', AssetCategory.document_category)
+        ensure_type('HTML Help Document (chm)', 'application/x-chm', AssetCategory.document_category)
+
+
       rescue => e
         puts "asset library init fails."
         puts e
-      end    
+      end
 
     end
 
     private
-    
-    # Makes sure the specified type exists in the DB, if it doesn’t it creates 
+
+    # Makes sure the specified type exists in the DB, if it doesn’t it creates
     # a new record.
     def self.ensure_type(name, mime_type, category)
       asset_type = AssetType.first( :conditions => "name = '#{name}'" )
@@ -145,7 +148,5 @@ module Gluttonberg
       asset_type.save
     end
 
-
-
   end # Library
 end # Gluttonberg

data/lib/gluttonberg/record_history.rb

@@ -2,18 +2,18 @@
 module Gluttonberg
   module RecordHistory
     def self.setup
-      ::ActionController::Base.send  :include, Gluttonberg::RecordHistory::ActionController  
+      ::ActionController::Base.send  :include, Gluttonberg::RecordHistory::ActionController
     end
 
     module ActionController
       def self.included(base)
         base.extend(ClassMethods)
       end
-  
-  
+
+
       module ClassMethods
         def record_history(object_name, title_field_name="", options = {})
-          class << self; 
+          class << self;
             attr_accessor :object_name, :title_field_name;
           end
           self.object_name = object_name
@@ -23,7 +23,7 @@ module Gluttonberg
           after_filter :log_update , :only => [:update]
           after_filter :log_destroy, :only => [:destroy]
         end
-    
+
       end # class methods
 
       module ControllerHelperClassMethods
@@ -32,22 +32,22 @@ module Gluttonberg
             if object.new_record?
             else
               Gluttonberg::Feed.log(current_user, object ,object_title , "created")
-            end  
-          end  
+            end
+          end
         end
 
         def log_update
           unless object.blank?
             if object.errors.blank?
               Gluttonberg::Feed.log(current_user, object ,object_title , "updated")
-            end  
-          end  
+            end
+          end
         end
 
         def log_destroy
           if object && object.destroyed?()
             Gluttonberg::Feed.log(current_user, object ,object_title , "deleted")
-          end   
+          end
         end
 
         def object
@@ -73,21 +73,20 @@ module Gluttonberg
                 field_name = :id
               end
             else
-              field_name = self.class.title_field_name     
+              field_name = self.class.title_field_name
             end
-            puts "====================  field_name  #{field_name}"
             unless field_name.blank?
               object.send(field_name)
             end
-          end  
-        end  
+          end
+        end
 
       end #ControllerHelperClassMethods
 
 
     end
 
-  end #RecordHistory  
+  end #RecordHistory
 end #Gluttonberg
 
 

data/lib/gluttonberg/tasks/asset.rake

@@ -12,9 +12,14 @@ namespace :gluttonberg do
         assets = category.assets #Asset.all
         assets.each do |asset|
           p "thumb-nailing '#{asset.file_name}'  "
-          asset.generate_image_thumb
-          asset.generate_proper_resolution
-          asset.save
+          if !File.exist?(asset.tmp_location_on_disk) && !File.exist?(asset.tmp_original_file_on_disk)
+            asset.download_asset_to_tmp_file
+          end
+          # asset.generate_image_thumb
+          # asset.generate_proper_resolution
+          # asset.save
+          Gluttonberg::Library::Processor::Image.process(asset)
+          asset.remove_file_from_tmp_storage
         end
       end
     end
@@ -44,5 +49,22 @@ namespace :gluttonberg do
       Gluttonberg::Asset.update_assets_synopsis_from_csv
     end
 
+    desc "Migrate assets from public/user_assets folder to S3"
+    task :migrate_assets_to_s3 => :environment do
+      Dir.entries("public/user_assets").each do |asset_folder|
+        if !asset_folder.include?(".DS_Store") && File.directory?("public/user_assets/" + asset_folder)
+          Dir.entries("public/user_assets/"+asset_folder).each do |asset_file|
+            if !asset_file.include?(".DS_Store") && !File.directory?("public/user_assets/" + asset_folder+"/"+asset_file)
+              begin
+                Gluttonberg::Library::Storage::S3::ClassMethods.migrate_file_to_s3(asset_folder , asset_file)
+              rescue => e
+                puts "Error: #{e.message}"
+              end
+            end
+          end
+        end
+      end
+    end
+
   end
 end

data/lib/gluttonberg/version.rb

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