mokio 0.0.15 → 2.0.8

data/lib/mokio/concerns/models/contact_template.rb

@@ -8,10 +8,6 @@ module Mokio
         extend ActiveSupport::Concern
 
         included do
-
-          belongs_to :base_contact
-          accepts_nested_attributes_for :base_contact
-
           belongs_to :contact
           accepts_nested_attributes_for :contact
         end

data/lib/mokio/concerns/models/content.rb

@@ -9,27 +9,27 @@ module Mokio
 
         included do
           include Mokio::Concerns::Models::Common
+          include Mokio::Concerns::Common::SeoTags
+          include Mokio::Concerns::Common::Services::Sitemap::Model
 
           has_many :content_links, :dependent => :destroy
           has_many :data_files, :dependent => :destroy
           has_many :menus, :through => :content_links
 
-          belongs_to :gmap, :dependent => :destroy  # Relation with gmap isn't necessary !
-          belongs_to :meta, :dependent => :destroy
+          belongs_to :gmap, :dependent => :destroy,optional: true # Relation with gmap isn't necessary !
 
           belongs_to :author, :class_name => 'Mokio::User', :foreign_key => :created_by
           belongs_to :editor, :class_name => 'Mokio::User', :foreign_key => :updated_by
-          belongs_to :lang
+          belongs_to :lang, required: false
 
           mount_uploader :main_pic, Mokio::MainPicUploader
 
           accepts_nested_attributes_for :menus
-          accepts_nested_attributes_for :meta,       :allow_destroy => true
           accepts_nested_attributes_for :gmap,       :allow_destroy => true, :reject_if => lambda { |g| g[:full_address].blank? }
           accepts_nested_attributes_for :data_files, :allow_destroy => true, :reject_if => lambda { |d| d[:data_file].blank? }
-          
+
           validates :title, presence: true
-          validate :compare_dates  
+          validate :compare_dates
 
           scope :lang,          -> (lang_id) { where('lang_id = ? or lang_id is null', lang_id) }
           scope :order_default, -> { order("seq asc") }
@@ -50,11 +50,19 @@ module Mokio
           #
           # Columns for table in CommonController#index view
           #
-          def columns_for_table 
+          def columns_for_table
             %w(title active type updated_at lang_id)
           end
         end
 
+        def sitemap_url_strategy
+          {loc: "#{self.title}",priority: 1,lastmod: self.updated_at }
+        end
+
+        def can_add_to_sitemap?
+          true
+        end
+
         def author_name
           author.name_view unless author.blank?
         end

data/lib/mokio/concerns/models/data_file.rb

@@ -11,9 +11,8 @@ module Mokio
           extend FriendlyId
 
           friendly_id :slug_candidates, use: :slugged
-          validates_uniqueness_of :slug
+          validates_uniqueness_of :slug,case_sensitive: true
           belongs_to :contents, :touch => true
-          belongs_to :base_contents
 
           mount_uploader :data_file, Mokio::DataFileUploader
           mount_uploader :thumb,     Mokio::ThumbUploader
@@ -61,13 +60,8 @@ module Mokio
         # For some reason touch => true does not work for DataFile :(
         #
         def touch_content
-          if self.content_id.present?
-            Mokio::Content.find(self.content_id).touch(:etag)
-          else
-            Mokio::BaseContent.find(self.base_content_id).touch(:etag)
-
-          end
-          end
+          Mokio::Content.find(self.content_id).touch(:etag)
+        end
 
         def slide?
           false

data/lib/mokio/concerns/models/lang.rb

@@ -73,23 +73,27 @@ module Mokio
       def destroy_all_dependand
         Mokio::StaticModule.where(:lang_id => id).update_all(:lang_id => nil)
         Mokio::ContentLink.delete_all(:menu_id => menu.pluck(:id))
-        Mokio::Meta.delete(menu.where.not(:meta_id => nil).pluck(:meta_id))
         Mokio::Menu.delete_all(:lang_id => id)
       end
 
       def add_fake_menu
         @menu = Mokio::Menu.new( name: self.shortname , lang_id: self.id,fake:true,deletable:false,editable:false)
-        @menu.build_meta
 
         if(@menu.save)
           self.menu_id = @menu.id
           self.save(:validate => false)
-          result = Mokio::Menu.all.fake_structure_unique
+          result = Mokio::Menu.all.fake_structure_unique.where.not(ancestry: nil).select(:name).distinct
+
           result.each do |s|
-            if s.depth == 1
-              @parent_menu = Mokio::Menu.new( name: s.name,ancestry:@menu.id, lang_id:self.id,fake:true,deletable:false,editable:false)
-              @parent_menu.save
-            end
+            @parent_menu = Mokio::Menu.new(
+              name: s.name,
+              ancestry: @menu.id,
+              lang_id: self.id,
+              fake: true,
+              deletable:false,
+              editable:false
+            )
+            @parent_menu.save
           end
         end
       end

data/lib/mokio/concerns/models/menu.rb

@@ -9,6 +9,7 @@ module Mokio
 
         included do
           include Mokio::Concerns::Models::Common
+          include Mokio::Concerns::Common::SeoTags
           extend FriendlyId
 
           friendly_id :slug_candidates, use: :slugged
@@ -17,10 +18,10 @@ module Mokio
 
           validates :name, presence: true
           validates :lang_id, presence: true
-          validates_uniqueness_of :slug
+          validates_uniqueness_of :slug,case_sensitive: true
 
           belongs_to :lang
-          belongs_to :meta, :dependent => :destroy
+          belongs_to :meta, :dependent => :destroy,optional: true
 
           mount_uploader :main_pic, Mokio::MainPicUploader
 
@@ -30,7 +31,6 @@ module Mokio
           has_many :available_modules, -> {order('mokio_selected_modules.seq')}, :through => :selected_modules
 
           accepts_nested_attributes_for :contents, :available_modules
-          accepts_nested_attributes_for :meta
 
           before_save :seq_and_lang_update
 
@@ -40,7 +40,7 @@ module Mokio
           scope :order_default, -> { order("seq asc") }
           scope :active,        -> { where(active: true) }
           scope :nofake,        -> { where(fake: false)}
-          scope :fake_structure_unique, -> { where(fake: true).group(:name) }
+          scope :fake_structure_unique, -> { where(fake: true) }
 
           def should_generate_new_friendly_id?
             name_changed?

data/lib/mokio/concerns/models/module_position.rb

@@ -12,7 +12,7 @@ module Mokio
           accepts_nested_attributes_for :static_modules
           validates :name , presence: true
           amoeba do
-            include_field :static_modules
+            include_association :static_modules
           end
         end
 

data/lib/mokio/concerns/models/recipient.rb

@@ -9,8 +9,6 @@ module Mokio
 
         included do
           belongs_to :contact
-          belongs_to :base_contact
-
           validates :email, :email => true
         end
       end

data/lib/mokio/concerns/models/seo_tag.rb

@@ -0,0 +1,118 @@
+module Mokio
+  module Concerns
+    module Models
+      module SeoTag
+
+        extend ActiveSupport::Concern
+
+        included do
+          belongs_to :seo_tagable, polymorphic: true
+          validates_uniqueness_of :tag_key, :scope => [:seo_tagable_type, :seo_tagable_id], case_sensitive: true
+
+          def is_title?
+            tag_key == "title"
+          end
+
+        end
+
+        module ClassMethods
+          def seo_tag_attributes
+            [:tag_key, :tag_value, :id, :_destroy]
+          end
+
+          def seo_tags_list_keys
+            self.seo_tags_list.pluck(:key)
+          end
+
+          def seo_tags_list
+            [
+              { type: "name", key: "title"},
+              { type: "name", key: "keywords"},
+              { type: "name", key: "description"},
+              { type: "name", key: "subject"},
+              { type: "name", key: "copyright"},
+              { type: "name", key: "language"},
+              { type: "name", key: "robots"},
+              { type: "name", key: "revised"},
+              { type: "name", key: "abstract"},
+              { type: "name", key: "topic"},
+              { type: "name", key: "summary"},
+              { type: "name", key: "Classification"},
+              { type: "name", key: "author"},
+              { type: "name", key: "designer"},
+              { type: "name", key: "copyright"},
+              { type: "name", key: "reply-to"},
+              { type: "name", key: "owner"},
+              { type: "name", key: "url"},
+              { type: "name", key: "identifier-URL"},
+              { type: "name", key: "directory"},
+              { type: "name", key: "category"},
+              { type: "name", key: "coverage"},
+              { type: "name", key: "distribution"},
+              { type: "name", key: "rating"},
+              { type: "name", key: "revisit-after"},
+              { type: "name", key: "og:title"},
+              { type: "name", key: "og:type"},
+              { type: "name", key: "og:url"},
+              { type: "name", key: "og:image"},
+              { type: "name", key: "og:site_name"},
+              { type: "name", key: "og:description"},
+              { type: "name", key: "fb:page_id"},
+              { type: "name", key: "og:email"},
+              { type: "name", key: "og:phone_number"},
+              { type: "name", key: "og:fax_number"},
+              { type: "name", key: "og:latitude"},
+              { type: "name", key: "og:longitude"},
+              { type: "name", key: "og:street-address"},
+              { type: "name", key: "og:locality"},
+              { type: "name", key: "og:region"},
+              { type: "name", key: "og:postal-code"},
+              { type: "name", key: "og:country-name"},
+              { type: "name", key: "microid"},
+              { type: "name", key: "apple-mobile-web-app-capable"},
+              { type: "name", key: "apple-touch-fullscreen"},
+              { type: "name", key: "apple-mobile-web-app-status-bar-style"},
+              { type: "name", key: "format-detection"},
+              { type: "name", key: "mssmarttagspreventparsing"},
+              { type: "name", key: "msapplication-starturl"},
+              { type: "name", key: "msapplication-window"},
+              { type: "name", key: "msapplication-navbutton-color"},
+              { type: "name", key: "application-name"},
+              { type: "name", key: "msapplication-tooltip"},
+              { type: "name", key: "msapplication-task"},
+              { type: "name", key: "tweetmeme-title"},
+              { type: "name", key: "apple-mobile-web-app-capable"},
+              { type: "name", key: "apple-mobile-web-app-status-bar-style"},
+              { type: "name", key: "format-detection"},
+              { type: "name", key: "viewport"},
+
+              { type: "property", key: "og:type" },
+              { type: "property", key: "og:points" },
+              { type: "property", key: "og:video" },
+              { type: "property", key: "og:video:height" },
+              { type: "property", key: "og:video:width" },
+              { type: "property", key: "og:video:type" },
+              { type: "property", key: "og:video" },
+              { type: "property", key: "og:video:type" },
+              { type: "property", key: "og:video" },
+              { type: "property", key: "og:video:type"},
+              { type: "property", key: "og:audio" },
+              { type: "property", key: "og:audio:title" },
+              { type: "property", key: "og:audio:artist" },
+              { type: "property", key: "og:audio:album" },
+              { type: "property", key: "og:audio:type" },
+
+              { type: "http-equiv", key: "Page-Enter"},
+              { type: "http-equiv", key: "Page-Exit"},
+              { type: "http-equiv", key: "X-UA-Compatible"},
+              { type: "http-equiv", key: "Expires"},
+              { type: "http-equiv", key: "Pragma"},
+              { type: "http-equiv", key: "Cache-Control"},
+            ]
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mokio/concerns/models/static_module.rb

@@ -13,12 +13,12 @@ module Mokio
           has_and_belongs_to_many :module_positions, :join_table => "mokio_available_modules"
           accepts_nested_attributes_for :module_positions
           validates :title, presence: true
-          
+
           #
           # include module_positions to amoeba duplication process
           #
           amoeba do
-            include_field :module_positions
+            include_association :module_positions
           end
         end
 

data/lib/mokio/concerns/models/user.rb

@@ -43,7 +43,7 @@ module Mokio
           roles :admin, :content_editor, :menu_editor, :static_module_editor, :user_editor, :comment_approver, :reader
 
           # before_validation :add_default_role
-          belongs_to :market
+          # belongs_to :market
 
           if Mokio.solr_enabled
             searchable do

data/lib/mokio/engine.rb

@@ -22,23 +22,6 @@ module Mokio
       end
     end
 
-    initializer 'mokio.helpers' do |app|
-      ActiveSupport.on_load :action_view do
-        ActionView::Base.send :include, Mokio::Backend::BackendHelper
-        ActionView::Base.send :include, Mokio::Backend::BreadcrumbsHelper
-        ActionView::Base.send :include, Mokio::Backend::CommonHelper
-        ActionView::Base.send :include, Mokio::Backend::JavascriptHelper
-        ActionView::Base.send :include, Mokio::Backend::MenuHelper
-        ActionView::Base.send :include, Mokio::Backend::UrlHelper
-
-        ActionView::Base.send :include, Mokio::FrontendHelpers::MenuHelper
-        ActionView::Base.send :include, Mokio::FrontendHelpers::StaticModulesHelper
-        ActionView::Base.send :include, Mokio::FrontendHelpers::ContentHelper
-        ActionView::Base.send :include, Mokio::FrontendHelpers::ExternalScriptsHelper
-        ActionView::Base.send :include, Mokio::FrontendHelpers::LangsHelper
-      end
-    end
-
     #
     # Precompile hook
     #
@@ -75,6 +58,13 @@ module Mokio
         frontend/*
         frontend/bg/*
         backend/head.js
+        backend/datatable.js
+        backend/favicon.ico
+        backend/menu/menu_dual_select.js
+        backend/help-engine/jquery.joyride-2.1.js
+        backend/help-engine/help-engine.js
+        backend/mokio-logo.svg
+        backend/menu/jquery.ui.nestedSortable.js
       )
     end
 

data/lib/mokio/frontend_helpers.rb

@@ -3,4 +3,5 @@ require 'mokio/frontend_helpers/menu_helper'
 require 'mokio/frontend_helpers/static_modules_helper'
 require 'mokio/frontend_helpers/external_scripts_helper'
 require 'mokio/frontend_helpers/langs_helper'
+require 'mokio/frontend_helpers/seo_tag_helper'
 

data/lib/mokio/frontend_helpers/seo_tag_helper.rb

@@ -0,0 +1,33 @@
+module Mokio
+  module FrontendHelpers
+    #
+    # Frontend helper methods used with Mokio::SeoTag objects
+    #
+    module SeoTagHelper
+      def render_seo_meta_tags(model_obj)
+        result = ""
+        return result unless model_obj.class.has_seo_tagable_enabled?
+        collection = model_obj.seo_tags
+        if collection.any?
+          seo_hash =  {}
+          Mokio::SeoTag.seo_tags_list.map{|a| seo_hash[a[:key].to_sym] = a[:type]}
+          collection.each do |el|
+            result << render_seo_meta_build_tag_helper(el,seo_hash)
+          end
+        end
+        result
+      end
+
+      private
+
+      def render_seo_meta_build_tag_helper(el, seo_hash)
+        return nil unless el.present? && seo_hash.present?
+        if el.is_title?
+          content_tag(:title, el.tag_value)
+        else
+          tag(:meta, "#{seo_hash[el.tag_key.to_sym]}" => ("#{el.tag_key}"), :content => ("#{el.tag_value}"))
+        end
+      end
+    end
+  end
+end

data/lib/mokio/simple-form-wrappers.rb

@@ -9,6 +9,17 @@ SimpleForm.setup do |config|
   # whole input.
 
  # =========================================================================================== #
+  config.wrappers :select2, :tag => 'div', :class => 'row-fluid', :error_class => 'error' do |b|
+    b.use :html5
+      b.wrapper :tag => 'label', :class => 'form-label span2' do |bb|
+        bb.use :label_text
+      end
+      b.wrapper :tag => 'div', :class => 'span10' do |bb|
+        bb.use :input, :class => 'mokio-select2'
+      end
+      b.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+      b.use :hint,  :wrap_with => { :tag => 'p', :class => 'help-block' }
+  end
 
   config.wrappers :custom, :tag => 'div', :class => 'row-fluid', :error_class => 'error' do |b|
     b.use :html5

data/lib/mokio/version.rb

@@ -2,5 +2,5 @@ module Mokio
   #
   # Actual Mokio version
   #
-  VERSION = "0.0.15"
+  VERSION = "2.0.8"
 end

data/lib/tasks/mokio_install.rake

@@ -3,6 +3,27 @@ require 'mokio'
 require 'rails/generators'
 
 namespace :mokio do
+  desc "Reset pg columns sequence"
+
+  task reset_pg_sequence: :environment do
+    ActiveRecord::Base.connection.tables.each do |t|
+      ActiveRecord::Base.connection.reset_pk_sequence!(t)
+    end
+  end
+
+  desc "Add mokio routing to routes.rb"
+
+  task :install_routes => :environment do |t|
+    path = "#{Rails.root}/config/routes.rb"
+    text = File.read(path)
+
+    if !Rails.application.routes.url_helpers.method_defined?(:mokio_url)
+      File.open(path, "w") do |file|
+        file.puts text.gsub(/Rails.application.routes.draw do/, "Rails.application.routes.draw do \n  mount Mokio::Engine => '/backend'")
+      end
+    end
+  end
+
   desc "Create database, running migrations and creating some default data for Mokio application"
 
   task :install, [:email, :password] => :environment do |t, args|
@@ -41,7 +62,6 @@ namespace :mokio do
       parent: menu,
       slug: "top"
     })
-    top_menu.build_meta
     puts "\n\tCreated default initial menu 'top'".green if top_menu.save(:validate => false)
 
 
@@ -55,18 +75,27 @@ namespace :mokio do
     })
     puts "\n\tCreated default user '#{args[:email]}' with password '#{args[:password]}'".green if user.save(:validate => false)
 
-    text = File.read("#{Rails.root}/config/routes.rb")
+    Rake::Task["mokio:install_routes"].execute
 
-    File.open("#{Rails.root}/config/routes.rb", "w") do |file|
-      file.puts text.gsub(/# The priority is based upon order of creation: first created \-\> highest priority\./, "mount Mokio::Engine => '/backend'")
-    end
+    # text = File.read("#{Rails.root}/config/routes.rb")
+
+    # File.open("#{Rails.root}/config/routes.rb", "w") do |file|
+    #   file.puts text.gsub(/# The priority is based upon order of creation: first created \-\> highest priority\./, "mount Mokio::Engine => '/backend'")
+    # end
 
     unless File.exist?("#{Rails.root}/config/initializers/mokio.rb")
       puts "\n"
       result = Rails::Generators.invoke("mokio:install")
       puts "\n\tCreated initializer(configuration file) in #{result}".green
     end
+
+    if(ActiveRecord::Base.configurations[Rails.env]['adapter']) == "postgresql"
+      Rake::Task["mokio:reset_pg_sequence"].execute
+    end
+    Rake::Task["webpacker:install"].execute
+
     puts "\nMokio is ready to start! Run 'rails server' and go to localhost:3000/backend to see your application in development mode"
+
   end
 
 
@@ -83,7 +112,7 @@ namespace :mokio do
       end
 
       Mokio::Lang.import langs
-      
+
       menus = build_menu(config['menus'], nil)
 
       menus.each do |me|
@@ -93,13 +122,12 @@ namespace :mokio do
 
   #recursively prepares Menu nodes based on given node list (menu_params)
 
-    def build_menu(menu_params, ancestry) 
+    def build_menu(menu_params, ancestry)
       menus = []
       menu_params.each do |m|
-        
+
         m["ancestry"] = ancestry
         new_menu = Mokio::Menu.new(m.except("children"))
-        new_menu.build_meta
         menus << new_menu
 
         unless m["children"].nil?