phcmembers 6.3.4 → 6.3.5

data/app/controllers/phcmembers/member/listings_controller.rb

@@ -1,77 +1,77 @@
 require_dependency "phcmembers/application_controller"
 
 module Phcmembers
-	class Member::ListingsController < ApplicationController
-
-		# Security & Action Filters
-		before_action :set_paper_trail_whodunnit
-		before_action :get_member_profile_info
-		before_action :set_member_listing, only: [:show, :edit, :update, :destroy]
-
-		# INDEX - Directory Listings
-		def index
-			profile = Member::Profile.find(params[:profile_id])
-			@member_listings = profile.listings
-		end
-
-		# LISTINGS DETAILS - Directory Listings
-		def show
-			profile = Member::Profile.find(params[:profile_id])
-			@meber_listing = profile.listings.find(params[:id])
-			@versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmembers::Member::Listing')
-		end
-
-		# NEW - Directory Listings
-		def new
-			profile = Member::Profile.find(params[:profile_id])
-			@member_listing = profile.listings.build
-		end
-
-		# EDIT - Directory Listings
-		def edit
-		end
-
-		# POST - Directory Listings
-		def create
-			@profile = Member::Profile.find(params[:profile_id])
-			@member_listing = @profile.listings.create(member_listing_params)
-			if @member_listing.save
-				@member_listing.categorylistings.build
-				redirect_to member_profile_listings_url, notice: 'Listing was successfully created.'
-				else
-					render :new
-			end
-		end
-
-		# PATCH/PUT - Directory Listings
-		def update
-			if @member_listing.update(member_listing_params)
-				@member_listing.categorylistings.build
-				redirect_to member_profile_listings_url, notice: 'Listing was successfully updated.'
-				else
-					render :edit
-			end
-		end
-
-		# DELETE - Directory Listings
-		def destroy
-			@profile = Member::Profile.find(params[:profile_id])
-			@member_listing = @profile.listings.find(params[:id])
-			@member_listing.destroy
-			redirect_to member_profile_listings_url, notice: 'Listing was successfully destroyed.'
-		end
-
-		private
-
-		# Common Callbacks
-		def set_member_listing
-			@member_listing = Member::Listing.find(params[:id])
-		end
-
-		# Whitelist
-		def member_listing_params
-			params.require(:member_listing).permit(:mbcompanyname, :mbcontactname, :mbaddressl1, :mbaddressl2, :mbcity, :mbcountry, :mbprovince, :mbpostalcode, :mbphone, :mbcontactemail, :mbwebsite, :profile_id, category_ids: [])
-		end
-
-	end
+  class Member::ListingsController < ApplicationController
+  
+    # Security & Action Filters
+    before_action :set_paper_trail_whodunnit
+    before_action :get_member_profile_info
+    before_action :set_member_listing, only: [:show, :edit, :update, :destroy]
+    
+    # INDEX - Directory Listings
+    def index
+      profile = Member::Profile.find(params[:profile_id])
+      @member_listings = profile.listings
+    end
+    
+    # LISTINGS DETAILS - Directory Listings
+    def show
+      profile = Member::Profile.find(params[:profile_id])
+      @meber_listing = profile.listings.find(params[:id])
+      @versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmembers::Member::Listing')
+    end
+    
+    # NEW - Directory Listings
+    def new
+      profile = Member::Profile.find(params[:profile_id])
+      @member_listing = profile.listings.build
+    end
+    
+    # EDIT - Directory Listings
+    def edit
+    end
+    
+    # POST - Directory Listings
+    def create
+      @profile = Member::Profile.find(params[:profile_id])
+      @member_listing = @profile.listings.create(member_listing_params)
+      if @member_listing.save
+        @member_listing.categorylistings.build
+        redirect_to member_profile_listings_url, notice: 'Listing was successfully created.'
+        else
+          render :new
+      end
+    end
+    
+    # PATCH/PUT - Directory Listings
+    def update
+      if @member_listing.update(member_listing_params)
+        @member_listing.categorylistings.build
+        redirect_to member_profile_listings_url, notice: 'Listing was successfully updated.'
+        else
+          render :edit
+      end
+    end
+    
+    # DELETE - Directory Listings
+    def destroy
+      @profile = Member::Profile.find(params[:profile_id])
+      @member_listing = @profile.listings.find(params[:id])
+      @member_listing.destroy
+      redirect_to member_profile_listings_url, notice: 'Listing was successfully destroyed.'
+    end
+    
+    private
+    
+    # Common Callbacks
+    def set_member_listing
+      @member_listing = Member::Listing.find(params[:id])
+    end
+    
+    # Whitelist
+    def member_listing_params
+      params.require(:member_listing).permit(:mbcompanyname, :mbcontactname, :mbaddressl1, :mbaddressl2, :mbcity, :mbcountry, :mbprovince, :mbpostalcode, :mbphone, :mbcontactemail, :mbwebsite, :profile_id, category_ids: [])
+    end
+  
+  end
 end

data/app/controllers/phcmembers/member/profiles_controller.rb

@@ -1,68 +1,68 @@
 require_dependency "phcmembers/application_controller"
 
 module Phcmembers
-	class Member::ProfilesController < ApplicationController
-
-		# Security & Action Filters
-		before_action :set_paper_trail_whodunnit
-		before_action :set_member_profile, only: [:show, :edit, :update, :destroy]
-
-		# INDEX - Member Profile
-		def index
-			@member_profiles = Member::Profile.all
-		end
-
-		# DETAILED PROFILE - Member Profile
-		def show
-			@member_profile = Member::Profile.find(params[:id])
-			@versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmembers::Member::Profile')
-		end
-
-		# NEW FORM - Member Profile
-		def new
-		@member_profile = Member::Profile.new
-		end
-
-		# EDIT FORM - Member Profile
-		def edit
-		end
-
-		# POST - Member Profile
-		def create
-			@member_profile = Member::Profile.new(member_profile_params)
-			if @member_profile.save
-				redirect_to member_profiles_url, notice: 'Profile was successfully created.'
-				else
-					render :new
-			end
-		end
-
-		# PATCH/PUT - Member Profile
-		def update
-			if @member_profile.update(member_profile_params)
-				redirect_to member_profiles_url, notice: 'Profile was successfully updated.'
-				else
-					render :edit
-			end
-		end
-
-		# DELETE - Member Profile
-		def destroy
-			@member_profile.destroy
-			redirect_to member_profiles_url, notice: 'Profile was successfully destroyed.'
-		end
-
-		private
-
-		# Common Callbacks
-		def set_member_profile
-			@member_profile = Member::Profile.find(params[:id])
-		end
-
-		# Whitelist
-		def member_profile_params
-			params.require(:member_profile).permit(:mfirstname, :mlastname, :mtitle, :memail, :mphone, :mnotes)
-		end
-
-	end
+  class Member::ProfilesController < ApplicationController
+  
+    # Security & Action Filters
+    before_action :set_paper_trail_whodunnit
+    before_action :set_member_profile, only: [:show, :edit, :update, :destroy]
+    
+    # INDEX - Member Profile
+    def index
+      @member_profiles = Member::Profile.all
+    end
+    
+    # DETAILED PROFILE - Member Profile
+    def show
+      @member_profile = Member::Profile.find(params[:id])
+      @versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmembers::Member::Profile')
+    end
+    
+    # NEW FORM - Member Profile
+    def new
+      @member_profile = Member::Profile.new
+    end
+    
+    # EDIT FORM - Member Profile
+    def edit
+    end
+    
+    # POST - Member Profile
+    def create
+      @member_profile = Member::Profile.new(member_profile_params)
+      if @member_profile.save
+        redirect_to member_profiles_url, notice: 'Profile was successfully created.'
+        else
+          render :new
+      end
+    end
+    
+    # PATCH/PUT - Member Profile
+    def update
+      if @member_profile.update(member_profile_params)
+        redirect_to member_profiles_url, notice: 'Profile was successfully updated.'
+        else
+          render :edit
+      end
+    end
+    
+    # DELETE - Member Profile
+    def destroy
+      @member_profile.destroy
+      redirect_to member_profiles_url, notice: 'Profile was successfully destroyed.'
+    end
+    
+    private
+    
+    # Common Callbacks
+    def set_member_profile
+      @member_profile = Member::Profile.find(params[:id])
+    end
+    
+    # Whitelist
+    def member_profile_params
+      params.require(:member_profile).permit(:mfirstname, :mlastname, :mtitle, :memail, :mphone, :mnotes)
+    end
+  
+  end
 end

data/config/routes.rb

@@ -1,42 +1,38 @@
 Phcmembers::Engine.routes.draw do
 
-	# Dashboard (Engine Root)
-	get 'dashboard/mains/index', :path => "dashboard"
+  # Dashboard (Engine Root)
+  get 'dashboard/mains/index', :path => "dashboard"
+  
+  # Application API
+  namespace :api do
+    # Routes for API
+    resources :catsapi, defaults: {format: 'json'} do
+      resources :listapi
+    end
+  end
+  
+  # Application Client Backend
+  
+  # Members Section
+  namespace :member do
+    # Members Main Index
+    root 'profiles#index'
+    
+    # Member Routes
+    resources :profiles, class_name: 'Phcmembers::Member::Profile' do
+      resources :listings, class_name: 'Phcmembers::Member::Listing'
+      resources :addresses, class_name: 'Phcmembers::Member::Address'
+    end
+  end
+  
+  # Directory Section
+  namespace :directory do
+    # Members Main Index
+    root 'categories#index'
+    resources :categories, class_name: 'Phcmembers::Directory::Category'
+    resources :categorylistings, class_name: 'Phcmembers::Directory::Categorylisting'
+  end
 
-	# Application API
-	namespace :api do
-
-		# Routes for API
-		resources :catsapi, defaults: {format: 'json'} do
-			resources :listapi
-		end
-
-	end
-
-	# Application Client Backend
-
-	# Members Section
-	namespace :member do
-
-		# Members Main Index
-		root 'profiles#index'
-
-		# Member Routes
-		resources :profiles, class_name: 'Phcmembers::Member::Profile' do
-			resources :listings, class_name: 'Phcmembers::Member::Listing'
-			resources :addresses, class_name: 'Phcmembers::Member::Address'
-		end
-
-	end
-
-	# Directory Section
-	namespace :directory do
-
-		# Members Main Index
-		root 'categories#index'
+end
 
-		resources :categories, class_name: 'Phcmembers::Directory::Category'
-		resources :categorylistings, class_name: 'Phcmembers::Directory::Categorylisting'
-	end
 
-end

data/db/migrate/20160707154842_create_versions.rb

@@ -5,56 +5,56 @@ class CreateVersions < ActiveRecord::Migration
   # - `MysqlAdapter` - Used by gems: `mysql`, `activerecord-jdbcmysql-adapter`.
   # - `Mysql2Adapter` - Used by `mysql2` gem.
   MYSQL_ADAPTERS = [
-    "ActiveRecord::ConnectionAdapters::MysqlAdapter",
-    "ActiveRecord::ConnectionAdapters::Mysql2Adapter"
+  "ActiveRecord::ConnectionAdapters::MysqlAdapter",
+  "ActiveRecord::ConnectionAdapters::Mysql2Adapter"
   ].freeze
-
+  
   # The largest text column available in all supported RDBMS is
   # 1024^3 - 1 bytes, roughly one gibibyte.  We specify a size
   # so that MySQL will use `longtext` instead of `text`.  Otherwise,
   # when serializing very large objects, `text` might not be big enough.
   TEXT_BYTES = 1_073_741_823
-
+  
   def change
-    create_table :versions, versions_table_options do |t|
-      t.string   :item_type, item_type_options
-      t.integer  :item_id,   null: false
-      t.string   :event,     null: false
-      t.string   :whodunnit
-      t.text     :object, limit: TEXT_BYTES
-
-      # Known issue in MySQL: fractional second precision
-      # -------------------------------------------------
-      #
-      # MySQL timestamp columns do not support fractional seconds unless
-      # defined with "fractional seconds precision". MySQL users should manually
-      # add fractional seconds precision to this migration, specifically, to
-      # the `created_at` column.
-      # (https://dev.mysql.com/doc/refman/5.6/en/fractional-seconds.html)
-      #
-      # MySQL users should also upgrade to rails 4.2, which is the first
-      # version of ActiveRecord with support for fractional seconds in MySQL.
-      # (https://github.com/rails/rails/pull/14359)
-      #
-      t.datetime :created_at
-    end
-    add_index :versions, [:item_type, :item_id]
+  create_table :versions, versions_table_options do |t|
+  t.string   :item_type, item_type_options
+  t.integer  :item_id,   null: false
+  t.string   :event,     null: false
+  t.string   :whodunnit
+  t.text     :object, limit: TEXT_BYTES
+  
+  # Known issue in MySQL: fractional second precision
+  # -------------------------------------------------
+  #
+  # MySQL timestamp columns do not support fractional seconds unless
+  # defined with "fractional seconds precision". MySQL users should manually
+  # add fractional seconds precision to this migration, specifically, to
+  # the `created_at` column.
+  # (https://dev.mysql.com/doc/refman/5.6/en/fractional-seconds.html)
+  #
+  # MySQL users should also upgrade to rails 4.2, which is the first
+  # version of ActiveRecord with support for fractional seconds in MySQL.
+  # (https://github.com/rails/rails/pull/14359)
+  #
+  t.datetime :created_at
   end
-
+  add_index :versions, [:item_type, :item_id]
+  end
+  
   private
-
+  
   # MySQL 5.6 utf8mb4 limit is 191 chars for keys used in indexes.
   # See https://github.com/airblade/paper_trail/issues/651
   def item_type_options
-    opt = { null: false }
-    opt[:limit] = 191 if mysql?
-    opt
+  opt = { null: false }
+  opt[:limit] = 191 if mysql?
+  opt
   end
-
+  
   def mysql?
-    MYSQL_ADAPTERS.include?(connection.class.name)
+  MYSQL_ADAPTERS.include?(connection.class.name)
   end
-
+  
   # Even modern versions of MySQL still use `latin1` as the default character
   # encoding. Many users are not aware of this, and run into trouble when they
   # try to use PaperTrail in apps that otherwise tend to use UTF-8. Postgres, by
@@ -73,8 +73,10 @@ class CreateVersions < ActiveRecord::Migration
   def versions_table_options
     if mysql?
       { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci" }
-    else
+      else
       {}
     end
   end
 end
+
+