notee 0.2.8 → 0.2.9

data/app/controllers/notee/application_controller.rb

@@ -1,12 +1,11 @@
 module Notee
   class ApplicationController < ActionController::Base
 
-    before_filter :set_access_token
-    before_filter :restrict_access_json
+    before_action :set_access_token
+    before_action :restrict_access_json
 
     private
     def set_access_token
-      p "TODO: add access_token to http header"
       # request['Authorization: Token token'] = session[:access_token] if session[:access_token].present?
     end
 

data/app/controllers/notee/posts_controller.rb

@@ -3,9 +3,11 @@ require_dependency "notee/application_controller"
 module Notee
   class PostsController < ApplicationController
 
+    # callbacks
     before_action :set_post, only: [:show, :update, :destroy]
-    skip_before_filter :restrict_access_json, only: [:notee]
-    before_filter :restrict_access, only: [:notee]
+    skip_before_action :restrict_access_json, only: [:notee]
+    before_action :restrict_access, only: [:notee]
+
 
     def notee
     end

data/app/models/notee/category.rb

@@ -1,7 +1,12 @@
 module Notee
   class Category < ActiveRecord::Base
+
+    # callbacks
     before_save :set_slug
 
+    # relations
+    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?
     end

data/app/models/notee/image.rb

@@ -2,9 +2,14 @@ require 'securerandom'
 
 module Notee
   class Image < ActiveRecord::Base
+
+    # accessors
     attr_accessor :file
+
+    # callbacks
     before_save :manage_image
 
+    private
     def manage_image
       return unless self.file
 

data/app/models/notee/post.rb

@@ -1,8 +1,14 @@
 module Notee
   class Post < ActiveRecord::Base
+
+    # callbacks
     before_create :set_title
     before_create :set_slug
 
+    # relations
+    belongs_to :category
+    belongs_to :thumbnail, :class_name => Notee::Image, :foreign_key => 'thumbnail_id'
+
     def set_title
       self.title = "no_title#{Notee::Post.count}" unless self.title.present?
     end

data/app/models/notee/token.rb

@@ -1,5 +1,7 @@
 module Notee
   class Token < ActiveRecord::Base
+
+    # callbacks
     before_create :generate_access_token
     before_create :set_expires_at
 

data/db/migrate/20160605141510_create_notee_categories.rb

@@ -1,9 +1,11 @@
 class CreateNoteeCategories < ActiveRecord::Migration
+  class NoteeCategory < ActiveRecord::Base; end
+
   def change
     create_table :notee_categories do |t|
 
       t.string  :name, null: false, default: "category_name"
-      t.string  :slug, null: false, default: "#{Time.now.strftime("%Y-%H-%M-%S")}", uniqueness: true
+      t.string  :slug, null: false, uniqueness: true
       t.integer :parent_id
       t.integer :status, null: false, default: 0
 
@@ -11,5 +13,8 @@ class CreateNoteeCategories < ActiveRecord::Migration
     end
 
     add_index :notee_categories, [:slug], :unique => true
+
+    # create default category
+    Notee::Category.create :name => 'None'
   end
 end

data/db/migrate/20160605141547_create_notee_images.rb

@@ -1,4 +1,6 @@
 class CreateNoteeImages < ActiveRecord::Migration
+  class NoteeImage < ActiveRecord::Base; end
+
   def change
     create_table :notee_images do |t|
 
@@ -9,6 +11,10 @@ class CreateNoteeImages < ActiveRecord::Migration
 
       t.timestamps null: false
     end
+
+    # create default image
+    default_image = Notee::Image.create :content => 'aa'
+    default_image.update_column("content", "default.png")
   end
 
 end

data/lib/notee/engine.rb

@@ -5,7 +5,7 @@ module Notee
   class Engine < ::Rails::Engine
     isolate_namespace Notee
 
-    initializer "notee.assets.precompile" do |app|
+    initializer 'notee.assets.precompile' do |app|
       app.config.assets.precompile += %w(*.js *.css)
     end
 

data/lib/notee/version.rb

@@ -1,3 +1,3 @@
 module Notee
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/lib/tasks/notee_tasks.rake

@@ -1,10 +1,12 @@
 desc 'setup notee'
 namespace :notee do
+
   task :start do
     notee_mark
     sh 'bundle exec rake notee:install:migrations'
     add_engine_to_route
     create_initializer_file
+    setup_default
   end
 
   def notee_mark
@@ -68,4 +70,22 @@ EOC
     puts 'you should change notee_id & notee_password'
   end
 
+  def setup_default
+    copy_default_image
+  end
+
+  private
+
+  def copy_default_image
+    image_dir = Rails.root.to_s + '/public/notee'
+    FileUtils.mkdir_p(image_dir) unless FileTest.exist?(image_dir)
+
+    image_url = image_dir + '/default.png'
+    unless FileTest.exist?(image_url)
+      open(image_url, 'wb') do |output|
+        output.write(File.open(File.expand_path('../images/default.png', __FILE__)).read)
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notee
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - takujifunao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,6 +165,7 @@ files:
 - lib/notee/helper.rb
 - lib/notee/version.rb
 - lib/notee/view_helper.rb
+- lib/tasks/images/default.png
 - lib/tasks/notee_tasks.rake
 - test/controllers/notee/categories_controller_test.rb
 - test/controllers/notee/images_controller_test.rb