notee 1.0.7 → 1.0.8

data/app/controllers/notee/comments_controller.rb

@@ -1,7 +1,7 @@
 require_dependency 'notee/application_controller'
 
 module Notee
-  class CommentsController < ApplicationController
+  class CommentsController < ActionController::Base
     before_action :set_comment, only: [:update, :destroy]
 
     def index

data/app/controllers/notee/tokens_controller.rb

@@ -1,6 +1,10 @@
 
 require_dependency 'notee/application_controller'
 
+require 'open-uri'
+require 'json'
+require 'uri'
+
 module Notee
   class TokensController < ApplicationController
     skip_before_filter :restrict_access_json, only: [:new, :create]
@@ -9,6 +13,7 @@ module Notee
     end
 
     def create
+      check_recaptcha
       User.sign_in(params[:id], params[:password])
       redirect_to root_path
     end
@@ -23,5 +28,15 @@ module Notee
         end
       end
     end
+
+    def check_recaptcha
+      endpoint = 'https://www.google.com/recaptcha/api/siteverify?secret=' + Notee.recaptcha_secret_key + '&response=' + params["g-recaptcha-response"]
+      uri = URI.parse(endpoint)
+      json = Net::HTTP.get(uri)
+      result = JSON.parse(json)
+      if result["success"] == false
+        raise
+      end
+    end
   end
 end

data/app/models/notee/post.rb

@@ -43,7 +43,7 @@ module Notee
     end
 
     def set_slug
-      self.slug = self.title.downcase unless self.slug.present?
+      self.slug = self.title.parameterize.underscore unless self.slug.present?
     end
 
     def set_published_at

data/app/models/notee/user.rb

@@ -67,12 +67,6 @@ module Notee
     end
 
     def self.root_user_setting
-      unless User.exists?(id: 0)
-        User.skip_callback(:create, :before, :create_authority)
-        User.create(id: 0, name: Notee.notee_id, email: "root", password: SecureRandom.hex, role: 9999)
-        User.set_callback(:create, :before, :create_authority)
-      end
-
       if token = Token.create!(user_id: 0)
         Thread.current[:request].session[:access_token] = token.access_token
       end

data/app/views/notee/partials/_comment_box.html.erb

@@ -1,137 +1,126 @@
+
+<!-- Riot.js Settings -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/riot/2.3.18/riot+compiler.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/superagent/2.1.0/superagent.min.js"></script>
+<script src="https://www.google.com/recaptcha/api.js" async defer></script>
+
+
 <div class="notee_list">
   <comments post_id='<%= post_id %>'></comments>
+  <div data-callback="syncerRecaptchaCallback" class="g-recaptcha notee_comment_form" data-sitekey="<%= recaptcha %>"></div>
   <comment_form post_id='<%= post_id %>'></comment_form>
 </div>
 
-<!-- <comment> tag -->
 
 <script type="riot/tag">
-	
-	var obs = riot.observable();
-
-	/////////////////////////////////////////
-	// 			comment_form tag
-	/////////////////////////////////////////
-
-	<comment_form class="notee_comment_form" id="notee_form">
-	<form method="POST">
-
-    	<label class="notee_label" for="comment_name">Name</label>
-    	<input class="notee_text_field" type="text" name="comment[name]" id="comment_name" />
-      
-      	<label class="notee_label" for="comment_email">Email</label>
-      	<input class="notee_text_field" type="text" name="comment[email]" id="comment_email" />
-      
-      	<label class="notee_label" for="comment_content">Content</label>
-      	<textarea class="notee_text_area" name="comment[content]" id="comment_content"></textarea>
-
-      	<div class="g-recaptcha" data-sitekey="<%= recaptcha %>"></div>
-      
-      	<input 
-      		type="submit" 
-      		value="Create Comment" 
-      		class="notee_submit" 
-      		data-disable-with="Create Comment"
-      		onClick={notee_submit} />
-
-	</form>
-
-		this.notee_submit = function(e){
-			e.preventDefault();
-			var comment = {
-				post_id: opts.post_id,
-				name: document.getElementById("comment_name").value,
-				email: document.getElementById("comment_email").value,
-				content: document.getElementById("comment_content").value
-			};
-
-			if(comment.content != null || comment.content != ""){
-				var request = window.superagent;
-			    var url = "/notee/api/comments";
-			    var self = this;
-
-			    request
-				  .post(url)
-				  .send({ comment: comment })
-				  .end(function(err, res){
-				    if(res.status == 200){
-				    	obs.trigger("notee_submit");
-				    	document.getElementById("comment_name").value = "";
-						document.getElementById("comment_email").value = "";
-						document.getElementById("comment_content").value = "";
-				    }
-				  });
-			}
-		}
-
-	</comment_form>
-
-
-
-	/////////////////////////////////////////
-	// 			comment tag
-	/////////////////////////////////////////
-
 
-  	<comment class="notee_comment">
-	    <p class="notee_comment_name">{ name }</p>
-	    <p class="notee_comment_content"> { content } </p>
+var obs = riot.observable();
 
-		 this.name = opts.name;
-		 this.content = opts.content;
-  	</comment>
+<comment_form class="notee_comment_form" id="notee_form">
+  <form method="POST" id="syncer-recaptcha-form">
+    <label class="notee_label" for="comment_name">Name</label>
+    <input class="notee_text_field" type="text" name="comment[name]" id="comment_name" disabled />
 
+    <label class="notee_label" for="comment_email">Email</label>
+    <input class="notee_text_field" type="text" name="comment[email]" id="comment_email" disabled />
 
+    <label class="notee_label" for="comment_content">Content</label>
+    <textarea class="notee_text_area" name="comment[content]" id="comment_content" disabled></textarea>
 
-  	/////////////////////////////////////////
-	// 			comments tag
-	/////////////////////////////////////////
-
-
-  	<comments class="notee_comments">
-	  	<comment 
-	  		each={ item in items } 
-	  		name={item.name} 
-	  		content={item.content}>
-	  	</comment>
-
-	  	var request = window.superagent;
-		    var url = "/notee/api/comments/" + opts.post_id
-		    var self = this;
-
-	  	this.one('update', function() {
-		    request
-			  .get(url)
-			  .end(function(err, res){
-			    console.log(res.body.comments);
-			    self.items = res.body.comments;
-			    self.update();
-			  });
-		})
-
-		obs.on("notee_submit", function() {
-	      request
-			  .get(url)
-			  .end(function(err, res){
-			    console.log(res.body.comments);
-			    self.items = res.body.comments;
-			    self.update();
-			  });
-	    });
+    <input
+      type="submit"
+      value="Create Comment"
+      class="notee_submit"
+      data-disable-with="Create Comment"
+      onClick={notee_submit}
+      disabled />
+	</form>
 
-  	</comments>
+  this.notee_submit = function(e){
+    e.preventDefault();
+    var comment = {
+      post_id: opts.post_id,
+      name: document.getElementById("comment_name").value,
+      email: document.getElementById("comment_email").value,
+      content: document.getElementById("comment_content").value
+    };
+
+    if(comment.content != null || comment.content != ""){
+      var request = window.superagent;
+      var url = "/notee/api/comments";
+      var self = this;
+
+      request
+        .post(url)
+        .send({ comment: comment })
+        .end(function(err, res){
+          if(res.status == 200){
+            obs.trigger("notee_submit");
+            document.getElementById("comment_name").value = "";
+						document.getElementById("comment_email").value = "";
+						document.getElementById("comment_content").value = "";
+          }
+        });
+      }
+    }
+</comment_form>
+
+<comment class="notee_comment">
+  <p class="notee_comment_name">{ name }</p>
+  <p class="notee_comment_content"> { content } </p>
+
+  this.name = opts.name;
+  this.content = opts.content;
+</comment>
+
+<comments class="notee_comments">
+  <comment
+    each={ item in items }
+    name={item.name}
+    content={item.content}>
+  </comment>
+
+  var request = window.superagent;
+  var url = "/notee/api/comments/" + opts.post_id;
+  var self = this;
+
+  this.one('update', function() {
+    request
+    .get(url)
+    .end(function(err, res){
+      if(res.body != null){
+        self.items = res.body.comments;
+        self.update();
+      }
+    });
+	})
+
+  obs.on("notee_submit", function() {
+    request
+    .get(url)
+    .end(function(err, res){
+      self.items = res.body.comments;
+      self.update();
+    });
+  });
+</comments>
 </script>
 
-
-
-
-<!-- Riot.js Settings -->
-
-<script src="https://cdnjs.cloudflare.com/ajax/libs/riot/2.3.18/riot+compiler.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/superagent/2.1.0/superagent.min.js"></script>
-<script src="https://www.google.com/recaptcha/api.js" async defer></script>
 <script>
-	window.onload = function() {
-  		riot.mount('*');
-	};
+  if(window.addEventListener) {
+    window.addEventListener( "load" , riot_mount, false );
+  }else{
+    window.attachEvent( "onload", riot_mount );
+  }
+
+  function riot_mount(){
+    riot.mount('*');
+  }
+
+  function syncerRecaptchaCallback( code ){
+    if(code != ""){
+      $( '#syncer-recaptcha-form input , #syncer-recaptcha-form button, #syncer-recaptcha-form textarea' ).removeAttr( 'disabled' ) ;
+    }
+  }
+
 </script>

data/app/views/notee/partials/_meta.html.erb

@@ -1,6 +1,8 @@
 
 <!-- Notee Meta Info -->
 
+<% meta ||= Notee.blog_meta %>
+
 <title><%= meta[:title] %></title>
 <meta name="keywords" content="<%= meta[:keyword] %>"/>
 <meta name="description" content="<%= meta[:description] %>"/>
@@ -22,4 +24,4 @@
   ga('create', '<%= ga %>', 'auto');
   ga('send', 'pageview');
 
-</script>
+</script>

data/app/views/notee/tokens/new.html.erb

@@ -1,13 +1,25 @@
+<script src="https://www.google.com/recaptcha/api.js" async defer></script>
+
 <div class="grid_start login_bg">
   <div class="fourty grid offset_by_twenty_five mt_60 login">
     <h1>Notee</h1>
     <p>Notee is creating blog gem by only one command</p>
-    <%= form_tag(tokens_path, :class => 'mt_50') do %>
+    <%= form_tag(tokens_path, :class => 'mt_50', :id => 'syncer-recaptcha-form') do %>
       <h3>ID:</h3>
-      <%= text_field_tag :id %>
+      <%= text_field_tag :id, "", :disabled => true %>
       <h3>PASSWORD:</h3>
-      <%= password_field_tag :password %>
-      <%= submit_tag "ログイン", :class => 'full grid mt_50'  %>
+      <%= password_field_tag :password, "", :disabled => true %>
+        <div data-callback="syncerRecaptchaCallback" class="g-recaptcha mt_30" data-sitekey="<%= Notee.recaptcha_key %>"></div>
+      <%= submit_tag "ログイン", :disabled => true, :class => 'full grid mt_50' %>
     <% end %>
   </div>
 </div>
+
+<script>
+  function syncerRecaptchaCallback( code ){
+    if(code != ""){
+      $( '#syncer-recaptcha-form input , #syncer-recaptcha-form button, #syncer-recaptcha-form textarea' ).removeAttr( 'disabled' ) ;
+    }
+  }
+</script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>

data/config/routes.rb

@@ -2,22 +2,6 @@ Notee::Engine.routes.draw do
 
   root to: 'notees#index'
 
-  get 'posts'                 => 'notees#index'
-  get 'posts/new'             => 'notees#index'
-  get 'posts/edit/:id'        => 'notees#index'
-  get 'categories'            => 'notees#index'
-  get 'categories/edit/:id'   => 'notees#index'
-  get 'images'                => 'notees#index'
-  get 'comments'              => 'notees#index'
-  get 'users'                 => 'notees#index'
-  get 'users/new'             => 'notees#index'
-  get 'users/edit/:id'        => 'notees#index'
-  get 'trashes'               => 'notees#index'
-  get 'trashes/:model'        => 'notees#index'
-  get 'mypage'                => 'notees#index'
-  get 'mypage/edit'           => 'notees#index'
-  get 'mypage/edit/password'  => 'notees#index'
-
   # post 'secret_published' => 'notees#secret_published'
   resources :tokens, only: [:new, :create, :destroy]
 
@@ -33,4 +17,6 @@ Notee::Engine.routes.draw do
     resources :roles, only: [:index, :show]
     resources :trashes, only: [:index, :update]
   end
+
+  get '*anything'             => 'notees#index'
 end

data/db/migrate/20160605141437_create_notee_posts.rb

@@ -1,4 +1,55 @@
 # This migration comes from notee (originally 20160605141437)
+
+INITIAL_TXT = <<-EOC
+
+# Notee
+
+Notee is creating CMS(blog) app by only one command.
+
+BackEnd: Ruby(RailsEngine)
+FrontEnd: React.js + Riot.js(only comment part)
+
+## Setting
+
+update for your setting in config/initializers/notee.rb
+
+Recommendation using .env
+
+```rb
+require 'notee'
+
+# Recommendation using .env for manage id & password
+
+Notee.configure do |config|
+
+  # root-user
+  config.notee_id = "your_name"
+  config.notee_password = "your_password"
+
+  # recaptcha
+  config.recaptcha_key = "hogehoge"
+  config.recaptcha_secret_key = "hogehoge"
+
+  # blog
+  config.blog_meta = {
+      title: "Notee",
+      url: "http://hogehoge.com",
+      keyword: "hoge, hoge, hoge",
+      description: "【react&rails】notee is creating CMS(blog) app by only one command.",
+      og_image: "http://hogehoge.com/hoge.png"
+  }
+
+  # google-analytics
+  config.google_analytics = "hogehogehogehoge"
+end
+
+```
+
+## Helper Method
+[Helper Method](https://github.com/funaota/notee/wiki/Helper-Method)
+
+EOC
+
 class CreateNoteePosts < ActiveRecord::Migration
   def change
     create_table :notee_posts do |t|
@@ -23,9 +74,13 @@ class CreateNoteePosts < ActiveRecord::Migration
 
 
       t.timestamps null: false
-
     end
 
+    # create default post
+    Notee::Post.skip_callback(:create, :before, :create_authority)
+    Notee::Post.create(title: "Hello World", content: INITIAL_TXT, status: 1, user_id: 0, category_id: 1, seo_description: "hello world! Notee is creating CMS(blog) app by only one command. BackEnd: Ruby(RailsEngine), FrontEnd: React.js + Riot.js(only comment part)", thumbnail_id: 1)
+    Notee::Post.set_callback(:create, :before, :create_authority)
+
     add_index :notee_posts, :slug, :unique => true
   end
 end