phcscriptcdnpro 11.1.1 → 11.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3177e12e6b1e6c18d9570379a3e7a404facb95af
-  data.tar.gz: 912b680645cf4bd1bd1f89b56fa896d1a0b0c7c8
+  metadata.gz: 9752e6aa6ca360e246d5a7655467af8419eb2e82
+  data.tar.gz: bd08f929ac11cb3a7f255e33db2daee36183a202
 SHA512:
-  metadata.gz: 6d32140414a0def073adfaaecb32e910a140f901877ac232e7eea5bd5cdc6daaef6ec4ace15f8a9a95a18c110bef2ad965ef122ab5f6f1a0b7c4d368a527b951
-  data.tar.gz: eb017191c11f78a7c8601e37b725024dd54951e544ae975ef3433ecc6d134cac73b1bfe3807379bd725c79c634f7a8386de39fe0319a3a93be16e2b85af67abe
+  metadata.gz: 9c3b5820bc5727a160306e799689b86c7d86c0bfda05a5b80203313cee4a8e14c5665c30d3d263ac9fefa4dcbbb6b9197a780c8f87f1e5388c5bd85765b7c736
+  data.tar.gz: a5962c8120dd2c4647eb4a47b0a7d70ec2d70b40ec70ad9825efe3d6d054ed67f8d887180f69c0c638ab64e2a1fabd6b309b529cd903e2aec9805fb59819be0f

data/app/controllers/phcscriptcdnpro/application_controller.rb

@@ -31,7 +31,7 @@ module Phcscriptcdnpro
     end
     helper_method :new_login_url
 
-    def membership_info
+    def authrocket_membership_info
       AuthRocket::Membership.all(user_id: current_user.id).first
     end
 
@@ -41,11 +41,6 @@ module Phcscriptcdnpro
       current_user ? current_user.username : 'Public user'
     end
 
-    # Grab Member Information
-    def get_member_profile_info
-      @members_profile_info = Member::Profile.find(params[:profile_id])
-    end
-
     private
 
 		# PHCPress Widget Helpers

data/app/controllers/phcscriptcdnpro/script/authors_controller.rb

@@ -3,19 +3,21 @@ require_dependency "phcscriptcdnpro/application_controller"
 module Phcscriptcdnpro
   class Script::AuthorsController < 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_script_author, only: [:show, :edit, :update, :destroy]
 
     # INDEX - Script Author
     def index
-      @script_authors = Script::Author.all
+      @script_authors = Script::Author.where(oganization_id: membership_info.org_id)
     end
 
     # DETAILS - Script Author
     def show
       @script_authors = Script::Author.friendly.find(params[:id])
+      @versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmemberspro::Directory::Category')
     end
 
     # NEW - Script Author

data/app/controllers/phcscriptcdnpro/script/extensions_controller.rb

@@ -3,19 +3,21 @@ require_dependency "phcscriptcdnpro/application_controller"
 module Phcscriptcdnpro
   class Script::ExtensionsController < 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_script_extension, only: [:show, :edit, :update, :destroy]
 
     # INDEX - Script Extension
     def index
-      @script_extensions = Script::Extension.all
+      @script_extensions = Script::Extension.where(oganization_id: membership_info.org_id)
     end
 
     # DETAILS - Script Extension
     def show
       @script_extensions = Script::Extension.friendly.find(params[:id])
+      @versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmemberspro::Directory::Category')
     end
 
     # NEW - Script Extension
@@ -69,7 +71,7 @@ module Phcscriptcdnpro
 
     # Whitelists
     def script_extension_params
-      params.require(:script_extension).permit(:scriptextensionname, :scriptextensiondes, :scriptextension, :user_id, :user_name, :slug, :membership_id, :oganization_id)
+      params.require(:script_extension).permit(:scriptextensionname, :scriptextensiondes, :scriptextension, :slug, :user_id, :user_name, :membership_id, :oganization_id)
     end
 
   end

data/app/controllers/phcscriptcdnpro/script/licences_controller.rb

@@ -3,19 +3,21 @@ require_dependency "phcscriptcdnpro/application_controller"
 module Phcscriptcdnpro
   class Script::LicencesController < 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_script_licence, only: [:show, :edit, :update, :destroy]
 
     # INDEX - Script Licences
     def index
-      @script_licences = Script::Licence.all
+      @script_licences = Script::Licence.where(oganization_id: membership_info.org_id)
     end
 
     # DETAILS - Script Licences
     def show
       @script_licences = Script::Licence.friendly.find(params[:id])
+      @versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmemberspro::Directory::Category')
     end
 
     # NEW - Script Licences
@@ -69,7 +71,7 @@ module Phcscriptcdnpro
 
     # Whitelists
     def script_licence_params
-      params.require(:script_licence).permit(:lcncname, :lcncdescription, :lcncdescript, :lcnccomgpl, :lcncarvlfsf, :lcncarvlosi, :lcncarvlcopyfree, :lcncarvldebian, :lcncarvlfedora, :user_id, :slug, :user_name, :membership_id, :oganization_id)
+      params.require(:script_licence).permit(:lcncname, :lcncdescription, :lcncdescript, :lcnccomgpl, :lcncarvlfsf, :lcncarvlosi, :lcncarvlcopyfree, :lcncarvldebian, :lcncarvlfedora, :slug, :user_id, :user_name, :membership_id, :oganization_id)
     end
 
   end

data/app/controllers/phcscriptcdnpro/script/listings_controller.rb

@@ -3,19 +3,21 @@ require_dependency "phcscriptcdnpro/application_controller"
 module Phcscriptcdnpro
   class Script::ListingsController < 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_script_listing, only: [:show, :edit, :update, :destroy]
 
     # INDEX - Script Listings
     def index
-      @script_listings = Script::Listing.all
+      @script_listings = Script::Listing.where(oganization_id: membership_info.org_id)
     end
 
     # DETAILS - Script Listings
     def show
       @script_listings = Script::Listing.friendly.find(params[:id])
+      @versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmemberspro::Directory::Category')
     end
 
     # NEW - Script Listings

data/app/controllers/phcscriptcdnpro/script/urls_controller.rb

@@ -3,9 +3,10 @@ require_dependency "phcscriptcdnpro/application_controller"
 module Phcscriptcdnpro
   class Script::UrlsController < 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_script_url, only: [:show, :edit, :update, :destroy]
 
     # INDEX - Script Authors

data/app/controllers/phcscriptcdnpro/script/versions_controller.rb

@@ -3,19 +3,21 @@ require_dependency "phcscriptcdnpro/application_controller"
 module Phcscriptcdnpro
   class Script::VersionsController < 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_script_version, only: [:show, :edit, :update, :destroy]
 
     # INDEX - Script Versions
     def index
-      @script_versions = Script::Version.all
+      @script_versions = Script::Version.where(oganization_id: membership_info.org_id)
     end
 
     # DETAILS - Script Versions
     def show
       @script_versions = Script::Version.friendly.find(params[:id])
+      @versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmemberspro::Directory::Category')
     end
 
     # NEW - Script Versions
@@ -69,7 +71,7 @@ module Phcscriptcdnpro
 
     # Only allow a trusted parameter "white list" through.
     def script_version_params
-      params.require(:script_version).permit(:scriptversion, :user_id, :user_name, :slug, :membership_id, :oganization_id)
+      params.require(:script_version).permit(:scriptversion, :slug, :user_id, :user_name, :membership_id, :oganization_id)
     end
 
   end

data/app/models/phcscriptcdnpro/script/author.rb

@@ -4,7 +4,10 @@ module Phcscriptcdnpro
     # Clean URL Initialize
     extend FriendlyId
 
-    # Listing (None Nested)
+    # Add Paper Trail
+    has_paper_trail
+
+    # Model Relationships
     has_many :listings, class_name: 'Phcscriptcdnpro::Script::Listing'
 
     # Clean URL Define

data/app/models/phcscriptcdnpro/script/extension.rb

@@ -4,7 +4,10 @@ module Phcscriptcdnpro
     # Clean URL Initialize
     extend FriendlyId
 
-    # URLs & Extensions (None Nested)
+    # Add Paper Trail
+    has_paper_trail
+
+    # Model Relationships
     has_many :listings, class_name: 'Phcscriptcdnpro::Script::Listing', :through => :urls
     has_many :urls, class_name: 'Phcscriptcdnpro::Script::Url'
 

data/app/models/phcscriptcdnpro/script/licence.rb

@@ -4,7 +4,10 @@ module Phcscriptcdnpro
     # Clean URL Initialize
     extend FriendlyId
 
-    # Listing (None Nested)
+    # Add Paper Trail
+    has_paper_trail
+
+    # Model Relationships
     has_many :listings, class_name: 'Phcscriptcdnpro::Script::Listing'
 
     # Clean URL Define

data/app/models/phcscriptcdnpro/script/listing.rb

@@ -4,7 +4,10 @@ module Phcscriptcdnpro
     # Clean URL Initialize
     extend FriendlyId
 
-    # Attach to URL (Nested)
+    # Add Paper Trail
+    has_paper_trail
+
+    # Model Relationships
     has_many :urls, class_name: 'Phcscriptcdnpro::Script::Url'
 
     # Attach to Author (None Nested)

data/app/models/phcscriptcdnpro/script/url.rb

@@ -4,7 +4,10 @@ module Phcscriptcdnpro
     # Clean URL Initialize
     extend FriendlyId
 
-    # Attach to Listings (Nested)
+    # Add Paper Trail
+    has_paper_trail
+
+    # Model Relationships
     belongs_to :listing, class_name: 'Phcscriptcdnpro::Script::Listing'
 
     # Attach to Version (None Nested)

data/app/models/phcscriptcdnpro/script/version.rb

@@ -4,7 +4,10 @@ module Phcscriptcdnpro
     # Clean URL Initialize
     extend FriendlyId
 
-    # Attach to Listing (None Nested)
+    # Add Paper Trail
+    has_paper_trail
+
+    # Model Relationships
     has_many :listings, class_name: 'Phcscriptcdnpro::Script::Listing'
 
     #  Attach to URL (None Nested)

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

@@ -4,5 +4,5 @@
 	<% end %>
 </div>
 <div>
-	&copy; 2012-<%= Time.now.year %> - v11.1.1 - RELEASED - MAY-12-<%= Date.today.year %>
+	&copy; 2012-<%= Time.now.year %> - v11.2.0 - RELEASED - MAY-12-<%= Date.today.year %>
 </div>

data/db/migrate/20160714193304_create_phcscriptcdnpro_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 CreatePhcscriptcdnproVersions < 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/phcscriptcdnpro/version.rb

@@ -1,3 +1,3 @@
 module Phcscriptcdnpro
-  VERSION = "11.1.1"
+  VERSION = "11.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phcscriptcdnpro
 version: !ruby/object:Gem::Version
-  version: 11.1.1
+  version: 11.2.0
 platform: ruby
 authors:
 - BradPotts
@@ -710,6 +710,7 @@ files:
 - app/views/phcscriptcdnpro/script/versions/show.html.erb
 - config/initializers/friendly_id.rb
 - config/routes.rb
+- db/migrate/20160714193304_create_phcscriptcdnpro_versions.rb
 - db/migrate/20160821183652_create_phcscriptcdnpro_script_listings.rb
 - db/migrate/20160821183714_create_phcscriptcdnpro_script_authors.rb
 - db/migrate/20160821183735_create_phcscriptcdnpro_script_extensions.rb
@@ -744,5 +745,5 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: Rails 5.1 Engine - Script Listings
+summary: Rails 5.1 Engine - Script Listing Management
 test_files: []