redactor3_rails 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abc1b66b53f02bdddd3a0c9afbba1b38345d1c6d6a55a1baf18ebb71641e6939
-  data.tar.gz: 40934b6a18c82e86cc133e260416024b940e8e95afec51de4e43515e1e450581
+  metadata.gz: 5f747abf8b7f354a610102a481773bfb2e87e0f44fd2af40421a8b873bca5686
+  data.tar.gz: 514820ce60bf0e2ffd20d035cdaf3788ad72bf53949cfee959e84e9fc27e8903
 SHA512:
-  metadata.gz: 0d21a5abe2b26251b4fbbe67b7c72177e06127a71ec70e7aca02b0e9e861734a4fc74c02b8e2e51c6569ca4ada3ace789491f60044993f9df37b96a82277c15f
-  data.tar.gz: e94992c4413d26c4156bd373648e8e994e39a116defb5697b5c504081da8f44c139070975b84285245003794c26ffceafbf2f7f29de6af5d0e1fdf47053797c7
+  metadata.gz: 14a67f941496305fdcbadcafc7d1792a3eed3e48a62a1418cd56009690e60a1912bcf10e76927b4da9d316d04f974ff4d1a8f3a4af3c40638fbb938cc8a93a88
+  data.tar.gz: e0237100a73c60c08f57a0d6f62dabeb9fac5f9496e52f37f56d8ea4e3ce7d6bd7d280af3a0c856d3af0e37129dd4366af2b93af2e738b53441934a773366b14

data/README.md

@@ -148,11 +148,11 @@ Create a new Migration: `rails g rename_user_id_to_new_user_id`
 
     class RenameUserIdToNewUserId < ActiveRecord::Migration
       def up
-        rename_column :redactor3_assets, :user_id, :admin_user_id
+        rename_column :redactor_assets, :user_id, :admin_user_id
       end
 
       def down
-        rename_column :redactor3_assets, :admin_user_id, :user_id
+        rename_column :redactor_assets, :admin_user_id, :user_id
       end
     end
 

data/lib/generators/redactor3/install_generator.rb

@@ -41,9 +41,9 @@ module Redactor3
       def create_migrations
         if orm.to_s == "active_record"
           if ARGV.include?('--devise')
-            migration_template "#{generator_dir}/devise_migration.rb", File.join('db/migrate', 'create_redactor3_assets.rb')
+            migration_template "#{generator_dir}/devise_migration.rb", File.join('db/migrate', 'create_redactor_assets.rb')
           else
-            migration_template "#{generator_dir}/migration.rb", File.join('db/migrate', 'create_redactor3_assets.rb')
+            migration_template "#{generator_dir}/migration.rb", File.join('db/migrate', 'create_redactor_assets.rb')
           end
         end
       end

data/lib/generators/redactor3/templates/active_record/carrierwave/devise_migration.rb

@@ -1,6 +1,6 @@
-class CreateRedactor3Assets < ActiveRecord::Migration
+class CreateRedactorAssets < ActiveRecord::Migration
   def self.up
-    create_table :redactor3_assets do |t|
+    create_table :redactor_assets do |t|
       # Change column name and override Redactor3Rails.devise_user_key
       t.integer :user_id
 
@@ -19,11 +19,11 @@ class CreateRedactor3Assets < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index 'redactor3_assets', ['assetable_type', 'type', 'assetable_id'], :name => 'idx_redactor3_assetable_type'
-    add_index 'redactor3_assets', ['assetable_type', 'assetable_id'], :name => 'idx_redactor3_assetable'
+    add_index 'redactor_assets', ['assetable_type', 'type', 'assetable_id'], :name => 'idx_redactor_assetable_type'
+    add_index 'redactor_assets', ['assetable_type', 'assetable_id'], :name => 'idx_redactor_assetable'
   end
 
   def self.down
-    drop_table :redactor3_assets
+    drop_table :redactor_assets
   end
 end

data/lib/generators/redactor3/templates/active_record/carrierwave/migration.rb

@@ -1,6 +1,7 @@
-class CreateRedactor3Assets < ActiveRecord::Migration
+class CreateRedactorAssets < ActiveRecord::Migration
   def self.up
-    create_table :redactor3_assets do |t|
+    create_table :redactor_assets do |t|
+      t.string :custom_file_name
       t.string :data_file_name, :null => false
       t.string :data_content_type
       t.integer :data_file_size
@@ -15,11 +16,11 @@ class CreateRedactor3Assets < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index 'redactor3_assets', ['assetable_type', 'type', 'assetable_id'], :name => 'idx_redactor3_assetable_type'
-    add_index 'redactor3_assets', ['assetable_type', 'assetable_id'], :name => 'idx_redactor3_assetable'
+    add_index 'redactor_assets', ['assetable_type', 'type', 'assetable_id'], :name => 'idx_redactor_assetable_type'
+    add_index 'redactor_assets', ['assetable_type', 'assetable_id'], :name => 'idx_redactor_assetable'
   end
 
   def self.down
-    drop_table :redactor3_assets
+    drop_table :redactor_assets
   end
 end

data/lib/generators/redactor3/templates/active_record/carrierwave/{redactor2 → redactor3}/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/active_record/carrierwave/{redactor2 → redactor3}/image.rb

@@ -1,5 +1,5 @@
 class Redactor3Rails::Image < 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/generators/redactor3/templates/base/carrierwave/uploaders/redactor3_rails_file_uploader.rb

@@ -6,7 +6,7 @@ class Redactor3RailsFileUploader < CarrierWave::Uploader::Base
   storage :file
 
   def store_dir
-    "system/redactor3_assets/files/#{model.id}"
+    "system/redactor_assets/files/#{model.id}"
   end
 
   def extension_white_list

data/lib/generators/redactor3/templates/base/carrierwave/uploaders/redactor3_rails_image_uploader.rb

@@ -14,7 +14,7 @@ class Redactor3RailsImageUploader < CarrierWave::Uploader::Base
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-    "system/redactor3_assets/images/#{model.id}"
+    "system/redactor_assets/images/#{model.id}"
   end
 
   # Provide a default URL as a default if there hasn't been a file uploaded:

data/lib/redactor3_rails/orm/active_record.rb

@@ -12,7 +12,7 @@ module Redactor3Rails
         module ClassMethods
           def self.extended(base)
             base.class_eval do
-              self.table_name = 'redactor3_assets'
+              self.table_name = 'redactor_assets'
 
               belongs_to :assetable, :polymorphic => true
               belongs_to Redactor3Rails.devise_user, :foreign_key => Redactor3Rails.devise_user_key

data/lib/redactor3_rails/orm/mongoid.rb

@@ -12,7 +12,7 @@ module Redactor3Rails
         module ClassMethods
           def self.extended(base)
             base.class_eval do
-              store_in :collection => 'redactor3_assets'
+              store_in :collection => 'redactor_assets'
 
               belongs_to :assetable, :polymorphic => true
 

data/lib/redactor3_rails/version.rb

@@ -1,3 +1,3 @@
 module Redactor3Rails
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/redactor3_rails.rb

@@ -21,18 +21,12 @@ module Redactor3Rails
   @@images_file_types = ['jpg', 'jpeg', 'png', 'gif', 'tiff']
   @@files_file_types = ['pdf', 'doc', 'docx', 'xls', 'xlsx', 'rtf', 'txt']
 
-
-  def self.image_model
-    Redactor3Rails::Image
-  end
-
-  def self.file_model
-    Redactor3Rails::File
-  end
-
-  def self.devise_user
-    :user
-  end
+  mattr_accessor :image_model, :file_model, :devise_user, :image_uploader, :file_uploader
+  @@image_model = Redactor3Rails::Image
+  @@file_model = Redactor3Rails::File
+  @@devise_user = :user
+  @@file_uploader = Redactor3RailsFileUploader
+  @@image_uploader = Redactor3RailsImageUploader
 
   def self.devise_user_key
     "#{self.devise_user.to_s}_id".to_sym

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redactor3_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Oleg Sulyanov
@@ -104,9 +104,9 @@ files:
 - lib/generators/redactor3/install_generator.rb
 - lib/generators/redactor3/templates/active_record/carrierwave/devise_migration.rb
 - lib/generators/redactor3/templates/active_record/carrierwave/migration.rb
-- lib/generators/redactor3/templates/active_record/carrierwave/redactor2/asset.rb
-- lib/generators/redactor3/templates/active_record/carrierwave/redactor2/file.rb
-- lib/generators/redactor3/templates/active_record/carrierwave/redactor2/image.rb
+- lib/generators/redactor3/templates/active_record/carrierwave/redactor3/asset.rb
+- lib/generators/redactor3/templates/active_record/carrierwave/redactor3/file.rb
+- lib/generators/redactor3/templates/active_record/carrierwave/redactor3/image.rb
 - lib/generators/redactor3/templates/base/carrierwave/uploaders/redactor3_rails_file_uploader.rb
 - lib/generators/redactor3/templates/base/carrierwave/uploaders/redactor3_rails_image_uploader.rb
 - lib/generators/redactor3/templates/config.js