coalla-cms 0.5.1.9 → 0.6.0.9

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

@@ -4,8 +4,7 @@ require 'rails/generators/active_record'
 module Coalla
   module Cms
     module Slider
-
-      class InitGenerator < ::ActiveRecord::Generators::Base
+      class InitGenerator < ActiveRecord::Generators::Base
         argument :name, type: :string, default: 'SliderImage'
         source_root File.expand_path('../templates', __FILE__)
 
@@ -33,7 +32,6 @@ module Coalla
             inject_into_file 'config/routes.rb', "\n  #{routing_code}", {:after => sentinel, :verbose => false}
           end
         end
-
       end
     end
   end

data/lib/generators/coalla/cms/slider/templates/slider_image.rb.erb

@@ -1,7 +1,6 @@
 class <%= @class_name %> < ActiveRecord::Base
 
   mount_uploader :image, <%= @uploader_name %>
-  acts_as_list scope: 'container_slider_id = #{container_slider_id} AND slider_type = \'#{slider_type}\''
 
   def self.with_type(slider_type)
     where(slider_type: slider_type)

data/lib/generators/coalla/cms/slider/templates/slider_image_uploader.rb.erb

@@ -1,4 +1,4 @@
-class <%= @uploader_name %> < GenericImageUploader
+class <%= @uploader_name %> < Coalla::ImageUploader
 
   version :thumb do
     resize_to_fill 80, 80

data/lib/generators/coalla/cms/templates/.gitignore

@@ -1,5 +1,4 @@
 .bundle
-Gemfile.lock
 db/*.sqlite3
 log/*.log
 tmp/
@@ -10,9 +9,7 @@ db/*.sqlite3-journal
 *.log
 tmp
 tmp/**/*
-
 /db/sphinx
-/db/schema.rb
 /log/development.sphinx.pid
 
 # Documentation
@@ -84,3 +81,6 @@ capybara-*html
 .rvmrc
 .rvmrc.*
 
+node_modules
+node_modules/*
+

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

@@ -2,35 +2,9 @@ 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
+      success = administrator_params[:password].present? ? resource.update(administrator_params) : resource.update_without_password(resource_params)
+      sign_in(resource, bypass: true) if current_administrator == resource
       if success
         redirect_or_render :edit
       else
@@ -38,18 +12,6 @@ module Admin
       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/scaffold_controller_template.rb.erb

@@ -1,45 +1,6 @@
 module Admin
 
   class <%= name.camelize.pluralize %>Controller < BaseController
-
-    PER_PAGE = 20
-
-    def index
-      @<%= @collection_name %> = <%= @class_name %>.order(created_at: :desc).paginate(page: params[:page], per_page: PER_PAGE)
-    end
-
-    def new
-      @<%= @instance_name %> = <%= @class_name %>.new
-    end
-
-    def create
-      @<%= @instance_name %> = <%= @class_name %>.new(params[:<%= @instance_name %>].permit!)
-      if @<%= @instance_name %>.save
-      redirect_or_render :edit
-      else
-        render :new
-      end
-    end
-
-    def edit
-      @<%= @instance_name %> = <%= @class_name %>.find(params[:id])
-    end
-
-    def update
-      @<%= @instance_name %> = <%= @class_name %>.find(params[:id])
-      if @<%= @instance_name %>.update_attributes(params[:<%= @instance_name %>].permit!)
-      redirect_or_render :edit
-      else
-        render :edit
-      end
-    end
-
-    def destroy
-      @<%= @instance_name %> = <%= @class_name %>.find(params[:id])
-      @<%= @instance_name %>.destroy
-      redirect_to_last
-    end
-
   end
 
 end

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

@@ -5,94 +5,4 @@ unless RUBY_PLATFORM.downcase.include?("win") || RUBY_PLATFORM.downcase.include?
 
   CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
 
-end
-
-if RUBY_VERSION == "1.9.3"
-
-  module CarrierWave
-
-    class SanitizedFile
-
-      private
-
-      # Sanitize the filename, to prevent hacking
-      def sanitize(name)
-        name = name.force_encoding(Encoding::UTF_8)
-        name = name.gsub("\\", "/") # work-around for IE
-        name = File.basename(name)
-        name = name.gsub(sanitize_regexp, "_")
-        name = "_#{name}" if name =~ /\A\.+\z/
-        name = "unnamed" if name.size == 0
-        return name.mb_chars.to_s
-      end
-
-    end
-
-  end
-
-  module CarrierWave
-
-    module Mount
-
-      class Mounter
-
-        def url(*args)
-          url = uploader.url(*args)
-          url = url.force_encoding(Encoding::UTF_8) if url
-          url
-        end
-
-      end
-
-    end
-
-  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

@@ -3,6 +3,7 @@ en:
     models:
       administrator: Administrators
       lookup: Settings
+      site_meta_tags: Meta-Tags
     structure:
       administrator: Administrators list management
 
@@ -13,4 +14,16 @@ en:
       lookup:
         code: Name
         value: Value
-
+        file_name: Filename
+      site_meta_tags:
+        identifier: Identifier
+        identifier_text: Page identifier
+        site: Site
+        title: Title
+        description: Description
+        image: Image
+        url: URL
+        og_title: Title
+        og_description: Description
+        og_image: Image
+        og_url: URL

data/lib/generators/coalla/cms/templates/views/admin/administrators/_form.html.haml

@@ -1,4 +1,4 @@
-= twitter_form_for [:admin, @administrator] do |f|
+= twitter_form_for [:admin, resource] do |f|
   = field_set do
     = f.errors
     = flash_messages

data/lib/generators/coalla/cms/templates/views/admin/administrators/edit.html.haml

@@ -1,4 +1,4 @@
-%h1= Administrator.model_name.human
+%h1= resource_model.model_name.human
 .page-header
   %h3= t('admin.form.edit')
 

data/lib/generators/coalla/cms/templates/views/admin/administrators/index.html.haml

@@ -1,15 +1,15 @@
 .page-header
-  %h1= Administrator.model_name.human
+  %h1= resource_model.model_name.human
 
 = actions do
-  = create_link(new_admin_administrator_path)
+  = create_link
 
-= table_for(Administrator).content(@administrators) do |t|
+= table_for(resource_model).content(resources) do |t|
   - t.column :email
   - t.edit
   - t.delete if: ->(admin) { current_administrator != admin }
 
-= admin_paginate @administrators
+= admin_paginate resources
 
 = actions do
-  = create_link(new_admin_administrator_path)
+  = create_link

data/lib/generators/coalla/cms/templates/views/admin/administrators/new.html.haml

@@ -1,4 +1,4 @@
-%h1= Administrator.model_name.human
+%h1= resource_model.model_name.human
 .page-header
   %h3 Добавление
 = render 'form'

data/lib/generators/coalla/cms/templates/views/admin/scaffold_template/_form.html.haml.erb

@@ -1,4 +1,4 @@
-= twitter_form_for [:admin, @<%= @instance_name %>] do |f|
+= twitter_form_for [:admin, resource] do |f|
   = field_set do
     = f.errors
     = flash_messages

data/lib/generators/coalla/cms/templates/views/admin/scaffold_template/edit.html.haml.erb

@@ -1,4 +1,4 @@
-%h1= <%= @class_name.constantize %>.model_name.human
+%h1= resource_model.model_name.human
 .page-header
   %h3= t('admin.form.edit')
 

data/lib/generators/coalla/cms/templates/views/admin/scaffold_template/index.html.haml.erb

@@ -1,15 +1,15 @@
 .page-header
-  %h1= <%= @class_name.constantize %>.model_name.human
+  %h1= resource_model.model_name.human
 
 = actions do
-  = create_link(new_admin_<%= @instance_name %>_path)
+  = create_link
 
-= table_for(<%= @class_name.constantize %>).content(@<%= @collection_name %>) do |t|
+= table_for(resource_model).content(resources) do |t|
   <% @table_columns.each do |column| %><% if @reflections[column[0]] %>- t.column :<%= @reflections[column[0]].name %>, format: ->(c) { c.try(:<%= cms_select_name(@reflections[column[0]].klass) %>) }<% else %>- t.column :<%= column[0]%><% end %>
   <% end %>- t.edit
   - t.delete
 
-= admin_paginate @<%= @collection_name %>
+= admin_paginate resources
 
 = actions do
-  = create_link(new_admin_<%= @instance_name %>_path)
+  = create_link

data/lib/generators/coalla/cms/templates/views/admin/scaffold_template/new.html.haml.erb

@@ -1,4 +1,4 @@
-%h1= <%= @class_name.constantize %>.model_name.human
+%h1= resource_model.model_name.human
 .page-header
   %h3= t('admin.form.new')
 = render 'form'

data/lib/generators/coalla/cms/templates/views/administrators/sessions/new.html.haml

@@ -6,7 +6,7 @@
         %h3= t('admin.auth.title')
 
       = twitter_form_for(resource, url: session_path(resource_name), width_class: 'col-md-8') do |f|
-        = flash_alert_messages
+        = render_alert(flash[:alert], :danger)
         = f.string :email
         = f.password :password
 

data/lib/generators/coalla/cms/utils/orm.rb

@@ -0,0 +1,29 @@
+module Coalla
+  module Cms
+    module Utils
+      module Orm
+        def model_contents
+          <<-CONTENT
+  devise :database_authenticatable, :rememberable, :validatable
+          CONTENT
+        end
+
+        def model_exists?
+          File.exists?(File.join(destination_root, model_path))
+        end
+
+        def migration_exists?(table_name)
+          Dir.glob("#{File.join(destination_root, migration_path)}/[0-9]*_*.rb").grep(/\d+_add_admin_role_to_#{table_name}.rb$/).first
+        end
+
+        def migration_path
+          @migration_path ||= File.join('db', 'migrate')
+        end
+
+        def model_path
+          @model_path ||= File.join('app', 'models', "#{file_path}.rb")
+        end
+      end
+    end
+  end
+end

data/lib/generators/coalla/cms/utils/scaffold.rb

@@ -0,0 +1,11 @@
+module Coalla
+  module Cms
+    module Utils
+      module Scaffold
+        def cms_select_name(klass)
+          (([:title, :name, :caption] & klass.new.methods) << :id).first
+        end
+      end
+    end
+  end
+end