coalla-cms 0.4.4.3 → 0.5.1.8

data/app/views/layouts/admin.html.haml

@@ -1,13 +1,11 @@
 !!!
 %html
   %head
-    %title Административная панель
+    %title= t('admin.title')
     = favicon_link_tag
     = stylesheet_link_tag 'admin/admin', media: 'all'
     = javascript_include_tag 'admin/admin'
     = csrf_meta_tags
-  %script(src='/wysiwyg/jquery.wymeditor.js')
-  %script(src='/wysiwyg/plugins/imageupload/jquery.wymeditor.imageupload.js')
   = yield(:head)
   :css
     .ajax-loader.visible { display: block; }
@@ -35,4 +33,12 @@
         = yield
 
     :javascript
-      PhotoUploader = new PhotoUploader('#{j(render partial: 'admin/common/upload_form')}');
+      $(function () {
+        PhotoUploader = new PhotoUploader('#{j(render partial: 'admin/common/upload_form')}');
+        var addUploadListener = function () {
+            PhotoUploader.addUploadListener();
+        };
+        addUploadListener();
+        window.NestedFormCallbacks = window.NestedFormCallbacks || [];
+        window.NestedFormCallbacks.push(addUploadListener);
+      });

data/app/views/structure/_section.haml

@@ -12,5 +12,6 @@
       = link_to section.creation_path, class: 'btn btn-success' do
         %i.glyphicon.glyphicon-plus
          
-        Добавить
+        = t('admin.common.new')
+
 

data/coalla-cms.gemspec

@@ -36,5 +36,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'remotipart'
   s.add_dependency 'rmagick'
   s.add_dependency 'will_paginate'
+  s.add_dependency 'standalone_typograf', '~> 3.0.2'
+  s.add_dependency 'meta-tags', '~> 2.1.0'
 
 end

data/lib/coalla/cms/version.rb

@@ -1,5 +1,5 @@
 module Coalla
   module Cms
-    VERSION = '0.4.4.3'
+    VERSION = '0.5.1.8'
   end
 end

data/lib/coalla/orm/page_slider.rb

@@ -50,4 +50,6 @@ module Coalla
 
 end
 
-ActiveRecord::Base.extend Coalla::PageSlider
+unless Rails.configuration.try(:disable_page_slider)
+  ActiveRecord::Base.extend Coalla::PageSlider
+end

data/lib/coalla/orm/relation.rb

@@ -4,10 +4,13 @@ module Coalla
 
     def multi_field(relation_name, options = {})
       through_collection_name = options[:through_collection_name] || "#{self.model_name.singular}_#{relation_name}".to_sym
-      through_class = self.reflections[through_collection_name].klass
-      self_foreign_key = self.reflections[through_collection_name].foreign_key
-      association_model_name = self.reflections[relation_name].source_reflection_name.to_sym
-      association_foreign_key = self.reflections[relation_name].foreign_key
+      reflection = self.reflections[through_collection_name] || self.reflections[through_collection_name.to_s]
+      through_class = reflection.klass
+      self_foreign_key = reflection.foreign_key
+
+      reflection = self.reflections[relation_name] || self.reflections[relation_name.to_s]
+      association_model_name = reflection.source_reflection_name.to_sym
+      association_foreign_key = reflection.foreign_key
 
       tokens_attribute_name = "#{relation_name}_tokens"
       attr_reader tokens_attribute_name

data/lib/generators/coalla/cms/create_admin_administrators_generator.rb

@@ -0,0 +1,29 @@
+require 'rails/generators/active_record'
+
+module Coalla
+  module Cms
+
+    class CreateAdminAdministratorsGenerator < ActiveRecord::Generators::Base
+      argument :name, type: :string, default: ""
+      source_root File.expand_path("../templates", __FILE__)
+
+      def setup_directory
+        copy_file 'controllers/admin/administrators_controller.rb', 'app/controllers/admin/administrators_controller.rb'
+        directory 'views/admin/administrators', 'app/views/admin/administrators'
+        inject_into_file 'config/structure.rb', "section Administrator, description: I18n.t('activerecord.structure.administrator'), icon: 'glyphicon glyphicon-home'", before: /^/
+      end
+
+      def setup_routes
+        sentinel = /namespace :admin do\s*$/
+
+        routing_code = "  resources :administrators"
+        in_root do
+          inject_into_file 'config/routes.rb', "\n  #{routing_code}", {after: sentinel}
+        end
+      end
+
+    end
+  end
+end
+
+

data/lib/generators/coalla/cms/create_markup_generator.rb

@@ -0,0 +1,30 @@
+require 'rails/generators/active_record'
+
+module Coalla
+  module Cms
+
+    class CreateMarkupGenerator < ActiveRecord::Generators::Base
+      argument :name, type: :string, default: ""
+      source_root File.expand_path('../templates', __FILE__)
+
+      def copy_controller_file
+        template 'controllers/markup_controller.rb.erb', 'app/controllers/markup_controller.rb'
+        empty_directory 'app/views/markup'
+      end
+
+      def setup_routes
+        sentinel = /namespace :admin do\s*$/
+
+        routing_code = <<EOF
+  scope controller: :markup, as: :markup, path: 'markup' do
+    get :lot
+  end
+EOF
+
+        in_root do
+          inject_into_file 'config/routes.rb', "\n  #{routing_code}", {after: sentinel}
+        end
+      end
+    end
+  end
+end

data/lib/generators/coalla/cms/init_generator.rb

@@ -19,51 +19,56 @@ module Coalla
         gem 'russian', '0.6.0'
         gem 'acts_as_list', '0.6.0'
         gem 'remotipart', '1.2.1'
-        gem 'rmagick', '2.13.2', require: false
-        gem 'will_paginate', '3.0.7'
-        gem 'cancan', '1.6.10'
+        gem 'rmagick', '2.15.4', require: false
+        gem 'cancancan', '1.13.1'
         gem 'active_attr', '0.8.5'
         gem 'sitemap_generator', '5.0.5'
         gem 'whenever', '0.9.4'
         gem 'holder_rails', '2.6.0'
-        gem 'tzinfo-data', '1.2015.2'
+        gem 'tzinfo-data', '~> 1.2015.7'
         gem 'jbuilder', '2.2.13'
         gem 'uglifier', '2.7.1'
+        gem 'sprockets', '3.5.2'
+        gem 'meta-tags', '2.1.0'
 
         gem_group :development do
-          gem 'ruby-prof', '0.15.6'
-          gem 'thin', '1.6.3'
-          gem 'eventmachine', '1.0.7'
+          gem 'ruby-prof', '0.15.9'
+          gem 'thin', '1.6.4'
+          gem 'eventmachine', '1.0.8'
           gem 'haml-rails', '0.9.0'
-          gem 'letter_opener', '1.3.0'
+          gem 'letter_opener', '1.4.1'
           gem 'quiet_assets', '1.1.0'
-          gem 'byebug', '4.0.5'
-          gem 'web-console', '2.1.2'
-          gem 'spring', '1.3.4'
+          gem 'byebug', '8.2.1'
+          gem 'web-console', '2.2.1'
+          gem 'spring', '1.6.2'
         end
 
-        copy_file 'activerecord.ru.yml', 'config/locales/activerecord.ru.yml'
+        gem_group :production, :staging do
+          gem 'exception_notification', '4.1.4'
+        end
+
+        copy_file 'locales/activerecord.ru.yml', 'config/locales/activerecord.ru.yml'
+        copy_file 'locales/activerecord.en.yml', 'config/locales/activerecord.en.yml'
         copy_file 'initializers/carrierwave.rb', 'config/initializers/carrierwave.rb'
         copy_file 'schedule.rb', 'config/schedule.rb'
 
         remove_file 'public/index.html'
         remove_file '.gitignore'
-        copy_file   '.gitignore', '.gitignore'
-        copy_file   '.gitattributes', '.gitattributes'
+        copy_file '.gitignore', '.gitignore'
+        copy_file '.gitattributes', '.gitattributes'
 
         remove_file 'public/500.html'
         remove_file 'public/404.html'
         remove_file 'public/422.html'
 
-        copy_file   'errors/500.html', 'public/500.html'
-        copy_file   'errors/404.html', 'public/404.html'
-        copy_file   'errors/422.html', 'public/422.html'
+        copy_file 'errors/500.html', 'public/500.html'
+        copy_file 'errors/404.html', 'public/404.html'
+        copy_file 'errors/422.html', 'public/422.html'
 
 
         template 'controllers/home_controller.rb.erb', 'app/controllers/home_controller.rb'
         empty_directory 'app/views/home'
         template 'views/home/index.html.haml.erb', 'app/views/home/index.html.haml'
-
         route "root to: 'home#index'"
 
         remove_file 'config/database.yml'
@@ -83,7 +88,7 @@ module Coalla
         gsub_file 'config/initializers/devise.rb', "# config.scoped_views = false", "config.scoped_views = true"
         gsub_file 'config/initializers/devise.rb', "# config.sign_out_all_scopes = true", "config.sign_out_all_scopes = false"
         remove_file 'config/locales/devise.ru.yml'
-        copy_file   'devise.ru.yml', 'config/locales/devise.ru.yml'
+        copy_file 'locales/devise.ru.yml', 'config/locales/devise.ru.yml'
       end
 
       def setup_application_file
@@ -99,32 +104,23 @@ module Coalla
   config.action_mailer.default_url_options = {host: 'localhost', port: 3000}
   config.action_mailer.delivery_method = :letter_opener
   config.action_mailer.asset_host = "http://localhost:3000"
-CONFIG
+          CONFIG
           match << c
         end
       end
 
       def configure_assets
-        copy_file 'assets.rb', 'config/initializers/assets.rb'
-      end
-
-      def basic_http_auth
-        gsub_file 'app/controllers/application_controller.rb', /protect_from_forgery with: :exception/ do |match|
-          c = <<-RUBY
-
-
-  before_action :basic_http_auth if Rails.env.staging?
+        gsub_file 'config/environments/development.rb', /config.action_mailer.raise_delivery_errors = false/ do |match|
+          c = <<-CONFIG
 
-  def basic_http_auth
-    if Rails.env.staging?
-      authenticate_or_request_with_http_basic do |username, password|
-        username == 'demo' && password == "#{generate_password(4)}"
-      end
-    end
-  end
-          RUBY
+  config.action_mailer.default_url_options = {host: 'localhost', port: 3000}
+  config.action_mailer.delivery_method = :letter_opener
+  config.action_mailer.asset_host = "http://localhost:3000"
+          CONFIG
           match << c
         end
+
+        template 'assets.rb', 'config/initializers/assets.rb'
       end
 
       private

data/lib/generators/coalla/cms/lookups/install_generator.rb

@@ -6,15 +6,22 @@ module Coalla
     module Lookups
 
       class InstallGenerator < ActiveRecord::Generators::Base
-        argument :name, type: :string, default: ""
-        source_root File.expand_path("../../../../../../", __FILE__)
-        class_option :copy, type: :boolean, default: false, description: "Copy all files to project"
+        argument :name, type: :string, default: ''
+        source_root File.expand_path('../../../../../../', __FILE__)
+        class_option :copy, type: :boolean, default: false, description: 'Copy all files to project'
 
         def copy_files
-          migration_template "lib/generators/coalla/cms/lookups/templates/migration.rb", "db/migrate/create_lookups.rb"
+          migration_template 'lib/generators/coalla/cms/lookups/templates/migration.rb', 'db/migrate/create_lookups.rb'
 
           if options.copy?
-            [ 'app/views/admin/lookups/_form.html.haml',
+            [ 'app/views/admin/lookups/types/boolean',
+              'app/views/admin/lookups/types/enum',
+              'app/views/admin/lookups/types/float',
+              'app/views/admin/lookups/types/integer',
+              'app/views/admin/lookups/types/memo',
+              'app/views/admin/lookups/types/string',
+              'app/views/admin/lookups/types/wysiwyg',
+              'app/views/admin/lookups/_form.html.haml',
               'app/views/admin/lookups/edit.html.haml',
               'app/views/admin/lookups/index.html.haml',
               'app/views/admin/lookups/show.html.haml',
@@ -30,12 +37,16 @@ module Coalla
         def setup_routes
           sentinel = /namespace :admin do\s*$/
 
-          routing_code = "  resources :lookups"
+          routing_code = "  get 'lookups/(:category)' => 'lookups#index', as: :lookups_index\n  resources :lookups, except: [:show]"
           in_root do
             inject_into_file 'config/routes.rb', "\n  #{routing_code}", { :after => sentinel, :verbose => false }
           end
         end
 
+        def add_section
+          append_to_file 'config/structure.rb', "\nlookup_section"
+        end
+
       end
 
     end

data/lib/generators/coalla/cms/lookups/templates/migration.rb

@@ -4,6 +4,10 @@ class CreateLookups < ActiveRecord::Migration
       t.text :code, null: false
       t.text :value
       t.text :type_code, null: false
+      t.text :value_options
+      t.text :tooltip
+      t.text :category
+      t.text :file
       t.timestamps
     end
 

data/lib/generators/coalla/cms/market/templates/controllers/products_controller.rb

@@ -7,7 +7,7 @@ module Admin
     PER_PAGE = 20
 
     def index
-      @products = ::Market::Product.all.paginate(page: params[:page], per_page: PER_PAGE)
+      @products = ::Market::Product.order(created_at: :desc).paginate(page: params[:page], per_page: PER_PAGE)
     end
 
     def new

data/lib/generators/coalla/cms/market/templates/controllers/properties_controller.rb

@@ -11,7 +11,7 @@ module Admin
         # autocomplete
         render json: ::Market::Property.where('name ILIKE ?', "#{params[:term]}%").order(:name).map { |property| {id: property.id, label: property.name} }
       else
-        @properties = ::Market::Property.all.paginate(page: params[:page], per_page: PER_PAGE)
+        @properties = ::Market::Property.order(:name).paginate(page: params[:page], per_page: PER_PAGE)
       end
     end
 

data/lib/generators/coalla/cms/meta_tags/install_generator.rb

@@ -0,0 +1,58 @@
+require 'rails'
+require 'rails/generators/active_record'
+
+module Coalla
+  module Cms
+    module MetaTags
+
+      class InstallGenerator < ActiveRecord::Generators::Base
+        argument :name, type: :string, default: ''
+        source_root File.expand_path('../../../../../../', __FILE__)
+        class_option :copy, type: :boolean, default: false, description: 'Copy all files to project'
+
+        def copy_files
+          migration_template 'lib/generators/coalla/cms/meta_tags/templates/migration.rb', 'db/migrate/create_meta_tags.rb'
+
+          if options.copy?
+            [
+                'app/views/admin/site_meta_tags/_form.html.haml',
+                'app/views/admin/site_meta_tags/edit.html.haml',
+                'app/views/admin/site_meta_tags/index.html.haml',
+                'app/controllers/admin/meta_tags_controller.rb',
+                'app/controllers/concerns/page_meta_tags.rb',
+                'app/uploaders/meta_tags_image_uploader.rb'
+            ].each do |path|
+              copy_file path, path
+            end
+          end
+        end
+
+        def setup_routes
+          sentinel = /namespace :admin do\s*$/
+
+          routing_code = '  resources :meta_tags, except: [:show], controller: :site_meta_tags'
+          in_root do
+            inject_into_file 'config/routes.rb', "\n  #{routing_code}", {:after => sentinel, :verbose => false}
+          end
+        end
+
+        def add_module_to_application_controller
+          gsub_file 'app/controllers/application_controller.rb', /protect_from_forgery with: :exception/ do |match|
+            c = <<-RUBY
+
+  include PageMetaTags
+
+            RUBY
+            match << c
+          end
+
+        end
+
+        def add_section
+          append_to_file 'config/structure.rb', "\nmeta_tags_section"
+        end
+
+      end
+    end
+  end
+end

data/lib/generators/coalla/cms/meta_tags/templates/migration.rb

@@ -0,0 +1,23 @@
+class CreateMetaTags < ActiveRecord::Migration
+  def change
+    create_table :meta_tags do |t|
+      t.text :identifier, null: false
+      t.index :identifier, unique: true
+
+      t.text :site, null: false, default: ''
+      t.text :title, null: false, default: ''
+      t.text :description, null: false, default: ''
+      t.text :image
+      t.text :url
+
+      t.text :og_title
+      t.text :og_description
+      t.text :og_image
+      t.text :og_url
+
+      t.timestamps
+    end
+
+    SiteMetaTags.create!(identifier: :default)
+  end
+end

data/lib/generators/coalla/cms/news/templates/views/new.haml.erb

@@ -1,5 +1,5 @@
 %h1= <%= @class_name %>.model_name.human
 .page-header
-  %h3 Добавление
+  %h3= t('admin.form.new')
 
 = render 'form'

data/lib/generators/coalla/cms/setup_admin_generator.rb

@@ -17,14 +17,20 @@ module Coalla
         copy_file 'structure.rb', 'config/structure.rb'
       end
 
-      def patch_application_controller
-        inject_into_class "app/controllers/application_controller.rb", ApplicationController do
-          "  layout :layout_by_resource\n\n"
-        end
+      def copy_localization
+        copy_file 'locales/admin.ru.yml', 'config/locales/admin.ru.yml'
+        copy_file 'locales/admin.en.yml', 'config/locales/admin.en.yml'
+      end
 
+      def setup_default_views
+        invoke "coalla:cms:create_admin_administrators"
+      end
+
+      def patch_application_controller
         gsub_file 'app/controllers/application_controller.rb', /protect_from_forgery with: :exception/ do |match|
           c = <<-RUBY
 
+  layout :layout_by_resource
 
   def layout_by_resource
     if devise_controller? && resource_name === :administrator
@@ -47,9 +53,6 @@ module Coalla
         end
       end
 
-      def install_wysiwyg
-        generate 'coalla:cms:wysiwyg:wymeditor'
-      end
 
       def install_ckeditor
         generate 'coalla:cms:wysiwyg:ckeditor'

data/lib/generators/coalla/cms/setup_routes_generator.rb

@@ -21,6 +21,7 @@ module Coalla
     scope controller: :autocomplete do
       get 'list/:model/:field' => :list, as: 'autocomplete'
     end
+    get 'notifier/test_sending' => 'notifier#test_sending'
   end"
       end
     end

data/lib/generators/coalla/cms/templates/assets.rb

@@ -7,7 +7,5 @@ Rails.application.config.assets.version = '1.0'
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
 Rails.application.config.assets.precompile += %w( admin/admin.css )
-Rails.application.config.assets.precompile += [->(path) {
-  full_path = Rails.application.assets.resolve(path)
-  File.extname(full_path).in?(%w(.js .css))
-}]
+Rails.application.config.assets.precompile += [ Proc.new{ |path| File.extname(path).in?(%w(.js .css .coffee)) },
+                                                Proc.new{ |path| !File.extname(path).in?(%w(.js .css .coffee)) } ]

data/lib/generators/coalla/cms/templates/controllers/admin/administrators_controller.rb

@@ -0,0 +1,55 @@
+module Admin
+
+  class AdministratorsController < BaseController
+
+    PER_PAGE = 20
+
+    def index
+      @administrators = Administrator.order(created_at: :desc).paginate(page: params[:page], per_page: PER_PAGE)
+    end
+
+    def new
+      @administrator = Administrator.new
+    end
+
+    def create
+      @administrator = Administrator.new(params[:administrator].permit!)
+      if @administrator.save
+        redirect_or_render :edit
+      else
+        render :new
+      end
+    end
+
+    def edit
+      @administrator = Administrator.find(params[:id])
+    end
+
+    def update
+      @administrator = Administrator.find(params[:id])
+      success = administrator_params[:password].present? ? @administrator.update(administrator_params) : @administrator.update_without_password(administrator_params)
+      if current_administrator == @administrator
+        sign_in(@administrator, bypass: true)
+      end
+      if success
+        redirect_or_render :edit
+      else
+        render :edit
+      end
+    end
+
+    def destroy
+      @administrator = Administrator.find(params[:id])
+      @administrator.destroy
+      redirect_to_last
+    end
+
+    private
+
+    def administrator_params
+      params[:administrator].permit!
+    end
+
+  end
+
+end

data/lib/generators/coalla/cms/templates/controllers/admin/base_controller.rb.erb

@@ -15,11 +15,11 @@ module Admin
     protected
 
     def load_structure
-      @structure = ::AdminStructure.new
+      @structure = ::AdminStructure.new(self)
     end
 
     def add_success_msg
-      flash.now[:admin_success] = 'Информация успешно сохранена'
+      flash.now[:admin_success] = I18n.t('admin.common.save_success')
     end
 
     def redirect_or_render partial

data/lib/generators/coalla/cms/templates/controllers/markup_controller.rb.erb

@@ -0,0 +1,2 @@
+class MarkupController < ApplicationController
+end

data/lib/generators/coalla/cms/templates/initializers/carrierwave.rb

@@ -48,4 +48,51 @@ if RUBY_VERSION == "1.9.3"
 
   end
 
+end
+
+
+# for STI
+module CarrierWave
+
+  module Mount
+
+    class Mounter
+
+      def cache_name=(cache_name)
+        unless uploader.cached?
+          result = uploader.retrieve_from_cache!(cache_name)
+          record.send("#{serialization_column}_will_change!")
+          result
+        end
+      rescue CarrierWave::InvalidParameter
+      end
+
+    end
+
+  end
+
+end
+
+
+# override presence validator
+module Carrierwave
+  module Validations
+    class PresenceValidator < ActiveRecord::Validations::PresenceValidator # :nodoc:
+      def validate_each(record, attr_name, value)
+        record.errors.add(attr_name, :blank, options) if value.blank? || carrier_wave_image_present?(record, attr_name)
+      end
+
+      private
+
+      def carrier_wave_image_present?(record, attr_name)
+        (record.send(attr_name).try(:is_a?, CarrierWave::Uploader::Base) && record.try("remove_#{attr_name}?"))
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.instance_eval do
+  def validates_presence_of(*attr_names)
+    validates_with Carrierwave::Validations::PresenceValidator, _merge_attributes(attr_names)
+  end
 end

data/lib/generators/coalla/cms/templates/locales/activerecord.en.yml

@@ -0,0 +1,16 @@
+en:
+  activerecord:
+    models:
+      administrator: Administrators
+      lookup: Settings
+    structure:
+      administrator: Administrators list management
+
+    attributes:
+      administrator:
+        email: Email
+        password: Password
+      lookup:
+        code: Name
+        value: Value
+