erp_tech_svcs 3.0.0 → 3.0.1

data/lib/erp_tech_svcs/engine.rb

@@ -8,6 +8,12 @@ module ErpTechSvcs
       include ErpTechSvcs::Extensions::ActiveRecord::HasRoles
       include ErpTechSvcs::Extensions::ActiveRecord::HasFileAssets
       include ErpTechSvcs::Extensions::ActiveRecord::HasCapabilities
+      include ErpTechSvcs::Extensions::ActiveRecord::HasRelationalDynamicAttributes
+    end
+
+    engine = self
+    config.to_prepare do
+      ErpBaseErpSvcs.register_compass_ae_engine(engine)
     end
     
   end

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

@@ -26,7 +26,11 @@ module ErpTechSvcs
 				end
 						
 				module InstanceMethods
-				  def capabilities
+				  def has_capabilities?
+            !capabilities.empty?
+          end
+
+          def capabilities
             capable_model.capabilities
           end
 
@@ -42,7 +46,7 @@ module ErpTechSvcs
             capability_type = convert_capability_type(capability_type)
             raise ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::CapabilityTypeDoesNotExist if capability_type.nil?
 
-            capability = self.capabilities.where('capability_type_id = ? and resource = ?', capability_type.id, resource).first
+            capability = find_capability(capability_type, resource)
             unless capability.nil?
               capability.has_access?(user)
             else
@@ -54,7 +58,7 @@ module ErpTechSvcs
             capability_type = convert_capability_type(capability_type)
             raise ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::CapabilityTypeDoesNotExist if capability_type.nil?
             
-            capability = self.capabilities.where('capability_type_id = ? and resource = ?', capability_type.id, resource).first
+            capability = find_capability(capability_type, resource)
             if capability.nil?
               capability = Capability.create(:capability_type => capability_type, :resource => resource)
               capability.add_roles(roles)
@@ -71,7 +75,7 @@ module ErpTechSvcs
             capability_type = convert_capability_type(capability_type)
             raise ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::CapabilityTypeDoesNotExist if capability_type.nil?
 
-            capability = self.capabilities.where('capability_type_id = ? and resource = ?', capability_type.id, resource).first
+            capability = find_capability(capability_type, resource)
             unless capability.nil?
               capability.remove_all_roles
               capability.add_roles(roles)
@@ -82,7 +86,7 @@ module ErpTechSvcs
 
           def remove_all_capabilities
             self.capabilities.each do |capability|
-              remove_capability(capability.type, capability.resource)
+              capability.destroy
             end
           end
 
@@ -90,7 +94,7 @@ module ErpTechSvcs
             capability_type = convert_capability_type(capability_type)
             raise ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::CapabilityTypeDoesNotExist if capability_type.nil?
 
-            capability = self.capabilities.where('capability_type_id = ? and resource = ?', capability_type.id, resource).first
+            capability = find_capability(capability_type, resource)
             unless capability.nil?
               capability.destroy
             else
@@ -132,6 +136,14 @@ module ErpTechSvcs
             CapabilityType.find_by_internal_identifier(type.to_s) if (type.is_a?(String) || type.is_a?(Symbol))
           end
 
+          def find_capability(capability_type, resource)
+            if resource.nil?
+              self.capabilities.where('capability_type_id = ? and resource is null', capability_type.id).first
+            else
+              self.capabilities.where('capability_type_id = ? and resource = ?', capability_type.id, resource).first
+            end
+          end
+
 				end
 			end
 		end

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

@@ -20,9 +20,22 @@ module ErpTechSvcs
 				end
 				
 				module InstanceMethods
-				  
-          def add_file(data, path=nil)
-						FileAsset.create!(:file_asset_holder => self, :base_path => path, :data => data)
+
+          # Capabilites can be passed via a hash
+          # {
+          #   :download => ['admin', 'employee'],
+          #   :edit     => ['admin']
+          # }
+          #
+          def add_file(data, path=nil, capabilities=nil)
+						file_asset = FileAsset.create!(:file_asset_holder => self, :base_path => path, :data => data)
+
+            #set capabilites if they are passed
+            capabilities.each do |capability_type, roles|
+              file_asset.add_capability(capability_type, nil, roles)
+            end if capabilities
+
+            file_asset
           end
 
           def images

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

@@ -0,0 +1,99 @@
+module ErpTechSvcs
+  module Extensions
+    module ActiveRecord
+      module HasRelationalDynamicAttributes
+        def self.included(base)
+          base.extend(ClassMethods)
+        end
+
+        module ClassMethods
+
+          def has_relational_dynamic_attributes
+            has_many :attribute_values, :as => :attributed_record, :dependent => :destroy
+
+            before_save :assign_dynamic_attribute_on_save
+
+            extend HasRelationalDynamicAttributes::SingletonMethods
+            include HasRelationalDynamicAttributes::InstanceMethods
+          end
+
+        end
+
+        module SingletonMethods
+          def find_by_dynamic_attribute(value, options={})
+            arel_query = AttributeValue.where('attributed_record_type = ?', self.name)
+                                       .where(AttributeValue.arel_table[:value].matches("%#{value}%"))
+
+            or_clauses = nil
+            options[:type_iids].each do |type_iid|
+              type = AttributeType.where('description = ? or internal_identifier = ?',type_iid,type_iid).first
+              raise "Attribute Type '#{type_iid}' does not exist" if type.nil?
+              or_clauses = or_clauses.nil? ? AttributeValue.arel_table[:attribute_type_id].eq(type.id) : or_clauses.or(AttributeValue.arel_table[:attribute_type_id].eq(type.id))
+            end if options[:type_iids]
+            
+            arel_query = arel_query.where(or_clauses) if or_clauses
+            arel_query = arel_query.limit(options[:limit]) if options[:limit]
+            arel_query = arel_query.offset(options[:offset]) if options[:offset]
+            arel_query.all.collect(&:attributed_record)
+          end
+        end
+
+        module InstanceMethods
+          def update_or_create_dynamic_attribute(value, type, data_type)
+            if self.has_dynamic_attribute_of_type?(type)
+              update_first_dynamic_attribute_value_of_type(value, type)
+            else
+              add_dynamic_attribute(value, type, data_type)
+            end
+          end
+
+          def update_first_dynamic_attribute_value_of_type(value, type)
+            attribute_type = AttributeType.where('description = ? or internal_identifier = ?', type, type).first
+            attribute_value = self.attribute_values.where(:attribute_type_id => attribute_type.id).first
+            attribute_value.value = value
+            attribute_value.save!
+          end
+
+          def get_dynamic_attributes
+            {}.tap do |hash|
+              self.attribute_values.each do |value|
+                hash[value.attribute_type.description] = value.value
+              end
+            end
+          end
+
+          def get_dynamic_value_of_type(attribute_type_iid)
+            attribute_value = get_dynamic_attribute_of_type(attribute_type_iid)
+            attribute_value.nil? ? nil : attribute_value.value
+          end
+
+          def get_dynamic_attribute_of_type(attribute_type_iid)
+            attribute_value = self.attribute_values.includes(:attribute_type).where('attribute_types.internal_identifier = ? or attribute_types.description = ?', attribute_type_iid.to_s, attribute_type_iid.to_s).first
+            attribute_value.nil? ? nil : attribute_value
+          end
+          
+          def assign_dynamic_attribute_on_save
+            #template method overridden in implementing class
+          end
+
+          def has_dynamic_attribute_of_type? (attribute_type_iid)
+            !self.attribute_values.includes(:attribute_type).where('attribute_types.internal_identifier = ? or attribute_types.description = ?', attribute_type_iid.to_s, attribute_type_iid.to_s).first.nil?
+          end
+
+          def destroy_dynamic_attribute_of_type (attribute_type_iid)
+            self.attribute_values.includes(:attribute_type).destroy_all("attribute_types.internal_identifier = #{attribute_type_iid.to_s} or attribute_types.description = #{attribute_type_iid.to_s}")
+          end
+          
+          def add_dynamic_attribute(value, type, data_type)
+            attribute_type = AttributeType.where('description = ? or internal_identifier = ?', type, type).first
+            attribute_type = AttributeType.create(:description => type, :data_type => data_type) unless attribute_type
+            attribute_value = AttributeValue.create(:value => value, :attribute_type => attribute_type)
+            self.attribute_values << attribute_value
+          end
+
+        end
+        
+      end#HasRelationalDynamicAttributes
+    end#ActiveRecord
+  end#Extensions
+end#ErpTechSvcs

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

@@ -59,6 +59,7 @@ module ErpTechSvcs
             unless self.has_role?(role)
   					  self.secured_model.roles << role
   					  self.secured_model.save
+              self.reload
   					end
 				  end
 
@@ -79,11 +80,13 @@ module ErpTechSvcs
             roles.flatten!
             roles.each do |role|
               self.remove_role(role)
+              self.reload
             end
 				  end
 
           def remove_all_roles
             self.roles.delete_all
+            self.reload
 				  end
 
           def has_role?(*passed_roles)

data/lib/erp_tech_svcs/extensions/sorcery/user_activation.rb

@@ -0,0 +1,13 @@
+Sorcery::Model::Submodules::UserActivation::InstanceMethods.class_eval do
+  def deactivate!
+    config = sorcery_config
+    self.send(:"#{config.activation_state_attribute_name}=", "deactivated")
+    save!(:validate => false) # don't run validations
+  end
+
+  def reactivate!
+    config = sorcery_config
+    self.send(:"#{config.activation_state_attribute_name}=", "active")
+    save!(:validate => false) # don't run validations
+  end
+end

data/lib/erp_tech_svcs/extensions.rb

@@ -2,4 +2,8 @@
 require 'erp_tech_svcs/extensions/active_record/has_file_assets'
 require 'erp_tech_svcs/extensions/active_record/has_roles'
 require 'erp_tech_svcs/extensions/active_record/has_capabilities'
-require 'erp_tech_svcs/extensions/active_record/acts_as_versioned'
+require 'erp_tech_svcs/extensions/active_record/acts_as_versioned'
+require 'erp_tech_svcs/extensions/active_record/has_relational_dynamic_attributes'
+
+#sorcery
+require 'erp_tech_svcs/extensions/sorcery/user_activation'

data/lib/erp_tech_svcs/file_support/base.rb

@@ -1,8 +1,6 @@
 module ErpTechSvcs
   module FileSupport
-    DEFAULT_OPTIONS = {
-      :storage => :filesystem
-    }
+    DEFAULT_OPTIONS = {:storage => :filesystem}
 
     mattr_accessor :options
     @@options = HashWithIndifferentAccess.new(DEFAULT_OPTIONS)

data/lib/erp_tech_svcs/file_support/file_system_manager.rb

@@ -4,16 +4,16 @@ module ErpTechSvcs
       REMOVE_FILES_REGEX = /^\./
 
       def root
-        File.join(Rails.root,'public')
+        Rails.root.to_s
       end
 
       def update_file(path, content)
-        File.open(path, 'w+') {|f| f.puts(content) }
+        File.open(path, 'w+:ASCII-8BIT') {|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+') {|f| f.puts(contents) }
+        File.open(File.join(path,name), 'w+:ASCII-8BIT') {|f| f.write(contents) }
       end
 
       def create_folder(path, name)
@@ -21,14 +21,16 @@ module ErpTechSvcs
       end
 
       def save_move(path, new_parent_path)
-        result = nil
-        unless File.exists? path
-          message = 'File does not exists'
+        old_path = File.join(path)
+        new_path = File.join(new_parent_path)
+        result = false
+        unless File.exists? old_path
+          message = FILE_DOES_NOT_EXIST
         else
           name = File.basename(path)
           #make sure path is there.
-          FileUtils.mkdir_p new_parent_path unless File.directory? new_parent_path
-          FileUtils.mv(path, new_parent_path + '/' + name)
+          FileUtils.mkdir_p new_path unless File.directory? new_path
+          FileUtils.mv(old_path, File.join(new_path,name))
           message = "#{name} was moved to #{new_parent_path} successfully"
           result = true
         end
@@ -41,9 +43,9 @@ module ErpTechSvcs
       end
 
       def rename_file(path, name)
-        result = nil
+        result = false
         unless File.exists? path
-          message = 'File does not exists'
+          message = FILE_DOES_NOT_EXIST
         else
           old_name = File.basename(path)
           path_pieces = path.split('/')
@@ -59,18 +61,18 @@ module ErpTechSvcs
       end
 
       def delete_file(path, options={})
-        result = nil
+        result = false
         name = File.basename(path)
         is_directory = false
         if !File.exists? path and !File.directory? path
-          message = 'File / Folder does not exist'
+          message = FILE_FOLDER_DOES_NOT_EXIST
         else
           if File.directory? path
             is_directory = true
             entries = Dir.entries(path)
             entries.delete_if{|entry| entry =~ REMOVE_FILES_REGEX}
             if entries.count > 0 && !options[:force]
-              message = "Folder is not empty"
+              message = FOLDER_IS_NOT_EMPTY
               result = false;
             else
               FileUtils.rm_rf(path)
@@ -91,9 +93,9 @@ module ErpTechSvcs
         contents = nil
         message = nil
         unless File.exists? path
-          message = 'File does not exists'
+          message = FILE_DOES_NOT_EXIST
         else
-          contents = IO.read(path)
+          contents = IO.read(path).force_encoding('ASCII-8BIT')
         end
         return contents, message
       end
@@ -149,16 +151,16 @@ module ErpTechSvcs
             tree_data[:children] << if options[:preload]
               build_tree_for_directory(path, options) if options[:preload]
             else
-              {:text => entry, :id => path}
+              {:text => entry, :id => path, :iconCls => 'icon-content'}
             end
           elsif !options[:included_file_extensions_regex].nil? && entry =~ options[:included_file_extensions_regex]
-            tree_data[:children] << {:text => entry, :leaf => true, :downloadPath => path, :id => path}
+            tree_data[:children] << {:text => entry, :leaf => true, :iconCls => 'icon-document', :downloadPath => directory, :id => path}
           elsif options[:included_file_extensions_regex].nil?
-            tree_data[:children] << {:text => entry, :leaf => true, :downloadPath => path, :id => path}
+            tree_data[:children] << {:text => entry, :leaf => true, :iconCls => 'icon-document', :downloadPath => directory, :id => path}
           end
         end if File.directory?(directory)
 
-        tree_data[:children].sort_by{|item| [item[:id]]}
+        tree_data[:children].sort_by!{|item| [item[:text]]}
         tree_data
       end
 

data/lib/erp_tech_svcs/file_support/manager.rb

@@ -1,11 +1,14 @@
 module ErpTechSvcs
   module FileSupport
     class Manager
+      FOLDER_IS_NOT_EMPTY = 'Folder is not empty'
+      FILE_DOES_NOT_EXIST = 'File does not exist'
+      FILE_FOLDER_DOES_NOT_EXIST = 'File / Folder does not exist'
 
       class << self
         def find_parent(item, parents)
           parents.find do |parent|
-            path = item[:path].gsub(item[:text],'').split('/').join('/')
+            path = item[:path].split('/')[0..-2].join('/')
             parent[:id] == path
           end
         end
@@ -50,9 +53,11 @@ module ErpTechSvcs
       end
 
       def build_file_assets_tree_for_model(model, starting_path)
+        files = model.files
+
         node_tree = [{:text => root, :leaf => false, :id => root, :children => []}]
         
-        paths = model.files.collect{|file| File.join(file.directory,file.name)}
+        paths = files.collect{|file| File.join(file.directory,file.name)}
 
         node_tree.first[:children] << {:id => starting_path, :text => starting_path.split('/').last, :children => []} if paths.select{|path| path.split('/')[1] == starting_path.split('/')[1]}.empty?
         
@@ -82,7 +87,16 @@ module ErpTechSvcs
             level.each do |item|
               parent = old_parents.count == 1 ? old_parents.first : self.class.find_parent(item, old_parents)
               path = File.join(parent[:id], item[:text]).gsub(root, '')
-              child_hash = {:text => item[:text], :downloadPath => path, :leaf => !File.extname(item[:text]).blank?, :id => path, :children => []}
+              icon_cls = File.extname(item[:text]).blank? ? 'icon-content' : 'icon-document'
+              child_hash = {:text => item[:text], :downloadPath => parent[:id], :iconCls => icon_cls, :leaf => !File.extname(item[:text]).blank?, :id => path, :children => []}
+              
+              #attempt set security if this file is a file_asset model
+              file = files.find{|file| file.directory == parent[:id].gsub(root,'') and file.name == item[:text]}
+              unless file.nil?
+                child_hash[:isSecured] = file.has_capabilities?
+                child_hash[:iconCls] = 'icon-document_lock' if child_hash[:isSecured]
+              end
+
               new_parents << child_hash
               parent[:children] << child_hash
             end
@@ -97,13 +111,15 @@ module ErpTechSvcs
       def insert_folders(file_asset_nodes)
         file_asset_nodes.each do |child_asset_node|
           node = find_node(File.join(self.root,child_asset_node[:id]))
-          folders = node[:children].select{|item| !item[:leaf]}
-          child_asset_node[:children] = [] if child_asset_node[:children].nil? && !folders.empty?
-          folders.each do |folder|
-            folder[:id].gsub!(self.root,'')
-            child_asset_node[:children] << folder unless child_asset_node[:children].collect{|child_node| child_node[:text] }.include?(folder[:text])
+          unless node.nil?
+            folders = node[:children].select{|item| !item[:leaf]}
+            child_asset_node[:children] = [] if child_asset_node[:children].nil? && !folders.empty?
+            folders.each do |folder|
+              folder[:id].gsub!(self.root,'')
+              child_asset_node[:children] << folder unless child_asset_node[:children].collect{|child_node| child_node[:text] }.include?(folder[:text])
+            end
+            insert_folders(child_asset_node[:children])
           end
-          insert_folders(child_asset_node[:children])
         end unless file_asset_nodes.nil?
       end
 
@@ -142,6 +158,10 @@ module ErpTechSvcs
         end
       end
 
+      def reload
+        # this is a template method
+      end
+
     end#Manager
   end#FileSupport
 end#ErpTechSvcs

data/lib/erp_tech_svcs/file_support/paperclip_patch.rb

@@ -5,17 +5,21 @@ module Paperclip
         @queued_for_write.each do |style, file|
           begin
             log("saving #{path(style)}")
-            AWS::S3::S3Object.store(path(style),
-              file,
-              bucket_name,
-              {:content_type => content_type,
-                :access => (@s3_permissions[style] || @s3_permissions[:default]),
-              }.merge(@s3_headers))
-          rescue AWS::S3::NoSuchBucket => e
+            acl = @s3_permissions[style] || @s3_permissions[:default]
+            acl = acl.call(self, style) if acl.respond_to?(:call)
+            write_options = {
+              :content_type => content_type,
+              :acl => acl
+            }
+            write_options[:metadata] = @s3_metadata unless @s3_metadata.empty?
+            unless @s3_server_side_encryption.blank?
+              write_options[:server_side_encryption] = @s3_server_side_encryption
+            end
+            write_options.merge!(@s3_headers)
+            s3_object(style).write(file, write_options)
+          rescue AWS::S3::Errors::NoSuchBucket => e
             create_bucket
             retry
-          rescue AWS::S3::ResponseError => e
-            raise
           end
         end
 

data/lib/erp_tech_svcs/file_support/railties/s3_resolver.rb

@@ -26,10 +26,15 @@ module ActionView
           @cached[key][name][prefix][partial][locals] = decorate(yield, path_info, details, locals)
         else
           @cached[key][name][prefix][partial][locals].each do |template|
-            last_update = mtime(template.identifier, file_support)
-            if last_update > template.updated_at
+            #check if the file still exists
+            if file_support.exists? template.identifier
+              last_update = mtime(template.identifier, file_support)
+              if last_update > template.updated_at
+                @cached[key][name][prefix][partial][locals].delete_if{|item| item.identifier == template.identifier}
+                @cached[key][name][prefix][partial][locals] << build_template(template.identifier, template.virtual_path, (details[:formats] || [:html] if template.formats.empty?), file_support, template.locals)
+              end
+            else
               @cached[key][name][prefix][partial][locals].delete_if{|item| item.identifier == template.identifier}
-              @cached[key][name][prefix][partial][locals] << build_template(template.identifier, template.virtual_path, (details[:formats] || [:html] if template.formats.empty?), file_support, template.locals)
             end
           end
           @cached[key][name][prefix][partial][locals]
@@ -70,9 +75,24 @@ module ActionView
 
     protected
 
+    def cache_template(path, file_support)
+      contents, message = file_support.get_contents(path)
+      path = path.sub(%r{^/},'')
+      #Rails.logger.info "creating cache with key: #{path}"
+      Rails.cache.write(path, contents, :expires_in => ErpTechSvcs::Config.s3_cache_expires_in_minutes.minutes)
+      return contents, message 
+    end
+
     def build_template(p, virtual_path, formats, file_support, locals=nil)
       handler, format = extract_handler_and_format(p, formats)
-      contents, message = file_support.get_contents(p)
+      contents = Rails.cache.read(p.sub(%r{^/},''))
+      if contents.nil?
+        contents, message = cache_template(p, file_support)
+      else
+        #Rails.logger.info "!!!!! USING CACHED TEMPLATE: #{contents.inspect}"
+        contents = contents.dup
+      end
+      
       Template.new(contents, p, handler, :virtual_path => virtual_path, :format => format, :updated_at => mtime(p, file_support), :locals => locals)
     end
   end