redactor-rails 0.2.5 → 0.3

data/README.md

@@ -31,12 +31,12 @@ Create a `config/redactor.yml` file with your global configuration options, like
     lang: 'zh_tw'
     autoresize: true
     buttons:
-	- html
-	- '|'
-	- formatting
-	- '|'
-	- bold
-	- italic
+		- html
+		- '|'
+		- formatting
+		- '|'
+		- bold
+		- italic
 
 If You Want To setup a new language in Redactor you should do two things:
 

data/app/controller/redactor_rails/pictures_controller.rb

@@ -1,6 +1,6 @@
 class RedactorRails::PicturesController < ApplicationController
   def index
-    @pictures = RedactorRails.picture_model.find_all
+    @pictures = RedactorRails.picture_model.find_all({})
     render :json => @pictures.to_json
 
   end

data/lib/generators/redactor/config_generator.rb

@@ -0,0 +1,18 @@
+require 'rails/generators'
+module Redactor
+  module Generators
+    class ConfigGenerator < ::Rails::Generators::Base
+      desc "Generates redactor-rails config"
+
+      def self.source_root
+	@source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      end
+
+
+      def create_config
+	template "config.js",
+	  File.join('app/assets/javascripts/redactor-rails', "config.js")
+      end
+    end
+  end
+end

data/lib/generators/redactor/templates/config.js

@@ -0,0 +1,15 @@
+$(document).ready(
+  function(){
+  var csrf_token = $('meta[name=csrf-token]').attr('content');
+  var csrf_param = $('meta[name=csrf-param]').attr('content');
+  var params;
+  if (csrf_param !== undefined && csrf_token !== undefined) {
+    params = csrf_param + "=" + encodeURIComponent(csrf_token);
+  }
+  $('.redactor').redactor(
+    { "imageUpload":"/redactor_rails/pictures?" + params,
+      "imageGetJson":"/redactor_rails/pictures",
+      "path":"/assets/redactor-rails",
+      "css":"style.css"}
+  );
+});

data/lib/redactor-rails.rb

@@ -13,15 +13,10 @@ module RedactorRails
   require 'redactor-rails/orm/active_record'
   require 'redactor-rails/engine'
   require 'redactor-rails/helper'
-  require 'redactor-rails/configuration'
 
   mattr_accessor :image_file_types
   @@image_file_types = ["jpg", "jpeg", "png", "gif", "tiff"]
 
-  def self.configuration
-    @configuration ||= Configuration.load(::Rails.root.join("config/redactor.yml"))
-  end
-
 
   def self.picture_model
     RedactorRails::Picture.to_adapter

data/lib/redactor-rails/helper.rb

@@ -1,14 +1,5 @@
 module RedactorRails
   module Helpers
-    def redactor(options={})
-      javascript_tag { redactor_javascript(options) }
-    end
-
-    # Returns the JavaScript code required to initialize RedactorRailsjs.
-    def redactor_javascript(options={})
-      configuration = RedactorRails.configuration.merge(options)
-      "$(document).ready(function(){$('.redactor').redactor(#{configuration.options_for_redactor.to_json});});".html_safe
-    end
     # Setting Redactor Language
     def redactor_lang(lang = 'en')
       javascript_include_tag "redactor-rails/langs/#{lang}.js"

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

@@ -25,7 +25,8 @@ module RedactorRails
 
           def as_json(options = nil)
             options = {
-              :methods => as_json_methods
+              :methods => as_json_methods,
+              :root => false
             }
 
             super options

data/lib/redactor-rails/version.rb

@@ -1,3 +1,3 @@
 module RedactorRails
-  VERSION = "0.2.5"
+  VERSION = "0.3"
 end

data/vendor/assets/javascripts/redactor-rails/config.js

@@ -0,0 +1,15 @@
+$(document).ready(
+  function(){
+  var csrf_token = $('meta[name=csrf-token]').attr('content');
+  var csrf_param = $('meta[name=csrf-param]').attr('content');
+  var params;
+  if (csrf_param !== undefined && csrf_token !== undefined) {
+    params = csrf_param + "=" + encodeURIComponent(csrf_token);
+  }
+  $('.redactor').redactor(
+    { "imageUpload":"/redactor_rails/pictures?" + params,
+      "imageGetJson":"/redactor_rails/pictures",
+      "path":"/assets/redactor-rails",
+      "css":"style.css"}
+  );
+});

data/vendor/assets/javascripts/redactor-rails/index.js

@@ -1 +1,2 @@
 //= require ./redactor.min
+//= require ./config

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

@@ -63,7 +63,7 @@ RELANG['hr'] = {
 	align_right: 'Poravnaj desno',
 	align_justify: 'Od ruba do ruba',
 	horizontalrule: 'Horizontalna crta',
-	fullscreen: 'Prikaz preko �itavog ekrana',
+	fullscreen: 'Prikaz preko èitavog ekrana',
 	deleted: 'Izbrisano',
 	anchor: 'Sidro'
 };

data/vendor/assets/stylesheets/redactor-rails/css/style.css

@@ -0,0 +1,20 @@
+html, body {
+	margin: 0;
+	padding: 0;
+}
+
+
+/* =Typography
+-----------------------------------------------------------------------------*/
+body {
+	font-family: Helvetica, Arial, sans-serif;	
+	font-size: 14px;
+}
+
+
+/* =Layout
+-----------------------------------------------------------------------------*/
+#page {
+	width: 960px;
+	margin: 50px auto;
+}

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: redactor-rails
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 13
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Sammy
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-17 00:00:00 Z
+date: 2012-08-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
@@ -62,14 +61,15 @@ files:
 - Rakefile
 - app/controller/redactor_rails/pictures_controller.rb
 - config/routes.rb
+- lib/generators/redactor/config_generator.rb
 - lib/generators/redactor/install_generator.rb
 - lib/generators/redactor/templates/active_record/carrierwave/migration.rb
 - lib/generators/redactor/templates/active_record/carrierwave/redactor/asset.rb
 - lib/generators/redactor/templates/active_record/carrierwave/redactor/picture.rb
 - lib/generators/redactor/templates/base/carrierwave/uploaders/redactor_rails_picture_uploader.rb
+- lib/generators/redactor/templates/config.js
 - lib/redactor-rails.rb
 - lib/redactor-rails/backend/carrierwave.rb
-- lib/redactor-rails/configuration.rb
 - lib/redactor-rails/engine.rb
 - lib/redactor-rails/helper.rb
 - lib/redactor-rails/http.rb
@@ -77,6 +77,7 @@ files:
 - lib/redactor-rails/orm/base.rb
 - lib/redactor-rails/version.rb
 - redactor-rails.gemspec
+- vendor/assets/javascripts/redactor-rails/config.js
 - vendor/assets/javascripts/redactor-rails/css/docstyle.css
 - vendor/assets/javascripts/redactor-rails/css/style.css
 - vendor/assets/javascripts/redactor-rails/css/wym.css
@@ -108,6 +109,7 @@ files:
 - vendor/assets/javascripts/redactor-rails/redactor.js
 - vendor/assets/javascripts/redactor-rails/redactor.min.js
 - vendor/assets/stylesheets/redactor-rails/css/redactor.css
+- vendor/assets/stylesheets/redactor-rails/css/style.css
 - vendor/assets/stylesheets/redactor-rails/img/icons.png
 - vendor/assets/stylesheets/redactor-rails/index.css
 homepage: https://github.com/SammyLin/redactor-rails

data/lib/redactor-rails/configuration.rb

@@ -1,42 +0,0 @@
-module RedactorRails
-  class Configuration
-    class Function < String
-      def encode_json(encoder)
-	self
-      end
-    end
-
-    def self.defaults
-      {
-	imageUpload: '/redactor_rails/pictures',
-	imageGetJson: '/redactor_rails/pictures'
-      }
-    end
-
-    attr_reader :options
-
-    def initialize(options)
-      @options = options
-    end
-
-
-    def options_for_redactor
-      options
-    end
-
-    def merge(options)
-      self.class.new(self.options.merge(options))
-    end
-
-    def load(filename)
-      options.merge!(YAML::load(ERB.new(IO.read(filename)).result))
-    end
-
-    def self.load(filename)
-      config = new(defaults)
-      config.load(filename) if File.exists?(filename)
-      config
-    end
-
-  end
-end