redactor-rails 0.3.3 → 0.3.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTViMDQ4MzY0OGE2MzY2YjAzNWUyMDA1NmU4NzQ5ZjI1ZGJjNzE0NQ==
+  data.tar.gz: !binary |-
+    OTU5Yjg0ZjVmZmJkMDJmMWZhNDYxNjYxMmQ4YjMxYmZkODBjYzgwZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MmFmODg5MmU5MDdmOGUxNzY3ZmM3MmUzOTUxMTU0ODIzZjIwMjhmZTU1ZjU2
+    OTRlZGI4Nzk1YWM1MTNjOWJlNmYwOTE1NmJiNWVjNmRmNWZjMDIwNGU1ZWNj
+    NDYyMTA5OWYzYjJlYzdiZDk4NjM5Yjc2OTBhYjI5M2RkM2U4NjQ=
+  data.tar.gz: !binary |-
+    MjljMDJjNTVmY2Y1YjI3MDRkZGU2NjkxMjRmNmVmY2RmNjE1NWIwYTkxM2Ri
+    YzBhNThlZDJjM2Q3Y2FlOTAwNTkwZmJiZWI2NDQ2ZGQ0NTlmZjk2M2UyODRl
+    NjZlZjhjMTNjZjIyZmE2NGVkZDQzNjdhODhiNzU3NDY4YThmNGY=

data/README.md

@@ -83,7 +83,64 @@ and
 Add to your layout
 
     <%= redactor_lang('zh_tw') %>
-
+    
+### Defining a Devise User Model
+
+By default redactor-rails uses the `User` model.
+
+You may use a different model by:
+
+1. Run a migration to update the user_id column in the 
+2. Overriding the user class in an initializer.
+3. Overriding the authentication helpers in your controller.
+
+    Create a new Migration: `rails g rename_user_id_to_new_user_id`
+    
+    ```
+    # db/migrate/...rename_user_id_to_new_user_id.rb
+    
+    class RenameUserIdToNewUserId < ActiveRecord::Migration
+      def up
+        rename_column :redactor_assets, :user_id, :admin_user_id
+      end
+    
+      def down
+        rename_column :redactor_assets, :admin_user_id, :user_id
+      end
+    end
+    ```
+
+    ```
+    # config/redactor.rb
+    # Overrides the user class
+    
+    module RedactorRails
+      def self.devise_user
+        %s(admin_user) # name of your user class
+      end
+      
+      # You may override this to support legacy schema.
+      # def self.devise_user_key
+      #   "#{self.devise_user.to_s}_id".to_sym
+      # end
+    end
+    ```
+    
+    ```
+    # app/controllers/application_controller.rb
+    
+    class ApplicationController < ActionController::Base
+      ...
+      
+      def redactor_authenticate_user!
+        authenticate_admin_user! # devise before_filter
+      end
+    
+      def redactor_current_user
+        current_admin_user # devise user helper
+      end
+    end
+    ```
 
 ## Contributing
 

data/app/controller/redactor_rails/documents_controller.rb

@@ -1,20 +1,20 @@
 class RedactorRails::DocumentsController < ApplicationController
-  before_filter :authenticate_user! if RedactorRails.document_model.new.respond_to?(:user_id)
+  before_filter :redactor_authenticate_user! if RedactorRails.document_model.new.respond_to?(RedactorRails.devise_user)
 
   def index
     @documents = RedactorRails.document_model.where(
-        RedactorRails.document_model.new.respond_to?(:user_id) ? { user_id: current_user.id } : { })
+        RedactorRails.document_model.new.respond_to?(RedactorRails.devise_user) ? { RedactorRails.devise_user_key => redactor_current_user.id } : { })
     render :json => @documents.to_json
   end
 
   def create
-    @document = RedactorRails::Document.new
+    @document = RedactorRails.document_model.new
 
     file = params[:file]
     @document.data = RedactorRails::Http.normalize_param(file, request)
-    if @document.respond_to?(:user_id)
-      @document.user = current_user
-      @document.assetable = current_user
+    if @document.respond_to?(RedactorRails.devise_user)
+      @document.send("#{RedactorRails.devise_user}=", redactor_current_user)
+      @document.assetable = redactor_current_user
     end
 
     if @document.save

data/app/controller/redactor_rails/pictures_controller.rb

@@ -1,20 +1,20 @@
 class RedactorRails::PicturesController < ApplicationController
-  before_filter :authenticate_user! if RedactorRails.picture_model.new.respond_to?(:user_id)
+  before_filter :redactor_authenticate_user! if RedactorRails.picture_model.new.respond_to?(RedactorRails.devise_user)
 
   def index
     @pictures = RedactorRails.picture_model.where(
-        RedactorRails.picture_model.new.respond_to?(:user_id) ? { user_id: current_user.id } : { })
+        RedactorRails.picture_model.new.respond_to?(RedactorRails.devise_user) ? { RedactorRails.devise_user_key => redactor_current_user.id } : { })
     render :json => @pictures.to_json
   end
 
   def create
-    @picture = RedactorRails::Picture.new
+    @picture = RedactorRails.picture_model.new
 
     file = params[:file]
     @picture.data = RedactorRails::Http.normalize_param(file, request)
-    if @picture.respond_to?(:user_id)
-      @picture.user = current_user
-      @picture.assetable = current_user
+    if @picture.respond_to?(RedactorRails.devise_user)
+      @picture.send("#{RedactorRails.devise_user}=", redactor_current_user)
+      @picture.assetable = redactor_current_user
     end
 
     if @picture.save

data/lib/generators/redactor/templates/active_record/carrierwave/redactor/document.rb

@@ -4,4 +4,8 @@ class RedactorRails::Document < RedactorRails::Asset
   def url_content
     url(:content)
   end
+
+  def as_json_methods
+    [:image]
+  end
 end

data/lib/redactor-rails.rb

@@ -7,6 +7,7 @@ module RedactorRails
   FILE_TYPES = ['application/msword', 'application/pdf', 'text/plain', 'text/rtf', 'application/vnd.ms-excel']
 
   autoload :Http, 'redactor-rails/http'
+  autoload :Devise, 'redactor-rails/devise'
 
   module Backend
     autoload :CarrierWave, 'redactor-rails/backend/carrierwave'
@@ -29,4 +30,12 @@ module RedactorRails
   def self.document_model
     RedactorRails::Document
   end
+
+  def self.devise_user
+    %s(user)
+  end
+
+  def self.devise_user_key
+    "#{self.devise_user.to_s}_id".to_sym
+  end
 end

data/lib/redactor-rails/devise.rb

@@ -0,0 +1,11 @@
+module RedactorRails
+  module Devise
+    def redactor_authenticate_user!
+      authenticate_user!
+    end
+
+    def redactor_current_user
+      current_user
+    end
+  end
+end

data/lib/redactor-rails/engine.rb

@@ -3,8 +3,12 @@ module RedactorRails
     isolate_namespace RedactorRails
     initializer "helper" do |app|
       ActiveSupport.on_load(:action_view) do
-	include RedactorRails::Helpers
+        include RedactorRails::Helpers
       end
     end
+
+    initializer "redactor_devise" do |app|
+      ActionController::Base.send :include, RedactorRails::Devise
+    end
   end
 end

data/lib/redactor-rails/orm/active_record.rb

@@ -15,7 +15,7 @@ module RedactorRails
               self.table_name = "redactor_assets"
 
               belongs_to :assetable, :polymorphic => true
-              belongs_to :user,      :dependent   => :destroy
+              belongs_to RedactorRails.devise_user, :dependent => :destroy, :foreign_key => RedactorRails.devise_user_key
 
               attr_accessible :data, :assetable_type, :assetable_id, :assetable
             end

data/lib/redactor-rails/version.rb

@@ -1,3 +1,3 @@
 module RedactorRails
-  VERSION = "0.3.3"
+  VERSION = "0.3.5"
 end

data/vendor/assets/javascripts/redactor-rails/langs/zh_cn.js

@@ -63,5 +63,8 @@ RELANG['zh_cn'] = {
 	horizontalrule: '水平线',
 	fullscreen: '全屏',
 	deleted: '删除',
-	anchor: '锚点'
+	anchor: '锚点',
+	link_new_tab: '在新窗口打开',
+	underline: '下划线',
+	alignment: '对齐方式'
 };

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: redactor-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.3
-  prerelease: 
+  version: 0.3.5
 platform: ruby
 authors:
 - Sammy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -89,6 +82,7 @@ files:
 - lib/generators/redactor/templates/mongoid/carrierwave/redactor/picture.rb
 - lib/redactor-rails.rb
 - lib/redactor-rails/backend/carrierwave.rb
+- lib/redactor-rails/devise.rb
 - lib/redactor-rails/engine.rb
 - lib/redactor-rails/helper.rb
 - lib/redactor-rails/http.rb
@@ -144,27 +138,26 @@ files:
 - vendor/assets/stylesheets/redactor-rails/index.css
 homepage: https://github.com/SammyLin/redactor-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ''
 test_files: []
 has_rdoc: