site_blog 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf041277feab727166fd7043e16a4acabc3c76c2331ea3539e10b0d09e0d5379
-  data.tar.gz: 92a866da471993311f3dfbdcbe65d799d2d3c4e79b3f1c402e0fe5fefc6f5507
+  metadata.gz: 17c4d73ad52870e304479caf1049e94b12b4481e4c8d5eabb5bea12677c9097f
+  data.tar.gz: e72cc5aeba1c9a71b12559872ddc35afb984811f52284e8522a2907501976d8d
 SHA512:
-  metadata.gz: 6b2a7822605383b579c46a204bdf88c00077365d9632606208d1174e5f810a8269e1bd573e8803dff2b26997138d5c65be71749f87e5d5873c536678628107a5
-  data.tar.gz: 2c0a2e6a362662a95d5e4517029306bdebb56266a09accdd87b25d07101f57bde1dc6d7662129783d892584f231359304a75fa871bcffd776841caffaa1c9450
+  metadata.gz: 3d248b7747eeef9a2014adf611c15f014f13c1977603c3f8b0b076a62feb7afc767457829d971b60bef60ddc55943784382877ac88be25d4fab736c7057c0f56
+  data.tar.gz: d21079c4a65041f5c65c7b86e33d590e2003dbffd6337b5a250a5608be9eb15a793ccb83b76da41b1f44cd4a61f25c4ccb8669cb6c3f289cc2ec6573a1508982

data/app/controllers/site_blog/tags_controller.rb

@@ -47,7 +47,7 @@ module SiteBlog
 
       # Only allow a list of trusted parameters through.
       def tag_params
-        params.require(:tag).permit(:title, :arichived)
+        params.require(:tag).permit(:slug, :arichived)
       end
   end
 end

data/app/models/site_blog/article.rb

@@ -13,12 +13,13 @@ module SiteBlog
 
     mount_uploader :image, SiteBlog::ImageUploader
 
-    belongs_to :tag
+    has_many :taggings, class_name: 'SiteBlog::Tagging'
+    has_many :tags, through: :taggings
 
+    validates :tags,        presence: true
     validates :title,       presence: true, length: { minimum: 2 , maximum: 250 }
     validates :description, presence: true
     validates :image,       presence: true
-    validates :tag_id,      presence: true
     validates :slug,        presence: true, uniqueness: true, format: { with: /\A[a-z0-9\-_]+\z/ }
     validates :locale,      presence: true
 
@@ -28,9 +29,12 @@ module SiteBlog
 
     scope :filters, lambda { |params|
       rel = where(archived: false)
-      rel = rel.where(tag_id: params[:tag_id]) if params[:tag_id].present?
+      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.order('created_at DESC').page(params[:page]).per(20)
+      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)
     }
 
     private

data/app/models/site_blog/tag.rb

@@ -1,5 +1,17 @@
 module SiteBlog
   class Tag < ApplicationRecord
-    has_many :articles
+    has_many :taggings, class_name: 'SiteBlog::Tagging'
+    has_many :articles, through: :taggings
+
+    validates :slug, presence: true
+
+    before_validation :slug_downcase
+
+    private
+
+    def slug_downcase
+      self.slug = self.slug.downcase if self.slug.present?
+    end
+
   end
 end

data/app/models/site_blog/tagging.rb

@@ -0,0 +1,6 @@
+module SiteBlog
+	class Tagging < ApplicationRecord
+	  belongs_to :article
+	  belongs_to :tag
+	end
+end

data/db/migrate/20230201140930_add_article_and_tag.rb

@@ -1,7 +1,7 @@
 class AddArticleAndTag < ActiveRecord::Migration[7.0]
   def change
     create_table :site_blog_tags do |t|
-      t.string :title
+      t.string :slug
       t.boolean :archived, null: false, default: false
       t.timestamps
     end
@@ -12,14 +12,20 @@ class AddArticleAndTag < ActiveRecord::Migration[7.0]
       t.text :html_description, null: false
       t.text :description, null: false
       t.string :image, null: false
-      t.belongs_to :tag, null: false, foreign_key: { to_table: :site_blog_tags }
       t.integer :view_count, null: false, default: 0
       t.boolean :archived, null: false, default: false
       t.boolean :active, null: false, default: true
+      t.boolean :main, null: false, default: false
       t.string :locale, null: false
       t.timestamps
     end
 
+    create_table :taggings do |t|
+      t.belongs_to :article, foreign_key: { to_table: :site_blog_articles }
+      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.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site_blog
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Eldar
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activeadmin_addons
+  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
@@ -144,11 +158,11 @@ files:
 - app/models/site_blog/application_record.rb
 - app/models/site_blog/article.rb
 - app/models/site_blog/tag.rb
+- app/models/site_blog/tagging.rb
 - app/uploaders/site_blog/image_uploader.rb
 - app/views/layouts/blog/application.html.erb
 - config/routes.rb
 - db/migrate/20230201140930_add_article_and_tag.rb
-- db/migrate/20230221033922_remove_tables.rb
 - lib/site_blog.rb
 - lib/site_blog/engine.rb
 - lib/site_blog/version.rb

data/db/migrate/20230221033922_remove_tables.rb

@@ -1,6 +0,0 @@
-class RemoveTables < ActiveRecord::Migration[7.0]
-  def change
-    drop_table :site_blog_tags
-    drop_table :site_blog_articles
-  end
-end