redactor3_rails 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ead135f7c23b149f86d21c2cf44faa4a817996ba60671c86d55b65913b3d31d
-  data.tar.gz: 3f8e9b928a23b1f9d075d240a08e53bbc3b2296a8a02863994b287cbc8f470ab
+  metadata.gz: a999fc5071bb6552ec994262c01850bcbfbadde6dc693d6dec6dd883ea450960
+  data.tar.gz: 2d130fd02b520f28f799f7d15afa39a6a5c3acbf5d616ea37fe512d6b0e3ecb8
 SHA512:
-  metadata.gz: 96708663f3af61e0c18be0afc6a17ead9fb78a15d47b6cd44867206d39df6b68e190c5e76460064a7168be8b05efeb0cf6fcab8b05c04efd0e58e44420318544
-  data.tar.gz: 28a3b329540a465c30d79068a62bbe9756c238b590b236e11ca3800909d3f328874b103a267723ef7f8361eafe4508c5a2aec0fcd734dc3ddf43a8d454519e5b
+  metadata.gz: a9794457b03e65a26804bd9e5c6c4be3e70356719f0580a4b7c1800fcb6d1e24cc18bfe9e03df5188407cc4933814dd327e0b647990e8238132fdfe406181f93
+  data.tar.gz: f7d81de078dafe5059a62a5d87d0c6867c2f01f1064e7925f7648c7113cefafed75ec6a8a5c7901a5e3805039d7af556ea1802774122cc308739517258ffa966

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/*.gem

data/app/controller/redactor3_rails/files_controller.rb

@@ -1,5 +1,6 @@
-class Redactor3Rails::FilesController < ApplicationController
-  before_filter :redactor3_authenticate_user!
+class Redactor3Rails::FilesController < Redactor3Rails.base_controller
+  include ActionView::Helpers::NumberHelper
+  before_action :redactor3_authenticate_user!
 
   def create
     json = {}
@@ -26,7 +27,7 @@ class Redactor3Rails::FilesController < ApplicationController
   end
 
   def index
-    json = Redactor3Rails.file_model.order('id DESC').map do |file|
+    json = Redactor3Rails.file_model.where(user_id: redactor3_current_user.id).order('id DESC').map do |file|
       {
         title: file.custom_file_name,
         size: number_to_human_size(file.data_file_size),
@@ -36,12 +37,4 @@ class Redactor3Rails::FilesController < ApplicationController
     end
     render json: json
   end
-
-  private
-
-  def redactor3_authenticate_user!
-    if Redactor3Rails.file_model.new.has_attribute?(Redactor3Rails.devise_user)
-      super
-    end
-  end
 end

data/app/controller/redactor3_rails/images_controller.rb

@@ -1,5 +1,6 @@
-class Redactor3Rails::ImagesController < ApplicationController
-  before_filter :redactor3_authenticate_user!
+class Redactor3Rails::ImagesController < Redactor3Rails.base_controller
+  skip_before_action :verify_authenticity_token
+  before_action :redactor3_authenticate_user!
 
   def create
     json = {}
@@ -11,7 +12,6 @@ class Redactor3Rails::ImagesController < ApplicationController
         @image.send("#{Redactor3Rails.devise_user}=", redactor3_current_user)
         @image.assetable = redactor3_current_user
       end
-
       if @image.save
         json["file-#{i}"] = { id: @image.id, url: @image.url(:content) }
       else
@@ -25,7 +25,7 @@ class Redactor3Rails::ImagesController < ApplicationController
   end
 
   def index
-    json = Redactor3Rails.image_model.order('id DESC').map do |image|
+    json = Redactor3Rails.image_model.where(user_id: redactor3_current_user.id).order('id DESC').map do |image|
       {
         thumb: image.data.thumb.url,
         url: image.url(:content),
@@ -34,12 +34,4 @@ class Redactor3Rails::ImagesController < ApplicationController
     end
     render json: json
   end
-
-  private
-
-  def redactor3_authenticate_user!
-    if Redactor3Rails.image_model.new.has_attribute?(Redactor3Rails.devise_user)
-      super
-    end
-  end
 end

data/lib/generators/redactor3/templates/mongoid/carrierwave/redactor/file.rb

@@ -1,5 +1,5 @@
 class Redactor3Rails::File < Redactor3Rails::Asset
-  mount_uploader :data, Redactor3RailsFileUploader, :mount_on => :data_file_name
+  mount_uploader :data, Redactor3Rails.file_uploader, :mount_on => :data_file_name
 
   def url_content
     url(:content)

data/lib/generators/redactor3/templates/mongoid/carrierwave/redactor/picture.rb

@@ -1,5 +1,5 @@
 class Redactor3Rails::Picture < Redactor3Rails::Asset
-  mount_uploader :data, Redactor3RailsImageUploader, :mount_on => :data_file_name
+  mount_uploader :data, Redactor3Rails.image_uploader, :mount_on => :data_file_name
 
   def url_content
     url(:content)

data/lib/redactor3_rails/devise.rb

@@ -1,5 +1,8 @@
 module Redactor3Rails
   module Devise
+
+    private
+
     def redactor3_authenticate_user!
       authenticate_user!
     end

data/lib/redactor3_rails/version.rb

@@ -1,3 +1,3 @@
 module Redactor3Rails
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/redactor3_rails.rb

@@ -22,6 +22,14 @@ module Redactor3Rails
   @@files_file_types = ['pdf', 'doc', 'docx', 'xls', 'xlsx', 'rtf', 'txt']
 
   class << self
+    def base_controller=(v)
+      @base_controller = v
+    end
+
+    def base_controller
+      @base_controller ||= ApplicationController
+    end
+
     def image_model=(v)
       @image_model = v
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redactor3_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Oleg Sulyanov