rcms 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91f94749eb4033bf65023866f48eb70621e31416
-  data.tar.gz: ab3589780c005fb8a37740b77f34948de9d770b9
+  metadata.gz: 5c1faee7a58a67d00cb8058690f7dce50f2d066d
+  data.tar.gz: 7770258d669fcae8e71581c86b1dcafe8459ce4a
 SHA512:
-  metadata.gz: a5b8bc33debe502d4ee1e0d23fd9169506b5d17c43004736235cc2a862137798fa432781a84c04a857974cfb4db6ed4591663866ebe64c210bd1467d2e6e4a11
-  data.tar.gz: 568aeda176a452ba5f972854f2a882cba8cf6860f07bd7f727e8a4deb34cc4816ef2ceaa1a69828daee549b32893d8ac0c19ecd508cb70a531597f5b012f6872
+  metadata.gz: 5ee19950c196ae9ffe416b3479d2eabcbdadedf48d0bdc7429328e1e9fa36a4b4f5b5cccfe50aca472eb64a4683e093481b06962faebfd96e684c61b65b1a8f4
+  data.tar.gz: 260e27a2adf277ab92a2137828ba297fd723e92454a430435b95c8fdd6315e920329e1e84e57a41e92713adbd1e1cd902419eefd2576ed7b052ac9b07fbef0d1

data/README.md

@@ -25,13 +25,11 @@ Currently Rcms designed to work with:
 
 ## Installation
 
-```ruby
+```bash
 gem 'rcms', '0.1.3'
 ```
-
 or
-
-```ruby
+```bash
 gem 'rcms', github: 'r1dd1ck777/rcms'
 ```
 
@@ -59,22 +57,25 @@ apply_meta_tags rcms_page
 
 ### News
 News feature: allows you to manage news from admin panel and show them on frontend
-
+```bash
 $ rails g rcms_news
 $ rake db:migrate
-Will generate models, activeadmin resources, controllers, views and patch routes.rb
+```
+Will generate models, activeadmin resources, controllers, uploaders, views and patch routes.rb
 
 ### Mentions
 Mentions feature: guest users can add their mention, and you can manage it at admin panel
-
+```bash
 $ rails g rcms_mentions
 $ rake db:migrate
+```
 Will generate models, activeadmin resources, controllers, views and patch routes.rb
 
 ### Feedbacks
 Feedbacks feature: allows users to send feedbacks to admins by emails
-
+```bash
 $ rails g rcms_feedbacks
+```
 Will generate controllers, views and patch routes.rb
 
 ## Backlog

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

@@ -1,5 +1,5 @@
-.aside-news-list{
-  .news-item{
+.rcms-tidings-preview-list{
+  .tiding-item{
     &:last-of-type .list-group-item-text{
       border-bottom: none;
       padding-bottom: 0;
@@ -23,4 +23,81 @@
     font-size: 18px;
     line-height: 22px;
   }
+
+  .row-picture{
+    width: 50px;
+    margin: 0 7px 7px 0;
+    float: left;
+
+    img{
+      width: 100%;
+    }
+  }
+
+  .row-content{
+    width: calc(100% - 57px);
+    float: left;
+
+    h3{
+      margin-top: 3px;
+      font-size: 16px;
+    }
+  }
+}
+
+.rcms-tidings-list{
+  .tiding-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;
+  }
+
+  .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;
+  }
+
+  .row-picture{
+    width: 100px;
+    margin: 0 7px 7px 0;
+    float: left;
+
+    img{
+      width: 100%;
+    }
+  }
+
+  .row-content{
+    width: calc(100% - 107px);
+    float: left;
+
+    h3{
+      margin-top: 3px;
+    }
+  }
+
+  time{
+    color: #6e6e6e;
+  }
+}
+
+.rcms-tidings-show-content{
+  padding-bottom: 15px;
+
+  .image-row{
+    margin-top: 15px;
+  }
 }

data/config/locales/rcms.ru.yml

@@ -6,7 +6,7 @@ ru:
     feedback:
       subject: "Обратная связь для %{contact}"
       created: "Запрос отправлен"
-    news:
+    tiding:
       index_title: Новости
     mentions:
       created: Спасибо за Ваш отзыв
@@ -16,25 +16,25 @@ ru:
     models:
       rcms/page:
         one: Страницу
-        few: Страниц
+        few: Страницы
         many: Страниц
         other: Страницы
 
       rcms/mention:
         one: Отзыв
-        few: Отзывов
-        many: Отзывы
+        few: Отзыва
+        many: Отзывов
         other: Отзывы
 
       rcms/partial:
         one: Текст
-        few: Текса
+        few: Текста
         many: Текстов
         other: Тексты
 
       rcms/meta_page:
         one: Мета страницу
-        few: Мета страниц
+        few: Мета страницы
         many: Мета страниц
         other: Мета страницы
       rcms/meta_tag:
@@ -43,10 +43,10 @@ ru:
         many: Мета тегов
         other: Мета теги
 
-      rcms/news:
+      rcms/tiding:
         one: Новость
-        few: Новостей
-        many: Новости
+        few: Новости
+        many: Новостей
         other: Новости
 
     attributes:
@@ -58,8 +58,7 @@ ru:
         email: E-mail
         is_published: Опубликован
 
-
-      rcms/news:
+      rcms/tiding:
         title: Заголовок
         image: Файл изображения
         remote_image_url: URL изображения

data/lib/generators/{rcms_news_generator.rb → rcms_tidings_generator.rb}

@@ -1,5 +1,5 @@
-class RcmsNewsGenerator < Rails::Generators::Base
-  source_root File.expand_path("../templates_news", __FILE__)
+class RcmsTidingsGenerator < Rails::Generators::Base
+  source_root File.expand_path("../templates_tidings", __FILE__)
   include Rails::Generators::Migration
 
   def self.next_migration_number(dirname)
@@ -7,34 +7,34 @@ class RcmsNewsGenerator < Rails::Generators::Base
   end
 
   def create_cmshelper_migration
-    migration_template "migration.rb", File.join('db/migrate', "create_rcms_news_tables.rb")
+    migration_template "migration.rb", File.join('db/migrate', "create_rcms_tidings_tables.rb")
   end
 
   def create_all_files
     Rails.cache.clear
 
-    %w(news.rb).each do |name|
+    %w(tiding.rb).each do |name|
       copy_file "app/admin/rcms/#{name}"
     end
 
-    %w(news_controller.rb).each do |name|
+    %w(tidings_controller.rb).each do |name|
       copy_file "app/controllers/rcms/#{name}"
     end
 
-    %w(news.rb).each do |name|
+    %w(tiding.rb).each do |name|
       copy_file "app/models/rcms/#{name}"
     end
 
-    %w(news_image_uploader.rb).each do |name|
+    %w(tiding_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}"
+    %w(_preview.html.slim index.html.slim show.html.slim).each do |name|
+      copy_file "app/views/rcms/tidings/#{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"
+    insert_into_file "config/routes.rb", "  get 'news' => 'rcms/tidings#index', as: :rcms_tidings\n  get 'news-:slug' => 'rcms/tidings#show', as: :rcms_tiding\n", :after => "Rails.application.routes.draw do\n"
   end
 end

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

@@ -1,7 +1,7 @@
 class Rcms::MetaPage < ActiveRecord::Base
   self.table_name = 'rcms_meta_pages'
 
-  has_many :meta_tags, as: :meta_managable, :dependent => :destroy, class_name: Rcms::MetaTag
+  has_many :meta_tags, as: :target, :dependent => :destroy, class_name: Rcms::MetaTag
   accepts_nested_attributes_for :meta_tags
 
   after_initialize :create_meta_tags

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

@@ -1,5 +1,5 @@
 class Rcms::MetaTag < ActiveRecord::Base
   self.table_name = 'rcms_meta_tags'
 
-  belongs_to :meta_managable, polymorphic: true, touch: true
+  belongs_to :target, polymorphic: true, touch: true
 end

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

@@ -1,10 +1,31 @@
 class Rcms::Page < ActiveRecord::Base
   self.table_name = 'rcms_pages'
-
   extend FriendlyId
   friendly_id :title, use: [:slugged, :finders]
 
+  # if you want extended SEO manipulations
+  # has_many :meta_tags, as: :target, class_name: Rcms::MetaTag
+  # accepts_nested_attributes_for :meta_tags, reject_if: :all_blank, allow_destroy: true
+  # after_initialize :init_default_meta_tags
+
+  validates :title, presence: true
+
+  scope :frontend, ->{ where( is_active: true ) }
+
+  def self.find_or_init slug_or_id
+    page =  Rcms::Page.find_by(slug: slug_or_id)
+    page = new title: "#{slug_or_id}", text: "<a href=\"/admin/rcms/pages/new?slug=#{slug_or_id}\">Создайте страницу</a>" unless page
+    page
+  end
+
   protected
+  # def init_default_meta_tags
+  #   if !persisted? && self.meta_tags.empty?
+  #     self.meta_tags.new(key: :title)
+  #     self.meta_tags.new(key: :description)
+  #     self.meta_tags.new(key: :keywords)
+  #   end
+  # end
 
   def should_generate_new_friendly_id?
     !slug.present?

data/lib/generators/templates/app/views/rcms/pages/show.html.slim

@@ -1,8 +1,5 @@
-.rcms-page-show-content
-  .paper-panel
-    h2
-      = @rcms_page.title
-
-    div
-      == @rcms_page.text
+h2
+  = @rcms_page.title
 
+div
+  == @rcms_page.text

data/lib/generators/templates/migration.rb

@@ -13,7 +13,7 @@ class CreateRcmsTables < ActiveRecord::Migration
       t.string :key
       t.text :text
       t.string :value
-      t.references :meta_managable, polymorphic: true
+      t.references :target, polymorphic: true
 
       t.timestamps
     end
@@ -29,6 +29,7 @@ class CreateRcmsTables < ActiveRecord::Migration
       t.string :slug
       t.string :title
       t.text :text
+      t.boolean :is_active
 
       t.timestamps
     end

data/lib/generators/{templates_news/app/admin/rcms/news.rb → templates_tidings/app/admin/rcms/tiding.rb}

@@ -1,4 +1,4 @@
-ActiveAdmin.register Rcms::News do
+ActiveAdmin.register Rcms::Tiding do
   # include AdminRedirects
 
   permit_params :slug, :title, :text, :image, :image_cache, :remote_image_url, :is_published, :description
@@ -7,15 +7,15 @@ ActiveAdmin.register Rcms::News do
     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 :remote_image_url, as: :string, hint: t("activerecord.attributes.rcms/tiding.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.input :slug, hint: f.object.persisted? ? (t("activerecord.attributes.rcms/tiding.slug_hint", path: rcms_tiding_path(f.object))) : nil
+      f.input :description, hint: t("activerecord.attributes.rcms/tiding.description_hint")
+      f.inputs t("activerecord.attributes.rcms/tiding.text") do
         f.cktext_area :text
       end
     end

data/lib/generators/templates_tidings/app/controllers/rcms/tidings_controller.rb

@@ -0,0 +1,16 @@
+class Rcms::TidingsController < ApplicationController
+  def index
+    @resources = Rcms::Tiding.frontend.page(params[:page]).per(10)
+    apply_meta_tags title: t('rcms.tiding.index_title')
+  end
+
+  def show
+    @resource = retrieve params[:id]
+    apply_meta_tags @resource
+  end
+
+  def retrieve slug_or_id
+    Rcms::Tiding.find slug_or_id
+  rescue
+  end
+end

data/lib/generators/{templates_news/app/models/rcms/news.rb → templates_tidings/app/models/rcms/tiding.rb}

@@ -1,12 +1,16 @@
-class Rcms::News < ActiveRecord::Base
-  self.table_name = 'rcms_news'
+class Rcms::Tiding < ActiveRecord::Base
+  self.table_name = 'rcms_tidings'
   extend FriendlyId
   friendly_id :title, use: [:slugged, :finders]
 
-  mount_uploader :image, Rcms::NewsImageUploader
+  mount_uploader :image, Rcms::TidingImageUploader
+
+  # if you want extended SEO manipulations
+  # has_many :meta_tags, as: :target, class_name: Rcms::MetaTag
+  # accepts_nested_attributes_for :meta_tags, reject_if: :all_blank, allow_destroy: true
 
   scope :frontend, -> {where(is_published: true).order('id desc')}
-  scope :aside_menu, -> {frontend.limit(3)}
+  scope :preview, -> {frontend.limit(3)}
 
   def get_short_desc l = 110
     description.present? ? truncate(description, l) : truncate(text, l)

data/lib/generators/{templates_news/app/uploaders/rcms/news_image_uploader.rb → templates_tidings/app/uploaders/rcms/tiding_image_uploader.rb}

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-class Rcms::NewsImageUploader < CarrierWave::Uploader::Base
+class Rcms::TidingImageUploader < CarrierWave::Uploader::Base
 
   # Include RMagick or MiniMagick support:
   include CarrierWave::RMagick

data/lib/generators/templates_tidings/app/views/rcms/tidings/_preview.html.slim

@@ -0,0 +1,17 @@
+.rcms-tidings-preview-list.list-group
+  - resources.each do |resource|
+    .tiding-item
+      .row-picture
+        a href=rcms_tiding_path(resource) rel="nofollow"
+          img.circle src=resource.image.url(:preview) alt=resource.title
+      .row-content
+        a href=rcms_tiding_path(resource)
+          h3.list-group-item-heading
+            = resource.title
+      .clearfix
+      .list-group-item-text
+        = resource.get_short_desc
+  a.pull-right href=rcms_tidings_path Все новости
+- if resources.public_methods.include?(:total_pages)
+  .text-center
+    = paginate resources, :theme => 'twitter-bootstrap-3'

data/lib/generators/templates_tidings/app/views/rcms/tidings/index.html.slim

@@ -0,0 +1,29 @@
+.paper-panel
+  h2 Новости
+
+  - resources = @resources
+  .rcms-tidings-list.list-group
+    - resources.each do |resource|
+      .tiding-item
+        .row-picture
+          a href=rcms_tiding_path(resource) rel="nofollow"
+            img.circle src=resource.image.url(:list) alt=resource.title
+
+        .row-content
+          a.pull-left href=rcms_tiding_path(resource)
+            h3.list-group-item-heading
+              = resource.title
+          time.pull-right
+            small #{l(resource.created_at, format: :short)}
+          .clearfix
+          .list-group-item-text
+            = resource.get_short_desc
+          .clearfix
+          a.pull-right rel="nofollow" href=href=rcms_tiding_path(resource)
+            | читать подробнее
+            i.fa.fa-caret-right.r
+      .clearfix
+
+  - if resources.public_methods.include?(:total_pages)
+    .text-center
+      = paginate resources, :theme => 'twitter-bootstrap-3'

data/lib/generators/templates_tidings/app/views/rcms/tidings/show.html.slim

@@ -0,0 +1,19 @@
+.paper-panel.rcms-tidings-show-content
+  a href=rcms_tidings_path
+    i.fa.fa-caret-left.l
+    | все новости
+  .clearfix
+  .row
+    .col-sm-3
+      .image-row
+        img.img-responsive src=@resource.image.url
+    .col-sm-9
+      h2.t-only.pull-left
+        = @resource.title
+      time.pull-right
+        small
+          = l(@resource.created_at, format: :short)
+      .clearfix
+      div
+        == @resource.text
+  .clearfix

data/lib/generators/{templates_news → templates_tidings}/migration.rb

@@ -1,6 +1,6 @@
-class CreateRcmsNewsTables < ActiveRecord::Migration
+class CreateRcmsTidingsTables < ActiveRecord::Migration
   def self.up
-    create_table :rcms_news do |t|
+    create_table :rcms_tidings do |t|
       t.string :image
       t.string :title
       t.string :description
@@ -10,10 +10,10 @@ class CreateRcmsNewsTables < ActiveRecord::Migration
 
       t.timestamps
     end
-    add_index :rcms_news, :slug, unique: true
+    add_index :rcms_tidings, :slug, unique: true
   end
 
   def self.down
-    drop_table :rcms_news
+    drop_table :rcms_tidings
   end
 end

data/lib/rcms/application_controller.rb

@@ -11,12 +11,12 @@ module Rcms
     end
 
     module InstanceMethods
-      def rcms_menu key, domain = nil
-        @rcms_menu = "#{domain}#{key}"
+      def rcms_menu key, options
+        @rcms_menu = "#{options[:scope]}#{key}"
       end
 
-      def rcms_menu_class key, domain = nil
-        @rcms_menu == "#{domain}#{key}" ? 'active' : ''
+      def rcms_menu_class key, options
+        @rcms_menu == "#{options[:scope]}#{key}" ? 'active' : ''
       end
 
       def apply_meta_tags object
@@ -33,14 +33,14 @@ module Rcms
         end
       end
 
-      protected
-
       def render *args
         run_callbacks :render do
           super
         end
       end
 
+      protected
+
       def use_meta_page
         if request.fullpath != '/'
           path = request.fullpath.scan(/(\/[^#\?]+)/)[0][0]

data/lib/rcms/version.rb

@@ -1,3 +1,3 @@
 module Rcms
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rcms
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - ruslan.palagin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,7 +65,7 @@ files:
 - 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/rcms_tidings_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
@@ -89,14 +89,14 @@ files:
 - 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/generators/templates_tidings/app/admin/rcms/tiding.rb
+- lib/generators/templates_tidings/app/controllers/rcms/tidings_controller.rb
+- lib/generators/templates_tidings/app/models/rcms/tiding.rb
+- lib/generators/templates_tidings/app/uploaders/rcms/tiding_image_uploader.rb
+- lib/generators/templates_tidings/app/views/rcms/tidings/_preview.html.slim
+- lib/generators/templates_tidings/app/views/rcms/tidings/index.html.slim
+- lib/generators/templates_tidings/app/views/rcms/tidings/show.html.slim
+- lib/generators/templates_tidings/migration.rb
 - lib/rcms.rb
 - lib/rcms/application_controller.rb
 - lib/rcms/router.rb

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

@@ -1,16 +0,0 @@
-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 params[:slug]
-    apply_meta_tags @news_article
-  end
-
-  def retrieve slug_or_id
-    Rcms::News.find slug_or_id
-  rescue
-  end
-end