notee 0.3.5 → 0.3.6

data/lib/tasks/notee_tasks.rake

@@ -6,6 +6,7 @@ namespace :notee do
     sh 'bundle exec rake notee:install:migrations'
     add_engine_to_route
     create_initializer_file
+    create_css_file
     setup_default
   end
 
@@ -27,24 +28,25 @@ ________________________________
 
   def add_engine_to_route
     puts ""
-    return puts 'setup Notee Engine in config/route.rb\n' unless route_file = File.open("#{Rails.root}/config/routes.rb","r")
+    return puts 'setup Notee Engine in config/route.rb\n' unless route = File.open("#{Rails.root}/config/routes.rb","r")
+    return if File.open("#{Rails.root}/config/routes.rb","r").read.include?("Notee::Engine")
 
-    notee_routes_str = String.new
     text = <<-EOC
 
   mount Notee::Engine => "/notee"
 EOC
 
-    route_file.each_line do |line|
+    new_route = String.new
+    route.each_line do |line|
       line += text if line.include?("Rails.application.routes.draw do")
-      notee_routes_str += line
+      new_route += line
     end
 
     f = File.open("#{Rails.root}/config/routes.rb","w")
-    f.write(notee_routes_str)
+    f.write(new_route)
     f.close()
 
-    puts 'add "mount Notee::Engine => "/notee" to config/route.rb'
+    puts 'Notee added "mount Notee::Engine => "/notee" to config/route.rb'
     puts ""
   end
 
@@ -70,6 +72,26 @@ EOC
     puts 'you should change notee_id & notee_password'
   end
 
+  def create_css_file
+    image_dir = Rails.root.to_s + '/app/assets/stylesheets/notee/'
+    FileUtils.mkdir_p(image_dir) unless FileTest.exist?(image_dir)
+
+    file_path = image_dir + 'notee_default.css'
+    return if File.exist?(file_path)
+
+    css = File.open(File.expand_path('../css/notee_default.css', __FILE__))
+    new_css = String.new
+    css.each_line do |line|
+      new_css += line
+    end
+
+
+    File.open(file_path,"w") do |file|
+      file.puts new_css
+    end
+    puts 'create file in "/app/assets/stylesheets/notee/notee_default.css"'
+  end
+
   def setup_default
     copy_default_image
   end

data/test/controllers/notee/comments_controller_test.rb

@@ -0,0 +1,52 @@
+require 'test_helper'
+
+module Notee
+  class CommentsControllerTest < ActionDispatch::IntegrationTest
+    include Engine.routes.url_helpers
+
+    setup do
+      @comment = notee_comments(:one)
+    end
+
+    test "should get index" do
+      get comments_url
+      assert_response :success
+    end
+
+    test "should get new" do
+      get new_comment_url
+      assert_response :success
+    end
+
+    test "should create comment" do
+      assert_difference('Comment.count') do
+        post comments_url, params: { comment: { content: @comment.content, email: @comment.email, name: @comment.name, post_id: @comment.post_id } }
+      end
+
+      assert_redirected_to comment_url(Comment.last)
+    end
+
+    test "should show comment" do
+      get comment_url(@comment)
+      assert_response :success
+    end
+
+    test "should get edit" do
+      get edit_comment_url(@comment)
+      assert_response :success
+    end
+
+    test "should update comment" do
+      patch comment_url(@comment), params: { comment: { content: @comment.content, email: @comment.email, name: @comment.name, post_id: @comment.post_id } }
+      assert_redirected_to comment_url(@comment)
+    end
+
+    test "should destroy comment" do
+      assert_difference('Comment.count', -1) do
+        delete comment_url(@comment)
+      end
+
+      assert_redirected_to comments_url
+    end
+  end
+end

data/test/fixtures/notee/comments.yml

@@ -0,0 +1,13 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  post_id: 1
+  content: MyText
+  name: MyString
+  email: MyString
+
+two:
+  post_id: 1
+  content: MyText
+  name: MyString
+  email: MyString

data/test/models/notee/comment_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+module Notee
+  class CommentTest < ActiveSupport::TestCase
+    # test "the truth" do
+    #   assert true
+    # end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notee
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - takujifunao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,6 +142,7 @@ files:
 - app/assets/stylesheets/notee/preview.scss
 - app/controllers/notee/application_controller.rb
 - app/controllers/notee/categories_controller.rb
+- app/controllers/notee/comments_controller.rb
 - app/controllers/notee/images_controller.rb
 - app/controllers/notee/notees_controller.rb
 - app/controllers/notee/posts_controller.rb
@@ -149,30 +150,37 @@ files:
 - app/controllers/notee/tokens_controller.rb
 - app/helpers/notee/application_helper.rb
 - app/helpers/notee/categories_helper.rb
+- app/helpers/notee/comments_helper.rb
 - app/helpers/notee/images_helper.rb
 - app/helpers/notee/posts_helper.rb
 - app/models/notee/category.rb
+- app/models/notee/comment.rb
 - app/models/notee/image.rb
 - app/models/notee/post.rb
 - app/models/notee/token.rb
 - app/views/layouts/notee/application.html.erb
 - app/views/notee/notees/index.html.erb
+- app/views/notee/partials/_comment_box.html.erb
+- app/views/notee/partials/_secret_published.html.erb
 - app/views/notee/tokens/new.html.erb
 - config/routes.rb
 - db/migrate/20160605141437_create_notee_posts.rb
 - db/migrate/20160605141510_create_notee_categories.rb
 - db/migrate/20160605141547_create_notee_images.rb
 - db/migrate/20160608102012_create_notee_tokens.rb
+- db/migrate/20160803154954_create_notee_comments.rb
 - lib/notee.rb
 - lib/notee/configuration.rb
 - lib/notee/engine.rb
-- lib/notee/helper.rb
+- lib/notee/helpers/notee_helper.rb
+- lib/notee/helpers/view_helper.rb
 - lib/notee/status.rb
 - lib/notee/version.rb
-- lib/notee/view_helper.rb
+- lib/tasks/css/notee_default.css
 - lib/tasks/images/default.png
 - lib/tasks/notee_tasks.rake
 - test/controllers/notee/categories_controller_test.rb
+- test/controllers/notee/comments_controller_test.rb
 - test/controllers/notee/images_controller_test.rb
 - test/controllers/notee/posts_controller_test.rb
 - test/dummy/README.rdoc
@@ -341,11 +349,13 @@ files:
 - test/dummy/tmp/cache/assets/sprockets/v3.0/z4/z4i9WzpZRzFXynWsqewNMikNdcZ9f9mGFdlrIP5N6Gs.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/zN/zNfQXfFXMTyOoz3HbVM-_4m-46rWO7XrZPvGs4aJCQc.cache
 - test/fixtures/notee/categories.yml
+- test/fixtures/notee/comments.yml
 - test/fixtures/notee/images.yml
 - test/fixtures/notee/posts.yml
 - test/fixtures/notee/tokens.yml
 - test/integration/navigation_test.rb
 - test/models/notee/category_test.rb
+- test/models/notee/comment_test.rb
 - test/models/notee/image_test.rb
 - test/models/notee/post_test.rb
 - test/models/notee/token_test.rb
@@ -377,6 +387,7 @@ specification_version: 4
 summary: notee is very simple blogging gem.
 test_files:
 - test/controllers/notee/categories_controller_test.rb
+- test/controllers/notee/comments_controller_test.rb
 - test/controllers/notee/images_controller_test.rb
 - test/controllers/notee/posts_controller_test.rb
 - test/dummy/app/assets/javascripts/application.js
@@ -545,11 +556,13 @@ test_files:
 - test/dummy/tmp/cache/assets/sprockets/v3.0/ZT/ZT-4a7lIKMm0Swxyt7MdXMz5v6r5MaVvtHvqAT6T8Ts.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/Zu/ZuAoFB2A_kFOIb19dNUzEU5jP-SzQLmauPCURINz2Fo.cache
 - test/fixtures/notee/categories.yml
+- test/fixtures/notee/comments.yml
 - test/fixtures/notee/images.yml
 - test/fixtures/notee/posts.yml
 - test/fixtures/notee/tokens.yml
 - test/integration/navigation_test.rb
 - test/models/notee/category_test.rb
+- test/models/notee/comment_test.rb
 - test/models/notee/image_test.rb
 - test/models/notee/post_test.rb
 - test/models/notee/token_test.rb

data/lib/notee/helper.rb

@@ -1,36 +0,0 @@
-module Notee
-  module Helper
-    def notees(search_txt)
-
-      @notees = []
-
-      if search_txt.nil?
-        # all_notees
-        @notees = Notee::Post.where(status: Notee::STATUS[:published]).order(published_at: :desc)
-      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
-
-        @notees = Notee::Post.where(category_id: category_id, status: Notee::STATUS[:published]).order(published_at: :desc)
-      end
-
-      @notees
-
-    end
-
-    def secret_notees
-      @notees = Notee::Post.where(status: Notee::STATUS[:secret_published]).order(published_at: :desc)
-    end
-
-
-    def notee(search_txt)
-      return false unless search_txt
-      @notee = Notee::Post.find_by(id: search_txt, status: Notee::STATUS[:published])
-      @notee = Notee::Post.find_by(slug: search_txt, status: Notee::STATUS[:published]) unless @notee
-
-      @notee
-    end
-  end
-end

data/lib/notee/view_helper.rb

@@ -1,16 +0,0 @@
-require 'redcarpet'
-
-module Notee
-  module ViewHelper
-    def notee_content(text)
-
-      unless @markdown
-        renderer = Redcarpet::Render::HTML.new(filter_html: true, hard_wrap: true)
-        @markdown = Redcarpet::Markdown.new(renderer, :fenced_code_blocks => true, :highlight => true)
-      end
-
-      @markdown.render(text).html_safe
-    end
-
-  end
-end