alchemy-custom-model 2.0.3 → 2.2.1

data/lib/alchemy/custom/model/engine.rb

@@ -20,9 +20,15 @@ module Alchemy
 
           Alchemy::PagesController.include(PagesControllerDec)
 
+
+          if "Alchemy::Node".safe_constantize
+              Alchemy::Node.include Alchemy::NodeDec
+              Alchemy::Admin::NodesController.include Alchemy::Admin::NodesControllerDec
+          end
+
           # load degli helpers per alchemy
           [
-            Alchemy::Custom::Model::Engine.root.join('app', 'helpers', 'alchemy', 'pages_helper_decorator.rb')
+              Alchemy::Custom::Model::Engine.root.join('app', 'helpers', 'alchemy', 'pages_helper_decorator.rb')
           ].each do |f|
             Rails.configuration.cache_classes ? require(f) : load(f)
           end

data/lib/alchemy/custom/model/globalize_model_decoration.rb

@@ -0,0 +1,26 @@
+module Alchemy::Custom::Model
+  module GlobalizeModelDecoration
+    extend ActiveSupport::Concern
+
+    included do
+
+      include GlobalIdSetter
+      include MenuMethods
+      include ModelUtilsMethods
+      include SitemapMethods
+
+
+
+      def self.use_friendly(base = nil, options = {}, &block)
+        extend FriendlyId
+
+        self.friendly_id(base, options.merge(use: [:globalize]), &block)
+
+        include SlugOptimizer
+
+      end
+
+    end
+
+  end
+end

data/lib/alchemy/custom/model/menu_methods.rb

@@ -0,0 +1,16 @@
+module Alchemy
+  module Custom
+    module Model
+      module MenuMethods
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          class_attribute :menu_generator_methods, default: []
+
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/custom/model/model_decoration.rb

@@ -5,6 +5,9 @@ module Alchemy::Custom::Model
     included do
 
       include GlobalIdSetter
+      include MenuMethods
+      include SlugOptimizer
+      include SitemapMethods
 
       belongs_to :language, class_name: "Alchemy::Language"
 

data/lib/alchemy/custom/model/model_utils_methods.rb

@@ -0,0 +1,28 @@
+module Alchemy
+  module Custom
+    module Model
+      module ModelUtilsMethods
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          def to_url
+            layout = Alchemy::PageLayout.get_all_by_attributes(custom_model: self.class.to_s).select { |ly| ly["custom_model_action"] == "show" }.first
+            page = Alchemy::Language.current.pages.find_by(page_layout: layout["name"]).parent
+            page.urlname
+          end
+
+          def ui_title
+            self.class.to_s.demodulize.downcase
+          end
+
+          def breadcrumb_name
+            self.class.to_s.demodulize.titleize
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/custom/model/pages_controller_dec.rb

@@ -7,12 +7,28 @@ module Alchemy::Custom::Model
 
       skip_before_action :page_not_found!, only: [:index, :show]
       before_action :load_custom_model_page, only: [:show]
-      before_action :page_not_found_after_custom_model!, if: -> {@page.blank?}, only: [:index, :show]
+      before_action :page_not_found_after_custom_model!, if: -> { @page.blank? }, only: [:index, :show]
       before_action :perform_search, only: :show
-      after_action :set_404_after
+      after_action :set_404_after, except: :sitemap
 
       helper CustomModelHelper
 
+      def sitemap
+        @pages = Alchemy::Page.sitemap.reject do |page|
+          page.definition["custom_model_action"].to_s == "show"
+        end
+        @custom_elements = []
+        Alchemy::Custom::Model.sitemaps_models.each do |model|
+          if model.respond_to? :to_sitemap
+            @custom_elements << model.to_sitemap
+          end
+        end
+        @custom_elements = @custom_elements.flatten
+        respond_to do |format|
+          format.xml { render layout: 'alchemy/sitemap' }
+        end
+      end
+
       private
 
       def load_custom_model_page
@@ -30,6 +46,8 @@ module Alchemy::Custom::Model
             instance_variable_set("@#{custom_model_string.demodulize.downcase.pluralize}", @custom_elements)
           end
 
+        elsif action_name == "sitemap"
+          super
         else
 
           url = params[:urlname]
@@ -38,37 +56,35 @@ module Alchemy::Custom::Model
 
           unless url_params.nil?
 
-
             parent_page = Alchemy::Language.current.pages.contentpages.find_by(
               urlname: url_params[:page_name],
               language_code: params[:locale] || Alchemy::Language.current.code
             )
 
             if parent_page.nil?
-              raise ActionController::RoutingError, "Parent Page not Found [#{url_params[:page_name]}]"
-            end
-
-            #TODO magari implementare ricerca children in base a una action es. edit new chow ecc
-
-            @page = parent_page.children.first
-
-            if @page.nil?
-              raise ActionController::RoutingError, "You have to define a subpage for custom model"
-            end
-
-            custom_model_string = get_custom_model_string
-
-            if custom_model_string.blank?
-              raise ActionController::RoutingError, "You have to specify custom_model in page_layouts config file"
+              Rails.logger.warn "Parent Page not Found [#{url_params[:page_name]}]"
+              #TODO magari implementare ricerca children in base a una action es. edit new chow ecc
             else
-              custom_model = custom_model_string.classify.constantize
-              @custom_element = custom_model.only_current_language.friendly.find(url_params[:custom_model_id])
-              instance_variable_set("@#{custom_model_string.demodulize.underscore}", @custom_element)
+              @page = parent_page.children.first
+              if @page.nil?
+                Rails.logger.warn "You have to define a subpage for custom model"
+              else
+                custom_model_string = get_custom_model_string
+
+                if custom_model_string.blank?
+                  Rails.logger.warn "You have to specify custom_model in page_layouts config file"
+                else
+                  custom_model = custom_model_string.classify.constantize
+                  @custom_element = custom_model.only_current_language.friendly.find(url_params[:custom_model_id])
+                  instance_variable_set("@#{custom_model_string.demodulize.underscore}", @custom_element)
+                end
+
+              end
+
             end
 
           end
 
-
         end
       end
 
@@ -95,7 +111,6 @@ module Alchemy::Custom::Model
         end
       end
 
-
       def get_custom_model_string
 
         children_page_layout = Alchemy::PageLayout.get(@page.page_layout)
@@ -104,7 +119,6 @@ module Alchemy::Custom::Model
 
       end
 
-
       def page_not_found_after_custom_model!
         not_found_error!("Alchemy::Page not found \"#{request.fullpath}\"")
       end
@@ -113,7 +127,6 @@ module Alchemy::Custom::Model
         ArchimediaPgsearch::SEARCH_RESULTS_PAGINATION_NUMBER
       end
 
-
       def not_found_error!(msg = "Not found \"#{request.fullpath}\"")
         not_found_page = Alchemy::Language.current.pages.published.find_by(page_layout: "not_found")
         if !not_found_page.nil?

data/lib/alchemy/custom/model/picture_used_by.rb

@@ -0,0 +1,51 @@
+module Alchemy
+  module Custom
+    module Model
+      class PictureUsedBy
+
+        def self.used_by(picture_id)
+          model_to_search_for = ApplicationRecord.descendants.collect(&:name)
+
+          finded_pictures = []
+          model_to_search_for.each do |mname|
+            relations = mname.constantize.reflections.collect{|c| c[0] }
+
+            relations.each do |refc|
+              relation = mname.constantize.reflections[refc]
+
+              if relation.class_name == "Alchemy::Picture"
+                begin
+                  if relation.class == ActiveRecord::Reflection::BelongsToReflection
+                    mm = mname.constantize.where(relation.foreign_key.to_sym => picture_id)
+                    mm.each do |rec|
+                      finded_pictures << rec
+                    end
+                  end
+
+                  if relation.class == ActiveRecord::Reflection::ThroughReflection
+                    relation_through = mname.constantize.reflections[relation.options[:through].to_s]
+                    mm = relation_through.klass.where(relation.foreign_key.to_sym => picture_id)
+                    mm.each do |rec|
+                      rec.class.reflections.collect{|c| c[0] }.each do |relative_relation|
+                        relation_relation_class = rec.class.reflections[relative_relation]
+                        if relation_relation_class.class_name == mname
+                          mm = relation_relation_class.klass.find( rec[relation_relation_class.foreign_key] )
+                          finded_pictures << mm unless mm.nil?
+                        end
+                      end
+                    end
+                  end
+
+                rescue Exception => excp
+                  Rails.logger.error {"PictureUsedBy ERROR: #{excp.message}"}
+                end
+              end
+            end
+          end
+          finded_pictures
+        end
+
+      end
+    end
+  end
+end

data/lib/alchemy/custom/model/sitemap_methods.rb

@@ -0,0 +1,18 @@
+module Alchemy
+  module Custom
+    module Model
+      module SitemapMethods
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          def self.to_sitemap
+            all
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/custom/model/slug_optimizer.rb

@@ -0,0 +1,23 @@
+module Alchemy
+  module Custom
+    module Model
+      module SlugOptimizer
+
+        extend ActiveSupport::Concern
+
+        included do
+          validates friendly_id_config.query_field, uniqueness: {:allow_nil => true}
+          before_save :prevent_wrong_slug
+
+          private
+
+          def prevent_wrong_slug
+            self.send("#{friendly_id_config.query_field}=", normalize_friendly_id(self.slug))
+          end
+        end
+
+
+      end
+    end
+  end
+end

data/lib/alchemy/custom/model/version.rb

@@ -1,7 +1,7 @@
 module Alchemy
   module Custom
     module Model
-      VERSION = '2.0.3'
+      VERSION = '2.2.1'
     end
   end
 end

data/lib/tasks/alchemy_custom_model_tasks.rake

@@ -30,10 +30,13 @@ namespace :alchemy_custom_model do
 
     #installa friendly_id
     system("rails generate friendly_id")
+    system("bin/rails alchemy_custom_model:install:migrations")
     system("bin/rails db:migrate")
 
     system("yarn add alchemy-custom-model") || exit!(1)
 
+
+
     install_helper.inject_assets
     install_helper.inject_routes
   end

data/vendor/assets/javascripts/flatpickr/i10n/it.js

@@ -0,0 +1,71 @@
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+  typeof define === 'function' && define.amd ? define(['exports'], factory) :
+  (global = global || self, factory(global.it = {}));
+}(this, function (exports) { 'use strict';
+
+  var fp = typeof window !== "undefined" && window.flatpickr !== undefined
+      ? window.flatpickr
+      : {
+          l10ns: {}
+      };
+  var Italian = {
+      weekdays: {
+          shorthand: ["Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab"],
+          longhand: [
+              "Domenica",
+              "Lunedì",
+              "Martedì",
+              "Mercoledì",
+              "Giovedì",
+              "Venerdì",
+              "Sabato",
+          ]
+      },
+      months: {
+          shorthand: [
+              "Gen",
+              "Feb",
+              "Mar",
+              "Apr",
+              "Mag",
+              "Giu",
+              "Lug",
+              "Ago",
+              "Set",
+              "Ott",
+              "Nov",
+              "Dic",
+          ],
+          longhand: [
+              "Gennaio",
+              "Febbraio",
+              "Marzo",
+              "Aprile",
+              "Maggio",
+              "Giugno",
+              "Luglio",
+              "Agosto",
+              "Settembre",
+              "Ottobre",
+              "Novembre",
+              "Dicembre",
+          ]
+      },
+      firstDayOfWeek: 1,
+      ordinal: function () { return "°"; },
+      rangeSeparator: " al ",
+      weekAbbreviation: "Se",
+      scrollTitle: "Scrolla per aumentare",
+      toggleTitle: "Clicca per cambiare",
+      time_24hr: true
+  };
+  fp.l10ns.it = Italian;
+  var it = fp.l10ns;
+
+  exports.Italian = Italian;
+  exports.default = it;
+
+  Object.defineProperty(exports, '__esModule', { value: true });
+
+}));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-custom-model
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.2.1
 platform: ruby
 authors:
 - Alessandro Baccanelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -79,20 +79,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.4
+- !ruby/object:Gem::Dependency
+  name: globalize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+- !ruby/object:Gem::Dependency
+  name: friendly_id-globalize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.alpha3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.alpha3
 - !ruby/object:Gem::Dependency
   name: active_type
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.3'
 description: A gem for semplify model implementation with Alchemy CMS
 email:
 - alexbaccanelli@gmail.com
@@ -106,6 +134,7 @@ files:
 - Rakefile
 - app/assets/config/alchemy_custom_model_manifest.js
 - app/assets/images/alchemy-custom-model/no_image.png
+- app/assets/javascripts/alchemy-custom-model/alchemy_custom_model_select.js
 - app/assets/javascripts/alchemy-custom-model/change_language.js
 - app/assets/javascripts/alchemy-custom-model/common_init.js
 - app/assets/javascripts/alchemy-custom-model/custom_admin_element_editor.js.coffee
@@ -118,15 +147,20 @@ files:
 - app/assets/javascripts/alchemy-custom-model/sortable.js
 - app/assets/javascripts/alchemy-custom-model/subobjects.js
 - app/assets/javascripts/alchemy-custom-model/total_page_elfinder.js.coffee
+- app/assets/javascripts/backend/date_picker.js
+- app/assets/javascripts/backend/fix_more_image_in_element.js.coffee
+- app/assets/javascripts/backend/override_alchemy_selectbox.js
 - app/assets/stylesheets/alchemy-custom-model/custom_elfinder.css.scss
 - app/assets/stylesheets/alchemy-custom-model/custom_style.css.scss
 - app/assets/stylesheets/alchemy-custom-model/custom_tiny_mce.scss
 - app/assets/stylesheets/alchemy-custom-model/manifest.css
 - app/controllers/alchemy/custom/model/admin/base_controller.rb
+- app/controllers/alchemy/custom/model/admin/base_with_globalize_controller.rb
 - app/controllers/alchemy/custom/model/admin/clones_controller.rb
 - app/controllers/alchemy/custom/model/admin/files_controller.rb
 - app/controllers/alchemy/custom/model/admin/orders_controller.rb
 - app/controllers/alchemy/pages_controller_decorator.rb
+- app/controllers/concerns/alchemy/admin/nodes_controller_dec.rb
 - app/helpers/alchemy/custom/model/admin/base_helper.rb
 - app/helpers/alchemy/custom/model/admin/orders_helper.rb
 - app/helpers/alchemy/custom/model/base_helper.rb
@@ -135,11 +169,20 @@ files:
 - app/models/admin_override_to_param.rb
 - app/models/alchemy/custom/model/cloner.rb
 - app/models/application_record.rb
+- app/models/concerns/alchemy/node_dec.rb
+- app/views/alchemy/admin/nodes/_form.html.erb
+- app/views/alchemy/admin/nodes/custom_models.json.jbuilder
+- app/views/alchemy/admin/nodes/custom_models_methods.json.jbuilder
+- app/views/alchemy/admin/pictures/_custom_model_info.html.erb
+- app/views/alchemy/admin/pictures/_infos.html.erb
 - app/views/alchemy/custom/model/admin/base/_buttons_tool.html.erb
 - app/views/alchemy/custom/model/admin/base/_gallery_item.html.erb
 - app/views/alchemy/custom/model/admin/base/_language_tree_select.html.erb
 - app/views/alchemy/custom/model/admin/base/_search_box.html.erb
+- app/views/alchemy/custom/model/admin/base/_search_panel.html.erb
 - app/views/alchemy/custom/model/admin/base/_seo.html.erb
+- app/views/alchemy/custom/model/admin/base/_show_object.html.erb
+- app/views/alchemy/custom/model/admin/base/_show_objects.html.erb
 - app/views/alchemy/custom/model/admin/base/_table.html.erb
 - app/views/alchemy/custom/model/admin/base/_title.html.erb
 - app/views/alchemy/custom/model/admin/base/edit.html.erb
@@ -150,11 +193,13 @@ files:
 - app/views/alchemy/custom/model/admin/files/error_notice.json.jbuilder
 - app/views/alchemy/custom/model/admin/files/ui.html.erb
 - app/views/alchemy/custom/model/admin/orders/new.html.erb
+- app/views/alchemy/pages/sitemap.xml.erb
 - config/initializers/elfinder_abilities.rb
 - config/locales/en.yml
 - config/locales/it.yml
 - config/routes.rb
-- lib/alchemy-custom-model.rb
+- db/migrate/20200424184007_add_fields_to_node.rb
+- lib/alchemy/custom/model.rb
 - lib/alchemy/custom/model/el_finder.rb
 - lib/alchemy/custom/model/el_finder/ability.rb
 - lib/alchemy/custom/model/el_finder/connector.rb
@@ -180,13 +225,20 @@ files:
 - lib/alchemy/custom/model/errors/error.rb
 - lib/alchemy/custom/model/errors/parent_nil.rb
 - lib/alchemy/custom/model/global_id_setter.rb
+- lib/alchemy/custom/model/globalize_model_decoration.rb
+- lib/alchemy/custom/model/menu_methods.rb
 - lib/alchemy/custom/model/model_decoration.rb
+- lib/alchemy/custom/model/model_utils_methods.rb
 - lib/alchemy/custom/model/order.rb
 - lib/alchemy/custom/model/pages_controller_dec.rb
+- lib/alchemy/custom/model/picture_used_by.rb
+- lib/alchemy/custom/model/sitemap_methods.rb
+- lib/alchemy/custom/model/slug_optimizer.rb
 - lib/alchemy/custom/model/translation_scope.rb
 - lib/alchemy/custom/model/version.rb
 - lib/alchemy/touching_decorator.rb
 - lib/tasks/alchemy_custom_model_tasks.rake
+- vendor/assets/javascripts/flatpickr/i10n/it.js
 - vendor/assets/javascripts/tinymce/langs/it.js
 - vendor/assets/javascripts/tinymce/plugins/image/plugin.min.js
 - vendor/assets/stylesheets/elFinder.scss
@@ -266,8 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A gem for semplify model implementation with Alchemy CMS