refinerycms 0.9.6.5 → 0.9.6.6

data/VERSION

@@ -1 +1 @@
-0.9.6.5
+0.9.6.6

data/app/controllers/application.rb

@@ -1,3 +1,3 @@
 # This file is here to support web servers who load Rails in the old fashion e.g. some builds of Phusion Passenger.
 # This will simply load the application controller using the new style if this file is ever loaded.
-require_dependency 'application_controller'
+require_dependency 'application_controller'

data/app/controllers/application_controller.rb

@@ -4,4 +4,4 @@
 # You can extend refinery with your own functions here and they will likely not get overriden in an update.
 
 class ApplicationController < Refinery::ApplicationController
-end
+end

data/config/environment.rb

@@ -64,7 +64,7 @@ eval("#{(defined? Refinery::Initializer) ? Refinery : Rails}::Initializer").run
 
   #===REFINERY REQUIRED GEMS===
   config.gem "rake", :version => ">= 0.8.3", :lib => "rake"
-	config.gem "rubyzip", :version => ">= 0.9.1", :lib => "zip/zip"
+  config.gem "rubyzip", :version => ">= 0.9.1", :lib => "zip/zip"
   config.gem "friendly_id", :version => ">= 2.2.2", :lib => "friendly_id"
   config.gem "will_paginate", :version => ">= 2.3.11", :lib => "will_paginate", :source => "http://gemcutter.org"
   config.gem "rails", :version => ">= 2.3.5", :lib => "rails"
@@ -72,4 +72,4 @@ eval("#{(defined? Refinery::Initializer) ? Refinery : Rails}::Initializer").run
   config.gem "slim_scrooge", :version => ">= 1.0.3", :lib => "slim_scrooge", :source => "http://gemcutter.org" unless RUBY_PLATFORM =~ /mswin|mingw/ # kill gem when windows is running.
   config.gem "hpricot", :version => ">= 0.8.1", :lib => "hpricot", :source => "http://gemcutter.org"
   #===REFINERY END OF REQUIRED GEMS===
-end
+end

data/config/environments/development.rb

@@ -23,4 +23,4 @@ config.action_mailer.raise_delivery_errors = false
 #  ::ActiveSupport::Dependencies.load_once_paths = ::ActiveSupport::Dependencies.load_once_paths.select do |path|
 #    (path =~ /app/).nil?
 #  end
-#end
+#end

data/config/environments/production.rb

@@ -24,4 +24,4 @@ config.log_level = :warn
 # Set to true in order to use Amazon's Simple Storage Service on your production machine
 # instead of the default file system for resources and images
 # Make sure to your bucket info is correct in amazon_s3.yml
-USE_S3_BACKEND = false
+USE_S3_BACKEND = false

data/config/preinitializer.rb

@@ -25,4 +25,4 @@ REFINERY_ROOT = Rails.root.to_s unless defined? REFINERY_ROOT
 
 # Set to true in your environment specific file (e.g. production.rb) to use Amazon's Simple
 # Storage Service instead of the default file system for resources and images
-USE_S3_BACKEND = false unless defined?(USE_S3_BACKEND)
+USE_S3_BACKEND = false unless defined?(USE_S3_BACKEND)

data/db/migrate/20100114092849_add_themes_table.rb

@@ -1,19 +1,19 @@
 class AddThemesTable < ActiveRecord::Migration
-	
+
   def self.up
-	  create_table "themes", :force => true do |t|
-	    t.integer "size"
-	    t.string "content_type"
-	    t.string "filename"
-	    t.string "title"
-	    t.text "description"
-	    t.text "license"
-			t.timestamps
-		end
+    create_table "themes", :force => true do |t|
+      t.integer "size"
+      t.string "content_type"
+      t.string "filename"
+      t.string "title"
+      t.text "description"
+      t.text "license"
+      t.timestamps
+    end
   end
 
   def self.down
-		drop_table :themes
+    drop_table :themes
   end
 
-end
+end

data/db/migrate/20100202034802_remove_custom_title_image_id_and_image_id_from_pages.rb

@@ -1,13 +1,13 @@
 class RemoveCustomTitleImageIdAndImageIdFromPages < ActiveRecord::Migration
-	
+
   def self.up
-		remove_column :pages, :custom_title_image_id
-		remove_column :pages, :image_id
+    remove_column :pages, :custom_title_image_id
+    remove_column :pages, :image_id
   end
 
   def self.down
-		add_column :pages, :custom_title_image_id, :integer
-		add_column :pages, :image_id, :integer
+    add_column :pages, :custom_title_image_id, :integer
+    add_column :pages, :image_id, :integer
   end
 
-end
+end

data/db/schema.rb

@@ -1,4 +1,4 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# This file is auto-generated from the current state of the database. Instead of editing this file,
 # please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #

data/db/seeds.rb

@@ -3,7 +3,7 @@
   {:name => "activity_show_limit", :value => 18},
   {:name => "preferred_image_view", :value => :grid},
   {:name => "analytics_page_code", :value => "UA-xxxxxx-x"},
-	{:name => "theme", :value => "demolicious"},
+  {:name => "theme", :value => "demolicious"},
   {:name => "image_thumbnails", :value => {
     :dialog_thumb => 'c106x106',
     :grid => 'c135x135',
@@ -126,4 +126,4 @@ Dir[File.join(%W(#{REFINERY_ROOT} themes *.zip))].each do |theme|
     "filename" => theme.split('/').last,
     'tempfile' => File.open(theme)
   }).read_theme
-end
+end

data/lib/refinery_initializer.rb

@@ -6,4 +6,4 @@ unless REFINERY_ROOT == RAILS_ROOT # e.g. only if we're in a gem.
 
   require 'refinery'
   require 'refinery/initializer'
-end
+end

data/public/javascripts/refinery/admin.js

@@ -225,13 +225,9 @@ var link_dialog = {
     $('.link_list li').click(function(e){
       e.preventDefault();
 
-      remove_linked_class();
+      $('.link_list li.linked').removeClass('linked');
       $(this).addClass('linked');
 
-      function remove_linked_class(){
-        $('.link_list li.linked').removeClass('linked');
-      }
-
       var link = $(this).children('a.page_link').get(0);
       var port = (window.location.port.length > 0 ? (":" + window.location.port) : "");
       var url = link.href.replace(window.location.protocol + "//" + window.location.hostname + port, "");
@@ -441,14 +437,17 @@ var page_options = {
 }
 
 var image_dialog = {
-  init: function(){
+  callback: null
+
+  , init: function(callback){
+    this.callback = callback;
     this.init_tabs();
     this.init_select();
-    this.init_submit();
-    this.init_close();
-  },
+    this.init_actions();
+    return this;
+  }
 
-  init_tabs: function(){
+  , init_tabs: function(){
     var radios = $('#dialog_menu_left input:radio');
     var selected = radios.parent().filter(".selected_radio").find('input:radio').first() || radios.first();
 
@@ -458,16 +457,16 @@ var image_dialog = {
 
     selected.attr('checked', 'true');
     link_dialog.switch_area(selected);
-  },
+  }
 
-  switch_area: function(radio){
+  , switch_area: function(radio){
     $('#dialog_menu_left .selected_radio').removeClass('selected_radio');
     $(radio).parent().addClass('selected_radio');
     $('#dialog_main .dialog_area').hide();
     $('#' + radio.value + '_area').show();
-  },
+  }
 
-  init_select: function(){
+  , init_select: function(){
     $('#existing_image_area_content ul li img').click(function(){
         image_dialog.set_image(this);
     });
@@ -475,9 +474,9 @@ var image_dialog = {
     if ((selected_image = $('#existing_image_area_content ul li.selected img')).length > 0) {
       image_dialog.set_image(selected_image.first());
     }
-  },
+  }
 
-  set_image: function(img){
+  , set_image: function(img){
     if ($(img).length > 0) {
       $('#existing_image_area_content ul li.selected').removeClass('selected');
 
@@ -499,39 +498,38 @@ var image_dialog = {
       }
       catch(e){}
     }
-  },
-
-  init_submit: function(){
-    $('#dialog-form-actions #submit_button').click(function(e){
-      e.preventDefault();
-      if(img_selected = $('#existing_image_area_content ul li.selected img').get(0)) {
-        parent.image_picker.changed(img_selected);
-      }
+  }
 
-      if(parent && typeof(parent.tb_remove) == "function"){
-        parent.tb_remove();
-      }
-    });
+  , submit_image_choice: function(e) {
+    e.preventDefault();
+    if((img_selected = $('#existing_image_area_content ul li.selected img').get(0)) && typeof(this.callback) == "function") {
+      this.callback(img_selected);
+    }
 
-    $('#dialog-form-actions #cancel_button').click(function(e){
-      e.preventDefault();
+    if(parent && typeof(parent.tb_remove) == "function"){
       parent.tb_remove();
-    });
-  },
+    }
 
-  init_close: function(){
-    $('#TB_title .close_dialog, #dialog_container .close_dialog').click(function(e) {
-      e.preventDefault();
+  }
 
-      // if we're in a frame
-      if(parent && typeof(parent.tb_remove) == "function"){
-        parent.tb_remove();
+  , cancel_image_dialog: function(e) {
+    e.preventDefault();
+    // if we're in a frame
+    if(parent && typeof(parent.tb_remove) == "function"){
+      parent.tb_remove();
 
-      } // if we're not in a frame
-      else if(typeof(tb_remove) == 'function'){
-        tb_remove();
-      }
-    });
+    } // if we're not in a frame
+    else if(typeof(tb_remove) == 'function'){
+      tb_remove();
+    }
+  }
+
+  , init_actions: function(){
+    var _this = this;
+    $('#dialog-form-actions #submit_button').click($.proxy(_this.submit_image_choice, _this));
+    $('#dialog-form-actions #cancel_button, #TB_title .close_dialog, #dialog_container .close_dialog').click(
+      $.proxy(_this.cancel_image_dialog, _this)
+    );
   }
 }
 
@@ -600,43 +598,45 @@ var list_reorder = {
 var image_picker = {
   options: {
     selected: '',
-    thumbnail: '',
-    toggle_image_display: false
+    thumbnail: 'dialog_thumb',
+    field: '#image',
+    image_display: '#current_picked_image',
+    no_image_message: '#no_picked_image_selected',
+    image_container: '#current_image_container',
+    remove_image_button: '#remove_picked_image',
+    image_toggler: null
   }
 
   , init: function(new_options){
     this.options = $.extend(this.options, new_options);
-    $('#remove_picked_image').click(function(e){
+    $(this.options.remove_image_button).click(function(e){
       e.preventDefault();
-      $('#current_picked_image').removeClass('brown_border')
+      $(this.options.image_display).removeClass('brown_border')
                                 .attr({'src': '', 'width': '', 'height': ''})
                                 .css({'width': 'auto', 'height': 'auto'})
                                 .hide();
-      $('#custom_title_field').val('');
-      $('#no_picked_image_selected').show();
+      $(this.options.field).val('');
+      $(this.options.no_image_message).show();
       $(this).hide();
     });
 
-    if(this.options.toggle_image_display){
-      $('#current_image_toggler').click(function(e){
+    if(this.options.image_toggler != null){
+      $(this.options.image_toggler).click(function(e){
         $(this).html(($(this).html() == 'Show' ? 'Hide' : 'Show'));
-        $("#current_image_container").toggle();
+        $(this.options.image_container).toggle();
         e.preventDefault();
       });
     }
 
   }
 
-  , changed: function(image){
-    var current_img = $('#current_picked_image');
-    $('#custom_title_field').val(image.id.replace("image_", ""));
+  , changed: function(image) {
+    $(this.options.field).val(image.id.replace("image_", ""));
 
-    if(this.options.thumbnail != ''){
-      image.src = image.src.replace('_dialog_thumb', '_' + this.options.thumbnail);
-    }
-    current_img.attr('src', image.src).addClass('brown_border').show();
-    $('#remove_picked_image').show();
-    $('#no_picked_image_selected').hide();
+    image.src = image.src.replace('_dialog_thumb', '_' + this.options.thumbnail);
+    $(this.options.image_display).attr('src', image.src).addClass('brown_border').show();
+    $(this.options.remove_image_button).show();
+    $(this.options.no_image_message).hide();
   }
 }
 

data/readme.md

@@ -92,7 +92,7 @@ You will be prompted to setup your first user.
 If you're using [Heroku](http://heroku.com/) you will want to put
 
     USE_S3_BACKEND = true
-  
+
 in your ``config/production.rb`` file to make Refinery store files uploaded on Amazon S3.
 
 ## Updating to the latest Refinery
@@ -161,12 +161,12 @@ This will pull in all of the updated files in the project and may result in some
 Extend Refinery easily by running the Refinery generator
 
     ruby script/generate refinery
-  
+
 to get help on how to use that. Or read the full documentation on [writing plugins for Refinery](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery/plugins.md)
 
 ### What about a portfolio?
 
-Check out the [portfolio plugin gem](http://github.com/resolve/portfolio)
+Check out the [portfolio plugin gem](http://github.com/resolve/refinery-portfolio)
 
 ## License
 

data/test/fixtures/images.yml

@@ -0,0 +1,14 @@
+the_world:
+  content_type: image/gif
+  filename: The%20world!.gif
+  width: 614
+  height: 340
+  size: 17535
+  # TODO: image_type? What's that used for?
+  
+our_car:
+  content_type: image/jpg
+  filename: car-wallpapers19.jpg
+  width: 640
+  height: 300
+  size: 87647

data/test/test_helper.rb

@@ -16,7 +16,7 @@ class ActiveSupport::TestCase
   # don't care one way or the other, switching from MyISAM to InnoDB tables
   # is recommended.
   #
-  # The only drawback to using transactional fixtures is when you actually 
+  # The only drawback to using transactional fixtures is when you actually
   # need to test transactions.  Since your test is bracketed by a transaction,
   # any transactions started in your code will be automatically rolled back.
   self.use_transactional_fixtures = true

data/test/unit/image_test.rb

@@ -2,13 +2,24 @@ require 'test_helper'
 
 class ImageTest < ActiveSupport::TestCase
 
-	fixtures :images
+  fixtures :images
 
-	def test_titles
-	end
-	
-	def test_per_page
-		
-	end
+  def test_titles
+    assert_equal "The%20world!.gif", images(:the_world).filename
+    assert_equal "The World!", images(:the_world).title
 
-end
+    assert_equal "car-wallpapers19.jpg", images(:our_car).filename
+    assert_equal "Car Wallpapers19", images(:our_car).title
+  end
+
+  def test_per_page
+    assert_equal 18, Image.per_page(dialog = true)
+    assert_equal 20, Image.per_page # dialog = false
+  end
+
+  def test_attachment_fu_options
+    assert_equal 50.megabytes, Image.attachment_options[:max_size]
+    assert_equal 'Rmagick', Image.attachment_options[:processor]
+  end
+
+end

data/test/unit/page_part_test.rb

@@ -1,19 +1,19 @@
 require 'test_helper'
 
 class PagePartTest < ActiveSupport::TestCase
-	
-	fixtures :page_parts
-	
-	def setup
-		@new_page_part = PagePart.new
-	end
-	
+
+  fixtures :page_parts
+
+  def setup
+    @new_page_part = PagePart.new
+  end
+
   def test_should_not_save_page_part_without_title
-		assert !@new_page_part.save, "Saved the page part without a title"
+    assert !@new_page_part.save, "Saved the page part without a title"
   end
 
   def test_alias_content_body_works
-		assert_equal page_parts(:home_page_body).body, page_parts(:home_page_body).content
-	end
+    assert_equal page_parts(:home_page_body).body, page_parts(:home_page_body).content
+  end
 
-end
+end