refinerycms 0.9.8.2 → 0.9.8.3

data/.gitignore

@@ -1,6 +1,7 @@
 # Rails
 .bundle
 db/*.sqlite3
+db/*.sqlite3-journal
 *.log
 tmp/**/*
 

data/Gemfile

@@ -44,8 +44,15 @@ gem 'refinerycms-inquiries',    '~> 0.9.8.7'
 # Add i18n support (optional, you can remove this if you really want to).
 gem 'refinerycms-i18n',         '~> 0.9.8.6', :require => 'refinery/i18n'
 
+# Figure out how to get RMagick:
+rmagick_options = {:require => false}
+rmagick_options.update({
+  :git => 'git://github.com/refinerycms/rmagick.git',
+  :branch => 'windows'
+}) if Bundler::WINDOWS
+
 # Specify a version of RMagick that works in your environment:
-gem 'rmagick',                  '~> 2.12.0', :require => false
+gem 'rmagick',                  '~> 2.12.0', rmagick_options
 
 # END REFINERY CMS ============================================================
 

data/bin/refinerycms

@@ -119,7 +119,7 @@ module Refinery
 
     def generate!
       # Generate a rails application
-      rails_command = "rails new '#{@app_path}'"
+      rails_command = "rails new \"#{@app_path}\""
       rails_command << " --database #{@options[:database]}"
       rails_command << " --force" if @options[:force]
       rails_command << " --skip-test-unit --skip-prototype"
@@ -195,7 +195,7 @@ module Refinery
       run_command("bundle install")
 
       puts "\n\nSetting up your development database..\n"
-      run_command("rake -f '#{@app_path.join('Rakefile')}' db:setup")
+      run_command("rake -f \"#{@app_path.join('Rakefile')}\" db:setup", {:cd => false})
 
       # Deploy to Heroku
       if @options[:heroku]
@@ -238,9 +238,13 @@ module Refinery
     def run_command(command, options = {})
       options = {:cd => true, :puts => true}.merge(options)
       to_run = %w()
-      to_run << "cmd /c" if RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
-      to_run << "cd #{@app_path} &&" if options[:cd]
+      to_run << "cd \"#{@app_path}\" &&" if options[:cd]
       to_run << command
+
+      if RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
+        to_run = %w(cmd /c) | to_run.map{|c| c.gsub(/\//m, '\\')}
+      end
+
       to_run = to_run.join(' ')
 
       if options[:puts]

data/vendor/refinerycms/authentication/features/support/paths.rb

@@ -21,4 +21,4 @@ module NavigationHelpers
       end
     end
   end
-end
+end

data/vendor/refinerycms/core/app/views/shared/_menu_branch.html.erb

@@ -1,22 +1,23 @@
 <%
   css = if ((defined?(apply_css) && apply_css) || !defined?(apply_css)) and
            (classes = css_for_menu_branch(menu_branch, menu_branch_counter, sibling_count||=nil)).any?
-    " class='#{classes.join(' ')}'"
+    "class='#{classes.join(' ')}'"
   end
-  dom_id = (" id='item_#{menu_branch_counter}'" if menu_branch.parent_id.nil? and menu_branch.title.present?)
-  @menu_pages.reject! { |branch| branch == menu_branch } # Remove page from the array, so that future searching will be faster.
-  children = @menu_pages.select { |p| p.parent_id == menu_branch.id && p.in_menu? }
+  dom_id = ("id='item_#{menu_branch_counter}'" if menu_branch.parent_id.nil? and menu_branch.title.present?)
+  
+  hide_children = (defined?(hide_children) && hide_children)
+  children = hide_children ? [] : @menu_pages.select { |p| p.parent_id == menu_branch.id && p.in_menu? }
 -%>
-<li<%= css -%><%= dom_id -%>>
+<li<%= ['', css, dom_id].join(' ').gsub(/\ *$/, '') %>>
   <%= link_to menu_branch.title, menu_branch.url %>
 
-  <% unless hide_children or children.empty? %>
+  <% if children.present? %>
     <ul class='clearfix'>
       <%=
         render :partial => "/shared/menu_branch",
                :collection => children,
                :locals => {
-                 :hide_children => false, # hide children can't be true or we wouldn't get here.
+                 :hide_children => hide_children,
                  :sibling_count => children.size - 1
                } -%>
     </ul>

data/vendor/refinerycms/core/config/locales/de.yml

@@ -49,6 +49,9 @@ de:
         download_current: Aktuelles %{what} herunterladen
         opens_in_new_window: Öffnet in einem neuen Fenster
         remove_current: "Entferne aktuelles %{what}"
+        no_resource_selected: Es ist momentan keine Datei ausgewählt, klicken Sie hier, um eine hinzuzufügen.
+        name: Datei hinzufügen
+        current: Aktuelle Datei
       search:
         button_text: Suchen
         results_for: Suchergebnisse für '%{query}'

data/vendor/refinerycms/core/crud.md

@@ -80,7 +80,7 @@ So when viewing a list of the images you have you don't want it to show all the
 
 You do that like this:
 
-    :conditions => "parent_id IS NULL"
+    :conditions => {:parent_id => nil}
 
 ### ``:sortable``
 

data/vendor/refinerycms/core/engines.md

@@ -86,7 +86,7 @@ This bit is important. It's where all the controllers are held to manage pages i
 
     class Admin::PagesController < Admin::BaseController
 
-      crudify :page, :conditions => "parent_id IS NULL",
+      crudify :page, :conditions => {:parent_id => nil},
                      :order => "position ASC", :paging => false
 
     end

data/vendor/refinerycms/core/features/support/paths.rb

@@ -11,4 +11,4 @@ module NavigationHelpers
       end
     end
   end
-end
+end

data/vendor/refinerycms/core/lib/core.rb

@@ -26,7 +26,7 @@ module Refinery
       end
 
       initializer 'add presenters' do |app|
-        app.config.load_paths += [
+        app.config.autoload_paths += [
           Rails.root.join("app", "presenters"),
           Rails.root.join("vendor", "**", "**", "app", "presenters"),
           Refinery.root.join("vendor", "refinerycms", "*", "app", "presenters")

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/db/seeds/plural_name.rb

@@ -7,7 +7,7 @@ page = Page.create(
   :title => "<%= class_name.pluralize.underscore.titleize %>",
   :link_url => "/<%= plural_name %>",
   :deletable => false,
-  :position => ((Page.maximum(:position, :conditions => "parent_id IS NULL") || -1)+1),
+  :position => ((Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)+1),
   :menu_match => "^/<%= plural_name %>(\/|\/.+?|)$"
 )
 RefinerySetting.find_or_set(:default_page_parts, ["Body", "Side Body"]).each do |default_page_part|

data/vendor/refinerycms/core/lib/refinery/crud.rb

@@ -47,18 +47,16 @@ module Refinery
             # if the position field exists, set this object as last object, given the conditions of this class.
             if #{class_name}.column_names.include?("position")
               params[:#{singular_name}].merge!({
-                :position => ((#{class_name}.maximum(:position, :conditions => "#{options[:conditions]}")||-1) + 1)
+                :position => ((#{class_name}.maximum(:position, :conditions => #{options[:conditions].inspect})||-1) + 1)
               })
             end
 
             if (@#{singular_name} = #{class_name}.create(params[:#{singular_name}])).valid?
-              unless request.xhr?
-                flash[:notice] = t('refinery.crudify.created',
-                                   :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
-              else
-                flash.now[:notice] = t('refinery.crudify.created',
-                                       :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
-              end
+              (request.xhr? ? flash.now : flash).notice = t(
+                'refinery.crudify.created',
+                :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'"
+              )
+
               unless from_dialog?
                 unless params[:continue_editing] =~ /true|on|1/
                   redirect_back_or_default(#{options[:redirect_to_url]})
@@ -91,13 +89,11 @@ module Refinery
 
           def update
             if @#{singular_name}.update_attributes(params[:#{singular_name}])
-              unless request.xhr?
-                flash[:notice] = t('refinery.crudify.updated',
-                                   :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
-              else
-                flash.now[:notice] = t('refinery.crudify.updated',
-                                       :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
-              end
+              (request.xhr? ? flash.now : flash).notice = t(
+                'refinery.crudify.updated',
+                :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'"
+              )
+
               unless from_dialog?
                 unless params[:continue_editing] =~ /true|on|1/
                   redirect_back_or_default(#{options[:redirect_to_url]})
@@ -125,80 +121,70 @@ module Refinery
           end
 
           def destroy
+            # object gets found by find_#{singular_name} function
             if @#{singular_name}.destroy
-              flash[:notice] = t('refinery.crudify.destroyed',
-                                 :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
+              flash.notice = t('refinery.crudify.destroyed',
+                               :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
             end
             redirect_to #{options[:redirect_to_url]}
           end
 
+          # Finds one single result based on the id params.
           def find_#{singular_name}
             @#{singular_name} = #{class_name}.find(params[:id],
-                                                   :include => %w(#{options[:include].join(' ')}))
+                                                   :include => #{options[:include].map(&:to_sym).inspect})
           end
 
-          def find_all_#{plural_name}
-            @#{plural_name} = #{class_name}.find(
-              :all,
-              :order => "#{options[:order]}",
-              :conditions => "#{options[:conditions]}",
-              :include => %w(#{options[:include].join(' ')})
-            )
+          # Find the collection of @#{plural_name} based on the conditions specified into crudify
+          # It will be ordered based on the conditions specified into crudify
+          # And eager loading is applied as specified into crudify.
+          def find_all_#{plural_name}(conditions = #{options[:conditions].inspect})
+            @#{plural_name} = #{class_name}.where(conditions).includes(
+                                #{options[:include].map(&:to_sym).inspect}
+                              ).order("#{options[:order]}")
           end
 
+          # Paginate a set of @#{plural_name} that may/may not already exist.
           def paginate_all_#{plural_name}
-            @#{plural_name} = #{class_name}.paginate(
-              :page => params[:page],
-              :order => "#{options[:order]}",
-              :conditions => "#{options[:conditions]}",
-              :include => %w(#{options[:include].join(' ')})
-            )
+            # If we have already found a set then we don't need to again
+            find_all_#{plural_name} if @#{plural_name}.nil?
+
+            @#{plural_name} = @#{plural_name}.paginate(:page => params[:page])
           end
 
+          # Returns a weighted set of results based on the query specified by the user.
           def search_all_#{plural_name}
-            @#{plural_name} = #{class_name}.with_query(params[:search]).find(
-              :all,
-              :order => "#{options[:order]}",
-              :conditions => "#{options[:search_conditions]}",
-              :include => %w(#{options[:include].join(' ')})
-            )
-          end
+            # First find normal results.
+            find_all_#{plural_name}(#{options[:search_conditions].inspect})
 
-          def search_and_paginate_all_#{plural_name}
-            @#{plural_name} = #{class_name}.with_query(params[:search]).paginate(
-              :page => params[:page],
-              :order => "#{options[:order]}",
-              :conditions => "#{options[:search_conditions]}",
-              :include => %w(#{options[:include].join(' ')})
-            )
+            # Now get weighted results by running the query against the results already found.
+            @#{plural_name} = @#{plural_name}.with_query(params[:search])
           end
 
+          # Ensure all methods are protected so that they should only be called
+          # from within the current controller.
           protected :find_#{singular_name},
                     :find_all_#{plural_name},
                     :paginate_all_#{plural_name},
-                    :search_all_#{plural_name},
-                    :search_and_paginate_all_#{plural_name}
-
+                    :search_all_#{plural_name}
         )
 
+        # Methods that are only included when this controller is searchable.
         if options[:searchable]
           if options[:paging]
             module_eval %(
               def index
-                if searching?
-                  search_and_paginate_all_#{plural_name}
-                else
-                  paginate_all_#{plural_name}
-                end
+                search_all_#{plural_name} if searching?
+                paginate_all_#{plural_name}
               end
             )
           else
             module_eval %(
               def index
-                if searching?
-                  search_all_#{plural_name}
-                else
+                unless searching?
                   find_all_#{plural_name}
+                else
+                  search_all_#{plural_name}
                 end
               end
             )
@@ -229,11 +215,9 @@ module Refinery
 
             # Based upon http://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
             def update_positions
-              newlist = params[:ul]
               previous = nil
               # The list doesn't come to us in the correct order. Frustration.
-              index = 0
-              while index < newlist.length do
+              while (index ||= 0) < (newlist ||= params[:ul]).length do
                 hash = newlist[index.to_s]
                 moved_item_id = hash['id'].split(/#{singular_name}/)
                 @current_#{singular_name} = #{class_name}.find_by_id(moved_item_id)
@@ -267,7 +251,7 @@ module Refinery
                 if child['children'].present?
                   update_child_positions(child, child_#{singular_name})
                 end
-                
+
                 child_index += 1
               end
             end

data/vendor/refinerycms/core/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -1266,9 +1266,17 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
         selection = wym._iframe.contentWindow.getSelection();
         selected_html = $(selected).html();
 
-        new_html = selected_html.substring(0, selection.focusOffset)
-                   + "<span id='replace_me_with_" + this._current_unique_stamp + "'></span>"
-                   + selected_html.substring(selection.focusOffset);
+        if ((selection.focusOffset - selection.anchorOffset) > 1) {
+          new_html = selected_html.substring(0, selection.anchorOffset)
+                     + "<span id='replace_me_with_" + this._current_unique_stamp + "'>"
+                     + selected_html.substring(selection.anchorOffset, selection.focusOffset)
+                     + "</span>"
+                     + selected_html.substring(selection.focusOffset);
+        } else {
+          new_html = selected_html.substring(0, selection.focusOffset)
+                     + "<span id='replace_me_with_" + this._current_unique_stamp + "'></span>"
+                     + selected_html.substring(selection.focusOffset);
+        }
 
         $(selected).html(new_html);
       } else {

data/vendor/refinerycms/dashboard/features/support/paths.rb

@@ -11,4 +11,4 @@ module NavigationHelpers
       end
     end
   end
-end
+end

data/vendor/refinerycms/images/app/controllers/admin/images_controller.rb

@@ -9,12 +9,9 @@ class Admin::ImagesController < Admin::BaseController
   before_filter :change_list_mode_if_specified, :init_dialog
 
   def index
-    if searching?
-      search_and_paginate_all_images
-    else
-      paginate_all_images
-    end
-
+    search_all_images if searching?
+    paginate_all_images
+    
     if RefinerySetting.find_or_set(:group_images_by_date_uploaded, true)
       @grouped_images = group_by_date(@images)
     end
@@ -48,7 +45,7 @@ class Admin::ImagesController < Admin::BaseController
 
   #This returns a url. If params[:size] is provided, it will generate a url for this size.
   def url
-    @image = Image.find(params[:id])
+    find_image
     if params[:size].present?
       begin
         thumbnail = @image.thumbnail(params[:size])
@@ -64,13 +61,14 @@ class Admin::ImagesController < Admin::BaseController
   def create
     begin
       @image = Image.create(params[:image])
-    rescue Dragonfly::Delegator::UnableToHandle
+    rescue Dragonfly::FunctionManager::UnableToHandle
+      logger.warn($!.message)
       @image = Image.new
     end
 
     unless params[:insert]
       if @image.valid?
-        flash[:notice] = t('refinery.crudify.created', :what => "'#{@image.title}'")
+        flash.notice = t('refinery.crudify.created', :what => "'#{@image.title}'")
         unless from_dialog?
           redirect_to :action => 'index'
         else

data/vendor/refinerycms/images/features/support/paths.rb

@@ -14,4 +14,4 @@ module NavigationHelpers
       end
     end
   end
-end
+end

data/vendor/refinerycms/pages/app/controllers/admin/pages_controller.rb

@@ -1,7 +1,7 @@
 class Admin::PagesController < Admin::BaseController
 
   crudify :page,
-          :conditions => "pages.parent_id IS NULL",
+          :conditions => {:parent_id => nil},
           :order => "lft ASC",
           :include => [:parts, :slugs, :children, :parent],
           :paging => false

data/vendor/refinerycms/pages/app/controllers/admin/pages_dialogs_controller.rb

@@ -6,9 +6,9 @@ class Admin::PagesDialogsController < Admin::DialogsController
 
   def link_to
     @pages = Page.paginate :page => params[:page],
-                             :conditions => 'parent_id is null',
-                             :order => 'position ASC',
-                             :per_page => Page.per_page(dialog=true)
+                           :conditions => {:parent_id => nil},
+                           :order => 'position ASC',
+                           :per_page => Page.per_page(dialog=true)
 
     @resources = Resource.paginate :page => params[:resource_page],
                                    :order => 'created_at DESC',

data/vendor/refinerycms/pages/features/support/paths.rb

@@ -15,4 +15,4 @@ module NavigationHelpers
       end
     end
   end
-end
+end

data/vendor/refinerycms/refinery.rb

@@ -27,7 +27,7 @@ module Refinery
     @major = 0
     @minor = 9
     @tiny  = 8
-    @build = 2
+    @build = 3
 
     class << self
       attr_reader :major, :minor, :tiny, :build

data/vendor/refinerycms/resources/app/controllers/admin/resources_controller.rb

@@ -34,11 +34,8 @@ class Admin::ResourcesController < Admin::BaseController
   end
 
   def index
-    if searching?
-      search_and_paginate_all_resources
-    else
-      paginate_all_resources
-    end
+    search_all_resources if searching?
+    paginate_all_resources
 
     if RefinerySetting.find_or_set(:group_resources_by_date_uploaded, true)
       @grouped_resources = group_by_date(@resources)

data/vendor/refinerycms/settings/app/models/refinery_setting.rb

@@ -155,7 +155,7 @@ class RefinerySetting < ActiveRecord::Base
     if %w(trueclass falseclass).include?(new_value.class.to_s.downcase)
       new_value = new_value.to_s
     end
-    
+
     super
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: false
   segments: 
   - 0
   - 9
   - 8
-  - 2
-  version: 0.9.8.2
+  - 3
+  version: 0.9.8.3
 platform: ruby
 authors: 
 - Resolve Digital
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +12:00
+date: 2010-09-15 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -890,7 +890,6 @@ files:
 - vendor/refinerycms/images/features/uploads/id-rather-be-here.jpg
 - vendor/refinerycms/images/features/uploads/refinery_is_awesome.txt
 - vendor/refinerycms/images/lib/images.rb
-- vendor/refinerycms/images/lib/tasks/images.rake
 - vendor/refinerycms/images/readme.md
 - vendor/refinerycms/pages/app/controllers/admin/page_parts_controller.rb
 - vendor/refinerycms/pages/app/controllers/admin/pages_controller.rb
@@ -1001,7 +1000,6 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
 - vendor/refinerycms
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false

data/vendor/refinerycms/images/lib/tasks/images.rake

@@ -1,50 +0,0 @@
-namespace :images do
-
-  desc "Regenerate all thumbnails. Useful for when you've changed size or cropping on the images after images have been uploaded."
-  task :regenerate => :environment do
-=begin
-    thumbnails_size = Image.count(:conditions => "parent_id IS NOT NULL")
-    puts "Preparing to delete #{thumbnails_size} generated thumbnails"
-
-    if Image.destroy_all("parent_id IS NOT null")
-      puts "--> #{thumbnails_size} thumbnails deleted"
-    else
-      puts "There may have been a problem deleting the thumbnails."
-    end
-
-    originals = Image.originals
-    puts "Preparing to regenerate thumbnails for #{originals.size} images"
-
-    originals.each do |image|
-      begin
-        image.rebuild_thumbnails!
-      rescue Exception => e
-        puts "--> ERROR image #{image.id} could not be saved because #{e.message}"
-      end
-    end
-    puts "Image regeneration complete."
-=end
-    puts "TODO: update task for Dragonfly"
-  end
-
-  desc "Update thumbnails. Useful for when you have added new thumbnail sizes and you just need to regenerate those without regenerating all the thumbnails again."
-  task :update => :environment do
-=begin
-  originals = Image.originals
-
-    puts "Preparing to update #{originals.size} images. This may take a few minutes. Please wait..."
-
-    originals.each do |image|
-      begin
-        image.rebuild_missing_thumbnails!
-      rescue Exception => e
-        puts "--> ERROR image #{image.id} could not be saved because #{e.message}"
-      end
-    end
-
-    puts "Thumbnail update complete."
-=end
-    puts "TODO: update task for Dragonfly"
- end
-
-end