erp_tech_svcs 3.0.8 → 3.0.9

data/app/controllers/erp_tech_svcs/session_controller.rb

@@ -8,6 +8,9 @@ module ErpTechSvcs
           #log when someone logs in
           ErpTechSvcs::ErpTechSvcsAuditLog.successful_login(current_user)
 
+          #set logout
+          session[:logout_to] = params[:logout_to]
+
           login_to = last_login_at.nil? ? params[:first_login_to] : params[:login_to]
           login_to = login_to || params[:login_to]
           request.xhr? ? (render :json => {:success => true, :login_to => login_to}) : (redirect_to login_to)
@@ -19,14 +22,26 @@ module ErpTechSvcs
     end
 
     def destroy
-      logged_out_user = current_user
+      message = "You have successfully logged out."
+      logged_out_user_id = current_user.id unless current_user === false
+      logout_to          = session[:logout_to]
+
       logout
 
       #log when someone logs out
-      ErpTechSvcs::ErpTechSvcsAuditLog.successful_logout(logged_out_user)
+      ErpTechSvcs::ErpTechSvcsAuditLog.successful_logout(logged_out_user_id) if logged_out_user_id
+
+      if logout_to
+        redirect_to logout_to, :notice => message
+      else
+        login_url = params[:login_url].blank? ? ErpTechSvcs::Config.login_url : params[:login_url]
+        redirect_to login_url, :notice => message
+      end
+
+    end
 
-      login_url = params[:login_url].blank? ? ErpTechSvcs::Config.login_url : params[:login_url]
-      redirect_to login_url, :notice => "You have successfully logged out."
+    def keep_alive
+      render :json => {:success => true, :last_activity_at => current_user.last_activity_at}
     end
   end#SessionsController
 end#ErpTechSvcs

data/app/models/audit_log.rb

@@ -26,7 +26,7 @@ class AuditLog < ActiveRecord::Base
   def method_missing(m, *args, &block)
     if self.respond_to?(m)
       item = get_item_by_item_type_internal_identifier(m.to_s)
-      (item.nil?) ? super : (return item.value)
+      (item.nil?) ? super : (return item.audit_log_item_value)
     else
       super
     end

data/app/models/file_asset.rb

@@ -39,13 +39,12 @@ class FileAsset < ActiveRecord::Base
   end
 
   after_create :set_sti
-  after_save   :set_data_file_name
 
   belongs_to :file_asset_holder, :polymorphic => true
   instantiates_with_sti
 
   has_capabilities
-
+  
   #paperclip
   has_attached_file :data,
     :storage => ErpTechSvcs::Config.file_storage,
@@ -56,6 +55,9 @@ class FileAsset < ActiveRecord::Base
     :url => ":file_url",
     :validations => { :extension => lambda { |data, file| validate_extension(data, file) } }
 
+  # must fire after paperclip's after_save :save_attached_files
+  after_save   :set_data_file_name, :save_dimensions
+
   before_post_process :set_content_type
 
   validates_attachment_presence :data
@@ -125,6 +127,40 @@ class FileAsset < ActiveRecord::Base
     super attributes.merge(:directory => directory, :name => name, :data => data)
   end
 
+  # compass file download url
+  def url
+    "/download/#{self.name}?#{self.directory}"
+  end
+
+  # returns full path to local image or url to s3 image
+  def path
+    file_support = ErpTechSvcs::FileSupport::Base.new(:storage => ErpTechSvcs::Config.file_storage)
+
+    if ErpTechSvcs::Config.file_storage == :s3
+      file_path = File.join(self.directory,self.name).sub(%r{^/},'')
+      options = {}
+      options[:expires] = ErpTechSvcs::Config.s3_url_expires_in_seconds if self.has_capabilities?
+      return file_support.bucket.objects[file_path].url_for(:read, options).to_s
+    else
+      return File.join(Rails.root, self.directory, self.name)
+    end
+  end
+
+  def save_dimensions 
+    if type == 'Image'
+      begin
+        f = Paperclip::Geometry.from_file(self.path)
+        w = f.width.to_i
+        h = f.height.to_i
+        update_attribute(:width, w) if width != w
+        update_attribute(:height, h) if height != h
+      rescue Exception=>ex
+        Rails.logger.error('Could not save width and height of image. Make sure Image Magick and the identify command are accessible')
+      end
+    end
+    #return true
+  end 
+
   def basename
     data_file_name.gsub(/\.#{extname}$/, "")
   end
@@ -165,7 +201,9 @@ class FileAsset < ActiveRecord::Base
 
     result, message = file_support.save_move(old_path, new_parent_path)
     if result
-      self.directory = new_parent_path.gsub(Regexp.new(Rails.root.to_s), '') # strip rails root from new_parent_path, we want relative path
+      dir = new_parent_path.gsub(Regexp.new(Rails.root.to_s), '') # strip rails root from new_parent_path, we want relative path
+      dir = '/' + dir unless dir.match(%r{^/})
+      self.directory = dir
       self.save
     end
 
@@ -176,13 +214,13 @@ end
 
 class Image < FileAsset
   self.file_type = :image
-  self.valid_extensions = %w(.jpg .jpeg .gif .png .ico .PNG .JPEG .JPG)
+  self.valid_extensions = %w(.jpg .JPG .jpeg .JPEG .gif .GIF .png .PNG .ico .ICO .bmp .BMP .tif .tiff .TIF .TIFF)
 end
 
 class TextFile < FileAsset
   self.file_type = :textfile
   self.content_type = 'text/plain'
-  self.valid_extensions = %w(.txt .text)
+  self.valid_extensions = %w(.txt .TXT .text)
 
   def data=(data)
     data = StringIO.new(data) if data.is_a?(String)
@@ -197,13 +235,13 @@ end
 class Javascript < TextFile
   self.file_type = :javascript
   self.content_type = 'text/javascript'
-  self.valid_extensions = %w(.js)
+  self.valid_extensions = %w(.js .JS)
 end
 
 class Stylesheet < TextFile
   self.file_type = :stylesheet
   self.content_type = 'text/css'
-  self.valid_extensions = %w(.css)
+  self.valid_extensions = %w(.css .CSS)
 end
 
 class Template < TextFile
@@ -215,17 +253,17 @@ end
 class HtmlFile < TextFile
   self.file_type = :html
   self.content_type = 'text/html'
-  self.valid_extensions = %w(.html)
+  self.valid_extensions = %w(.html .HTML)
 end
 
 class Pdf < TextFile
   self.file_type = :pdf
   self.content_type = 'application/pdf'
-  self.valid_extensions = %w(.pdf)
+  self.valid_extensions = %w(.pdf .PDF)
 end
 
 class Swf < TextFile
   self.file_type = :swf
   self.content_type = 'application/x-shockwave-flash'
-  self.valid_extensions = %w(.swf)
+  self.valid_extensions = %w(.swf .SWF)
 end

data/config/routes.rb

@@ -2,6 +2,7 @@ Rails.application.routes.draw do
   #handle login / logout
   match "/session/sign_in" => 'erp_tech_svcs/session#create'
   match "/session/sign_out" => 'erp_tech_svcs/session#destroy'
+  match "/session/keep_alive" => 'erp_tech_svcs/session#keep_alive'
 
   #handle activation
   get "/users/activate/:activation_token" => 'erp_tech_svcs/user#activate'

data/db/data_migrations/upgrade/20120727152144_set_image_dimensions_on_file_assets.rb

@@ -0,0 +1,13 @@
+class SetImageDimensionsOnFileAssets < ActiveRecord::Migration
+  
+  def self.up
+    FileAsset.where(:type => 'Image').all.each do |i|
+      i.save_dimensions
+    end
+  end
+  
+  def self.down
+    # do nothing
+  end
+
+end

data/db/migrate/20080805000010_base_tech_services.rb

@@ -169,6 +169,8 @@ class BaseTechServices < ActiveRecord::Migration
         t.string :data_content_type
         t.integer :data_file_size
         t.datetime :data_updated_at
+        t.string :width
+        t.string :height
 
         t.timestamps
       end

data/db/migrate/upgrade/20120725205131_add_image_dimension_columns_to_file_asset.rb

@@ -0,0 +1,15 @@
+class AddImageDimensionColumnsToFileAsset < ActiveRecord::Migration
+  def self.up
+    unless columns(:file_assets).collect {|c| c.name}.include?('width')
+      add_column :file_assets, :width, :string
+      add_column :file_assets, :height, :string
+    end
+  end
+
+  def self.down
+    if columns(:file_assets).collect {|c| c.name}.include?('width')
+      remove_column :file_assets, :width
+      remove_column :file_assets, :height
+    end
+  end
+end

data/lib/erp_tech_svcs/config.rb

@@ -2,7 +2,7 @@ module ErpTechSvcs
   module Config
     class << self
 
-      attr_accessor :max_file_size_in_mb, 
+      attr_accessor :max_file_size_in_mb,
                     :installation_domain, 
                     :login_url,
                     :email_notifications_from, 
@@ -25,7 +25,7 @@ module ErpTechSvcs
           :@s3_protocol => 'https', # Can be either 'http' or 'https'
           :@file_storage => :filesystem, # Can be either :s3 or :filesystem
           :@s3_cache_expires_in_minutes => 60,
-          :@session_expires_in_hours => 12, # this is used by DeleteExpiredSessionsJob to purge inactive sessions from database 
+          :@session_expires_in_hours => 12, # this is used by DeleteExpiredSessionsJob to purge inactive sessions from database
           :@compass_logger_path => "#{Rails.root}/log"
         }
       end

data/lib/erp_tech_svcs/erp_tech_svcs_audit_log.rb

@@ -3,7 +3,8 @@ module ErpTechSvcs
     class << self
 
       #log when a user logs out
-      def successful_logout(user)
+      def successful_logout(user_id)
+        user = User.find(user_id)
         AuditLog.create(
             :party_id => user.party.id,
             :event_record => user,

data/lib/erp_tech_svcs/extensions/active_record/has_capabilities.rb

@@ -16,9 +16,12 @@ module ErpTechSvcs
     				after_initialize :initialize_capable_model
     				after_update     :save_capable_model
     				after_create     :save_capable_model
-    				after_destroy    :destroy_capable_model
-    				
-    				has_one :capable_model, :as => :capable_model_record
+    				after_destroy    :destroy_capable_model    
+
+            has_one :capable_model, :as => :capable_model_record				
+            has_many :capabilities, :through => :capable_model
+
+            default_scope :include => :capabilities
 				  end
 				end
 				
@@ -26,14 +29,11 @@ module ErpTechSvcs
 				end
 						
 				module InstanceMethods
+
 				  def has_capabilities?
             !capabilities.empty?
           end
 
-          def capabilities
-            capable_model.capabilities
-          end
-
           def available_capability_resources
             capabilities.collect{|capability| capability.resource}.uniq
           end
@@ -113,7 +113,8 @@ module ErpTechSvcs
           end
 
           def initialize_capable_model
-            if self.capable_model.nil?
+            # added new_record? because simply querying for a file_asset was causing a plethora of unnecessary queries for capable_model
+            if self.new_record? and self.capable_model.nil?
               capable_model = CapableModel.new
               self.capable_model = capable_model
               capable_model.capable_model_record = self

data/lib/erp_tech_svcs/extensions/active_record/has_file_assets.rb

@@ -12,7 +12,7 @@ module ErpTechSvcs
 						extend HasFileAssets::SingletonMethods
 						include HasFileAssets::InstanceMethods
 						
-						has_many :files, :as => :file_asset_holder, :class_name => 'FileAsset', :dependent => :delete_all 								
+						has_many :files, :as => :file_asset_holder, :class_name => 'FileAsset', :dependent => :delete_all, :include => :capabilities
 					end
 				end
   		

data/lib/erp_tech_svcs/extensions/active_record/has_roles.rb

@@ -22,7 +22,7 @@ module ErpTechSvcs
     				after_create     :save_secured_model
     				after_destroy    :destroy_secured_model
     				
-    				has_one :secured_model, :as => :secured_record    												
+    				has_one :secured_model, :as => :secured_record, :include => :roles  												
 				  end
 				end
 				
@@ -55,7 +55,7 @@ module ErpTechSvcs
           end
 
 				  def add_role(role)
-					  role = Role.find_by_internal_identifier(role) if role.is_a? String
+					  role = role.is_a?(Role) ? role : Role.find_by_internal_identifier(role.to_s)
             unless self.has_role?(role)
   					  self.secured_model.roles << role
   					  self.secured_model.save
@@ -72,7 +72,7 @@ module ErpTechSvcs
           end
 
           def remove_role(role)
-            role = Role.find_by_internal_identifier(role) if role.is_a? String
+            role = role.is_a?(Role) ? role : Role.find_by_internal_identifier(role.to_s)
             self.secured_model.roles.delete(role) if has_role?(role)
 				  end
 
@@ -93,7 +93,7 @@ module ErpTechSvcs
             result = false
             passed_roles.flatten!
             passed_roles.each do |role|
-              role_iid = (role.is_a?(String)) ? role : role.internal_identifier
+              role_iid = role.is_a?(Role) ?  role.internal_identifier : role.to_s
               self.roles.each do |this_role|
                 result = true if (this_role.internal_identifier == role_iid)
                 break if result
@@ -121,9 +121,10 @@ module ErpTechSvcs
             end
           end
         end
-      end
-    end
-  end
-end
+
+      end #HasRoles
+    end #ActiveRecord
+  end #Extensions
+end #ErpTechSvcs
 
 

data/lib/erp_tech_svcs/file_support/file_system_manager.rb

@@ -8,12 +8,12 @@ module ErpTechSvcs
       end
 
       def update_file(path, content)
-        File.open(path, 'w+:ASCII-8BIT') {|f| f.write(content) }
+        File.open(path, 'wb+') {|f| f.write(content) }
       end
 
       def create_file(path, name, contents)
         FileUtils.mkdir_p path unless File.exists? path
-        File.open(File.join(path,name), 'w+:ASCII-8BIT') {|f| f.write(contents) }
+        File.open(File.join(path,name), 'wb+') {|f| f.write(contents) }
       end
 
       def create_folder(path, name)
@@ -22,7 +22,7 @@ module ErpTechSvcs
 
       def save_move(path, new_parent_path)
         old_path = File.join(path)
-        new_path = File.join(new_parent_path)
+        new_path = File.join(Rails.root,new_parent_path)
         result = false
         unless File.exists? old_path
           message = FILE_DOES_NOT_EXIST
@@ -73,7 +73,7 @@ module ErpTechSvcs
             entries.delete_if{|entry| entry =~ REMOVE_FILES_REGEX}
             if entries.count > 0 && !options[:force]
               message = FOLDER_IS_NOT_EMPTY
-              result = false;
+              result = false
             else
               FileUtils.rm_rf(path)
               message = "Folder #{name} was deleted #{name} successfully"
@@ -95,7 +95,7 @@ module ErpTechSvcs
         unless File.exists? path
           message = FILE_DOES_NOT_EXIST
         else
-          contents = IO.read(path).force_encoding('ASCII-8BIT')
+          contents = File.open(path, 'rb') {|file| file.read }
         end
         return contents, message
       end

data/lib/erp_tech_svcs/file_support/manager.rb

@@ -95,6 +95,10 @@ module ErpTechSvcs
               unless file.nil?
                 child_hash[:isSecured] = file.has_capabilities?
                 child_hash[:iconCls] = 'icon-document_lock' if child_hash[:isSecured]
+                child_hash[:size] = file.data_file_size
+                child_hash[:width] = file.width
+                child_hash[:height] = file.height
+                child_hash[:url] = file.url
               end
 
               new_parents << child_hash

data/lib/erp_tech_svcs/file_support/s3_manager.rb

@@ -100,7 +100,7 @@ module ErpTechSvcs
       def update_file(path, content)
         file = FileAsset.where(:name => ::File.basename(path)).where(:directory => ::File.dirname(path)).first
         acl = (file.has_capabilities? ? :private : :public_read) unless file.nil?
-        options = (file.nil? ? {} : {:acl => acl})
+        options = (file.nil? ? {} : {:acl => acl, :content_type => file.content_type })
         path = path.sub(%r{^/},'')
         bucket.objects[path].write(content, options)
         clear_cache(path)

data/lib/erp_tech_svcs/file_support.rb

@@ -1,6 +1,5 @@
 require 'erp_tech_svcs/file_support/base'
 require 'erp_tech_svcs/file_support/manager'
-require 'erp_tech_svcs/file_support/paperclip_patch'
 require 'erp_tech_svcs/file_support/file_system_manager'
 require 'erp_tech_svcs/file_support/s3_manager'
 require 'erp_tech_svcs/file_support/file_manipulator'

data/lib/erp_tech_svcs/version.rb

@@ -2,7 +2,7 @@ module ErpTechSvcs
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 8
+    TINY  = 9
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_tech_svcs
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_base_erp_svcs
-  requirement: &70128767646120 !ruby/object:Gem::Requirement
+  requirement: &70098070406840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70128767646120
+  version_requirements: *70098070406840
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
-  requirement: &70128767645620 !ruby/object:Gem::Requirement
+  requirement: &70098070406180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70128767645620
+  version_requirements: *70098070406180
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70128767645160 !ruby/object:Gem::Requirement
+  requirement: &70098070398820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70128767645160
+  version_requirements: *70098070398820
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
-  requirement: &70128767644700 !ruby/object:Gem::Requirement
+  requirement: &70098070397900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70128767644700
+  version_requirements: *70098070397900
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70128767644240 !ruby/object:Gem::Requirement
+  requirement: &70098070396920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 3.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70128767644240
+  version_requirements: *70098070396920
 - !ruby/object:Gem::Dependency
   name: pdfkit
-  requirement: &70128767643780 !ruby/object:Gem::Requirement
+  requirement: &70098070395480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70128767643780
+  version_requirements: *70098070395480
 - !ruby/object:Gem::Dependency
   name: sorcery
-  requirement: &70128767643320 !ruby/object:Gem::Requirement
+  requirement: &70098070394520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,7 +87,7 @@ dependencies:
         version: 0.7.12
   type: :runtime
   prerelease: false
-  version_requirements: *70128767643320
+  version_requirements: *70098070394520
 description: This engine is implemented with the premise that services like logging,
   tracing and encryption would likely already exist in many organizations, so they
   are factored here so they can easily be re-implemented. There are default implementations
@@ -139,6 +139,7 @@ files:
 - db/data_migrations/20110802200222_schedule_delete_expired_sessions_job.rb
 - db/data_migrations/20111111144706_setup_audit_log_types.rb
 - db/data_migrations/20120109173616_create_download_capability_type.rb
+- db/data_migrations/upgrade/20120727152144_set_image_dimensions_on_file_assets.rb
 - db/migrate/20080805000010_base_tech_services.rb
 - db/migrate/20111117183144_create_has_attribute_tables.rb
 - db/migrate/upgrade/20111109161549_add_capabilites.rb
@@ -146,6 +147,7 @@ files:
 - db/migrate/upgrade/20111109161551_update_user.rb
 - db/migrate/upgrade/20120329161641_add_file_asset_indexes.rb
 - db/migrate/upgrade/20120517203052_add_queue_to_delayed_jobs.rb
+- db/migrate/upgrade/20120725205131_add_image_dimension_columns_to_file_asset.rb
 - lib/erp_tech_svcs/application_installer.rb
 - lib/erp_tech_svcs/config.rb
 - lib/erp_tech_svcs/engine.rb