erp_tech_svcs 3.1.5 → 3.1.7

data/app/models/file_asset.rb

@@ -165,7 +165,7 @@ class FileAsset < ActiveRecord::Base
       end
     end
     #return true
-  end 
+  end
 
   def basename
     data_file_name.gsub(/\.#{extname}$/, "")

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

@@ -75,7 +75,7 @@ module ErpTechSvcs
               join_type = (self.protect_all_instances ? 'JOIN' : 'LEFT JOIN')
               query = joins("#{join_type} capabilities AS c ON c.capability_resource_id = #{self.table_name}.id AND c.capability_resource_type = '#{self.name}'").
                       group(columns.collect{|c| "#{self.table_name}.#{c.name}" })
-              query = (deny_count == 0 ? query.where("c.id IS NULL OR c.id = c.id") : query.where("c.id IS NULL OR c.id NOT IN (#{denied_capabilities.to_sql})"))
+              query = (deny_count == 0 ? query.where("c.id NOT IN (SELECT id FROM capabilities) OR c.id = c.id") : query.where("c.id NOT IN (SELECT id FROM capabilities) OR c.id NOT IN (#{denied_capabilities.to_sql})"))
               query
             }
 

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

@@ -64,33 +64,15 @@ module ActionView
     end
 
     def mtime(p, file_support)
-      node = file_support.find_node(p)
-      node[:last_modified]
+      p = p.sub(%r{^/}, '')
+      ErpTechSvcs::FileSupport::S3Manager.new.bucket.objects[p].last_modified
     end
 
     protected
-    
-    def cache_key(path)
-      Thread.current[:tenant_id].nil? ? path : "tenant_#{Thread.current[:tenant_id]}_#{path}"
-    end
-    
-    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(cache_key(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 = Rails.cache.read(cache_key(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
+      contents, message = file_support.get_contents(p)
       
       Template.new(contents, p, handler, :virtual_path => virtual_path, :format => format, :updated_at => mtime(p, file_support), :locals => locals)
     end

data/lib/erp_tech_svcs/file_support/s3_manager.rb

@@ -5,69 +5,25 @@ module ErpTechSvcs
   module FileSupport
     class S3Manager < Manager
       class << self
-        cattr_accessor :node_tree, :s3_connection
+        cattr_accessor :s3_connection, :s3_bucket, :tree
 
         def setup_connection
-          @@configuration = YAML::load_file(File.join(Rails.root,'config','s3.yml'))[Rails.env]
-          
+          @@configuration = YAML::load_file(File.join(Rails.root, 'config', 's3.yml'))[Rails.env]
+
           # S3 debug logging
           # AWS.config(
-          #   :logger => Rails.logger,
-          #   :log_level => :info
+          #     :logger => Rails.logger,
+          #     :log_level => :info
           # )
 
           @@s3_connection = AWS::S3.new(
-            :access_key_id     => @@configuration['access_key_id'],
-            :secret_access_key => @@configuration['secret_access_key']
+              :access_key_id => @@configuration['access_key_id'],
+              :secret_access_key => @@configuration['secret_access_key']
           )
 
           @@s3_bucket = @@s3_connection.buckets[@@configuration['bucket'].to_sym]
         end
 
-        def reload
-          !@@s3_connection.nil? ? build_node_tree(true) : setup_connection
-        end
-
-        def cache_key
-          Thread.current[:tenant_id].nil? ? 'node_tree' : "tenant_#{Thread.current[:tenant_id]}_node_tree"
-        end
-
-        def cache_node_tree(node_tree)
-          Rails.cache.write(cache_key, node_tree, :expires_in => ErpTechSvcs::Config.s3_cache_expires_in_minutes.minutes)
-          node_tree
-        end
-
-        def add_children(parent_hash, tree)
-          tree.children.each do |child|
-            child_hash = {
-              :last_modified => '',
-              #:last_modified => (child.leaf? ? @@s3_bucket.objects[child.key].last_modified : ''), 
-              :text => (child.leaf? ? File.basename(child.key) : File.basename(child.prefix)), 
-              :downloadPath => (child.leaf? ? '/'+File.dirname(child.key) : "/#{child.parent.prefix}".sub(%r{/$},'')), 
-              :leaf => child.leaf?, 
-              :id => (child.leaf? ? '/'+child.key : "/#{child.prefix}".sub(%r{/$},'')), 
-              :children => []
-            }
-            child_hash = add_children(child_hash, child) unless child.leaf?
-            unless child_hash[:id].gsub(/\/$/,'') == parent_hash[:id].gsub(/\/$/,'') # resolves s3 issue where empty dir contains itself
-              parent_hash[:children] << child_hash unless child_hash[:downloadPath] == '/.'
-            end
-          end
-
-          parent_hash
-        end
-
-        def build_node_tree(reload=false)
-          node_tree = Rails.cache.read(cache_key)
-          if !reload and !node_tree.nil?
-            #Rails.logger.info "@@@@@@@@@@@@@@ USING CACHED node_tree: #{node_tree.inspect}"
-            return node_tree
-          end
-
-          tree_data = {:text => @@s3_bucket.name, :leaf => false, :id => '', :children => []}
-          tree_data = [add_children(tree_data, @@s3_bucket.as_tree)]
-          cache_node_tree(tree_data)
-        end
       end
 
       def buckets
@@ -86,39 +42,25 @@ module ErpTechSvcs
         ''
       end
 
-      def cache_key
-        ErpTechSvcs::FileSupport::S3Manager.cache_key
-      end
-
-      def clear_cache(path)
-        path = path.sub(%r{^/},'')
-        #Rails.logger.info "deleting cache with key: #{path}"
-        Rails.cache.delete(path) # delete template from cache
-        Rails.cache.delete(cache_key) # delete node tree from cache
-      end
-
       def update_file(path, content)
         file = FileAsset.where(:name => ::File.basename(path)).where(:directory => ::File.dirname(path)).first
         acl = (file.is_secured? ? :private : :public_read) unless file.nil?
-        options = (file.nil? ? {} : {:acl => acl, :content_type => file.content_type })
-        path = path.sub(%r{^/},'')
+        options = (file.nil? ? {} : {:acl => acl, :content_type => file.content_type})
+        path = path.sub(%r{^/}, '')
         bucket.objects[path].write(content, options)
-        clear_cache(path)
       end
 
       def create_file(path, name, content)
-        path = path.sub(%r{^/},'')
+        path = path.sub(%r{^/}, '')
         full_filename = (path.blank? ? name : File.join(path, name))
-        bucket.objects[full_filename].write(content, { :acl => :public_read })
-        clear_cache(path)
+        bucket.objects[full_filename].write(content, {:acl => :public_read})
       end
 
       def create_folder(path, name)
-        path = path.sub(%r{^/},'')
+        path = path.sub(%r{^/}, '')
         full_filename = (path.blank? ? name : File.join(path, name))
         folder = full_filename + "/"
-        bucket.objects[folder].write('', { :acl => :public_read })
-        clear_cache(path)
+        bucket.objects[folder].write('', {:acl => :public_read})
       end
 
       def save_move(path, new_parent_path)
@@ -130,13 +72,12 @@ module ErpTechSvcs
           acl = (file.is_secured? ? :private : :public_read) unless file.nil?
           options = (file.nil? ? {} : {:acl => acl})
           name = File.basename(path)
-          path = path.sub(%r{^/},'')
-          new_path = File.join(new_parent_path,name).sub(%r{^/},'')
+          path = path.sub(%r{^/}, '')
+          new_path = File.join(new_parent_path, name).sub(%r{^/}, '')
           old_object = bucket.objects[path]
           if new_object = old_object.move_to(new_path, options)
             message = "#{name} was moved to #{new_path} successfully"
             result = true
-            clear_cache(path)
           else
             message = "Error moving file #{path}"
           end
@@ -156,18 +97,17 @@ module ErpTechSvcs
           file = FileAsset.where(:name => ::File.basename(path)).where(:directory => ::File.dirname(path)).first
           acl = (file.is_secured? ? :private : :public_read) unless file.nil?
           options = (file.nil? ? {} : {:acl => acl})
-          path = path.sub(%r{^/},'')
-          new_path = new_path.sub(%r{^/},'')
+          path = path.sub(%r{^/}, '')
+          new_path = new_path.sub(%r{^/}, '')
 #          Rails.logger.info "renaming from #{path} to #{new_path}"
           old_object = bucket.objects[path]
           if new_object = old_object.move_to(new_path, options)
             message = "#{old_name} was renamed to #{name} successfully"
             result = true
-            clear_cache(path)
           else
             message = "Error renaming #{old_name}"
           end
-        rescue AWS::S3::Errors::NoSuchKey=>ex
+        rescue AWS::S3::Errors::NoSuchKey => ex
           message = FILE_FOLDER_DOES_NOT_EXIST
         end
 
@@ -175,13 +115,13 @@ module ErpTechSvcs
       end
 
       def set_permissions(path, canned_acl=:public_read)
-        path = path.sub(%r{^/},'')
+        path = path.sub(%r{^/}, '')
         bucket.objects[path].acl = canned_acl
       end
 
       def delete_file(path, options={})
-        is_directory = !path.match(/\/$/).nil?
-        path = path.sub(%r{^/},'')
+        is_directory = File.extname(path).blank?
+        path = path.sub(%r{^/}, '')
         result = false
         message = nil
         begin
@@ -189,21 +129,20 @@ module ErpTechSvcs
             bucket.objects.with_prefix(path).delete_all
             message = "File was deleted successfully"
             result = true
-            clear_cache(path)
           else
             message = FOLDER_IS_NOT_EMPTY
           end
         rescue Exception => e
-         result = false
-         message = e
-        end    
+          result = false
+          message = e
+        end
 
-        return result, message, is_directory    
+        return result, message, is_directory
       end
 
       def exists?(path)
         begin
-          path = path.sub(%r{^/},'')
+          path = path.sub(%r{^/}, '')
           return bucket.objects[path].exists?
         rescue AWS::S3::Errors::NoSuchKey
           return false
@@ -214,10 +153,10 @@ module ErpTechSvcs
         contents = nil
         message = nil
 
-        path = path.sub(%r{^/},'')
+        path = path.sub(%r{^/}, '')
         begin
           object = bucket.objects[path]
-          contents = object.read 
+          contents = object.read
         rescue AWS::S3::Errors::NoSuchKey => error
           contents = ''
           message = FILE_DOES_NOT_EXIST
@@ -227,36 +166,62 @@ module ErpTechSvcs
       end
 
       def build_tree(starting_path, options={})
-        starting_path = "/" + starting_path unless starting_path.first == "/"
         node_tree = find_node(starting_path, options)
         node_tree.nil? ? [] : node_tree
       end
 
       def find_node(path, options={})
-        parent = if options[:file_asset_holder]
-          super
-        else
-          parent = ErpTechSvcs::FileSupport::S3Manager.build_node_tree(false).first
-          unless path.nil?
-            path_pieces = path.split('/')
-            path_pieces.each do |path_piece|
-              next if path_piece.blank?
-              parent[:children].each do |child_node|
-                if child_node[:text] == path_piece
-                  parent = child_node
-                  break
-                end
+        #remove proceeding slash for s3
+        path.sub!(%r{^/}, '')
+
+        parent = {:text => path.split('/').pop, :leaf => false, :id => path, :children => []}
+
+        tree = bucket.as_tree(:prefix => path)
+        tree.children.each do |node|
+          if node.leaf?
+            #ignore current path that comes as leaf from s3
+            next if node.key == path + '/'
+
+            leaf_hash = {
+                :text => node.key.split('/').pop,
+                :downloadPath => "/#{node.key}",
+                :id => "/#{node.key}",
+                :leaf => true
+            }
+
+            if options[:file_asset_holder]
+              files = options[:file_asset_holder].files
+
+              parent_directories =  leaf_hash[:id].split('/')
+              parent_directories.pop
+              parent_directory = parent_directories.join('/')
+
+              file = files.find { |file| file.directory == parent_directory and file.name == leaf_hash[:text] }
+              unless file.nil?
+                leaf_hash[:isSecured] = file.is_secured?
+                leaf_hash[:roles] = file.roles.collect { |r| r.internal_identifier }
+                leaf_hash[:iconCls] = 'icon-document_lock' if leaf_hash[:isSecured]
+                leaf_hash[:size] = file.data_file_size
+                leaf_hash[:width] = file.width
+                leaf_hash[:height] = file.height
+                leaf_hash[:url] = file.url
               end
             end
-            parent = nil unless parent[:id] == path
-          end
 
-          parent
+            parent[:children] << leaf_hash
+          else
+            parent[:children] << {
+                :iconCls => "icon-content",
+                :text => node.prefix.split('/').pop,
+                :id => "/#{node.prefix}".chop,
+                :leaf => false
+            }
+          end
         end
 
         parent
       end
 
-    end#S3Manager
-  end#FileSupport
-end#ErpTechSvcs
+    end #S3Manager
+  end #FileSupport
+end #ErpTechSvcs

data/lib/erp_tech_svcs/version.rb

@@ -2,7 +2,7 @@ module ErpTechSvcs
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 5
+    TINY  = 7
 
     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.1.5
+  version: 3.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_base_erp_svcs
@@ -258,29 +258,6 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/s3.yml
 - spec/dummy/config.ru
-- spec/dummy/db/data_migrations/20130220143304_add_usd_currency.erp_base_erp_svcs.rb
-- spec/dummy/db/data_migrations/20130220143305_add_iso_codes.erp_base_erp_svcs.rb
-- spec/dummy/db/data_migrations/20130220143306_setup_compass_ae_instance.erp_base_erp_svcs.rb
-- spec/dummy/db/data_migrations/20130220143307_upgrade_compass_ae_instances_data.erp_base_erp_svcs.rb
-- spec/dummy/db/data_migrations/20130220143308_create_capability_scope_types.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20130220143309_schedule_delete_expired_sessions_job.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20130220143310_setup_audit_log_types.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20130220143311_create_group_relationship_and_role_types.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20130220143312_note_capabilities.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20130422151256_add_guid_to_instances.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130220143259_base_erp_services.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130220143260_add_txn_status.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130220143261_upgrade_compass_ae_instances.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130220143262_base_tech_services.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130220143263_create_has_attribute_tables.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130220143264_create_groups.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130220143265_upgrade_security.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130220143266_upgrade_security2.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130422151250_add_uuid_compass_ae_instance.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130422151251_add_long_lat_to_address.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130422151252_add_queue_to_delayed_jobs.erp_tech_svcs.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/spec.sqlite3
 - spec/dummy/move_test_tmp/file_asset_spec_text.txt
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -301,7 +278,8 @@ files:
 - spec/models/user_spec.rb
 - spec/spec_helper.rb
 homepage: http://development.compassagile.com
-licenses: []
+licenses:
+- GPL-3
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -320,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: This engine is implemented with the premise that services like logging, tracing
@@ -348,29 +326,6 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/s3.yml
 - spec/dummy/config.ru
-- spec/dummy/db/data_migrations/20130220143304_add_usd_currency.erp_base_erp_svcs.rb
-- spec/dummy/db/data_migrations/20130220143305_add_iso_codes.erp_base_erp_svcs.rb
-- spec/dummy/db/data_migrations/20130220143306_setup_compass_ae_instance.erp_base_erp_svcs.rb
-- spec/dummy/db/data_migrations/20130220143307_upgrade_compass_ae_instances_data.erp_base_erp_svcs.rb
-- spec/dummy/db/data_migrations/20130220143308_create_capability_scope_types.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20130220143309_schedule_delete_expired_sessions_job.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20130220143310_setup_audit_log_types.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20130220143311_create_group_relationship_and_role_types.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20130220143312_note_capabilities.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20130422151256_add_guid_to_instances.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130220143259_base_erp_services.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130220143260_add_txn_status.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130220143261_upgrade_compass_ae_instances.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130220143262_base_tech_services.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130220143263_create_has_attribute_tables.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130220143264_create_groups.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130220143265_upgrade_security.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130220143266_upgrade_security2.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130422151250_add_uuid_compass_ae_instance.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130422151251_add_long_lat_to_address.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130422151252_add_queue_to_delayed_jobs.erp_tech_svcs.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/spec.sqlite3
 - spec/dummy/move_test_tmp/file_asset_spec_text.txt
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html