homeland-press 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9cc3c455c07a0670af45ab7a72ff155d5447688
-  data.tar.gz: ec7204dbc3eceb92ea1c36a2ecb5f695e76c3a10
+  metadata.gz: 30be3e204d09b92d87040eb9d2ae7761afbcdad7
+  data.tar.gz: df05927e51707cd6bbce8c83dc19a5917c995f50
 SHA512:
-  metadata.gz: b0f854ec0699c3e0567385da2d5cab44c4a198e17963b1664a5dfc978417db886b9064e2b982ed0af23b753f8dc5d0536222d51e11488ced7aa7028b828e0635
-  data.tar.gz: e97c740289298fe1f58ece76c606d7e46c6f5c8c7689c5e392c7cd90fa3e09365399e002a06e809ec4ac9a07dd36920f663c2d3c1dc86ab741987ab2e3b61efd
+  metadata.gz: cda7883c57d45ec8bdd9096cb282b9da3bf8c7adc2c3a884bbc4a36aa4cf00d0e56a37e83145782318f52452dc54a5543b014a8401be3b82ecc424160181845c
+  data.tar.gz: 41ee2131ca13e4c292253819b9a5b2513c91ed356328eec0f2c59b64b1c9da913fba38aa0a88e6818b174de85aed11317fdd6a6a54fe98b0a81e9a6434d9028d

data/app/helpers/homeland/press/application_helper.rb

@@ -1,5 +1,10 @@
 module Homeland::Press
   module ApplicationHelper
     delegate :comments_path, to: :main_app
+
+    def press_user_name_tag(user)
+      return '官方' if user.admin?
+      user_name_tag(user)
+    end
   end
 end

data/app/models/post.rb

@@ -4,10 +4,14 @@ class Post < ApplicationRecord
 
   enum status: %i(upcoming published rejected)
 
+  validates :slug, uniqueness: true, if: Proc.new { |post| post.slug.present? }
+  validates :title, :summary, :body, presence: true
+
   counter :hits
 
   before_save :generate_summary
   before_create :generate_published_at
+  before_validation :safe_slug
 
   def to_param
     self.slug.blank? ? self.id : self.slug
@@ -33,6 +37,11 @@ class Post < ApplicationRecord
 
   private
 
+  def safe_slug
+    self.slug.downcase!
+    self.slug.gsub!(/[^a-z0-9]/i, '-')
+  end
+
   def generate_published_at
     self.published_at = Time.now
   end

data/app/views/homeland/press/posts/_post.html.erb

@@ -12,7 +12,7 @@
       <%= simple_format post.summary %>
     </div>
     <div class="post-info">
-      <%= user_name_tag(post.user) %> ·
+      <%= press_user_name_tag(post.user) %> ·
       <span class="time" title="发布时间"><i class="fa fa-clock-o"></i> <%= timeago(post.created_at) %></span> ·
       <%= link_to "#{post.comments_count} 条评论", post_path(post, anchor: 'comments') %>
     </div>

data/app/views/homeland/press/posts/show.html.erb

@@ -23,7 +23,7 @@
     </div>
     <h1><%= @post.title %></h1>
     <div class="post-info">
-      <%= user_name_tag(@post.user) %> ·
+      <%= press_user_name_tag(@post.user) %> ·
       <span class="time" title="发布时间"><i class="fa fa-clock-o"></i> <%= timeago @post.created_at %></span> ·
       <%= @post.hits %> 次阅读 ·
       <a href="#comments"><i class="fa fa-comments-o"></i> <%= @post.comments_count %> 条评论</a>
@@ -34,7 +34,9 @@
     <div class="post-actions">
       <%= likeable_tag(@post, class: 'btn btn-lg btn-default') %>
 
-      <%= reward_user_tag(@post.user, class: 'btn btn-lg btn-default') %>
+      <% unless @post.user&.admin? %>
+        <%= reward_user_tag(@post.user, class: 'btn btn-lg btn-default') %>
+      <% end %>
     </div>
   </div>
 </div>

data/lib/homeland/press/version.rb

@@ -1,6 +1,6 @@
 module Homeland
   module Press
     NAME    = 'press'
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homeland-press
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jason Lee