RubyGems - erp_tech_svcs - Versions diffs - 3.1.8 → 4.0.0 - Mend

erp_tech_svcs 3.1.8 → 4.0.0

Files changed (70) hide show

data/app/models/notification_type.rb ADDED Viewed

@@ -0,0 +1,5 @@
+class NotificationType < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
+  has_many :notifications
+end

data/app/models/user.rb CHANGED Viewed

@@ -15,11 +15,11 @@ class User < ActiveRecord::Base
   validates :password, :presence => true, :password_strength => true, :if => :password
   #email validations
-  validates :email, :presence => {:message => 'Email cannot be blank'}, :uniqueness => {:case_sensitive => false}
+  validates :email, :presence => {:message => 'cannot be blank'}, :uniqueness => {:case_sensitive => false}
   validates_format_of :email, :with => /\b[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}\z/
   #username validations
-  validates :username, :presence => {:message => 'Username cannot be blank'}, :uniqueness => {:case_sensitive => false}
+  validates :username, :presence => {:message => 'cannot be blank'}, :uniqueness => {:case_sensitive => false}
   validate :email_cannot_match_username_of_other_user
   def email_cannot_match_username_of_other_user

data/app/models/user_defined_data.rb ADDED Viewed

@@ -0,0 +1,6 @@
+class UserDefinedData < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
+  has_many :user_defined_fields
+end

data/app/models/user_defined_field.rb ADDED Viewed

@@ -0,0 +1,8 @@
+class UserDefinedField < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
+  belongs_to :user_defined_data
+  validates_uniqueness_of :field_name, :scope => [:user_defined_data_id]
+end

data/app/views/user_mailer/activation_needed_email.html.erb CHANGED Viewed

@@ -1,14 +1,24 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
-  </head>
-  <body>
-    <h1>Welcome <%= @user.username %></h1>
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
+</head>
+<body>
+<h1>Welcome <%= @user.username %></h1>
+<% if @temp_password %>
+    <p>An account has been created for you, to activate your account follow this link: <a href="<%= @url %>"><%= @url %></a></p>
+    <p>Your username is <%= @user.username %>, your temporary password is <%= @temp_password %>.</p>
+    <p>Please login and update your password.</p>
+<% else %>
     <p>
       You have successfully registered, to activate your account follow this link: <a href="<%= @url %>"><%= @url %></a>
     </p>
-    <p>Your username is <%=@user.username%>, use the password you set during registration to login.</p>
+    <p>Your username is <%= @user.username %>, use the password you set during registration to login.</p>
     <p>Thanks for joining and have a great day!!</p>
-  </body>
+<% end %>
+</body>
 </html>

data/config/initializers/file_support.rb CHANGED Viewed

@@ -3,7 +3,7 @@ Rails.application.config.to_prepare do
   # Rescue here, Compass should not die if it cannot connect to S3
   begin
     ErpTechSvcs::FileSupport::S3Manager.setup_connection() if Rails.application.config.erp_tech_svcs.file_storage == :s3
-  rescue Exception => e
-    Rails.logger.error "ERROR: Failed to connect to Amazon S3 #{e.inspect}"
+  rescue => ex
+    Rails.logger.error "ERROR: Failed to connect to Amazon S3 #{ex.inspect}"
   end
 end

data/config/routes.rb CHANGED Viewed

@@ -2,7 +2,8 @@ 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'
+  post "/session/keep_alive" => 'erp_tech_svcs/session#keep_alive'
+  get "/session/is_alive" => 'erp_tech_svcs/session#is_alive'
   #handle activation
   get "/users/activate/:activation_token" => 'erp_tech_svcs/user#activate'

data/db/migrate/20130610163240_create_notifications.rb ADDED Viewed

@@ -0,0 +1,37 @@
+class CreateNotifications < ActiveRecord::Migration
+  def up
+    unless table_exists? :notifications
+      create_table :notifications do |t|
+        t.string :type
+        t.references :created_by
+        t.text :message
+        t.references :notification_type
+        t.string :current_state
+        t.timestamps
+      end
+      add_index :notifications, :notification_type_id
+      add_index :notifications, :created_by_id
+      add_index :notifications, :type
+    end
+    unless table_exists? :notification_types
+      create_table :notification_types do |t|
+        t.string :internal_identifier
+        t.string :description
+        t.timestamps
+      end
+      add_index :notification_types, :internal_identifier
+    end
+  end
+  def down
+    drop_table :notifications if table_exists? :notifications
+    drop_table :notification_types if table_exists? :notification_types
+  end
+end

data/db/migrate/20131113213843_add_audit_log_item_old_value.rb ADDED Viewed

@@ -0,0 +1,13 @@
+class AddAuditLogItemOldValue < ActiveRecord::Migration
+  def up
+    unless AuditLogItem.columns.include?(:audit_log_item_old_value)
+      add_column :audit_log_items, :audit_log_item_old_value, :string
+    end
+  end
+  def down
+    if AuditLogItem.columns.include?(:audit_log_item_old_value)
+      remove_column :audit_log_items, :audit_log_item_old_value
+    end
+  end
+end

data/db/migrate/20131113213844_add_erp_tech_svcs_missing_indexes.rb ADDED Viewed

@@ -0,0 +1,31 @@
+class AddErpTechSvcsMissingIndexes < ActiveRecord::Migration
+  def up
+    if indexes(:role_types).select { |index| index.name == 'role_types_parent_id_idx' }.empty?
+      add_index :role_types, :parent_id, :name => 'role_types_parent_id_idx'
+      add_index :security_roles, :internal_identifier, :name => 'security_roles_internal_identifier_idx'
+      add_index :audit_logs, :audit_log_type_id, :name => 'audit_logs_audit_log_type_id_idx'
+      add_index :audit_log_types, :internal_identifier, :name => 'audit_log_types_internal_identifier_idx'
+      add_index :audit_log_types, :parent_id, :name => 'audit_log_types_parent_id_idx'
+      add_index :audit_log_items, :audit_log_id, :name => 'audit_log_items_audit_log_id_idx'
+      add_index :audit_log_items, :audit_log_item_type_id, :name => 'audit_log_items_audit_log_item_type_id_idx'
+      add_index :audit_log_item_types, :internal_identifier, :name => 'audit_log_item_types_internal_identifier_idx'
+      add_index :audit_log_item_types, :parent_id, :name => 'audit_log_item_types_parent_id_idx'
+      add_index :capability_types, :internal_identifier, :name => 'capability_types_internal_identifier_idx'
+    end
+  end
+  def down
+    unless indexes(:role_types).select { |index| index.name == 'role_types_parent_id_idx' }.empty?
+      remove_index :role_types, :parent_id
+      remove_index :security_roles, :internal_identifier
+      remove_index :audit_logs, :audit_log_type_id
+      remove_index :audit_log_types, :internal_identifier
+      remove_index :audit_log_types, :parent_id
+      remove_index :audit_log_items, :audit_log_id
+      remove_index :audit_log_items, :audit_log_item_type_id
+      remove_index :audit_log_item_types, :internal_identifier
+      remove_index :audit_log_item_types, :parent_id
+      remove_index :capability_types, :internal_identifier
+    end
+  end
+end

data/db/migrate/20131129203603_add_user_defined_fields.rb ADDED Viewed

@@ -0,0 +1,43 @@
+class AddUserDefinedFields < ActiveRecord::Migration
+  def up
+    unless table_exists? :user_defined_data
+      create_table :user_defined_data do |t|
+        t.string :scope
+        t.string :model_name
+        t.timestamps
+      end
+      add_index :user_defined_data, :scope
+    end
+    unless table_exists? :user_defined_fields
+      create_table :user_defined_fields do |t|
+        t.string :field_name
+        t.string :label
+        t.string :data_type
+        t.references :user_defined_data
+        t.timestamps
+      end
+      add_index :user_defined_fields, :user_defined_data_id
+      add_index :user_defined_fields, :field_name
+    end
+  end
+  def down
+    if table_exists? :user_defined_data
+      drop_table :user_defined_data
+    end
+    if table_exists? :user_defined_fields
+      drop_table :user_defined_fields
+    end
+  end
+end

data/db/migrate/20141013060204_add_custom_fields_to_notifications.rb ADDED Viewed

@@ -0,0 +1,12 @@
+class AddCustomFieldsToNotifications < ActiveRecord::Migration
+  def change
+    if ::ActiveRecord::Base.connection.instance_values["config"][:adapter] == 'postgresql'
+      execute('CREATE EXTENSION IF NOT EXISTS hstore;')
+      add_column :notifications, :custom_fields, :hstore
+      add_hstore_index :notifications, :custom_fields
+    else
+      add_column :notifications, :custom_fields, :text
+    end
+  end
+end

data/db/migrate/20141108182427_add_scoped_by_to_file_assets.rb ADDED Viewed

@@ -0,0 +1,14 @@
+class AddScopedByToFileAssets < ActiveRecord::Migration
+  def change
+    if ::ActiveRecord::Base.connection.instance_values["config"][:adapter] == 'postgresql'
+      execute('CREATE EXTENSION IF NOT EXISTS hstore;')
+      add_column :file_assets, :scoped_by, :hstore
+      add_hstore_index :file_assets, :scoped_by
+    else
+      add_column :file_assets, :scoped_by, :text
+    end
+  end
+end

data/lib/erp_tech_svcs.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+require 'aasm'
 #compass_ae libraries
 require 'erp_base_erp_svcs'
@@ -8,6 +10,8 @@ require 'mail_alternatives_with_attachments'
 require 'sorcery'
 require 'pdfkit'
 require 'aws'
+require 'activerecord-postgres-hstore'
+require 'nested-hstore'
 require "erp_tech_svcs/version"
 require "erp_tech_svcs/utils/compass_logger"
 require "erp_tech_svcs/utils/default_nested_set_methods"
@@ -20,6 +24,5 @@ require "erp_tech_svcs/engine"
 require 'erp_tech_svcs/sessions/delete_expired_sessions_job'
 require 'erp_tech_svcs/sessions/delete_expired_sessions_service'
 require 'erp_tech_svcs/erp_tech_svcs_audit_log'
 module ErpTechSvcs
 end

data/lib/erp_tech_svcs/config.rb CHANGED Viewed

@@ -8,9 +8,11 @@ module ErpTechSvcs
                     :login_url,
                     :email_notifications_from,
                     :email_regex,
-                    :file_assets_location,
+                    :file_assets_location,
+                    :file_protocol,
                     :s3_url_expires_in_seconds,
                     :s3_protocol,
+                    :s3_url,
                     :file_storage,
                     :s3_cache_expires_in_minutes,
                     :session_expires_in_hours,
@@ -26,9 +28,10 @@ module ErpTechSvcs
           :@email_regex => "^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$",
           :@file_assets_location => 'file_assets', # relative to Rails.root/
           :@s3_url_expires_in_seconds => 60,
+          :@s3_url => ':s3_path_url',
+          :@file_protocol => 'http', # Can be either 'http' or 'https'
           :@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
           :@compass_logger_path => "#{Rails.root}/log"
         }

data/lib/erp_tech_svcs/engine.rb CHANGED Viewed

@@ -9,7 +9,9 @@ module ErpTechSvcs
       include ErpTechSvcs::Extensions::ActiveRecord::HasFileAssets
       include ErpTechSvcs::Extensions::ActiveRecord::ProtectedByCapabilities
       include ErpTechSvcs::Extensions::ActiveRecord::HasCapabilityAccessors
-      include ErpTechSvcs::Extensions::ActiveRecord::HasRelationalDynamicAttributes
+      include ErpTechSvcs::Extensions::ActiveRecord::HasUserDefinedData
+      include ErpTechSvcs::Extensions::ActiveRecord::IsJson
+      include ErpTechSvcs::Extensions::ActiveRecord::ScopedBy
     end
     ErpBaseErpSvcs.register_as_compass_ae_engine(config, self)

data/lib/erp_tech_svcs/extensions.rb CHANGED Viewed

@@ -8,7 +8,9 @@ require 'erp_tech_svcs/extensions/active_record/has_security_roles'
 require 'erp_tech_svcs/extensions/active_record/protected_with_capabilities'
 require 'erp_tech_svcs/extensions/active_record/has_capability_accessors'
 require 'erp_tech_svcs/extensions/active_record/acts_as_versioned'
-require 'erp_tech_svcs/extensions/active_record/has_relational_dynamic_attributes'
+require 'erp_tech_svcs/extensions/active_record/has_user_defined_data'
+require 'erp_tech_svcs/extensions/active_record/is_json'
+require 'erp_tech_svcs/extensions/active_record/scoped_by'
 #sorcery
 require 'erp_tech_svcs/extensions/sorcery/user_activation'

data/lib/erp_tech_svcs/extensions/active_record/has_user_defined_data.rb ADDED Viewed

@@ -0,0 +1,147 @@
+module ErpTechSvcs
+  module Extensions
+    module ActiveRecord
+      module HasUserDefinedData
+        module Errors
+          class UserDefinedFieldAlreadyExists < StandardError
+            def to_s
+              "User defined field already exists."
+            end
+          end
+          class UserDefinedFieldDoesNotExist < StandardError
+            def to_s
+              "User defined field does not exist."
+            end
+          end
+          class UserDefinedDataDoesNotExist < StandardError
+            def to_s
+              "User defined data does not exist."
+            end
+          end
+        end
+        def self.included(base)
+          base.extend(ClassMethods)
+        end
+        module ClassMethods
+          def has_user_defined_data
+            extend HasUserDefinedData::SingletonMethods
+            include HasUserDefinedData::InstanceMethods
+          end
+        end
+        module SingletonMethods
+          def remove_all_user_defined_data
+            UserDefinedData.destroy_all("model_name = #{self.name}")
+          end
+          alias remove_user_fields remove_all_user_defined_data
+          def user_defined_fields(scope=nil)
+            user_defined_data = if scope
+                                  # return array and remove nil if none with specified scope
+                                  [UserDefinedData.where('scope = ? and model_name = ?', scope, self.name).first].compact
+                                else
+                                  UserDefinedData.where('model_name = ?', self.name).all
+                                end
+            if user_defined_data.empty?
+              []
+            else
+              user_defined_data.collect(&:user_defined_fields).flatten
+            end
+          end
+          alias user_fields user_defined_fields
+          def user_defined_field(field_name, scope=nil)
+            UserDefinedField.joins(:user_defined_data)
+            .where('model_name = ?', self.name)
+            .where('scope = ?', scope)
+            .where('field_name = ?', field_name).first
+          end
+          alias user_field user_defined_field
+          def add_user_defined_field(field_name, label, data_type, scope=nil)
+            current_user_field = self.user_field(field_name, scope)
+            if current_user_field
+              raise Error::UserDefinedFieldAlreadyExists
+            else
+              user_defined_field = UserDefinedField.new(field_name: field_name, label: label, data_type: data_type)
+              user_defined_data = if scope
+                                    # return array and remove nil if none with specified scope
+                                    UserDefinedData.where('scope = ? and model_name = ?', scope, self.name).first
+                                  else
+                                    UserDefinedData.where('scope = ? and model_name = ?', nil, self.name)
+                                  end
+              user_defined_data = UserDefinedData.new(scope: scope, model_name: self.name) unless user_defined_data
+              user_defined_data.user_defined_fields << user_defined_field
+              user_defined_data.save
+              user_defined_field
+            end
+          end
+          alias add_user_field add_user_defined_field
+          def update_user_defined_field(field_name, label, scope=nil)
+            current_user_field = self.user_field(field_name, scope)
+            if current_user_field
+              current_user_field.label = label
+              current_user_field.save
+            else
+              raise Errors::UserDefinedFieldDoesNotExist
+            end
+          end
+          alias update_user_field update_user_defined_field
+          def remove_user_defined_field(field_name, scope=nil)
+            user_defined_data = if scope
+                                  # return array and remove nil if none with specified scope
+                                  UserDefinedData.where('scope = ? and model_name = ?', scope, self.name).first
+                                else
+                                  UserDefinedData.where('scope = ? and model_name = ?', nil, self.name)
+                                end
+            if user_defined_data
+              user_defined_field = user_defined_data.user_defined_fields.where('field_name = ?', field_name)
+              if user_defined_field
+                user_defined_field.destroy
+              else
+                raise Errors::UserDefinedFieldDoesNotExist
+              end
+            else
+              raise Errors::UserDefinedDataDoesNotExist
+            end
+          end
+          alias remove_user_field remove_user_defined_field
+        end
+        module InstanceMethods
+        end
+      end #HasUserDefinedData
+    end #ActiveRecord
+  end #Extensions
+end #ErpTechSvcs