camaleon_cms 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aba1d4b02ab9b56d100884e9dc5bcbdf8ff41f16649ad4d201294b373c8b8420
-  data.tar.gz: e326fd8cd1c03b4dbbcec1f0d3bde885fc6104382a416c8508d3fffcad85ddf0
+  metadata.gz: 5462913ed0aa0a870f6e439cc538466edbfad347851a9c5c48b13549a43b35fd
+  data.tar.gz: 8744e717ffdc8eb6c41b9edf41bb31aee30818ab1d25bbfaeb53bc80be1457a7
 SHA512:
-  metadata.gz: ebeb6842563f554d7ef86c016810671943fc1580c06b38d21a6030d2fbe8cb48c409e0065f37254cdffb646e5817d47e481420df457920c1f62b771acb363a26
-  data.tar.gz: 4077d54b9b4a6d0ab314be9f26933eecada138a195473cfbe32705ef167275db91e5d794e554e1839577bfd848ae1fc2d2696adf37e392e85b4b0b4280408958
+  metadata.gz: dd3175e04ccbda3575cf1aa586993e536419acaf1ae48e4b06a57e354e32d440c2ed527f9c80571cad576a5f23b669f855c057d8582d385458f7632274403a91
+  data.tar.gz: 375a9d32c4094197e61af8224c12e5463913dfa1d1bf4f2b89be3a1bb18d2df369b5f3df7c8c23e49a4eab54289a297dcc7a4cc811b57a749289b67f243a6566

data/app/models/camaleon_cms/category.rb

@@ -1,5 +1,7 @@
 module CamaleonCms
   class Category < CamaleonCms::TermTaxonomy
+    include CamaleonCms::CommonRelationships
+
     alias_attribute :site_id, :term_group
     alias_attribute :post_type_id, :status
 

data/app/models/camaleon_cms/nav_menu.rb

@@ -1,5 +1,7 @@
 module CamaleonCms
   class NavMenu < CamaleonCms::TermTaxonomy
+    include CamaleonCms::CommonRelationships
+
     default_scope { where(taxonomy: :nav_menu).order(id: :asc) }
     alias_attribute :site_id, :parent_id
 

data/app/models/camaleon_cms/nav_menu_item.rb

@@ -1,5 +1,7 @@
 module CamaleonCms
   class NavMenuItem < CamaleonCms::TermTaxonomy
+    include CamaleonCms::CommonRelationships
+
     alias_attribute :site_id, :term_group
     alias_attribute :label, :name
     alias_attribute :url, :description

data/app/models/camaleon_cms/plugin.rb

@@ -1,5 +1,7 @@
 module CamaleonCms
   class Plugin < CamaleonCms::TermTaxonomy
+    include CamaleonCms::CommonRelationships
+
     # attrs:
     #   term_group => status active (1, nil)
     #   slug => plugin key

data/app/models/camaleon_cms/post.rb

@@ -1,6 +1,7 @@
 module CamaleonCms
   class Post < CamaleonCms::PostDefault
     include CamaleonCms::CategoriesTagsForPosts
+    include CamaleonCms::CommonRelationships
 
     alias_attribute :post_type_id, :taxonomy_id
     default_scope -> { where(post_class: 'Post').order(post_order: :asc, created_at: :desc) }

data/app/models/camaleon_cms/post_comment.rb

@@ -1,7 +1,7 @@
 module CamaleonCms
   class PostComment < CamaleonRecord
     include CamaleonCms::Metas
-    include CommonRelationships
+    include CamaleonCms::CommonRelationships
 
     self.table_name = "#{PluginRoutes.static_system_info['db_prefix']}comments"
     # attr_accessible :user_id, :post_id, :content, :author, :author_email, :author_url, :author_IP, :approved, :agent, :agent, :typee, :comment_parent, :is_anonymous

data/app/models/camaleon_cms/post_default.rb

@@ -2,7 +2,6 @@ module CamaleonCms
   class PostDefault < CamaleonRecord
     include CamaleonCms::Metas
     include CamaleonCms::CustomFieldsRead
-    include CommonRelationships
 
     self.table_name = "#{PluginRoutes.static_system_info['db_prefix']}posts"
 

data/app/models/camaleon_cms/post_tag.rb

@@ -1,5 +1,7 @@
 module CamaleonCms
   class PostTag < CamaleonCms::TermTaxonomy
+    include CamaleonCms::CommonRelationships
+
     default_scope { where(taxonomy: :post_tag) }
 
     has_many :posts, foreign_key: :objectid, through: :term_relationships, source: :object

data/app/models/camaleon_cms/post_type.rb

@@ -1,5 +1,7 @@
 module CamaleonCms
   class PostType < CamaleonCms::TermTaxonomy
+    include CamaleonCms::CommonRelationships
+
     alias_attribute :site_id, :parent_id
     default_scope { where(taxonomy: :post_type) }
 

data/app/models/camaleon_cms/site.rb

@@ -1,5 +1,6 @@
 module CamaleonCms
   class Site < CamaleonCms::TermTaxonomy
+    include CamaleonCms::CommonRelationships
     include CamaleonCms::SiteDefaultSettings
 
     # attrs: [name, description, slug]

data/app/models/camaleon_cms/term_taxonomy.rb

@@ -2,7 +2,6 @@ module CamaleonCms
   class TermTaxonomy < CamaleonRecord
     include CamaleonCms::Metas
     include CamaleonCms::CustomFieldsRead
-    include CommonRelationships
 
     self.table_name = "#{PluginRoutes.static_system_info['db_prefix']}term_taxonomy"
     # attr_accessible :taxonomy, :description, :parent_id, :count, :name, :slug, :term_group, :status, :term_order, :user_id

data/app/models/camaleon_cms/theme.rb

@@ -1,5 +1,7 @@
 module CamaleonCms
   class Theme < CamaleonCms::TermTaxonomy
+    include CamaleonCms::CommonRelationships
+
     # attrs:
     #   slug => plugin key
     belongs_to :site, class_name: 'CamaleonCms::Site', foreign_key: :parent_id, required: false

data/app/models/camaleon_cms/user_role.rb

@@ -1,5 +1,7 @@
 module CamaleonCms
   class UserRole < CamaleonCms::TermTaxonomy
+    include CamaleonCms::CommonRelationships
+
     after_destroy :set_users_as_cilent
 
     default_scope { where(taxonomy: :user_roles) }

data/app/models/concerns/camaleon_cms/common_relationships.rb

@@ -5,7 +5,7 @@ module CamaleonCms
     extend ActiveSupport::Concern
 
     included do
-      class_name = self.class.name.demodulize
+      class_name = name.demodulize
       has_many :metas, -> { where(object_class: class_name) },
                class_name: 'CamaleonCms::Meta', foreign_key: :objectid, dependent: :destroy
 

data/app/models/concerns/camaleon_cms/user_methods.rb

@@ -4,7 +4,7 @@ module CamaleonCms
     included do
       include CamaleonCms::Metas
       include CamaleonCms::CustomFieldsRead
-      include CommonRelationships
+      include CamaleonCms::CommonRelationships
 
       validates_uniqueness_of :username, scope: [:site_id], case_sensitive: false,
                                          message: I18n.t('camaleon_cms.admin.users.message.requires_different_username', default: 'Requires different username')

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.7.0'.freeze
+  VERSION = '2.7.1'.freeze
 end

data/spec/dummy/log/development.log

@@ -1354,3 +1354,7 @@ DELETE FROM "users"
   CamaleonCms::Site Exists? (0.0ms)  SELECT 1 AS one FROM "term_taxonomy" WHERE "term_taxonomy"."taxonomy" = ? LIMIT ?  [["taxonomy", "site"], ["LIMIT", 1]]
   CamaleonCms::Site Load (0.1ms)  SELECT "term_taxonomy".* FROM "term_taxonomy" WHERE "term_taxonomy"."taxonomy" = ? ORDER BY "term_taxonomy"."id" ASC LIMIT ?  [["taxonomy", "site"], ["LIMIT", 1]]
   CamaleonCms::Site Load (0.1ms)  SELECT "term_taxonomy".* FROM "term_taxonomy" WHERE "term_taxonomy"."taxonomy" = ? ORDER BY "term_taxonomy"."term_group" DESC, "term_taxonomy"."id" ASC  [["taxonomy", "site"]]
+  CamaleonCms::Site Exists? (0.2ms)  SELECT 1 AS one FROM "term_taxonomy" WHERE "term_taxonomy"."taxonomy" = ? LIMIT ?  [["taxonomy", "site"], ["LIMIT", 1]]
+  CamaleonCms::Site Exists? (0.0ms)  SELECT 1 AS one FROM "term_taxonomy" WHERE "term_taxonomy"."taxonomy" = ? LIMIT ?  [["taxonomy", "site"], ["LIMIT", 1]]
+  CamaleonCms::Site Load (0.0ms)  SELECT "term_taxonomy".* FROM "term_taxonomy" WHERE "term_taxonomy"."taxonomy" = ? ORDER BY "term_taxonomy"."id" ASC LIMIT ?  [["taxonomy", "site"], ["LIMIT", 1]]
+  CamaleonCms::Site Load (0.0ms)  SELECT "term_taxonomy".* FROM "term_taxonomy" WHERE "term_taxonomy"."taxonomy" = ? ORDER BY "term_taxonomy"."term_group" DESC, "term_taxonomy"."id" ASC  [["taxonomy", "site"]]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt