rich 1.0.2 → 1.0.3

data/README.rdoc

@@ -149,7 +149,7 @@ Rich also includes a few settings that manipulate CKEditor settings, but are a b
 
 When you run the generator a css file is created for you in <tt>app/assets/stylesheets/rich/editor.css</tt>. Use this stylesheet to define the contents of the Styles drop down in CKEditor.
 
-=== Image configuration
+=== Image configuration & (re)processing
 
 The styles you define in the initializer are passed to Paperclip directly, so the syntax is identical. See https://github.com/thoughtbot/paperclip/wiki/Thumbnail-Generation for more information.
 

data/app/assets/javascripts/rich/browser/filebrowser.js

@@ -30,7 +30,7 @@ rich.Browser.prototype = {
 	initStyles: function(opt, def) {
 		opt=opt.split(',');
 		$.each(opt, function(index, value) { 
-		  $('#styles').append("<li class='scope' id='style-"+value+"' data-rich-style='"+value+"'>"+value+"</li>");
+			if(value != 'rich_thumb') $('#styles').append("<li class='scope' id='style-"+value+"' data-rich-style='"+value+"'>"+value+"</li>");
 		});
 		
 		browser.selectStyle(def);

data/app/helpers/rich/files_helper.rb

@@ -3,7 +3,7 @@ module Rich
     
     def thumb_for_file(file)
       if file.simplified_type == "image"
-        file.rich_file.url(:thumb)
+        file.rich_file.url(:rich_thumb)
       else
         asset_path "rich/document-thumb.png"
       end

data/lib/generators/rich/install/templates/rich.rb.erb

@@ -10,13 +10,12 @@ if Object.const_defined?("Rich")
     # 
     # For example, the elements available in the formats
     # dropdown are defined like this:
-    #   config.editor[:formats] = ""
+    #   config.editor[:format_tags] = "h3;p;pre"
     # 
     # By default, Rich visualizes what type of element
     # you are editing. To disable this:
     #   config.editor[:startupOutlineBlocks] = false
     
-    
     # == Image styles
     # 
     # Rich uses paperclip for image processing. You can
@@ -25,8 +24,8 @@ if Object.const_defined?("Rich")
     # See: https://github.com/thoughtbot/paperclip/wiki/Thumbnail-Generation
     # 
     # When you change these after uploading some files,
-    # remember to do let Paperclip re-generate these by running
-    #   rake paperclip:refresh CLASS=Rich::RichFile
+    # remember to re-generate your styles by running:
+    #   rake rich:refresh_assets
     config.image_styles = {
       :thumb => "100x100#"
     }
@@ -49,36 +48,36 @@ if Object.const_defined?("Rich")
     # the unprocessed file. Make sure this style exists.
     config.default_style = :thumb
 
-		# == Upload non-image files
-		#
-		# Setting this option to true will add a second Rich filebrowser icon to
-		# the editor toolbar. In this filebrowser you can upload non-image files.
-		# Inserting these files into your editor will result in a direct (A) link.
-		#
-		# Default:
-		# config.allow_document_uploads = false
+	# == Upload non-image files
+	#
+	# Setting this option to true will add a second Rich filebrowser icon to
+	# the editor toolbar. In this filebrowser you can upload non-image files.
+	# Inserting these files into your editor will result in a direct (A) link.
+	#
+	# Default:
+	# config.allow_document_uploads = false
 		
-		# == Set allowed filetypes for non-image files
-		#
-		# If you want, you can restrict the types of documents that users can upload.
-		# Default behavior is to allow any kind of file to be uploaded. You can set
-		# the accepted types by providing an array of mimetypes to check against.
-		# Note that for this to have any effect, you first need to enable document
-		# uploads using the setting above.
-		# 
-		# Default, allow any file to be uploaded:
-		# config.allowed_document_types = :all
-		#
-		# Example, only allow PDF uploads:
-		# config.allowed_document_types = ['application/pdf']
+	# == Set allowed filetypes for non-image files
+	#
+	# If you want, you can restrict the types of documents that users can upload.
+	# Default behavior is to allow any kind of file to be uploaded. You can set
+	# the accepted types by providing an array of mimetypes to check against.
+	# Note that for this to have any effect, you first need to enable document
+	# uploads using the setting above.
+	# 
+	# Default, allow any file to be uploaded:
+	# config.allowed_document_types = :all
+	#
+	# Example, only allow PDF uploads:
+	# config.allowed_document_types = ['application/pdf']
 		
-		# == Asset insertion
-		#
-		# Set this to true to keep the filebrowser open after inserting an asset.
-		# Also configurable per-use from within the filebrowser.
-		#
-		# Default:
-		# config.insert_many = false
+	# == Asset insertion
+	#
+	# Set this to true to keep the filebrowser open after inserting an asset.
+	# Also configurable per-use from within the filebrowser.
+	#
+	# Default:
+	# config.insert_many = false
     
     # == User Authentication
     #

data/lib/rich.rb

@@ -7,12 +7,18 @@ require "rich/engine"
 
 module Rich
  
-  # specify desired image styles here  
-  mattr_accessor :image_styles
+  # configure image styles
+  def self.image_styles
+      @@image_styles.merge({ :rich_thumb => "100x100#" })
+  end
+  def self.image_styles=(image_styles)
+    @@image_styles = image_styles
+  end
   @@image_styles = {
     :thumb => "100x100#"
   }
   
+  
   mattr_accessor :allowed_styles
   @@allowed_styles = :all
   
@@ -122,10 +128,10 @@ module Rich
     editor_options
 
   end
-  
+    
   def self.validate_mime_type(mime, simplified_type)
     # does the mimetype match the given simplified type?
-    puts "matching:" + mime + " TO " + simplified_type
+    #puts "matching:" + mime + " TO " + simplified_type
     
     false # assume the worst
     

data/lib/rich/version.rb

@@ -1,3 +1,3 @@
 module Rich
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rich
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Bastiaan Terhorst
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-11 00:00:00 Z
+date: 2012-02-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails