alchemy_cms 2.5.1 → 2.5.2

data/alchemy_cms.gemspec

@@ -38,7 +38,7 @@ POST_INSTALL
   s.add_runtime_dependency %q<awesome_nested_set>,         ["~> 2.0"]
   s.add_runtime_dependency %q<acts-as-taggable-on>,        ["~> 2.1"]
   s.add_runtime_dependency %q<declarative_authorization>,  ["= 0.5.5"]
-  s.add_runtime_dependency %q<dragonfly>,                  ["~> 0.9.12"]
+  s.add_runtime_dependency %q<dragonfly>,                  ["~> 0.9.14"]
   s.add_runtime_dependency %q<kaminari>,                   ["~> 0.13.0"]
   s.add_runtime_dependency %q<acts_as_ferret>,             ["~> 0.5"]
   s.add_runtime_dependency %q<acts_as_list>,               ["~> 0.1.9"]
@@ -46,7 +46,7 @@ POST_INSTALL
   s.add_runtime_dependency %q<dynamic_form>,               ["~> 1.1"]
   s.add_runtime_dependency %q<jquery-rails>,               ["~> 2.1.3"]
   s.add_runtime_dependency %q<jquery-ui-rails>,            ["~> 3.0.1"]
-  s.add_runtime_dependency %q<attachment_magic>,           ["~> 0.2.1"]
+  s.add_runtime_dependency %q<attachment_magic>,           [">= 0.2.1"]
   s.add_runtime_dependency %q<sass-rails>,                 ['~> 3.2.3']
   s.add_runtime_dependency %q<coffee-rails>,               ['~> 3.2.1']
   s.add_runtime_dependency %q<compass-rails>,              ['~> 1.0.3']

data/app/assets/stylesheets/alchemy/elements.scss

@@ -214,6 +214,7 @@ div.element_editor {
       position: relative;
       top: 2px;
       margin-right: 8px;
+      vertical-align: top;
     }
   }
 

data/app/controllers/alchemy/admin/layoutpages_controller.rb

@@ -3,7 +3,7 @@ module Alchemy
     class LayoutpagesController < Alchemy::Admin::BaseController
 
       def index
-        @locked_pages = Page.all_locked_by(current_user)
+        @locked_pages = Page.from_current_site.all_locked_by(current_user)
         @layout_root = Page.find_or_create_layout_root_for(session[:language_id])
         @languages = Language.all
       end

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -83,7 +83,7 @@ module Alchemy
           redirect_to admin_pages_path
         else
           @page.lock(current_user)
-          @locked_pages = Page.from_current_site.from_current_site.all_locked_by(current_user)
+          @locked_pages = Page.from_current_site.all_locked_by(current_user)
         end
         @layoutpage = @page.layoutpage?
       end
@@ -178,8 +178,7 @@ module Alchemy
       # Sets the page public and sweeps the page cache
       def publish
         # fetching page via before filter
-        @page.public = true
-        @page.save
+        @page.publish!
         flash[:notice] = _t("page_published", :name => @page.name)
         redirect_back_or_to_default(admin_pages_path)
       end

data/app/controllers/alchemy/pictures_controller.rb

@@ -11,56 +11,23 @@ module Alchemy
     filter_access_to :thumbnail
 
     def show
-      image_file = @picture.image_file
-
-      if image_file.nil?
-        raise MissingImageFileError, "Missing image file for #{@picture.inspect}"
-      end
-
-      upsample = params[:upsample] == 'true'
-      crop_from = normalized_size(params[:crop_from])
-      crop_size = params[:crop_size]
-      size = params[:size]
-
-      if params[:crop_size].present? && params[:crop_from].present?
-        crop_from = params[:crop_from].split('x')
-        image_file = image_file.process(:thumb, "#{params[:crop_size]}+#{crop_from[0]}+#{crop_from[1]}")
-      elsif params[:crop] == 'crop' && size.present?
-        image_file = image_file.process(:thumb, "#{size}#")
-      end
-
-      if size.present?
-        image_file = image_file.process(:resize, size + '>')
-      end
+      @size = params[:size]
 
       expires_in 1.month, public: !@picture.restricted?
-      respond_to { |format| send_image(image_file, format) }
+      respond_to { |format| send_image(processed_image, format) }
     end
 
     def thumbnail
-      image_file = @picture.image_file
-
       case params[:size]
-        when "small" then size = "80x60"
-        when "medium" then size = "160x120"
-        when "large" then size = "240x180"
-        when nil then size = "111x93"
+        when "small" then @size = "80x60"
+        when "medium" then @size = "160x120"
+        when "large" then @size = "240x180"
+        when nil then @size = "111x93"
       else
-        size = params[:size]
-      end
-
-      if params[:crop_size].present? && params[:crop_from].present?
-        crop_from = params[:crop_from].split('x')
-        image_file = image_file.process(:thumb, "#{params[:crop_size]}+#{crop_from[0]}+#{crop_from[1]}")
-      elsif params[:crop] == 'crop' && size.present?
-        image_file = image_file.process(:thumb, "#{size}#")
+        @size = params[:size]
       end
 
-      if size.present?
-        image_file = image_file.process(:resize, size + '>')
-      end
-
-      respond_to { |format| send_image(image_file, format) }
+      respond_to { |format| send_image(processed_image, format) }
     end
 
     def zoom
@@ -106,5 +73,35 @@ module Alchemy
       end
     end
 
+    # Return the processed image dependent of size and cropping parameters
+    def processed_image
+      image_file = @picture.image_file
+      if image_file.nil?
+        raise MissingImageFileError, "Missing image file for #{@picture.inspect}"
+      end
+      if params[:crop_size].present? && params[:crop_from].present?
+        crop_from = params[:crop_from].split('x')
+        image_file = image_file.process(:thumb, "#{params[:crop_size]}+#{crop_from[0]}+#{crop_from[1]}")
+        image_file.process(:resize, @size + '>')
+      elsif params[:crop] == 'crop' && @size.present?
+        width, height = @size.split('x').collect(&:to_i)
+        # prevent upscaling unless :upsample param is true
+        # unfurtunally dragonfly does not handle this correctly while cropping
+        unless params[:upsample] == 'true'
+          if width > image_file.width
+            width = image_file.width
+          end
+          if height > image_file.height
+            height = image_file.height
+          end
+        end
+        image_file.process(:resize_and_crop, :width => width, :height => height, :gravity => 'c')
+      elsif @size.present?
+        image_file.process(:resize, "#{@size}>")
+      else
+        image_file
+      end
+    end
+
   end
 end

data/app/helpers/alchemy/pages_helper.rb

@@ -44,11 +44,11 @@ module Alchemy
       options = default_options.merge(options)
       if multi_language?
         language_links = []
-        pages = (options[:link_to_public_child] == true) ? Page.language_roots : Page.public_language_roots
+        pages = (options[:link_to_public_child] == true) ? Page.from_current_site.language_roots : Page.from_current_site.public_language_roots
         return nil if (pages.blank? || pages.length == 1)
         pages.each_with_index do |page, i|
           if (options[:link_to_page_with_layout] != nil)
-            page_found_by_layout = Page.where(:page_layout => options[:link_to_page_with_layout].to_s, :language_id => page.language_id).first
+            page_found_by_layout = Page.from_current_site.where(:page_layout => options[:link_to_page_with_layout].to_s, :language_id => page.language_id).first
           end
           page = page_found_by_layout || page
           page = (options[:link_to_public_child] ? (page.first_public_child.blank? ? nil : page.first_public_child) : nil) if !page.public?

data/app/models/alchemy/element.rb

@@ -45,7 +45,7 @@ module Alchemy
     scope :not_in_cell, where(:cell_id => nil)
     scope :in_cell, where("#{self.table_name}.cell_id IS NOT NULL")
     # Scope for only the elements from Alchemy::Site.current
-    scope :from_current_site, lambda { where(:alchemy_languages => {site_id: Site.current}).joins(:page => :language) }
+    scope :from_current_site, lambda { where(:alchemy_languages => {site_id: Site.current || Site.default}).joins(:page => :language) }
     # TODO: add this as default_scope
     #default_scope { from_current_site }
 

data/app/models/alchemy/page.rb

@@ -73,7 +73,7 @@ module Alchemy
     after_create :autogenerate_elements, :unless => proc { |page| page.systempage? || page.do_not_autogenerate }
     after_update :trash_not_allowed_elements, :if => :page_layout_changed?
     after_update :autogenerate_elements, :if => :page_layout_changed?
-    after_update :create_legacy_url, :if => :urlname_changed?
+    after_update :create_legacy_url, :if => proc { |page| page.urlname_changed? && !page.redirects_to_external? }
     after_destroy { elements.each {|el| el.destroy unless el.trashed? } }
 
     scope :language_roots, where(:language_root => true)
@@ -97,7 +97,7 @@ module Alchemy
     scope :flushables, not_locked.published.contentpages
     scope :searchables, not_restricted.published.contentpages
     # Scope for only the pages from Alchemy::Site.current
-    scope :from_current_site, lambda { where(:alchemy_languages => {site_id: Site.current}).joins(:language) }
+    scope :from_current_site, lambda { where(:alchemy_languages => {site_id: Site.current || Site.default}).joins(:language) }
     # TODO: add this as default_scope
     #default_scope { from_current_site }
 
@@ -541,19 +541,23 @@ module Alchemy
       rootpage? || (self.parent_id == Page.root.id && !self.language_root?)
     end
 
+    # Overwrites the cache_key method so it uses the published_at attribute instead of updated_at.
     def cache_key(request = nil)
-      if timestamp = updated_at
-        timestamp = timestamp.utc.to_s(:number)
-        "alchemy/pages/#{id}-#{timestamp}"
-      else
-        "alchemy/pages/#{id}"
-      end
+      "alchemy/pages/#{id}"
     end
 
     def taggable?
       definition['taggable'] == true
     end
 
+    # Publishes the page
+    #
+    # Sets public true and saves the object.
+    def publish!
+      self.public = true
+      self.save
+    end
+
   private
 
     def next_or_previous(direction = :next, options = {})

data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb

@@ -1,9 +1,9 @@
 <%-
   prefix = "<div class=\"assign_file_file_icon\">"
-  suffix = "</div><div class=\"assign_file_file_name\">#{file_to_assign.filename}</div>"
+  suffix = "</div><div class=\"assign_file_file_name\">#{file_to_assign.file_name}</div>"
 -%>
 <%- img_tag = "#{prefix}#{render_icon(file_to_assign.icon_css_class)}#{suffix}".html_safe -%>
-<li class="assign_file_file <%= cycle('even', 'odd') %>" name="<%= file_to_assign.filename %>">
+<li class="assign_file_file <%= cycle('even', 'odd') %>" name="<%= file_to_assign.file_name %>">
   <%= link_to(
     img_tag,
     {
@@ -15,6 +15,6 @@
     },
     :remote => true,
     :method => 'put',
-    :title => file_to_assign.filename
+    :title => file_to_assign.file_name
   ) %>
 </li>

data/app/views/alchemy/essences/_essence_file_view.html.erb

@@ -5,5 +5,5 @@
     :name => content.essence.attachment.urlname
   ),
   :class => "file_link #{content.essence.css_class.blank? ? "" : content.essence.css_class}",
-  :title => "#{content.essence.title.blank? ? content.essence.attachment.filename : content.essence.title}"
+  :title => "#{content.essence.title.blank? ? content.essence.attachment.file_name : content.essence.title}"
 ) if content.essence.attachment %>

data/config/locales/alchemy.de.yml

@@ -255,6 +255,7 @@ de:
     "No Tags found": "Keine Tags gefunden"
     "None": "keine"
     "Open Link in": "Link öffnen in"
+    "Page": "Seite"
     "Page deleted": "%{name} wurde gelöscht"
     "Page saved": "%{name} wurde gespeichert"
     "Page Preview": "Seitenvorschau"

data/lib/alchemy/seeder.rb

@@ -81,6 +81,9 @@ module Alchemy
           :host => '*'
         )
         if site.new_record?
+          if Alchemy::Language.any?
+            site.languages = Alchemy::Language.all
+          end
           site.save!
           log "Created default site with default language."
         else

data/lib/alchemy/upgrader.rb

@@ -11,6 +11,7 @@ module Alchemy
         Rake::Task['alchemy:install:migrations'].invoke
         strip_alchemy_from_schema_version_table
         Rake::Task['db:migrate'].invoke
+        Seeder.seed!
         upgrade_to_language
         upgrade_layoutpages
         upgrade_essence_link_target_default
@@ -18,9 +19,9 @@ module Alchemy
         convert_essence_texts_displayed_as_select_into_essence_selects
         convert_essence_texts_displayed_as_checkbox_into_essence_booleans
         copy_new_config_file
+        gallery_pictures_change_notice
         removed_richmedia_essences_notice
         convert_picture_storage
-        upgrade_to_sites
         removed_standard_set_notice
         renamed_t_method
         migrated_to_devise
@@ -30,20 +31,6 @@ module Alchemy
 
     private
 
-      def upgrade_to_sites
-        desc "Creating default site and migrating existing languages to it"
-        if Site.count == 0
-          Alchemy::Site.transaction do
-            site = Alchemy::Site.new(host: '*', name: 'Default Site')
-            site.languages << Alchemy::Language.all
-            site.save!
-            log "Done."
-          end
-        else
-          log "Site(s) already present.", :skip
-        end
-      end
-
       # Creates Language model if it does not exist (Alchemy CMS prior v1.5)
       # Also creates missing associations between pages and languages
       def upgrade_to_language
@@ -51,7 +38,7 @@ module Alchemy
         Alchemy::Page.all.each do |page|
           if !page.language_code.blank? && page.language.nil?
             root = page.get_language_root
-            lang = Alchemy::Language.find_or_create_by_code(
+            lang = Alchemy::Language.find_or_create_by_language_code(
               :name => page.language_code.capitalize,
               :code => page.language_code,
               :frontpage_name => root.name,
@@ -214,6 +201,17 @@ module Alchemy
         end
       end
 
+      def gallery_pictures_change_notice
+        txt = ["We have changed the way Alchemy handles EssencePictures in elements."]
+        txt << "It is now possible to have single EssencePictures and galleries side by side in the same element."
+        txt << "All element editor views containing render_picture_editor with option `maximum_amount_of_images => 1` must be changed into render_essence_editor_by_name."
+        txt << "In the yml description of these elements add a new content for this picture."
+        txt << "\nIn order to upgrade your elements in the database run:"
+        txt << "\nrails g alchemy:gallery_pictures_migration\n"
+        txt << "and alter `db/seeds.rb`, so that it contains all elements that have essence pictures."
+        todo txt.join("\n")
+      end
+
       def removed_richmedia_essences_notice
         warn = <<-WARN
 We removed the EssenceAudio, EssenceFlash and EssenceVideo essences from Alchemy core!

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.5.1"
+  VERSION = "2.5.2"
 
   def self.version
     VERSION

data/lib/rails/generators/alchemy/gallery_pictures_migration/gallery_pictures_migration_generator.rb

@@ -0,0 +1,40 @@
+require 'rails'
+
+module Alchemy
+  module Generators
+    class GalleryPicturesMigrationGenerator < ::Rails::Generators::Base
+      desc "This generator generates a script to update your elements to gallery pictures."
+      source_root File.expand_path('templates', File.dirname(__FILE__))
+
+      def append_into_seeds
+        append_file Rails.root.join("db/seeds.rb") do
+          <<-BLAH
+
+module Alchemy
+
+  # Add all element names that contain a single picture.
+  Element.named(["picture", "background"]).each do |element|
+    element.contents.essence_pictures.each do |content|
+      content.update_column(:name, "image")
+    end
+  end
+
+  # Add all element names that contain a picture gallery.
+  Element.named(["gallery", "slides"]).each do |element|
+    element.contents.essence_pictures.each_with_index do |content, i|
+      content.update_column(:name, "essence_picture_#\{i+1\}")
+    end
+  end
+
+end
+BLAH
+        end
+      end
+
+      def display_todo
+        say "\nNow please alter `db/seeds.rb` so that it contains the elements you want to convert.\n"
+      end
+
+    end
+  end
+end

data/spec/controllers/admin/pages_controller_spec.rb

@@ -121,5 +121,20 @@ module Alchemy
 
     end
 
+    describe '#publish' do
+
+      let(:page) { stub_model(Page, published_at: nil, public: false, name: "page", parent_id: 1, urlname: "page", language: stub_model(Language), page_layout: "bla") }
+      before do
+        @controller.stub!(:load_page).and_return(page)
+        @controller.instance_variable_set("@page", page)
+      end
+
+      it "should publish the page" do
+        page.should_receive(:publish!)
+        post :publish, { id: page.id }
+      end
+
+    end
+
   end
 end

data/spec/controllers/pictures_controller_spec.rb

@@ -67,18 +67,50 @@ module Alchemy
       end
     end
 
-    context "Requesting a picture with crop and size parameters" do
-      it "should render a cropped image" do
-        options = {
-          :crop => 'crop',
-          :size => '10x10',
-          :format => 'png'
-        }
-        get :show, options.merge(:id => picture.id, :sh => picture.security_token(options))
-        response.body[0x10..0x18].unpack('NN').should == [10,10]
+    describe 'Picture processing' do
+
+      context "with crop and size parameters" do
+
+        let(:big_picture) { Picture.create(:image_file => fixture_file_upload(File.expand_path('../../support/80x60.png', __FILE__), 'image/png')) }
+
+        it "should return a cropped image." do
+          options = {
+            :crop => 'crop',
+            :size => '10x10',
+            :format => 'png'
+          }
+          get :show, options.merge(:id => big_picture.id, :sh => big_picture.security_token(options))
+          response.body[0x10..0x18].unpack('NN').should == [10,10]
+        end
+
+        context "without upsample parameter" do
+          it "should not upsample the image." do
+            options = {
+              :crop => 'crop',
+              :size => '10x10',
+              :format => 'png'
+            }
+            get :show, options.merge(:id => picture.id, :sh => picture.security_token(options))
+            response.body[0x10..0x18].unpack('NN').should == [1,1]
+          end
+        end
+
+        context "and with upsample true" do
+          it "should return an upsampled image." do
+            options = {
+              :crop => 'crop',
+              :size => '10x10',
+              :upsample => 'true',
+              :format => 'png'
+            }
+            get :show, options.merge(:id => picture.id, :sh => picture.security_token(options))
+            response.body[0x10..0x18].unpack('NN').should == [10,10]
+          end
+        end
+
       end
-    end
 
+    end
 
   end
 end

data/spec/dummy/config/alchemy/page_layouts.yml

@@ -24,3 +24,7 @@
   elements: [headline, text, searchresult]
   autogenerate: [searchresult]
   searchresults: true
+
+- name: external
+  unique: false
+  redirects_to_external: true

data/spec/models/page_spec.rb

@@ -161,20 +161,31 @@ module Alchemy
         end
 
         context "urlname has changed" do
-          it "should store legacy url" do
+
+          it "should store legacy url if page is not redirect to external page" do
             page.urlname = 'new-urlname'
             page.save!
             page.legacy_urls.should_not be_empty
             page.legacy_urls.first.urlname.should == 'my-testpage'
           end
+
+          it "should not store legacy url if page is redirect to external page" do
+            page.urlname = 'new-urlname'
+            page.page_layout = "external"
+            page.save!
+            page.legacy_urls.should be_empty
+          end
+
         end
 
         context "urlname has not changed" do
+
           it "should not store a legacy url" do
             page.urlname = 'my-testpage'
             page.save!
             page.legacy_urls.should be_empty
           end
+
         end
 
       end
@@ -681,7 +692,7 @@ module Alchemy
     end
 
     describe '.copy' do
-      let (:page) { FactoryGirl.create(:page, :name => 'Source') }
+      let(:page) { FactoryGirl.create(:page, :name => 'Source') }
       subject { Page.copy(page) }
 
       it "the copy should have added (copy) to name" do
@@ -745,5 +756,20 @@ module Alchemy
       end
     end
 
+    describe "#cache_key" do
+      let(:page) { stub_model(Page) }
+      subject { page }
+      its(:cache_key) { should match(page.id.to_s) }
+    end
+
+    describe "#publish!" do
+      let(:page) { stub_model(Page, public: false, name: "page", parent_id: 1, urlname: "page", language: stub_model(Language), page_layout: "bla") }
+      before { page.publish! }
+
+      it "sets public attribute to true" do
+        page.public.should == true
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,7 +118,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.14
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -244,7 +244,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
@@ -252,7 +252,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
@@ -859,6 +859,7 @@ files:
 - lib/rails/generators/alchemy/essence/essence_generator.rb
 - lib/rails/generators/alchemy/essence/templates/editor.html.erb
 - lib/rails/generators/alchemy/essence/templates/view.html.erb
+- lib/rails/generators/alchemy/gallery_pictures_migration/gallery_pictures_migration_generator.rb
 - lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb
 - lib/rails/generators/alchemy/page_layouts/templates/layout.html.erb
 - lib/rails/generators/alchemy/page_layouts/templates/layout.html.haml
@@ -993,6 +994,7 @@ files:
 - spec/models/user_spec.rb
 - spec/routing_spec.rb
 - spec/spec_helper.rb
+- spec/support/80x60.png
 - spec/support/alchemy/controller_hacks.rb
 - spec/support/alchemy/specs_helpers.rb
 - spec/support/alchemy/test_tweaks.rb
@@ -1129,7 +1131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1217136868404784011
+      hash: -107875823720288269
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
@@ -1258,6 +1260,7 @@ test_files:
 - spec/models/user_spec.rb
 - spec/routing_spec.rb
 - spec/spec_helper.rb
+- spec/support/80x60.png
 - spec/support/alchemy/controller_hacks.rb
 - spec/support/alchemy/specs_helpers.rb
 - spec/support/alchemy/test_tweaks.rb