phcpresspro 12.1.0 → 12.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a3d8a2e0c1489e9430c47a607a32bcd6c7e1db3
-  data.tar.gz: 06677564ba19e73a4472276dcb3c186efbede1e0
+  metadata.gz: a9839c08caf6d6cd481e9246ea5cfa670746802e
+  data.tar.gz: fa9936657cfa695a26de5f4a40dd2131562ee176
 SHA512:
-  metadata.gz: b7cccafafa6339020fca409a17b1024db9e2f4c7955881db67a1a1d7a705707c7ea537fda1b8d9e932c3a52e6559fd68e0809d51f5ce0d5f67988b556c17374d
-  data.tar.gz: 49bbc7901f76a129012634806d555ed5bc931d57de6f1c75479567747bd7b6335da06a7452140caf7cc306ecca5162e63398f2e1c523271063250bbcaa5427d2
+  metadata.gz: 42b313cf60123a532e4aacaff9099a6def1611dc82c1e5ead7968e4c14076c3ac3639c28231d571c4f5da3714ca75c478a07dc29f4d089396fba65ed318b249b
+  data.tar.gz: 38def7b378a5d325a12efb5e4c6203964310381b77f1d0bc3c3ceb809c709fdbeb06d05d2d2a3447b2087aa130c5d9e6797895cfdf22100c2915c159b34fbde5

data/app/controllers/phcpresspro/application_controller.rb

@@ -1,21 +1,52 @@
 module Phcpresspro
   class ApplicationController < ActionController::Base
 
-    # Load Helpers for PHCPress Widgets
-    before_action :phcpress_recent_posts
-
     # Security Filters
     protect_from_forgery with: :exception
 
+    # Load Helpers for PHCPress Widgets
+		before_action :phcpress_recent_posts
+
     # Load Helpers
     helper Phctitleseo::Engine.helpers
     helper Phcnotifi::Engine.helpers
     helper Phcaccountspro::Engine.helpers
 
-    # PHCPress Widget Helpers
-    def phcpress_recent_posts
-      @recent_posts = Articles::Post.all
+    # AuthRocket Definitions
+    def require_user
+      unless current_user
+        params.permit!
+        session[:last_url] = request.get? ? url_for(params) : url_for
+        redirect_to new_login_url
+      end
+    end
+
+    def current_user
+      @_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
+    end
+    helper_method :current_user
+
+    def new_login_url
+      ENV['AUTHROCKET_LOGIN_URL']
+    end
+    helper_method :new_login_url
+
+    def authrocket_membership_info
+      AuthRocket::Membership.all(user_id: current_user.id).first
     end
 
+    # Papertrail Whodunnit Username
+    def user_for_paper_trail
+      # Default is: current_user rescue nil
+      current_user ? current_user.username : 'Public user'
+    end
+
+    private
+
+		# PHCPress Widget Helpers
+		def phcpress_recent_posts
+			@recent_posts = Phcpresspro::Articles::Post.all
+		end
+
   end
 end

data/app/controllers/phcpresspro/articles/posts_controller.rb

@@ -3,19 +3,21 @@ require_dependency "phcpresspro/application_controller"
 module Phcpresspro
   class Articles::PostsController < ApplicationController
 
-    # Filters & Security
+    # Security & Action Filters
     before_action :require_user
-    before_action :membership_info
+    before_action :authrocket_membership_info
+    before_action :set_paper_trail_whodunnit
     before_action :set_articles_post, only: [:show, :edit, :update, :destroy]
 
     # Article Index
     def index
-      @articles_posts = Articles::Post.all
+      @articles_posts = Articles::Post.where(oganization_id: membership_info.org_id)
     end
 
     # Article Show
     def show
       @articles_post = Articles::Post.friendly.find(params[:id])
+      @versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcpresspro::Articles::Post')
     end
 
     # Article New
@@ -66,7 +68,7 @@ module Phcpresspro
 
     # Common Callbacks
     def set_articles_post
-      @articles_post = Articles::Post.find(params[:id])
+      @articles_post = Articles::Post.friendly.find(params[:id])
     end
 
     # Params Whitelist

data/app/controllers/phcpresspro/modules/categories_controller.rb

@@ -3,19 +3,21 @@ require_dependency "phcpresspro/application_controller"
 module Phcpresspro
   class Modules::CategoriesController < ApplicationController
 
-    # Security and Filters
+    # Security & Action Filters
     before_action :require_user
-    before_action :membership_info
+    before_action :authrocket_membership_info
+    before_action :set_paper_trail_whodunnit
     before_action :set_modules_category, only: [:show, :edit, :update, :destroy]
 
     # Categories Index
     def index
-      @modules_categories = Modules::Category.all
+      @modules_categories = Modules::Category.where(oganization_id: membership_info.org_id)
     end
 
     # Categories Show
     def show
       @modules_category = Modules::Category.friendly.find(params[:id])
+      @versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcpresspro::Modules::Category')
     end
 
     # Categories New
@@ -64,7 +66,7 @@ module Phcpresspro
 
     # Common Callbacks
     def set_modules_category
-      @modules_category = Modules::Category.find(params[:id])
+      @modules_category = Modules::Category.friendly.find(params[:id])
     end
 
     # Whitelist

data/app/controllers/phcpresspro/modules/connections_controller.rb

@@ -3,19 +3,21 @@ require_dependency "phcpresspro/application_controller"
 module Phcpresspro
   class Modules::ConnectionsController < ApplicationController
 
-    # Security and Filters
+    # Security & Action Filters
     before_action :require_user
-    before_action :membership_info
+    before_action :authrocket_membership_info
+    before_action :set_paper_trail_whodunnit
     before_action :set_modules_connection, only: [:show, :edit, :update, :destroy]
 
     # Connections Index
     def index
-      @modules_connections = Modules::Connection.all
+      @modules_connections = Modules::Connection.where(oganization_id: membership_info.org_id)
     end
 
     # Connections Show
     def show
       @modules_connection = Modules::Connection.friendly.find(params[:id])
+      @versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcpresspro::Modules::Connection')
     end
 
     # Connections New
@@ -64,7 +66,7 @@ module Phcpresspro
 
     # Common Callbacks
     def set_modules_connection
-      @modules_connection = Modules::Connection.find(params[:id])
+      @modules_connection = Modules::Connection.friendly.find(params[:id])
     end
 
     # Whitelist

data/app/models/phcpresspro/articles/post.rb

@@ -1,13 +1,16 @@
 module Phcpresspro
   class Articles::Post < ApplicationRecord
 
+    # For Image Uploads
+    mount_uploader :pstimage, Phcpresspro::PstimageUploader
+
     # Clean URL Initialize
     extend FriendlyId
 
-    # For Image Uploads
-    mount_uploader :pstimage, Phcpresspro::PstimageUploader
+    # Add Paper Trail
+    has_paper_trail
 
-    # Relationships
+    # Model Relationships
     has_many :connections, class_name: 'Phcpresspro::Modules::Connection', dependent: :destroy
     has_many :categories, class_name: 'Phcpresspro::Modules::Category', :through => :connections
 

data/app/models/phcpresspro/modules/category.rb

@@ -4,7 +4,10 @@ module Phcpresspro
     # Clean URL Initialize
     extend FriendlyId
 
-    # Relationships
+    # Add Paper Trail
+    has_paper_trail
+
+    # Model Relationships
     has_many :connections, class_name: 'Phcpresspro::Modules::Connection', dependent: :destroy
     has_many :posts, class_name: 'Phcpresspro::Modules::Category', :through => :connections
 

data/app/models/phcpresspro/modules/connection.rb

@@ -4,7 +4,10 @@ module Phcpresspro
     # Clean URL Initialize
     extend FriendlyId
 
-    # Relationships
+    # Add Paper Trail
+    has_paper_trail
+
+    # Model Relationships
     belongs_to :post, class_name: 'Phcpresspro::Articles::Post'
     belongs_to :category, class_name: 'Phcpresspro::Modules::Category'
 

data/app/views/layouts/phcpresspro/components/backend/footer/_footer.html.erb

@@ -4,5 +4,5 @@
 	<% end %>
 </div>
 <div>
-	&copy; 2012-<%= Time.now.year %> - v12.1.0 - RELEASED - MAY-11-<%= Date.today.year %>
+	&copy; 2012-<%= Time.now.year %> - v12.2.0 - RELEASED - MAY-15-<%= Date.today.year %>
 </div>

data/db/migrate/20160714193304_create_phcpresspro_versions.rb

@@ -0,0 +1,80 @@
+# This migration creates the `versions` table, the only schema PT requires.
+# All other migrations PT provides are optional.
+class CreatePhcpressproVersions < ActiveRecord::Migration[5.1]
+  # Class names of MySQL adapters.
+  # - `MysqlAdapter` - Used by gems: `mysql`, `activerecord-jdbcmysql-adapter`.
+  # - `Mysql2Adapter` - Used by `mysql2` gem.
+  MYSQL_ADAPTERS = [
+    "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]
+  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
+  end
+
+  def mysql?
+    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
+  # comparison, uses UTF-8 except in the unusual case where the OS is configured
+  # with a custom locale.
+  #
+  # - https://dev.mysql.com/doc/refman/5.7/en/charset-applications.html
+  # - http://www.postgresql.org/docs/9.4/static/multibyte.html
+  #
+  # Furthermore, MySQL's original implementation of UTF-8 was flawed, and had
+  # to be fixed later by introducing a new charset, `utf8mb4`.
+  #
+  # - https://mathiasbynens.be/notes/mysql-utf8mb4
+  # - https://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html
+  #
+  def versions_table_options
+    if mysql?
+      { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci" }
+    else
+      {}
+    end
+  end
+end

data/lib/phcpresspro/version.rb

@@ -1,3 +1,3 @@
 module Phcpresspro
-  VERSION = "12.1.0"
+  VERSION = "12.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phcpresspro
 version: !ruby/object:Gem::Version
-  version: 12.1.0
+  version: 12.2.0
 platform: ruby
 authors:
 - BradPotts
@@ -684,6 +684,7 @@ files:
 - app/views/phcpresspro/modules/connections/show.html.erb
 - config/routes.rb
 - config/tinymce.yml
+- db/migrate/20160714193304_create_phcpresspro_versions.rb
 - db/migrate/20160716182936_create_phcpresspro_modules_categories.rb
 - db/migrate/20160718204718_create_phcpresspro_articles_posts.rb
 - db/migrate/20160719221205_create_phcpresspro_modules_connections.rb
@@ -714,5 +715,5 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: PHCPress(PRO) Rails 5.1 CMS Engine
+summary: Rails 5.1 Engine - Content Management System
 test_files: []