notee 0.3.6 → 0.3.7

data/app/controllers/notee/application_controller.rb

@@ -1,19 +1,10 @@
 module Notee
   class ApplicationController < ActionController::Base
-
-    before_action :set_access_token
     before_action :restrict_access_json
 
     private
-    def set_access_token
-      # request['Authorization: Token token'] = session[:access_token] if session[:access_token].present?
-    end
 
     def restrict_access_json
-      # authenticate_or_request_with_http_token do |token, options|
-      #   Token.exists?(access_token: token)
-      # end
-
       unless Token.exists?(access_token: session[:access_token])
         raise
       end

data/app/controllers/notee/tokens_controller.rb

@@ -14,6 +14,13 @@ module Notee
       if Notee.notee_id == params[:id] && Notee.notee_password == params[:password]
         if token = Token.create!
           session[:access_token] = token.access_token
+          return redirect_to root_path
+        end
+      end
+
+      if now_user = User.sign_in(params[:id], params[:password])
+        if token = Token.create!(user_id: now_user.id)
+          session[:access_token] = token.access_token
         end
       end
 

data/app/controllers/notee/users_controller.rb

@@ -0,0 +1,60 @@
+require_dependency "notee/application_controller"
+
+module Notee
+  class UsersController < ApplicationController
+
+    # callbacks
+    before_action :set_user, only: [:show, :update, :destroy]
+
+    # GET /users
+    def index
+      @users = User.all.order(updated_at: :desc)
+      render json: { status: 'success', users: @users}
+    end
+
+    # GET /posts/1
+    def show
+      render json: { status: 'success', user: @user}
+    end
+
+    # POST /posts
+    def create
+      @user = User.new(user_params)
+      respond_to do |format|
+        if @user.save
+          format.json { render json: @user, status: 200 }
+        else
+          format.json { render json: @user.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    # PATCH/PUT /posts/1
+    def update
+      respond_to do |format|
+        if @user.update(user_params)
+          format.json { render json: @user, status: 200 }
+        else
+          format.json { render json: @user.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    # DELETE /posts/1
+    def destroy
+      @user.destroy
+      render json: { status: 'success'}
+    end
+
+    private
+
+      def set_user
+        @user = User.find_by(id: params[:id])
+      end
+
+      # Only allow a trusted parameter "white list" through.
+      def post_params
+        params.require(:user).permit(:title, :content, :slug, :status, :category_id, :thumbnail_id, :published_at, :seo_keyword, :seo_description, :secret_published_password)
+      end
+  end
+end

data/app/models/notee/user.rb

@@ -0,0 +1,27 @@
+module Notee
+  class User < ApplicationRecord
+
+  	# accessors
+  	attr_accessor :password
+
+  	# callback
+  	before_save :encrypt_password
+  	
+  	def sign_in(name_or_email password)
+  	  user = self.find_by(name: name_or_email)
+  	  user = self.find_by(email: name_or_email) unless user
+  	  return false unless user
+	  return false unless user.encrypted_password == encrypt(password)
+  	
+  	  return user
+  	end
+
+  	def encrypt(password)
+  	  return OpenSSL::Digest::MD5.hexdigest(password)
+  	end
+
+  	def encrypt_password
+  	  self.encrypted_password = encrypt(self.password)
+  	end
+  end
+end

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

@@ -3,7 +3,6 @@
   <comment_form post_id='<%= post_id %>'></comment_form>
 </div>
 
-
 <!-- <comment> tag -->
 
 <script type="riot/tag">
@@ -15,6 +14,8 @@
 	/////////////////////////////////////////
 
 	<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" />
@@ -24,6 +25,8 @@
       
       	<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" 
@@ -32,6 +35,8 @@
       		data-disable-with="Create Comment"
       		onClick={notee_submit} />
 
+	</form>
+
 		this.notee_submit = function(e){
 			e.preventDefault();
 			var comment = {
@@ -41,7 +46,7 @@
 				content: document.getElementById("comment_content").value
 			};
 
-			if(comment.content != null){
+			if(comment.content != null || comment.content != ""){
 				var request = window.superagent;
 			    var url = "/notee/api/comments";
 			    var self = this;
@@ -119,10 +124,13 @@
 </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('*');

data/config/routes.rb

@@ -6,12 +6,16 @@ Notee::Engine.routes.draw do
   get 'edit/:id'  => 'notees#index'
   get 'category'  => 'notees#index'
   get 'image'     => 'notees#index'
+  get 'user'     => 'notees#index'
+  get 'user/new'     => 'notees#index'
+  get 'user/edit/:id'     => 'notees#index'
 
   post 'secret_published' => 'notees#secret_published'
   resources :tokens, only: [:new, :create, :destroy]
 
   scope :api, { format: 'json' } do
     resources :posts, only: [:index, :show, :create, :update, :destroy]
+    resources :users, only: [:index, :show, :create, :update, :destroy]
     resources :images, only: [:index, :show, :create, :destroy]
     resources :categories, only: [:index, :show, :create, :update, :destroy]
     resources :statuses, only: [:index, :show]

data/db/migrate/20160605141437_create_notee_posts.rb

@@ -4,7 +4,6 @@ class CreateNoteePosts < ActiveRecord::Migration
     create_table :notee_posts do |t|
 
       # notee's base
-
       t.string  :title
       t.text    :content
       t.string  :slug
@@ -12,6 +11,7 @@ class CreateNoteePosts < ActiveRecord::Migration
       t.integer :category_id, default: 0
       t.integer :thumbnail_id, default: 0
       t.datetime :published_at
+      t.integer :user_id
 
       # seo
       t.string  :seo_keyword, default: ""
@@ -20,8 +20,6 @@ class CreateNoteePosts < ActiveRecord::Migration
       # secret_published
       t.string :secret_published_password
 
-      # if you have user_id
-      # t.integer :user_id
 
       t.timestamps null: false
 

data/db/migrate/20160605141510_create_notee_categories.rb

@@ -12,7 +12,7 @@ class CreateNoteeCategories < ActiveRecord::Migration
       t.timestamps null: false
     end
 
-    add_index :notee_categories, [:slug], :unique => true
+    add_index :notee_categories, :slug, :unique => true
 
     # create default category
     Notee::Category.create :name => 'No_Category'

data/db/migrate/20160608102012_create_notee_tokens.rb

@@ -2,11 +2,12 @@ class CreateNoteeTokens < ActiveRecord::Migration
   def change
     create_table :notee_tokens do |t|
       t.string :access_token,    null: false
+      t.integer :user_id
       t.datetime :expires_at,    null: false
 
       t.timestamps null: false
     end
 
-    add_index :notee_tokens, [:access_token], :unique => true
+    add_index :notee_tokens, :access_token, :unique => true
   end
 end

data/db/migrate/20160803154954_create_notee_comments.rb

@@ -1,4 +1,4 @@
-class CreateNoteeComments < ActiveRecord::Migration[5.0]
+class CreateNoteeComments < ActiveRecord::Migration
   def change
     create_table :notee_comments do |t|
       t.integer :post_id

data/db/migrate/20160809145754_create_notee_users.rb

@@ -0,0 +1,17 @@
+class CreateNoteeUsers < ActiveRecord::Migration
+  def change
+    create_table :notee_users do |t|
+      t.string :name, null: false
+      t.string :email, null: false
+      t.string :encrypted_password, null: false
+      t.text :profile
+      t.string :profile_img
+      t.text :sns
+      t.integer :role, null: false
+
+      t.timestamps null: false
+    end
+
+    add_index :notee_users, [:name, :email], :unique => true
+  end
+end

data/lib/notee/configuration.rb

@@ -3,11 +3,15 @@ module Notee
 
     VALID_OPTIONS_KEY = [
       :notee_id,
-      :notee_password
+      :notee_password,
+      :recaptcha_key,
+      :recaptcha_secret_key
     ].freeze
 
     DEFAULT_NOTEE_ID = nil
     DEFAULT_NOTEE_PASSWORD = nil
+    DEFAULT_RECAPTCHA_KEY = nil
+    DEFAULT_RECAPTCHA_SECRET_KEY = nil
 
     attr_accessor *VALID_OPTIONS_KEY
 
@@ -22,6 +26,8 @@ module Notee
     def reset
       self.notee_id = DEFAULT_NOTEE_ID
       self.notee_password = DEFAULT_NOTEE_PASSWORD
+      self.recaptcha_key = DEFAULT_RECAPTCHA_KEY
+      self.recaptcha_secret_key = DEFAULT_RECAPTCHA_SECRET_KEY
     end
 
   end

data/lib/notee/helpers/notee_helper.rb

@@ -67,6 +67,12 @@ module Notee
             return Notee::Post.where(status: Notee::STATUS[:published]).group('year(published_at)').group('month(published_at)').count
         end
       end
+
+      def notee_comments(id)
+        return if id.nil?
+        @notee_comments = Notee::Post.where(post_id: id)
+        @notee_comments
+      end
     end
   end
 end

data/lib/notee/helpers/view_helper.rb

@@ -3,7 +3,7 @@ require 'redcarpet'
 module Notee
   module Helpers
     module ViewHelper
-      def notee_content (notee)
+      def notee_content(notee)
 
         return if notee.nil?
 
@@ -21,9 +21,7 @@ module Notee
       end
 
       def notee_comment_box(id)
-        @comments = Notee::Comment.where(post_id: id)
-        @comment = Notee::Comment.new
-        return render :partial => "notee/partials/comment_box.html.erb", :locals => { :post_id => id}
+        return render :partial => "notee/partials/comment_box.html.erb", :locals => { :post_id => id, :recaptcha => Notee.recaptcha_key}
       end
     end
   end

data/lib/notee/version.rb

@@ -1,3 +1,3 @@
 module Notee
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/lib/tasks/notee_tasks.rake

@@ -62,6 +62,8 @@ require 'notee'
 Notee.configure do |config|
   config.notee_id = "hogehoge"
   config.notee_password = "hogehoge"
+  config.recaptcha_key = "hogehoge"
+  config.recaptcha_secret_key = "hogehoge"
 end
 EOC
 

data/test/dummy/log/development.log

@@ -3020,3 +3020,5 @@ rack (2.0.1) lib/rack/handler/webrick.rb:86:in `service'
   Rendered /Users/takujifunao/Hack/01_mine/02_lib/notee/vendor/bundle/ruby/2.3.0/gems/actionpack-5.0.0/lib/action_dispatch/middleware/templates/rescues/routing_error.html.erb within rescues/layout (213.0ms)
   Rendered /Users/takujifunao/Hack/01_mine/02_lib/notee/vendor/bundle/ruby/2.3.0/gems/actionpack-5.0.0/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (1.2ms)
   Rendered /Users/takujifunao/Hack/01_mine/02_lib/notee/vendor/bundle/ruby/2.3.0/gems/actionpack-5.0.0/lib/action_dispatch/middleware/templates/rescues/routing_error.html.erb within rescues/layout (198.4ms)
+DEPRECATION WARNING: ActiveRecord::Base.raise_in_transactional_callbacks= is deprecated, has no effect and will be removed without replacement. (called from load at /Users/takujifunao/Hack/01_mine/02_lib/notee/vendor/bundle/ruby/2.3.0/bin/rake:23)
+DEPRECATION WARNING: ActiveRecord::Base.raise_in_transactional_callbacks= is deprecated, has no effect and will be removed without replacement. (called from load at /Users/takujifunao/Hack/01_mine/02_lib/notee/vendor/bundle/ruby/2.3.0/bin/rake:23)

data/test/fixtures/notee/users.yml

@@ -0,0 +1,19 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  name: MyString
+  email: MyString
+  encrypt_password: MyString
+  profile: MyText
+  profile_img: MyString
+  sns: MyText
+  role: 1
+
+two:
+  name: MyString
+  email: MyString
+  encrypt_password: MyString
+  profile: MyText
+  profile_img: MyString
+  sns: MyText
+  role: 1

data/test/models/notee/user_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+module Notee
+  class UserTest < 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.6
+  version: 0.3.7
 platform: ruby
 authors:
 - takujifunao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -148,6 +148,7 @@ files:
 - app/controllers/notee/posts_controller.rb
 - app/controllers/notee/statuses_controller.rb
 - app/controllers/notee/tokens_controller.rb
+- app/controllers/notee/users_controller.rb
 - app/helpers/notee/application_helper.rb
 - app/helpers/notee/categories_helper.rb
 - app/helpers/notee/comments_helper.rb
@@ -158,6 +159,7 @@ files:
 - app/models/notee/image.rb
 - app/models/notee/post.rb
 - app/models/notee/token.rb
+- app/models/notee/user.rb
 - app/views/layouts/notee/application.html.erb
 - app/views/notee/notees/index.html.erb
 - app/views/notee/partials/_comment_box.html.erb
@@ -169,6 +171,7 @@ files:
 - db/migrate/20160605141547_create_notee_images.rb
 - db/migrate/20160608102012_create_notee_tokens.rb
 - db/migrate/20160803154954_create_notee_comments.rb
+- db/migrate/20160809145754_create_notee_users.rb
 - lib/notee.rb
 - lib/notee/configuration.rb
 - lib/notee/engine.rb
@@ -353,12 +356,14 @@ files:
 - test/fixtures/notee/images.yml
 - test/fixtures/notee/posts.yml
 - test/fixtures/notee/tokens.yml
+- test/fixtures/notee/users.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
+- test/models/notee/user_test.rb
 - test/notee_test.rb
 - test/test_helper.rb
 homepage: https://github.com/maru-3/notee.git
@@ -560,12 +565,14 @@ test_files:
 - test/fixtures/notee/images.yml
 - test/fixtures/notee/posts.yml
 - test/fixtures/notee/tokens.yml
+- test/fixtures/notee/users.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
+- test/models/notee/user_test.rb
 - test/notee_test.rb
 - test/test_helper.rb
 has_rdoc: