site_blog 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e76714792d33e9b0a08f1fc2d643f0caccad3bb083b77662bd9bcdfa02f07709
-  data.tar.gz: a261eec84ec7a2e8778792b49dc9e9e62bbcdeff56cd9d82b8012999b1a3e8cc
+  metadata.gz: 59fe18f766baca355592c03228df6214a9ca9370b46d8419c5819120abd487b9
+  data.tar.gz: 3e06efe39ced409bdc71042e7a641a2b9d666b272c0e05045a287857dc845ab8
 SHA512:
-  metadata.gz: bc839fa55585d4b3d27aab8feeacdec64be32423bb8a94356d26b9897abc4902d0d737dacb513eee8395fcc526f9291677b7a678bd7552c881ff970612998e14
-  data.tar.gz: a5a842079e9e679a02b45526f8068cf3e503b85c2f201dfd118117856f1a223d2a5a9a2f63c10bebf6b1e2ba8853da3f18c84c40c8d8ad82a851319c1e9389b0
+  metadata.gz: 0bdeb913978e58662f36c7928a442a5ab24ef79fb28b262b3f04b0d363255fbc133383397f3efa1754055ee5c65430f56fffa2584a8f09d43903ddf1e704e15b
+  data.tar.gz: 3a9de2774549820a8defc10c49ca65c338d97c6d1f95803bfbb9833559ca251a431fdf32f3d44d757f5b27d8d4b216cc3e32e1142181ee15b367c909a08eed25

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/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).exist?
+        res = self.archived(false).where(main: true).last
+      else
+        res = self.order('created_at DESC').first
+      end
+
+      res
+    end
+
     private
 
     def set_slug

data/config/routes.rb

@@ -1,8 +1,6 @@
 SiteBlog::Engine.routes.draw do
-
-  mount GraphiQL::Rails::Engine, at: "/graphiql", graphql_path: '/blog/graphql'
-
-  post '/graphql', to: 'graphql#execute'
   resources :tags
-  resources :articles
+  resources :articles do 
+    get :main, on: :collection
+  end
 end

data/db/migrate/20230201140930_add_article_and_tag.rb

@@ -27,5 +27,6 @@ class AddArticleAndTag < ActiveRecord::Migration[7.0]
     end
 
     add_index :site_blog_articles, :slug, unique: true
+    add_index :site_blog_articles, [:slug, :archived]
   end
 end

data/lib/site_blog/engine.rb

@@ -2,8 +2,6 @@ require 'carrierwave'
 require 'pg_search'
 require 'kaminari'
 require 'translit'
-require 'graphql'
-require 'graphiql/rails'
 
 module SiteBlog
   class Engine < ::Rails::Engine

data/lib/site_blog/version.rb

@@ -1,3 +1,3 @@
 module SiteBlog
-  VERSION = "0.7.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_blog
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.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
@@ -108,7 +108,6 @@ files:
 - app/assets/stylesheets/site_blog/application.css
 - app/controllers/site_blog/application_controller.rb
 - app/controllers/site_blog/articles_controller.rb
-- app/controllers/site_blog/graphql_controller.rb
 - app/controllers/site_blog/tags_controller.rb
 - app/helpers/site_blog/application_helper.rb
 - app/helpers/site_blog/articles_helper.rb

data/app/controllers/site_blog/graphql_controller.rb

@@ -1,52 +0,0 @@
-module SiteBlog
-  class GraphqlController < ApplicationController
-    # If accessing from outside this domain, nullify the session
-    # This allows for outside API access while preventing CSRF attacks,
-    # but you'll have to authenticate your user separately
-    # protect_from_forgery with: :null_session
-
-    def execute
-      variables = prepare_variables(params[:variables])
-      query = params[:query]
-      operation_name = params[:operationName]
-      context = {
-        # Query context goes here, for example:
-        # current_user: current_user,
-      }
-      result = Schema.execute(query, variables: variables, context: context, operation_name: operation_name)
-      render json: result
-    rescue StandardError => e
-      raise e unless Rails.env.development?
-      handle_error_in_development(e)
-    end
-
-    private
-
-    # Handle variables in form data, JSON body, or a blank value
-    def prepare_variables(variables_param)
-      case variables_param
-      when String
-        if variables_param.present?
-          JSON.parse(variables_param) || {}
-        else
-          {}
-        end
-      when Hash
-        variables_param
-      when ActionController::Parameters
-        variables_param.to_unsafe_hash # GraphQL-Ruby will validate name and type of incoming variables.
-      when nil
-        {}
-      else
-        raise ArgumentError, "Unexpected parameter: #{variables_param}"
-      end
-    end
-
-    def handle_error_in_development(e)
-      logger.error e.message
-      logger.error e.backtrace.join("\n")
-
-      render json: { errors: [{ message: e.message, backtrace: e.backtrace }], data: {} }, status: 500
-    end
-  end
-end