rcms 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a77d95f78d6b3fc8c610e14a66b269612a99818
-  data.tar.gz: 95646dacf664fe54fb5175fe7ae8f52b3c4f00ec
+  metadata.gz: c38dccc02b702057f6ff1c64ff346be11fc94607
+  data.tar.gz: 4347c11e18b06616013d8819776d8571fcff09e7
 SHA512:
-  metadata.gz: ae18ea76e1f4682ab80c383c3995c70e6698025b4bd7b7e52601512a6dd77277d940796a9d364d5318b42f1081169d9a04c9cf05196913ef9e36783443bf2aed
-  data.tar.gz: f48971a88b002f4e33d99eb0629655756e30c9433c2d41e8fb5de89c9a178f4aaae5b5d73fed65d92a92686af3bf81260e1e02d42cb6e71103d87f67167561ad
+  metadata.gz: e85e6d8a5f4c0424b377b08e132a3808df63c32a743f64606897d9769ed78850de0ec5fd702f290ddb3d7cfc14d1632e105c84a3df36af61abb24099ad0a4ac3
+  data.tar.gz: be2e5f1ac7eeb38045b7be76734e0cdfcc9f21923a5ea742d4dd181283080de738b96ebcf77cd90b30cdb6fd04e44d4c7090528288501544d7f7f6e509b2043f

data/app/assets/stylesheets/rcms/mentions.scss

@@ -0,0 +1,30 @@
+$success-color: #4CAF50 !default;
+
+.rcms-mention-form{
+  fieldset{
+    width: 350px;
+    margin: 30px auto;
+  }
+}
+
+.aside-mentions-list{
+  .fa{
+    color: rgba(0,0,0,0.3);
+  }
+
+  .mention-item{
+    .text{
+      padding-bottom: 15px;
+      margin-bottom: 15px;
+      border-bottom: 1px dashed #aeaeae;
+      height: 56px;
+    }
+  }
+  .username{
+    color: $success-color;
+    margin-right: 7px;
+  }
+  time{
+    color: #777;
+  }
+}

data/app/assets/stylesheets/rcms/news.scss

@@ -0,0 +1,26 @@
+.aside-news-list{
+  .news-item{
+    &:last-of-type .list-group-item-text{
+      border-bottom: none;
+      padding-bottom: 0;
+      margin-bottom: 0;
+    }
+  }
+
+  .list-group-item-text{
+    padding-bottom: 15px;
+    margin-bottom: 15px;
+    border-bottom: 1px dashed #888888;
+  }
+
+  .list-group-item-heading {
+    margin-top: 8px;
+    margin-bottom: 5px;
+  }
+
+  &.list-group .list-group-item .list-group-item-heading {
+    color: rgba(0, 0, 0, 0.77);
+    font-size: 18px;
+    line-height: 22px;
+  }
+}

data/config/locales/rcms.ru.yml

@@ -3,6 +3,15 @@ ru:
     none: 1
     page:
       not_found: Информационная страничка "%{slug}" не найдена.
+    feedback:
+      subject: "Обратная связь для %{contact}"
+      created: "Запрос отправлен"
+    news:
+      index_title: Новости
+    mentions:
+      created: Спасибо за Ваш отзыв
+      index_title: Все отзывы
+
   activerecord:
     models:
       rcms/page:
@@ -11,6 +20,12 @@ ru:
         many: Страниц
         other: Страницы
 
+      rcms/mention:
+        one: Отзыв
+        few: Отзывов
+        many: Отзывы
+        other: Отзывы
+
       rcms/partial:
         one: Текст
         few: Текса
@@ -28,22 +43,54 @@ ru:
         many: Мета тегов
         other: Мета теги
 
+      rcms/news:
+        one: Новость
+        few: Новостей
+        many: Новости
+        other: Новости
+
     attributes:
+      rcms/mention:
+        updated_at: Редактировано
+        created_at: Создано
+        text: Отзыв
+        username: Имя
+        email: E-mail
+        is_published: Опубликован
+
+
+      rcms/news:
+        title: Заголовок
+        image: Файл изображения
+        remote_image_url: URL изображения
+        remote_image_url_hint: для загрузки из сети
+        slug: Url-ключ
+        description: Краткое описание
+        description_hint: будет в списках новостей вместо обрезанного поля "текст"
+        is_published: Опубликовано
+        text: Текст
+        slug_hint: "Url новости: %{path}"
+        updated_at: Редактировано
+        created_at: Создано
+
       rcms/page:
         title: Заголовок
         slug: Url-ключ
         text: Текст
         slug_hint: "Url странички: %{path}"
         updated_at: Редактировано
+        created_at: Создано
       rcms/partial:
         placement: Разположение
         description: Описание (для админа)
         text: Текст
+        created_at: Создано
         updated_at: Редактировано
       rcms/meta_page:
         path: Путь
         path_hint: например "/p-some-product-name"
         meta_tags: Мета теги
+        created_at: Создано
         updated_at: Редактировано
       rcms/meta_tag:
         key: Название тега

data/lib/generators/rcms_feedback_generator.rb

@@ -0,0 +1,25 @@
+class RcmsFeedbackGenerator < Rails::Generators::Base
+  source_root File.expand_path("../templates_feedback", __FILE__)
+
+  def create_all_files
+    %w(feedbacks_controller.rb).each do |name|
+      copy_file "app/controllers/rcms/#{name}"
+    end
+
+    %w(feedback_mailer.rb).each do |name|
+      copy_file "app/mailers/#{name}"
+    end
+
+    %w(feedback.rb).each do |name|
+      copy_file "app/models/rcms/#{name}"
+    end
+
+    %w(feedback.html.slim plain.html.slim _form.html.slim).each do |name|
+      copy_file "app/views/feedback_mailer/#{name}"
+    end
+  end
+
+  def patch_routes
+    insert_into_file "config/routes.rb", "  post 'rcms/feedbacks' => 'rcms/feedbacks#create', as: :rcms_feedbacks\n", :after => "Rails.application.routes.draw do\n"
+  end
+end

data/lib/generators/rcms_mentions_generator.rb

@@ -0,0 +1,38 @@
+class RcmsMentionsGenerator < Rails::Generators::Base
+  source_root File.expand_path("../templates_mentions", __FILE__)
+  include Rails::Generators::Migration
+
+  def self.next_migration_number(dirname)
+    Time.now.strftime("%Y%m%d%H%M%S")
+  end
+
+  def create_cmshelper_migration
+    migration_template "migration.rb", File.join('db/migrate', "create_rcms_mentions_tables.rb")
+  end
+
+  def create_all_files
+    Rails.cache.clear
+
+    %w(mention.rb).each do |name|
+      copy_file "app/admin/rcms/#{name}"
+    end
+
+    %w(mentions_controller.rb).each do |name|
+      copy_file "app/controllers/rcms/#{name}"
+    end
+
+    %w(mention.rb).each do |name|
+      copy_file "app/models/rcms/#{name}"
+    end
+
+    %w(_dialog.html.slim _preview.html.slim).each do |name|
+      copy_file "app/views/rcms/mentions/#{name}"
+    end
+  end
+
+  def patch_routes
+    insert_into_file "config/routes.rb",
+                     "  get 'mentions' => 'rcms/mentions#index', as: :rcms_mentions\n  post 'mentions' => 'rcms/mentions#create'\n",
+                     :after => "Rails.application.routes.draw do\n"
+  end
+end

data/lib/generators/rcms_news_generator.rb

@@ -0,0 +1,40 @@
+class RcmsNewsGenerator < Rails::Generators::Base
+  source_root File.expand_path("../templates_news", __FILE__)
+  include Rails::Generators::Migration
+
+  def self.next_migration_number(dirname)
+    Time.now.strftime("%Y%m%d%H%M%S")
+  end
+
+  def create_cmshelper_migration
+    migration_template "migration.rb", File.join('db/migrate', "create_rcms_news_tables.rb")
+  end
+
+  def create_all_files
+    Rails.cache.clear
+
+    %w(news.rb).each do |name|
+      copy_file "app/admin/rcms/#{name}"
+    end
+
+    %w(news_controller.rb).each do |name|
+      copy_file "app/controllers/rcms/#{name}"
+    end
+
+    %w(news.rb).each do |name|
+      copy_file "app/models/rcms/#{name}"
+    end
+
+    %w(news_image_uploader.rb).each do |name|
+      copy_file "app/uploaders/rcms/#{name}"
+    end
+
+    %w(_menu.html.slim index.html.slim show.html.slim).each do |name|
+      copy_file "app/views/rcms/news/#{name}"
+    end
+  end
+
+  def patch_routes
+    insert_into_file "config/routes.rb", "  get 'news' => 'rcms/news#index', as: :rcms_news\n  get 'news-:slug' => 'rcms/news#show', as: :rcms_new\n", :after => "Rails.application.routes.draw do\n"
+  end
+end

data/lib/generators/templates/app/models/rcms/page.rb

@@ -4,10 +4,6 @@ class Rcms::Page < ActiveRecord::Base
   extend FriendlyId
   friendly_id :title, use: [:slugged, :finders]
 
-  def meta_title
-    self.title
-  end
-
   protected
 
   def should_generate_new_friendly_id?

data/lib/generators/templates_feedback/app/controllers/rcms/feedbacks_controller.rb

@@ -0,0 +1,12 @@
+class Rcms::FeedbacksController < ApplicationController
+  def create
+    @feedback = Feedback.new( params.require(:rcms_feedback).permit(:username, :feedback_type, :text, :phone) )
+    if @feedback.valid?
+      FeedbackMailer.feedback(@feedback).deliver_now
+      flash[:success] = t('rcms.feedback.created')
+      redirect_to root_path
+    else
+      render :create
+    end
+  end
+end

data/lib/generators/templates_feedback/app/mailers/feedback_mailer.rb

@@ -0,0 +1,13 @@
+class FeedbackMailer < ActionMailer::Base
+  def feedback(feedback)
+    @feedback = feedback
+    admin_emails = AdminUser.pluck(:email)
+    mail(to: admin_emails, subject: @feedback.subject)
+  end
+
+  def plain(text)
+    @text = text
+    admin_emails = AdminUser.pluck(:email)
+    mail(to: admin_emails, subject: text)
+  end
+end

data/lib/generators/templates_feedback/app/models/rcms/feedback.rb

@@ -0,0 +1,28 @@
+class Rcms::Feedback
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  extend ActiveModel::Naming
+
+  attr_accessor :username
+  attr_accessor :feedback_type
+  attr_accessor :phone
+  attr_accessor :text
+  attr_accessor :email
+
+  validates_presence_of :phone
+
+  def subject
+    I18n.t('rcms.feedback.subject', contact: (phone||email))
+  end
+
+  def initialize(attributes = {})
+    attributes.each do |name, value|
+      send("#{name}=", value)
+    end
+  end
+
+  def persisted?
+    false
+  end
+end
+

data/lib/generators/templates_feedback/app/views/feedback_mailer/_form.html.slim

@@ -0,0 +1,10 @@
+- feedback = @feedback || Rcms::Feedback.new(feedback_type: 'Позвоните мне')
+= simple_form_for feedback, url: rcms_feedbacks_path do |f|
+  .hide
+    = f.input_field :feedback_type
+  .form-group
+    = f.input_field :username, placeholder: 'имя', required: true, class: 'form-control'
+  .clearfix
+  = f.input_field :phone, placeholder: 'номер телефона', required: true, class: 'form-control'
+  .clearfix
+  button.btn.btn-primary.btn-sm.pull-right Позвоните мне

data/lib/generators/templates_feedback/app/views/feedback_mailer/feedback.html.slim

@@ -0,0 +1,5 @@
+p
+  = @feedback.subject
+p Имя #{@feedback.username}
+p Телефон #{@feedback.phone}
+p Сообщение #{@feedback.text}

data/lib/generators/templates_feedback/app/views/feedback_mailer/plain.html.slim

@@ -0,0 +1 @@
+== @text

data/lib/generators/templates_mentions/app/admin/rcms/mention.rb

@@ -0,0 +1,15 @@
+ActiveAdmin.register Rcms::Mention do
+  # include AdminRedirects
+
+  permit_params :username, :text, :email, :is_published
+
+  form do |f|
+    f.inputs do
+      f.input :username
+      f.input :email
+      f.input :is_published
+      f.input :text
+    end
+    f.actions
+  end
+end

data/lib/generators/templates_mentions/app/controllers/rcms/mentions_controller.rb

@@ -0,0 +1,26 @@
+class Rcms::MentionsController < ApplicationController
+  def index
+    @news = Rcms::News.all.page(params[:page]).per(10)
+    apply_meta_tags title: t('rcms.mentions.index_title')
+  end
+
+  def create
+    @mention = Rcms::Mention.new mention_params
+
+    @mention.is_published = true
+    if @mention.save
+      redirect_to after_create_path(@mention), flash: {success: t('rcms.mentions.created')}
+    else
+      render :create
+    end
+  end
+
+  def after_create_path mention
+    root_path
+  end
+
+  protected
+  def mention_params
+    params.require(:rcms_mention).permit(:username, :email, :text)
+  end
+end

data/lib/generators/templates_mentions/app/models/rcms/mention.rb

@@ -0,0 +1,19 @@
+class Rcms::Mention < ActiveRecord::Base
+  self.table_name = 'rcms_mentions'
+
+  scope :frontend, -> {where(is_published: true).order('id desc')}
+  scope :preview, -> {frontend.limit(4)}
+
+  validates_presence_of :username, :text
+
+  def get_short_desc l = 110
+    truncate(text, l)
+  end
+
+  def truncate text, l = 110
+    return nil if text.nil?
+    text = ActionView::Base.full_sanitizer.sanitize(text)
+    text.length > l ? text.truncate(l) : text
+  end
+end
+

data/lib/generators/templates_mentions/app/views/rcms/mentions/_dialog.html.slim

@@ -0,0 +1,17 @@
+.modal#new-mention-dialog.rcms-mention-form
+  = simple_form_for @mention||Rcms::Mention.new, url: rcms_mentions_path do |f|
+    .modal-dialog
+      .modal-content
+        .modal-header
+          button.close aria-hidden="true" data-dismiss="modal" type="button"  ×
+          h4.modal-title Новый отзыв
+        .modal-body
+          fieldset
+            .form-group
+              = f.input_field :username, class: 'form-control', placeholder: "Ваше имя", required: true
+            .form-group
+              = f.input_field :text, class: 'form-control', placeholder: "Отзыв", required: true
+
+        .modal-footer
+          button.btn.btn-default data-dismiss="modal" type="button"  Отмена
+          button.btn.btn-success type="submit" оставить отзыв

data/lib/generators/templates_mentions/app/views/rcms/mentions/_preview.html.slim

@@ -0,0 +1,15 @@
+.aside-mentions-list.row
+  - @mentions_preview.each do |mention|
+    .col-xs-6.mention-item
+      /.pull-left
+        i.fa.fa-quote-left
+      .pull-right
+        i.fa.fa-quote-right
+      span.username
+        = mention.username
+      time.small
+        = l(mention.created_at, format: :short)
+      .clearfix
+      .text
+        span.small
+          = mention.get_short_desc 120

data/lib/generators/templates_mentions/migration.rb

@@ -0,0 +1,16 @@
+class CreateRcmsMentionsTables < ActiveRecord::Migration
+  def self.up
+    create_table :rcms_mentions do |t|
+      t.string :username
+      t.string :email
+      t.boolean :is_published
+      t.text :text
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :rcms_mentions
+  end
+end

data/lib/generators/templates_news/app/admin/rcms/news.rb

@@ -0,0 +1,39 @@
+ActiveAdmin.register Rcms::News do
+  # include AdminRedirects
+
+  permit_params :slug, :title, :text, :image, :image_cache, :remote_image_url, :is_published, :description
+
+  form do |f|
+    f.inputs do
+      f.input :title
+
+      f.input :remote_image_url, as: :string, hint: t("activerecord.attributes.rcms/news.remote_image_url_hint")
+      f.input :image, as: :file, :hint => f.object.image.default? ? '' : "<img src='#{f.object.image.url(:list)}' />".html_safe
+
+      f.input :image_cache, as: :hidden
+      f.input :is_published
+
+      f.input :slug, hint: f.object.persisted? ? (t("activerecord.attributes.rcms/news.slug_hint", path: rcms_new_path(f.object))) : nil
+      f.input :description, hint: t("activerecord.attributes.rcms/news.description_hint")
+      f.inputs t("activerecord.attributes.rcms/page.text") do
+        f.cktext_area :text
+      end
+    end
+    f.actions
+  end
+
+  index do
+    selectable_column
+    column :id
+    column :image do |object|
+      "<img src='#{object.image.url(:list)}' height='40' />".html_safe
+    end
+    column :slug
+    column :title
+    column :updated_at
+    actions
+  end
+
+  filter :slug
+  filter :title
+end

data/lib/generators/templates_news/app/controllers/rcms/news_controller.rb

@@ -0,0 +1,16 @@
+class Rcms::NewsController < ApplicationController
+  def index
+    @news = Rcms::News.all.page(params[:page]).per(10)
+    apply_meta_tags title: t('rcms.news.index_title')
+  end
+
+  def show
+    @news_article = retrieve slug_or_id
+    apply_meta_tags @news_article
+  end
+
+  def retrieve slug_or_id
+    Rcms::News.find slug_or_id
+  rescue
+  end
+end

data/lib/generators/templates_news/app/models/rcms/news.rb

@@ -0,0 +1,27 @@
+class Rcms::News < ActiveRecord::Base
+  self.table_name = 'rcms_news'
+  extend FriendlyId
+  friendly_id :title, use: [:slugged, :finders]
+
+  mount_uploader :image, Rcms::NewsImageUploader
+
+  scope :frontend, -> {where(is_published: true).order('id desc')}
+  scope :aside_menu, -> {frontend.limit(3)}
+
+  def get_short_desc l = 110
+    description.present? ? truncate(description, l) : truncate(text, l)
+  end
+
+  def truncate text, l = 110
+    return nil if text.nil?
+    text = ActionView::Base.full_sanitizer.sanitize(text)
+    text.length > l ? text.truncate(l) : text
+  end
+
+  protected
+
+  def should_generate_new_friendly_id?
+    !slug.present?
+  end
+end
+

data/lib/generators/templates_news/app/uploaders/rcms/news_image_uploader.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+class Rcms::NewsImageUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or MiniMagick support:
+  include CarrierWave::RMagick
+  # include CarrierWave::MiniMagick
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  def store_dir
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  def default_url
+    # For Rails 3.1+ asset pipeline compatibility:
+    # ActionController::Base.helpers.asset_path("images/#{fallback_dir}/" + [version_name, "default.png"].compact.join('_'))
+    ActionController::Base.helpers.asset_path("default.jpg")
+  end
+
+  def set_filename(name)
+    @filename = name
+  end
+
+  def extension_white_list
+    %w(jpg jpeg png bmp)
+  end
+
+  def default?
+    url == default_url
+  end
+
+  version :list do
+    process :resize_to_limit => [100, 100]
+  end
+
+  version :show do
+    process :resize_to_limit => [200, 200]
+  end
+
+  protected
+
+  def fallback_dir
+    model.class.to_s.underscore
+  end
+end

data/lib/generators/templates_news/migration.rb

@@ -0,0 +1,19 @@
+class CreateRcmsNewsTables < ActiveRecord::Migration
+  def self.up
+    create_table :rcms_news do |t|
+      t.string :image
+      t.string :title
+      t.string :description
+      t.string :slug
+      t.boolean :is_published
+      t.text :text
+
+      t.timestamps
+    end
+    add_index :rcms_news, :slug, unique: true
+  end
+
+  def self.down
+    drop_table :rcms_news
+  end
+end

data/lib/rcms/version.rb

@@ -1,3 +1,3 @@
 module Rcms
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rcms
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ruslan.palagin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,10 +57,15 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/stylesheets/rcms/mentions.scss
+- app/assets/stylesheets/rcms/news.scss
 - bin/console
 - bin/setup
 - config/locales/rcms.ru.yml
+- lib/generators/rcms_feedback_generator.rb
 - lib/generators/rcms_generator.rb
+- lib/generators/rcms_mentions_generator.rb
+- lib/generators/rcms_news_generator.rb
 - lib/generators/templates/app/admin/rcms/meta_page.rb
 - lib/generators/templates/app/admin/rcms/page.rb
 - lib/generators/templates/app/admin/rcms/partial.rb
@@ -71,6 +76,27 @@ files:
 - lib/generators/templates/app/models/rcms/partial.rb
 - lib/generators/templates/app/views/rcms/pages/show.html.slim
 - lib/generators/templates/migration.rb
+- lib/generators/templates_feedback/app/controllers/rcms/feedbacks_controller.rb
+- lib/generators/templates_feedback/app/mailers/.keep
+- lib/generators/templates_feedback/app/mailers/feedback_mailer.rb
+- lib/generators/templates_feedback/app/models/rcms/feedback.rb
+- lib/generators/templates_feedback/app/views/feedback_mailer/_form.html.slim
+- lib/generators/templates_feedback/app/views/feedback_mailer/feedback.html.slim
+- lib/generators/templates_feedback/app/views/feedback_mailer/plain.html.slim
+- lib/generators/templates_mentions/app/admin/rcms/mention.rb
+- lib/generators/templates_mentions/app/controllers/rcms/mentions_controller.rb
+- lib/generators/templates_mentions/app/models/rcms/mention.rb
+- lib/generators/templates_mentions/app/views/rcms/mentions/_dialog.html.slim
+- lib/generators/templates_mentions/app/views/rcms/mentions/_preview.html.slim
+- lib/generators/templates_mentions/migration.rb
+- lib/generators/templates_news/app/admin/rcms/news.rb
+- lib/generators/templates_news/app/controllers/rcms/news_controller.rb
+- lib/generators/templates_news/app/models/rcms/news.rb
+- lib/generators/templates_news/app/uploaders/rcms/news_image_uploader.rb
+- lib/generators/templates_news/app/views/rcms/news/_menu.html.slim
+- lib/generators/templates_news/app/views/rcms/news/index.html.slim
+- lib/generators/templates_news/app/views/rcms/news/show.html.slim
+- lib/generators/templates_news/migration.rb
 - lib/rcms.rb
 - lib/rcms/application_controller.rb
 - lib/rcms/router.rb