site_blog 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1c17bed2d9dfb9c42207ed00b2958f8d412f011a4cd0789253d0f7fd84fdb9a
-  data.tar.gz: 32877ba756d06b0a139a43d1f4f6e806e54430bc7131109a434bf3b0e0897371
+  metadata.gz: cab7ac4ecc8185d4c4767188b5ea55b94a80670e2e8b3b7a82eede29cf7e35c0
+  data.tar.gz: 6978b193b7ec06015ce25b6eb1e830004bf5cc8afba4b3c89e4095e2f6d366c1
 SHA512:
-  metadata.gz: 155d5b8e30636d78c1dafe191d72f11dc9bb0bc4d96fc8d3d54318d20553201bbd12d72acb244ad4e9b6caf888be9408a36ff9c7614f0167c3973b331e24e4c5
-  data.tar.gz: fc947d550f5cd921f66571189072041915af772deebe5a4aee74947dc6822f8408c4f09272697481d4b2a20f232f0eb177fb3a577e3ccc565bd4df0c83689dc1
+  metadata.gz: a3aa2e2048e05a1ec032d540931686a824a971274c42353be6c2eaf67bc3bbae7394c069bcc3ae8b508d1031c1ea8c1fccf2c6c55694dfcbb0d5a460da7bddde
+  data.tar.gz: 545a4d6b16c671674e1c8b4a808a4434f52fe10a84f325629b1294babb2a53cb5337c63fed6415dba94857056d03b664c5edb42d802c114e133a7750c6756934

data/README.md

@@ -1,28 +1,39 @@
-# SiteBlog
-Short description and motivation.
+# Блог
+Компонент "Блог" для проекта, который имеет теги и статьи по ним.
 
-## Usage
-How to use my plugin.
-
-## Installation
-Add this line to your application's Gemfile:
+## Установка гема
+Добавьте эту строку в Gemfile вашего приложения:
 
 ```ruby
-gem "site_blog"
+gem "blog", git: "git@gitlab.telega.in:components-backend/Blog.git"
 ```
 
-And then execute:
+А затем выполните:
 ```bash
 $ bundle
 ```
 
-Or install it yourself as:
+Или установите его самостоятельно как:
+```bash
+$ gem install site_blog --source https://gitlab.telega.in/components-backend/Blog.git
+```
+
+## Backend
+1. Укажите путь к API в config/routes.rb:
+```ruby
+mount Blog::Engine, at: '/blog'
+```
+2. Выполните команду:
+```bash
+$ rails blog:install:migrations
+```
+3. Запустите миграции:
 ```bash
-$ gem install site_blog
+$ rails db:migrate
 ```
 
 ## Contributing
 Contribution directions go here.
 
 ## License
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/controllers/site_blog/articles_controller.rb

@@ -7,6 +7,10 @@ module SiteBlog
       render json: Article.filters(params)
     end
 
+    def main
+      render json: Article.main
+    end
+
     # GET /articles/1
     def show
       @article.increment!(:view_count)
@@ -43,7 +47,7 @@ module SiteBlog
 
       # Use callbacks to share common setup or constraints between actions.
       def set_article
-        @article = Article.find(params[:id])
+        @article = Article.find_by(params[:slug])
       end
 
       # Only allow a list of trusted parameters through.

data/app/controllers/site_blog/tags_controller.rb

@@ -4,7 +4,7 @@ module SiteBlog
 
     # GET /tags
     def index
-      render json: Tag.all
+      render json: Tag.archived(false)
     end
 
     # GET /tags/1
@@ -47,7 +47,7 @@ module SiteBlog
 
       # Only allow a list of trusted parameters through.
       def tag_params
-        params.require(:tag).permit(:slug, :arichived)
+        params.require(:tag).permit(:slug, :archived)
       end
   end
 end

data/app/models/site_blog/article.rb

@@ -27,16 +27,33 @@ module SiteBlog
     before_validation :set_locale
     before_validation :clean_description
 
+    scope :archived, -> (param = true) { where(archived: param) }
+
     scope :filters, lambda { |params|
-      rel = where(archived: false)
-      rel = rel.joins(:tags).where(tags: { id: params[:tag_id] }) if params[:tag_id].present?
-      rel = rel.search(params[:query])         if params[:query].present?
-      rel = rel.where(main: true)              if params[:main] == 'true'
-      rel = rel.order('created_at DESC')
-      rel = rel.limit(params[:limit]) if params[:limit]
-      rel = rel.page(params[:page]).per(20)
+      data  = archived(false)
+      data  = data.joins(:tags).where(tags: { id: params[:tag_id] }) if params[:tag_id].present?
+      data  = data.search(params[:query])                            if params[:query].present?
+      count = data.length
+      data  = data.order('created_at DESC')
+      data  = data.limit(params[:limit]) if params[:limit]
+      data  = data.page(params[:page]).per(20)
+
+      {
+        total_count: count,
+        data: data
+      }
     }
 
+    def self.main
+      if self.archived(false).where(main: true).exists?
+        res = self.archived(false).where(main: true).last
+      else
+        res = self.order('created_at DESC').first
+      end
+
+      res
+    end
+
     private
 
     def set_slug

data/app/models/site_blog/tag.rb

@@ -7,6 +7,8 @@ module SiteBlog
 
     before_validation :slug_downcase
 
+    scope :archived, -> (param = true) { where(archived: param) }
+
     private
 
     def slug_downcase

data/config/routes.rb

@@ -1,4 +1,5 @@
 SiteBlog::Engine.routes.draw do
   resources :tags
+  get 'articles/main' => 'articles#main'
   resources :articles
 end

data/db/migrate/20230201140930_add_article_and_tag.rb

@@ -2,18 +2,18 @@ class AddArticleAndTag < ActiveRecord::Migration[7.0]
   def change
     create_table :site_blog_tags do |t|
       t.string :slug
-      t.boolean :archived, null: false, default: false
+      t.boolean :archived, null: false, default: false, index: true
       t.timestamps
     end
 
     create_table :site_blog_articles do |t|
       t.string :title, null: false
-      t.string :slug, null: false
+      t.string :slug, null: false, unique: true, index: true
       t.text :html_description, null: false
       t.text :description, null: false
       t.string :image, null: false
       t.integer :view_count, null: false, default: 0
-      t.boolean :archived, null: false, default: false
+      t.boolean :archived, null: false, default: false, index: true
       t.boolean :active, null: false, default: true
       t.boolean :main, null: false, default: false
       t.string :locale, null: false
@@ -25,7 +25,5 @@ class AddArticleAndTag < ActiveRecord::Migration[7.0]
       t.belongs_to :tag, foreign_key: { to_table: :site_blog_tags }
       t.timestamps
     end
-
-    add_index :site_blog_articles, :slug, unique: true
   end
 end

data/lib/site_blog/version.rb

@@ -1,3 +1,3 @@
 module SiteBlog
-  VERSION = "0.8.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_blog
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Eldar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails