muck-contents 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/app/controllers/muck/tiny_mce_controller.rb

@@ -32,7 +32,7 @@ class Muck::TinyMceController < ApplicationController
     @parent = current_user if @parent.blank?
     @images = @parent.uploads.images.paginate(:page => @page, :per_page => @per_page, :order => 'created_at desc')
     respond_to do |format|
-      format.json { render :json => @images.to_json(json_options) }
+      format.json { render :json => make_json(@images) }
     end
   end
   
@@ -40,11 +40,16 @@ class Muck::TinyMceController < ApplicationController
     @parent = current_user if @parent.blank?
     @files = @parent.uploads.files.paginate(:page => @page, :per_page => @per_page, :order => 'created_at desc')
     respond_to do |format|
-      format.json { render :json => @files.to_json(json_options) }
+      format.json { render :json => make_json(@files) }
     end
   end
 
   protected
+    def make_json(uploads)
+      return [] if uploads.blank?
+      uploads.collect {|f| f.as_json(json_options)}
+    end
+  
     def json_options
       { :only => [:id], :methods => [:icon, :thumb, :file_name] }
     end

data/config/initializers/new_rails_defaults.rb

@@ -0,0 +1,19 @@
+# Be sure to restart your server when you modify this file.
+
+# These settings change the behavior of Rails 2 apps and will be defaults
+# for Rails 3. You can remove this initializer when Rails 3 is released.
+
+if defined?(ActiveRecord)
+  # Include Active Record class name as root for JSON serialized output.
+  ActiveRecord::Base.include_root_in_json = true
+
+  # Store the full class name (including module namespace) in STI type column.
+  ActiveRecord::Base.store_full_sti_class = true
+end
+
+# Use ISO 8601 format for JSON serialized times and dates.
+ActiveSupport.use_standard_json_time_format = true
+
+# Don't escape HTML entities in JSON, leave that for the #json_escape helper.
+# if you're including raw json in an HTML page.
+ActiveSupport.escape_html_entities_in_json = false

data/muck-contents.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-contents}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
      "app/views/tiny_mce/images.html.erb",
      "app/views/tiny_mce/links.html.erb",
      "config/initializers/mce_options.rb",
+     "config/initializers/new_rails_defaults.rb",
      "config/muck_contents_routes.rb",
      "db/migrate/20090703055724_add_contents.rb",
      "db/migrate/20090806230610_add_layout_to_contents.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-contents
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Justin Ball
@@ -134,6 +134,7 @@ files:
 - app/views/tiny_mce/images.html.erb
 - app/views/tiny_mce/links.html.erb
 - config/initializers/mce_options.rb
+- config/initializers/new_rails_defaults.rb
 - config/muck_contents_routes.rb
 - db/migrate/20090703055724_add_contents.rb
 - db/migrate/20090806230610_add_layout_to_contents.rb