notee 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83505146122c8bcd81a55fe91e31b7bcb2bb1761
-  data.tar.gz: 3189f0125d99d366d0e1f8f0216e566e3965ae33
+  metadata.gz: 70f31773687978bde09f4cad39620863730a3b75
+  data.tar.gz: 5a7a6e5313fba0e4c4fced6ee78c7f8e54a095aa
 SHA512:
-  metadata.gz: 4b4028d73060476a190b34323eaefa7f225dafe6546fd3797ac851eb86ff3d3f6330bdb0bd43ac2c7db81f271272cbc9f55e212cb9e6f4c7771a66c72b2fbdf0
-  data.tar.gz: bb5421bc887b93f3d285a22d000cf8afd95d2db69d36e699229228f198b1ebb531c8615b8b1aaad0de045765ce7697e91ab9ebf494fc1596a2dedf1304cd0c77
+  metadata.gz: 88b1b57a8136b57f514d7f6e5c2b2562e5bbf78bc762459af177df22f535a42f333e2ddaf4a01996150dc855dcec5bef3ce915469dc2dc349a1f67d8cc56c8f4
+  data.tar.gz: 2506dcd50f49351cec98c5b3901bf2490e59b699b593ce9ec1e44c22eb8050853616358890ca054b11c10d9b456c1a27dc41a83e550029633ed78aea91016a45

data/app/models/notee/category.rb

@@ -19,6 +19,7 @@ module Notee
     before_save :protect_default
 
     # relations
+    has_many :posts
     has_many :children, class_name: Notee::Category, foreign_key: 'parent_id', dependent: :destroy
 
     private

data/lib/notee/helpers/notee_helper.rb

@@ -61,14 +61,28 @@ module Notee
 
 
       def notee_categories
-        # DATA: {notee.category.name, notee.count}
-        Notee::Post.find_by_sql("SELECT category_id as category_id, count(*) as count FROM notee_posts WHERE notee_posts.status=1 and notee_posts.is_deleted=false GROUP BY category_id;")
+        categories = Notee::Category.where(is_deleted: false)
+        published_categories = categories.select { |category| category if category.posts.count > 0 }.map { |category| category }
+
+        published_categories
       end
 
 
       def notee_archives
-        # DATA: {notee.time, notee.count}
-        Notee::Post.find_by_sql("SELECT DATE_FORMAT(published_at, '%Y-%m') as time, count(*) as count FROM notee_posts WHERE status=1 and is_deleted=false GROUP BY DATE_FORMAT(published_at, '%Y-%m') ORDER BY time DESC;")
+        posts = Notee::Post.select(:published_at).where(status: 1, is_deleted: false).order(created_at: :desc)
+
+        notee_archives = {}
+        posts.each do |post|
+          month_str = post.published_at.strftime("%Y/%m")
+          if notee_archives.has_key?(month_str)
+            notee_archives[month_str] = notee_archives[month_str] + 1
+          else
+            notee_archives.store(month_str, 1)
+          end
+        end
+
+        notee_archives
+        # Notee::Post.find_by_sql("SELECT DATE_FORMAT(published_at, '%Y-%m') as time, count(*) as count FROM notee_posts WHERE status=1 and is_deleted=false GROUP BY DATE_FORMAT(published_at, '%Y-%m') ORDER BY time DESC;")
       end
 
 

data/lib/notee/version.rb

@@ -1,3 +1,3 @@
 module Notee
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/lib/tasks/views/notee/archives.html.erb

@@ -2,11 +2,10 @@
 <div class="notee_wrapper">
   <div class="notee_main">
     <h2>Archive List</h2>
-    <% @archives.each do |archive| %>
-        <% slash_time = archive.time.gsub("-","/") %>
+    <% @archives.each do |key, count| %>
         <div class="notee_list">
-          <a href="/archives/<%= slash_time %>">
-            <h3><%= slash_time %> (<%= archive.count %>)</h3>
+          <a href="/archives/<%= key %>">
+            <h3><%= key %> (<%= count %>)</h3>
           </a>
         </div>
     <% end %>

data/lib/tasks/views/notee/categories.html.erb

@@ -4,8 +4,8 @@
     <h2>Category List</h2>
     <% @categories.each do |category| %>
         <div class="notee_list">
-          <a href="/categories/<%= category.category.name %>">
-            <h3><%= category.category.name %> (<%= category.count %>)</h3>
+          <a href="/categories/<%= category.name %>">
+            <h3><%= category.name %> (<%= category.posts.count %>)</h3>
           </a>
         </div>
     <% end %>

data/lib/tasks/views/notee/partials/_sidebar.html.erb

@@ -3,19 +3,18 @@
   <div class="notee_sidebar_content">
     <ul class="notee_sidebar_ul">
       <% notee_categories.each do |category| %>
-          <a href="/categories/<%= category.category.name %>">
-            <li><%= category.category.name %> (<%= category.count %>)</li>
+          <a href="/categories/<%= category.name %>">
+            <li><%= category.name %> (<%= category.posts.count %>)</li>
           </a>
       <% end %>
     </ul>
   </div>
   <h3>Archive</h3>
   <div class="notee_sidebar_content">
-    <% notee_archives.each do |archive| %>
-        <% slash_time = archive.time.gsub("-","/") %>
+    <% notee_archives.each do |key, count| %>
         <ul class="notee_sidebar_ul">
-          <a href="/archives/<%= slash_time %>">
-            <li><%= slash_time %> (<%= archive.count %>)</li>
+          <a href="/archives/<%= key %>">
+            <li><%= key %> (<%= count %>)</li>
           </a>
         </ul>
     <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notee
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - funaota
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails