phcmembers 11.0.0 → 12.0.1

data/app/helpers/phcmembers/application_helper.rb

@@ -1,14 +1,14 @@
-module Phcmembers
-	module ApplicationHelper
-
-		# Add Active to Menu
-		def is_active_controller(controller_name)
-			params[:controller] == controller_name ? "active open selected" : nil
-		end
-
-		def is_active_action(action_name)
-			params[:action] == action_name ? "active" : nil
-		end
-
-	end
-end
+module Phcmembers
+	module ApplicationHelper
+
+		# Add Active to Menu
+		def is_active_controller(controller_name)
+			params[:controller] == controller_name ? "active open selected" : nil
+		end
+
+		def is_active_action(action_name)
+			params[:action] == action_name ? "active" : nil
+		end
+
+	end
+end

data/app/jobs/phcmembers/application_job.rb

@@ -1,4 +1,4 @@
-module Phcmembers
-	class ApplicationJob < ActiveJob::Base
-	end
-end
+module Phcmembers
+	class ApplicationJob < ActiveJob::Base
+	end
+end

data/app/mailers/phcmembers/application_mailer.rb

@@ -1,8 +1,8 @@
-module Phcmembers
-
-	class ApplicationMailer < ActionMailer::Base
-		default from: 'info@example.com'
-		layout 'mailer'
-	end
-
-end
+module Phcmembers
+
+	class ApplicationMailer < ActionMailer::Base
+		default from: 'info@example.com'
+		layout 'mailer'
+	end
+
+end

data/app/models/phcmembers/application_record.rb

@@ -1,5 +1,5 @@
-module Phcmembers
-	class ApplicationRecord < ActiveRecord::Base
-		self.abstract_class = true
-	end
-end
+module Phcmembers
+	class ApplicationRecord < ActiveRecord::Base
+		self.abstract_class = true
+	end
+end

data/app/models/phcmembers/connections.rb

@@ -1,7 +1,7 @@
-module Phcmembers
-  module Connections
-    def self.table_name_prefix
-      'phcmembers_connections_'
-    end
-  end
-end
+module Phcmembers
+  module Connections
+    def self.table_name_prefix
+      'phcmembers_connections_'
+    end
+  end
+end

data/app/models/phcmembers/directory.rb

@@ -1,7 +1,7 @@
-module Phcmembers
-	module Directory
-		def self.table_name_prefix
-			'phcmembers_directory_'
-		end
-	end
-end
+module Phcmembers
+	module Directory
+		def self.table_name_prefix
+			'phcmembers_directory_'
+		end
+	end
+end

data/app/models/phcmembers/directory/category.rb

@@ -1,19 +1,29 @@
-module Phcmembers
-	class Directory::Category < ApplicationRecord
-
-
-		# Clean URL Initialize
-		extend FriendlyId
-
-		# Paper_tail Initialize
-		has_paper_trail
-
-		# Relationships
-		has_many :categorylistings, class_name: 'Phcmembers::Directory::Categorylisting', dependent: :destroy
-		has_many :listings, class_name: 'Phcmembers::Member::Listing', :through => :categorylistings
-
-		# Clean URL Define
-		friendly_id :catname, use: :slugged
-
-	end
-end
+module Phcmembers
+	class Directory::Category < ApplicationRecord
+
+		# Clean URL Initialize
+		extend FriendlyId
+
+		# Paper_tail Initialize
+		has_paper_trail :class_name => 'Phcmembers::VersionsCategory'
+
+		# Relationships
+		has_many :categorylistings, class_name: 'Phcmembers::Directory::Categorylisting', dependent: :destroy
+		has_many :listings, class_name: 'Phcmembers::Member::Listing', :through => :categorylistings
+
+		validates :catname,
+    length: { minimum: 3 }
+
+    # Clean URL Define
+    friendly_id :phcmembers_category_slug, use: [:slugged, :finders]
+
+    # Define for Multiple Records
+    def phcmembers_category_slug
+    [
+      :catname,
+      [:catname, :id]
+    ]
+    end
+
+	end
+end

data/app/models/phcmembers/directory/categorylisting.rb

@@ -1,18 +1,12 @@
-module Phcmembers
-	class Directory::Categorylisting < ApplicationRecord
-
-    # Clean URL Initialize
-    extend FriendlyId
-
-		# Add Paper Trail
-		has_paper_trail
-
-		# Model Relationships
-		belongs_to :listing, class_name: 'Phcmembers::Member::Listing'
-		belongs_to :category, class_name: 'Phcmembers::Directory::Category'
-
-		# Clean URL Define
-		friendly_id :id, use: :slugged
-
-	end
-end
+module Phcmembers
+	class Directory::Categorylisting < ApplicationRecord
+
+		# Add Paper Trail
+		has_paper_trail :class_name => 'Phcmembers::VersionsCategoryListing'
+
+		# Model Relationships
+		belongs_to :listing, class_name: 'Phcmembers::Member::Listing'
+		belongs_to :category, class_name: 'Phcmembers::Directory::Category'
+
+	end
+end

data/app/models/phcmembers/member.rb

@@ -1,7 +1,7 @@
-module Phcmembers
-  module Member
-    def self.table_name_prefix
-      'phcmembers_member_'
-    end
-  end
-end
+module Phcmembers
+  module Member
+    def self.table_name_prefix
+      'phcmembers_member_'
+    end
+  end
+end

data/app/models/phcmembers/member/address.rb

@@ -1,17 +1,45 @@
-module Phcmembers
-	class Member::Address < ApplicationRecord
-
-    # Clean URL Initialize
-    extend FriendlyId
-
-		# Add Paper Trail
-		has_paper_trail
-
-		# Model Relationships
-		belongs_to :profile, class_name: 'Phcmembers::Member::Profile'
-
-		# Clean URL Define
-		friendly_id :id, use: :slugged
-
-	end
-end
+module Phcmembers
+	class Member::Address < ApplicationRecord
+
+		# Clean URL Initialize
+		extend FriendlyId
+
+		# Add Paper Trail
+		has_paper_trail :class_name => 'Phcmembers::VersionsAddress'
+
+		# Validation for Form Fields
+		validates :mcaddressl1,
+		presence: true,
+		length: { minimum: 2 }
+
+		validates :mccity,
+		length: { minimum: 3 }
+
+		validates :mcprovince,
+		presence: true,
+		length: { minimum: 2 }
+
+		validates :mccountry,
+		presence: true,
+		length: { minimum: 2 }
+
+		validates :mcpostalcode,
+		presence: true,
+		length: { minimum: 3 }
+
+		validates :mctype,
+		presence: true,
+		length: { minimum: 2 }
+
+		# Clean URL Define
+    friendly_id :phcmembers_address_slug, use: [:slugged, :finders]
+
+    # Define for Multiple Records
+    def phcmembers_address_slug
+    [
+      [:mcaddressl1, :mccity, :mcprovince]
+    ]
+    end
+
+	end
+end

data/app/models/phcmembers/member/listing.rb

@@ -1,26 +1,66 @@
-module Phcmembers
-	class Member::Listing < ApplicationRecord
-
-    # Clean URL Initialize
-    extend FriendlyId
-
-		# Add Paper Trail
-		has_paper_trail
-
-		# Model Relationships
-		belongs_to :profile, class_name: 'Phcmembers::Member::Profile'
-		has_many :categorylistings, class_name: 'Phcmembers::Directory::Categorylisting', dependent: :destroy
-		has_many :categories, class_name: 'Phcmembers::Directory::Category', :through => :categorylistings
-
-		# Clean URL Define
-    friendly_id :businessmemberfullname, use: :slugged
-
-    # Define for Multiple Records
-    def businessmemberfullname
-      [
-        [:mbcompanyname, :mbcontactname]
-      ]
-    end
-
-	end
-end
+module Phcmembers
+	class Member::Listing < ApplicationRecord
+
+		# Clean URL Initialize
+    extend FriendlyId
+
+    # Add Paper Trail
+    has_paper_trail :class_name => 'Phcmembers::VersionsListing'
+
+    # Model Relationships
+		belongs_to :profile, class_name: 'Phcmembers::Member::Profile'
+		has_many :categorylistings, class_name: 'Phcmembers::Directory::Categorylisting', dependent: :destroy
+		has_many :categories, class_name: 'Phcmembers::Directory::Category', :through => :categorylistings
+
+		# Validation for Form Fields
+		validates :mbcompanyname,
+		presence: true,
+		length: { minimum: 2 }
+
+		validates :mbcontactname,
+		presence: true,
+		length: { minimum: 2 }
+
+		validates :mbaddressl1,
+		length: { minimum: 3 }
+
+		validates :mbcity,
+		presence: true,
+		length: { minimum: 3 }
+
+		validates :mbcountry,
+		presence: true,
+		length: { minimum: 2 }
+
+		validates :mbprovince,
+		presence: true,
+		length: { minimum: 2 }
+
+		validates :mbpostalcode,
+		presence: true,
+		length: { minimum: 3 }
+
+		validates :mbcontactemail,
+		presence: true,
+		length: { minimum: 3 }
+
+		validates :mbwebsite,
+		presence: true,
+		length: { minimum: 6 }
+
+		validates :mbphone,
+		presence: true,
+		format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Number Format: xxx-xxx-xxxx" }
+
+		# Clean URL Define
+		friendly_id :phcmembers_listings_slug, use: [:slugged, :finders]
+
+		# Define for Multiple Records
+		def phcmembers_listings_slug
+			[
+				[:mbcompanyname, :mbcontactname]
+			]
+		end
+
+	end
+end

data/app/models/phcmembers/member/profile.rb

@@ -1,49 +1,49 @@
-module Phcmembers
-	class Member::Profile < ApplicationRecord
-
-    # Clean URL Initialize
-    extend FriendlyId
-
-		# Add Paper Trail
-		has_paper_trail
-
-		# Gravatar
-		include Gravtastic
-		gravtastic :memail
-
-		# Model Relationship
-		has_many :addresses, class_name: 'Phcmembers::Member::Address'
-		has_many :listings, class_name: 'Phcmembers::Member::Listing'
-
-		# Validation for Form Fields
-		validates :mfirstname,
-			presence: true,
-			length: { minimum: 1 }
-
-		validates :mlastname,
-			presence: true,
-			length: { minimum: 1 }
-
-		validates :mtitle,
-			length: { minimum: 2 }
-
-		validates :memail,
-			presence: true,
-			length: { minimum: 6 }
-
-		validates :mphone,
-			presence: true,
-			format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Number Format: xxx-xxx-xxxx" }
-
-			# Clean URL Define
-	    friendly_id :memberfullname, use: :slugged
-
-	    # Define for Multiple Records
-	    def memberfullname
-	      [
-	        [:mfirstname, :mlastname]
-	      ]
-	    end
-
-	end
-end
+module Phcmembers
+	class Member::Profile < ApplicationRecord
+
+		# Clean URL Initialize
+    extend FriendlyId
+
+    # Add Paper Trail
+    has_paper_trail :class_name => 'Phcmembers::VersionsProfile'
+
+    # Gravatar
+    include Gravtastic
+    gravtastic :memail
+
+    # Model Relationships
+		has_many :addresses, class_name: 'Phcmembers::Member::Address'
+		has_many :listings, class_name: 'Phcmembers::Member::Listing'
+
+		# Validation for Form Fields
+    validates :mfirstname,
+    presence: true,
+    length: { minimum: 1 }
+
+    validates :mlastname,
+    presence: true,
+    length: { minimum: 1 }
+
+    validates :mtitle,
+    length: { minimum: 2 }
+
+    validates :memail,
+    presence: true,
+    length: { minimum: 6 }
+
+    validates :mphone,
+    presence: true,
+    format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Number Format: xxx-xxx-xxxx" }
+
+		# Clean URL Define
+		friendly_id :phcmembers_profiles_slug, use: [:slugged, :finders]
+
+		# Define for Multiple Records
+		def phcmembers_profiles_slug
+			[
+				[:user_name, :mfirstname, :mlastname]
+			]
+		end
+
+	end
+end