coalla-cms 0.5.2.4 → 0.6.0.9

data/lib/coalla/orm/page_slider.rb

@@ -1,7 +1,5 @@
 module Coalla
-
   module PageSlider
-
     def slider(collection_name, options = {})
       class_name = options.delete(:class_name) || 'SliderImage'
       slider_type = slider_type(collection_name)
@@ -10,6 +8,7 @@ module Coalla
       define_method "sorted_#{collection_name}" do
         send(collection_name).sort_by(&:position)
       end
+      sortable_association(collection_name.to_sym)
     end
 
     def slider_type(collection_name)
@@ -24,32 +23,7 @@ module Coalla
       @@slider_metadata << slider_type
       slider_type
     end
-
-    def self.extended(klass)
-      klass.class_eval <<-EOV
-      include ::Coalla::PageSlider::InstanceMethods
-      EOV
-    end
-
-    module InstanceMethods
-
-      def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
-        association_class = self.class.reflect_on_association(association_name).klass
-        if association_class.attribute_names.include?('position')
-          attributes_collection.each_with_index do |(key, value), index|
-            if value.is_a?(Hash)
-              value[:position] = index
-            end
-          end
-        end
-        super
-      end
-
-    end
   end
-
 end
 
-unless Rails.configuration.try(:disable_page_slider)
-  ActiveRecord::Base.extend Coalla::PageSlider
-end
+ActiveRecord::Base.extend(Coalla::PageSlider)

data/lib/coalla/orm/sanitized.rb

@@ -1,16 +1,12 @@
 module Coalla
-
   module Sanitized
-
     def sanitize_html(attribute, config = Sanitize::Config::DEFAULT)
       before_save do
         sanitize_attr = Sanitize.fragment(send(attribute), config)
         send("#{attribute}=", sanitize_attr)
       end
     end
-
   end
-
 end
 
-ActiveRecord::Base.extend Coalla::Sanitized
+ActiveRecord::Base.extend(Coalla::Sanitized)

data/lib/coalla/orm/sortable_association.rb

@@ -0,0 +1,30 @@
+module Coalla
+  module SortableAssociation
+    def sortable_association(*args)
+      unless respond_to?(:sortable_associations)
+        class_attribute :sortable_associations, instance_writer: false
+        self.sortable_associations = []
+      end
+
+      self.sortable_associations += args
+
+      class_eval do
+        def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
+          association_class = self.class.reflect_on_association(association_name).klass
+          if sortable_associations.include?(association_name) && association_class.attribute_names.include?('position')
+            attributes_collection.each_with_index do |(key, value), index|
+              if key.is_a?(Hash)
+                key[:position] = index
+              elsif value.is_a?(Hash)
+                value[:position] = index
+              end
+            end
+          end
+          super
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.extend(Coalla::SortableAssociation)

data/lib/coalla/uploaders/file_uploader.rb

@@ -0,0 +1,9 @@
+module Coalla
+  class FileUploader < CarrierWave::Uploader::Base
+    storage :file
+
+    def store_dir
+      "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    end
+  end
+end

data/lib/coalla/uploaders/image_uploader.rb

@@ -0,0 +1,62 @@
+#encoding: utf-8
+require 'shellwords'
+
+module Coalla
+  class ImageUploader < CarrierWave::Uploader::Base
+    include CarrierWave::RMagick
+
+    storage :file
+
+    def store_dir
+      "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    end
+
+    # You can call this method in your model
+    # For example
+    # before_save if: :image_changed? do
+    #   image.set_image_properties
+    # end
+    def set_image_properties
+      return if !model || !file
+
+      model.send(setter(:file_name), file.filename) if model.respond_to?(setter(:file_name))
+      model.send(setter(:size), file.size) if model.respond_to?(setter(:size))
+      model.send(setter(:content_type), file.content_type) if model.respond_to?(setter(:content_type))
+      if model.respond_to?(setter(:width)) && model.respond_to?(setter(:height))
+        w, h = `identify -format "%wx %h" #{file.path.shellescape}`.split(/x/).map { |dim| dim.to_i }
+        model.send(setter(:width), w)
+        model.send(setter(:height), h)
+      end
+    end
+
+    # You can call this method with process in your uploader
+    def watermark
+      return if !model || !model.respond_to?(getter(:watermarked?)) || !model.send(getter(:watermarked?))
+
+      manipulate! do |img|
+        logo = Magick::Image.read(Rails.root.join('app/assets/images/watermark.png')).first
+        img.composite(logo, Magick::SouthEastGravity, 0, 0, Magick::OverCompositeOp)
+      end
+    end
+
+    private
+
+    def setter(name)
+      opt = model.class.uploader_options[mounted_as] || {}
+      if opt[:prefixed]
+        "#{mounted_as}_#{name}="
+      else
+        "#{name}="
+      end
+    end
+
+    def getter(name)
+      opt = model.class.uploader_options[mounted_as] || {}
+      if opt[:prefixed]
+        "#{mounted_as}_#{name}"
+      else
+        "#{name}"
+      end
+    end
+  end
+end

data/lib/coalla/uploaders/meta_image_uploader.rb

@@ -0,0 +1,7 @@
+module Coalla
+  class MetaImageUploader < ImageUploader
+    version :main do
+      resize_to_limit 1024, 1024
+    end
+  end
+end

data/lib/coalla-cms.rb

@@ -15,3 +15,13 @@ require 'will_paginate'
 require 'coalla/cms/engine'
 require 'coalla/cms/version'
 require 'coalla/ext/mapper'
+
+require 'coalla/uploaders/file_uploader'
+require 'coalla/uploaders/image_uploader'
+require 'coalla/uploaders/meta_image_uploader'
+
+require 'coalla/builders/policy'
+require 'coalla/builders/form_builder'
+require 'coalla/builders/table_builder'
+require 'coalla/builders/link_renderer'
+require 'coalla/builders/admin_structure'

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

@@ -1,11 +1,10 @@
-require 'rails/generators/active_record'
+require 'rails/generators/named_base'
 
 module Coalla
   module Cms
-
-    class CreateAdminAdministratorsGenerator < ActiveRecord::Generators::Base
-      argument :name, type: :string, default: ""
-      source_root File.expand_path("../templates", __FILE__)
+    class CreateAdminAdministratorsGenerator < Rails::Generators::NamedBase
+      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'
@@ -16,12 +15,11 @@ module Coalla
       def setup_routes
         sentinel = /namespace :admin do\s*$/
 
-        routing_code = "  resources :administrators"
+        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_admin_generator.rb

@@ -1,25 +1,27 @@
+require 'rails'
 require 'rails/generators/active_record'
-require 'generators/coalla/cms/orm_helpers'
+require 'generators/coalla/cms/utils/orm'
 
 module Coalla
   module Cms
     class CreateAdminGenerator < ActiveRecord::Generators::Base
-      argument :name, :type => :string, :default => "Administrator"
+      include Coalla::Cms::Utils::Orm
 
-      include Coalla::Cms::OrmHelpers
-      source_root File.expand_path("../templates", __FILE__)
+      argument :name, :type => :string, :default => 'Administrator'
+
+      source_root File.expand_path('../templates', __FILE__)
 
       def copy_devise_migration
         if (behavior == :invoke && model_exists?) || (behavior == :revoke && migration_exists?(table_name))
-          migration_template "migration_existing.rb", "db/migrate/add_admin_role_to_#{table_name}.rb"
+          migration_template 'migration_existing.rb', "db/migrate/add_admin_role_to_#{table_name}.rb"
         else
-          migration_template "migration.rb", "db/migrate/create_#{table_name}_model.rb"
+          migration_template 'migration.rb', "db/migrate/create_#{table_name}_model.rb"
         end
       end
 
       def generate_model
         unless model_exists? && behavior == :invoke
-          invoke "active_record:model", [name],
+          invoke 'active_record:model', [name],
                  migration: false,
                  fixture: false,
                  test_framework: false

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

@@ -1,18 +1,16 @@
-require 'rails/generators/active_record'
+require 'rails/generators/named_base'
 
 module Coalla
   module Cms
 
-    class CreateAdminLoginViewGenerator < ActiveRecord::Generators::Base
-      argument :name, type: :string, default: ""
-      source_root File.expand_path("../templates", __FILE__)
+    class CreateAdminLoginViewGenerator < Rails::Generators::NamedBase
+      argument :name, type: :string, default: ''
+      source_root File.expand_path('../templates', __FILE__)
 
       def setup_directory
         empty_directory 'app/views/administrators/sessions'
         empty_directory 'app/controllers/admin'
 
-        template 'controllers/admin/base_controller.rb.erb', 'app/controllers/admin/base_controller.rb'
-        template 'controllers/admin/home_controller.rb.erb', 'app/controllers/admin/home_controller.rb'
         template 'views/administrators/sessions/new.html.haml', 'app/views/administrators/sessions/new.html.haml'
       end
 

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

@@ -1,9 +1,9 @@
-require 'rails/generators/active_record'
+require 'rails/generators/named_base'
 
 module Coalla
   module Cms
 
-    class CreateMarkupGenerator < ActiveRecord::Generators::Base
+    class CreateMarkupGenerator < Rails::Generators::NamedBase
       argument :name, type: :string, default: ""
       source_root File.expand_path('../templates', __FILE__)
 

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

@@ -4,7 +4,6 @@ require 'rails/generators/active_record'
 module Coalla
   module Cms
     module FileUploads
-
       class InstallGenerator < ActiveRecord::Generators::Base
         argument :name, type: :string, default: ""
         source_root File.expand_path("../templates", __FILE__)
@@ -12,24 +11,8 @@ module Coalla
 
         def copy_files
           migration_template "migration.rb", "db/migrate/create_file_upload.rb"
-
-          #if options.copy?
-          #  [ '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/new.html.haml',
-          #    'app/views/admin/lookups/show.html.haml',
-          #    'app/controllers/admin/lookups_controller.rb',
-          #    'app/models/lookup.rb',
-          #    'app/helpers/lookup_helper.rb'
-          #  ].each do |path|
-          #    copy_file path, path
-          #  end
-          #end
         end
-
       end
-
     end
   end
 end

data/lib/generators/coalla/cms/file_uploads/mount_generator.rb

@@ -4,11 +4,10 @@ require 'rails/generators/active_record'
 module Coalla
   module Cms
     module FileUploads
-
       class MountGenerator < ActiveRecord::Generators::Base
         argument :name, type: :string
         argument :field_name, type: :string
-        source_root File.expand_path("../templates", __FILE__)
+        source_root File.expand_path('../templates', __FILE__)
 
         def setup_names
           @model_name = name.camelize
@@ -21,14 +20,12 @@ module Coalla
 
         def mount_uploader
           inject_into_class "app/models/#{@model_name.underscore}.rb", @model_name.constantize do
-            """
-  mount_uploader :#{@field_name}, FileUploader
-"""
+            "
+  mount_uploader :#{@field_name}, Coalla::FileUploader
+"
           end
         end
-
       end
-
     end
   end
 end

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

@@ -4,7 +4,6 @@ require 'rails/generators/active_record'
 module Coalla
   module Cms
     module Image
-
       class InstallGenerator < ActiveRecord::Generators::Base
         argument :name, type: :string, default: ""
         source_root File.expand_path("../templates", __FILE__)
@@ -31,9 +30,7 @@ module Coalla
           template "model.rb.erb", "app/models/#{name.underscore}.rb"
           template "uploader.rb.erb", "app/uploaders/#{name.underscore}_uploader.rb"
         end
-
       end
-
     end
   end
 end

data/lib/generators/coalla/cms/image/mount_generator.rb

@@ -4,7 +4,6 @@ require 'rails/generators/active_record'
 module Coalla
   module Cms
     module Image
-
       class MountGenerator < ActiveRecord::Generators::Base
         argument :name, type: :string
         argument :field, type: :string
@@ -42,9 +41,7 @@ module Coalla
             "  mount_uploader :#{@image_field}, #{@class_name}#{@image_field.camelize}Uploader#{@prefixed? ", prefixed: true" : ""}\n"
           end
         end
-
       end
-
     end
   end
 end

data/lib/generators/coalla/cms/image/templates/mount/uploader.rb.erb

@@ -1,3 +1,3 @@
-class <%= @class_name %><%= @image_field.camelize %>Uploader < GenericImageUploader
+class <%= @class_name %><%= @image_field.camelize %>Uploader < Coalla::ImageUploader
 
 end

data/lib/generators/coalla/cms/image/templates/uploader.rb.erb

@@ -1,3 +1,3 @@
-class <%= name %>Uploader < GenericImageUploader
+class <%= name %>Uploader < Coalla::ImageUploader
 
 end

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

@@ -1,52 +1,18 @@
-require 'rails/generators/active_record'
+require 'rails/generators/named_base'
 require 'securerandom'
 
 module Coalla
   module Cms
 
-    class InitGenerator < ActiveRecord::Generators::Base
+    class InitGenerator < Rails::Generators::NamedBase
       argument :name, type: :string
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path('../templates', __FILE__)
 
       def setup_names
         @name = name.underscore
       end
 
-      def include_common_gems
-        #add_source 'http://gems.coalla.ru'
-
-        gem 'pg', '0.18.1'
-        gem 'russian', '0.6.0'
-        gem 'acts_as_list', '0.6.0'
-        gem 'remotipart', '1.2.1'
-        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.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.9'
-          gem 'thin', '1.6.4'
-          gem 'eventmachine', '1.0.8'
-          gem 'haml-rails', '0.9.0'
-          gem 'letter_opener', '1.4.1'
-          gem 'quiet_assets', '1.1.0'
-          gem 'byebug', '8.2.1'
-          gem 'web-console', '2.2.1'
-          gem 'spring', '1.6.2'
-        end
-
-        gem_group :production, :staging do
-          gem 'exception_notification', '4.1.4'
-        end
-
+      def setup_common_parts
         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'
@@ -73,20 +39,14 @@ module Coalla
 
         remove_file 'config/database.yml'
         template 'database.yml.erb', 'config/database.yml'
-
-        inside ::Rails.root do
-          run "bundle update"
-        end
-
-        rake "db:create"
       end
 
       def setup_devise
-        generate "devise:install"
-        gsub_file 'config/initializers/devise.rb', "please-change-me-at-config-initializers-devise@example.com", "no-reply@#{name}.ru"
-        gsub_file 'config/initializers/devise.rb', "# config.password_length = 6..128", "config.password_length = 4..128"
-        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"
+        generate 'devise:install'
+        gsub_file 'config/initializers/devise.rb', 'please-change-me-at-config-initializers-devise@example.com', "no-reply@#{name}.ru"
+        gsub_file 'config/initializers/devise.rb', '# config.password_length = 6..128', 'config.password_length = 4..128'
+        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 'locales/devise.ru.yml', 'config/locales/devise.ru.yml'
       end
@@ -123,6 +83,39 @@ module Coalla
         template 'assets.rb', 'config/initializers/assets.rb'
       end
 
+      def include_common_gems
+        add_source 'http://gems.coalla.ru'
+
+        gem 'russian'
+        gem 'acts_as_list'
+        gem 'enumerize'
+        gem 'remotipart'
+        gem 'rmagick', require: false
+        gem 'cancancan'
+        gem 'sitemap_generator'
+        gem 'whenever'
+        gem 'tzinfo-data'
+        gem 'uglifier'
+        gem 'sprockets'
+        gem 'meta-tags'
+
+        gem_group :development do
+          gem 'ruby-prof'
+          gem 'thin'
+          gem 'haml-rails'
+          gem 'letter_opener'
+          gem 'byebug'
+          gem 'web-console'
+          gem 'spring'
+          gem 'awesome_print', require: 'ap'
+          gem 'annotate'
+        end
+
+        gem_group :production, :staging do
+          gem 'exception_notification'
+        end
+      end
+
       private
 
       def generate_password(ln=15)

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

@@ -4,7 +4,6 @@ require 'rails/generators/active_record'
 module Coalla
   module Cms
     module Lookups
-
       class InstallGenerator < ActiveRecord::Generators::Base
         argument :name, type: :string, default: ''
         source_root File.expand_path('../../../../../../', __FILE__)
@@ -46,9 +45,7 @@ module Coalla
         def add_section
           append_to_file 'config/structure.rb', "\nlookup_section"
         end
-
       end
-
     end
   end
 end

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

@@ -4,7 +4,6 @@ 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__)
@@ -51,7 +50,6 @@ module Coalla
         def add_section
           append_to_file 'config/structure.rb', "\nmeta_tags_section"
         end
-
       end
     end
   end

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

@@ -1,15 +1,15 @@
 require 'rails'
-require 'rails/generators/active_record'
-require 'generators/coalla/cms/scaffold_helper'
+require 'rails/generators/named_base'
+require 'generators/coalla/cms/utils/scaffold'
 
 module Coalla
   module Cms
-    class ScaffoldGenerator < ActiveRecord::Generators::Base
-      argument :name, type: :string
+    class ScaffoldGenerator < Rails::Generators::NamedBase
+      include Coalla::Cms::Utils::Scaffold
 
-      source_root File.expand_path("../templates", __FILE__)
+      argument :name, type: :string
 
-      include Coalla::Cms::ScaffoldHelper
+      source_root File.expand_path('../templates', __FILE__)
 
       def setup_names
         @instance_name = name.underscore
@@ -30,7 +30,7 @@ module Coalla
       end
 
       def create_views
-        dir = "views/admin/"
+        dir = 'views/admin/'
         empty_directory "app/#{dir}/#{@collection_name}"
 
         templates = %w{_form edit index new}

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

@@ -1,16 +1,16 @@
-require 'rails/generators/active_record'
+require 'rails/generators/named_base'
 
 module Coalla
   module Cms
 
-    class SetupAdminGenerator < ActiveRecord::Generators::Base
-      argument :name, :type => :string, :default => ""
-      source_root File.expand_path("../templates", __FILE__)
+    class SetupAdminGenerator < Rails::Generators::NamedBase
+      argument :name, :type => :string, :default => ''
+      source_root File.expand_path('../templates', __FILE__)
 
       def setup_directory
-        invoke "coalla:cms:create_admin"
-        invoke "coalla:cms:setup_routes"
-        invoke "coalla:cms:create_admin_login_view"
+        invoke 'coalla:cms:create_admin'
+        invoke 'coalla:cms:setup_routes'
+        invoke 'coalla:cms:create_admin_login_view'
       end
 
       def copy_structure
@@ -23,7 +23,7 @@ module Coalla
       end
 
       def setup_default_views
-        invoke "coalla:cms:create_admin_administrators"
+        invoke 'coalla:cms:create_admin_administrators'
       end
 
       def patch_application_controller
@@ -40,7 +40,7 @@ module Coalla
     end
   end
 
-  def after_sign_in_path_for resource
+  def after_sign_in_path_for(resource)
     case resource
       when Administrator
         admin_dashboard_path

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

@@ -1,10 +1,10 @@
-require 'rails/generators/active_record'
+require 'rails/generators/named_base'
 #require 'generators/coalla/cms/orm_helpers'
 
 module Coalla
   module Cms
-    class SetupRoutesGenerator < ActiveRecord::Generators::Base
-      argument :name, :type => :string, :default => "administrator"
+    class SetupRoutesGenerator < Rails::Generators::NamedBase
+      argument :name, :type => :string, :default => 'administrator'
 
       def create_route
         route "devise_for :#{name.pluralize}