site_blog 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59fe18f766baca355592c03228df6214a9ca9370b46d8419c5819120abd487b9
-  data.tar.gz: 3e06efe39ced409bdc71042e7a641a2b9d666b272c0e05045a287857dc845ab8
+  metadata.gz: 17887d197e4f068342e6b4b5488168131bf0322a10bd3ed5599db3c4133677e6
+  data.tar.gz: 6919603b9225bcdf09606af5faad5749f6864e83ce9996986e2cebd6b883ddf5
 SHA512:
-  metadata.gz: 0bdeb913978e58662f36c7928a442a5ab24ef79fb28b262b3f04b0d363255fbc133383397f3efa1754055ee5c65430f56fffa2584a8f09d43903ddf1e704e15b
-  data.tar.gz: 3a9de2774549820a8defc10c49ca65c338d97c6d1f95803bfbb9833559ca251a431fdf32f3d44d757f5b27d8d4b216cc3e32e1142181ee15b367c909a08eed25
+  metadata.gz: 6de7294cc0bc47e8d0b846abf65909a2d5d91f7f48c501d86ba9a691774e3370cbd2255b4538298dc2f5c57820dd738e795bfd437c8ee844943f2d05fc472ff1
+  data.tar.gz: 4ec3a1ef2ad9c2d8c5e951982e791eacd32580c5c27e3af300ad2abbdeb33f9ce6559019c8438712c19999d1cb9b09fe06ad8c9240fac53fa5f16919af88ded1

data/app/controllers/site_blog/articles_controller.rb

@@ -1,58 +1,31 @@
 module SiteBlog
   class ArticlesController < ApplicationController
-    before_action :set_article, only: %i[ show update destroy ]
+    before_action :set_host, only: %i[ index show main ]
 
     # GET /articles
     def index
-      render json: Article.filters(params)
+      @data = Article.filters(params)
+      render formats: :json
     end
 
+    # GET /articles/main
     def main
-      render json: Article.main
+      @article = Article.main
+      render formats: :json
     end
 
-    # GET /articles/1
+    # GET /articles/:slug
     def show
+      @article = Article.find_by(slug: params[:id])
       @article.increment!(:view_count)
-      render json: @article
-    end
-
-    # POST /articles
-    def create
-      article = Article.new(article_params)
-
-      if article.save
-        render json: article, status: :created
-      else
-        render json: article.errors, status: :unprocessable_entity
-      end
-    end
-
-    # PATCH/PUT /articles/1
-    def update
-      if @article.update(article_params)
-        render json: @article
-      else
-        render json: @article.errors, status: :unprocessable_entity
-      end
-    end
-
-    # DELETE /articles/1
-    def destroy
-      @article.destroy
-      render json: { success: true }
+      render formats: :json
     end
 
     private
 
-      # Use callbacks to share common setup or constraints between actions.
-      def set_article
-        @article = Article.find_by(params[:slug])
-      end
+    def set_host
+      @host = !Rails.env.production? ? request.host : ''
+    end
 
-      # Only allow a list of trusted parameters through.
-      def article_params
-        params.require(:article).permit(:title, :description, :image, :tag_id, :archived, :active)
-      end
   end
 end

data/app/controllers/site_blog/tags_controller.rb

@@ -1,53 +1,16 @@
 module SiteBlog
   class TagsController < ApplicationController
-    before_action :set_tag, only: %i[ show update destroy ]
 
     # GET /tags
     def index
-      render json: Tag.all
+      render json: Tag.archived(false).as_json(except: [:archived])
     end
 
     # GET /tags/1
     def show
-      render json: @tag
+      @tag = Tag.find(params[:id])
+      render json: @tag.as_json(except: [:archived])
     end
 
-    # POST /tags
-    def create
-      @tag = Tag.new(tag_params)
-
-      if @tag.save
-        render json: @tag, status: :created
-      else
-        render json: @tag.errors, status: :unprocessable_entity
-      end
-    end
-
-    # PATCH/PUT /tags/1
-    def update
-      if @tag.update(tag_params)
-        render json: @tag
-      else
-        render json: @tag.errors, status: :unprocessable_entity
-      end
-    end
-
-    # DELETE /tags/1
-    def destroy
-      @tag.destroy
-      render json: { success: true }
-    end
-
-    private
-
-      # Use callbacks to share common setup or constraints between actions.
-      def set_tag
-        @tag = Tag.find(params[:id])
-      end
-
-      # Only allow a list of trusted parameters through.
-      def tag_params
-        params.require(:tag).permit(:slug, :arichived)
-      end
   end
 end

data/app/models/site_blog/article.rb

@@ -33,19 +33,19 @@ module SiteBlog
       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
+      count = data.count
       data  = data.order('created_at DESC')
-      data  = data.limit(params[:limit]) if params[:limit]
       data  = data.page(params[:page]).per(20)
+      data  = data.limit(params[:limit]) if params[:limit]
 
       {
         total_count: count,
-        data: data
+        articles: data
       }
     }
 
     def self.main
-      if self.archived(false).where(main: true).exist?
+      if self.archived(false).where(main: true).exists?
         res = self.archived(false).where(main: true).last
       else
         res = self.order('created_at DESC').first

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/app/views/site_blog/articles/index.json.jbuilder

@@ -0,0 +1,15 @@
+json.total_count @data[:total_count]
+json.data do
+	json.array! @data[:articles] do |article|
+	  json.id article.id
+	  json.title article.title
+	  json.slug article.slug
+	  json.html_description article.html_description
+	  json.view_count article.view_count
+	  json.main article.main
+	  json.orig_image_url @host + article.image.url
+	  json.thumb_image_url @host + article.image.thumb.url
+	  json.(article, :created_at, :updated_at)
+	end
+end
+

data/app/views/site_blog/articles/main.json.jbuilder

@@ -0,0 +1,16 @@
+json.id @article.id
+json.title @article.title
+json.slug @article.slug
+json.html_description @article.html_description
+json.view_count @article.view_count
+json.main @article.main
+json.orig_image_url @host + @article.image.url
+json.thumb_image_url @host + @article.image.thumb.url
+json.tags do
+	json.array! @article.tags do |tag|
+	  json.id tag.id
+	  json.slug tag.slug
+	end
+end
+json.(@article, :created_at, :updated_at)
+

data/app/views/site_blog/articles/show.json.jbuilder

@@ -0,0 +1,16 @@
+json.id @article.id
+json.title @article.title
+json.slug @article.slug
+json.html_description @article.html_description
+json.view_count @article.view_count
+json.main @article.main
+json.orig_image_url @host + @article.image.url
+json.thumb_image_url @host + @article.image.thumb.url
+json.tags do
+	json.array! @article.tags do |tag|
+	  json.id tag.id
+	  json.slug tag.slug
+	end
+end
+json.(@article, :created_at, :updated_at)
+

data/config/routes.rb

@@ -1,6 +1,5 @@
 SiteBlog::Engine.routes.draw do
   resources :tags
-  resources :articles do 
-    get :main, on: :collection
-  end
+  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,8 +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
-    add_index :site_blog_articles, [:slug, :archived]
   end
 end

data/lib/site_blog/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_blog
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Eldar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jbuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Description of AppComponent
 email:
 - eldarweb@mail.ru
@@ -118,6 +132,9 @@ files:
 - app/models/site_blog/tagging.rb
 - app/uploaders/site_blog/image_uploader.rb
 - app/views/layouts/blog/application.html.erb
+- app/views/site_blog/articles/index.json.jbuilder
+- app/views/site_blog/articles/main.json.jbuilder
+- app/views/site_blog/articles/show.json.jbuilder
 - config/routes.rb
 - db/migrate/20230201140930_add_article_and_tag.rb
 - lib/site_blog.rb