notee 0.3.0 → 0.3.1

data/app/models/notee/category.rb

@@ -8,7 +8,7 @@ module Notee
     has_many :children, class_name: Notee::Category, :foreign_key => 'parent_id', dependent: :destroy
 
     def set_slug
-      self.slug = self.name.downcase if self.slug.nil?
+      self.slug = self.name.downcase unless self.slug.present?
     end
 
   end

data/lib/notee/helper.rb

@@ -1,31 +1,33 @@
 module Notee
   module Helper
-    def get_all_notees
-      @notees = Notee::Post.where(status: 1)
-    end
-
-    def get_secret_notees
-      @notees = Notee::Post.where(status: 2)
-    end
+    def notees(search_txt)
+      if search_txt.nil?
+        # all_notees
+        @notees = Notee::Post.where(status: 1)
+      else
+        # search_by_category_slug
+        category_id = Notee::Category.find_by(slug: search_txt)
+        category_id = Notee::Category.find_by(name: search_txt) unless category_id
+        return false unless category_id
 
-    def get_notees_by_category_slug(category_slug)
+        @notees = Notee::Post.where(category_id: category_id, status: 1)
+      end
 
-      return false unless category_slug
-      category_id = Notee::Category.find_by(name: category_slug)
-      return false unless category_id
+      @notees
 
-      @notees = Notee::Post.where(category_id: category_id, status: 1)
     end
 
-    def get_notee_by_id(id)
-      return false unless id
-      @notee = Notee::Post.find_by(id: id, status: 1)
+    def secret_notees
+      @notees = Notee::Post.where(status: 2)
     end
 
-    def get_notee_by_slug(slug)
-      return false unless slug
-      @notee = Notee::Post.find_by(slug: slug, status: 1)
-    end
 
+    def notee(search_txt)
+      return false unless search_txt
+      @notee = Notee::Post.find_by(id: search_txt, status: 1)
+      @notee = Notee::Post.find_by(slug: search_txt, status: 1) unless @notee
+
+      @notee
+    end
   end
 end

data/lib/notee/version.rb

@@ -1,3 +1,3 @@
 module Notee
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/notee/view_helper.rb

@@ -2,7 +2,7 @@ require 'redcarpet'
 
 module Notee
   module ViewHelper
-    def notee_markdown(text)
+    def notee_content(text)
 
       unless @markdown
         renderer = Redcarpet::Render::HTML.new(filter_html: true, hard_wrap: true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notee
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - takujifunao