alchemy_cms 3.1.0.rc1 → 3.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90a343fa98a444500a06cfbaa172e6bb8c6b4856
-  data.tar.gz: fc1c96763f1a10a0938f54057b5bdc04f81dc002
+  metadata.gz: 64b4c80e471321ff237ae2fa6232841e2769f1fc
+  data.tar.gz: c66e6fbc68e16aa584ac6801d32821a3e04267f1
 SHA512:
-  metadata.gz: 910b2641a2a94dfd31289b4f3d41f13e5b02f2ae1e543a1f4dc30627c9451500c9e34510058be064fa53de2c576b9bd770ed07f479bc69c0323b479e97c5fa92
-  data.tar.gz: f05aac4f401eb397193dbb5a07a22e279fdb2cae66165b8ca7033e0f2415074f42d0d91e12588c2e44d8f7b2108fa25e1f3fbc62d7e7ce696cff23097778688c
+  metadata.gz: 3e43c4db264c179ebc193d8ace01227b9e94570b82c8c6f4c572e4cb1e5cfcd66995fa99a7326d57ac65f144da95f47c8aa28b2c2358dcf79afc4ea844672464
+  data.tar.gz: 326af8d144fdab241db4c6e41c8f981364b4ab5552c86132ba05f61aafe25ac06f635742c9f1f610e0c2f0d2f6ff026b833e69aaf32c1268b0f2a2860cf7f9ae

data/.gitignore

@@ -6,22 +6,16 @@ doc/
 rdoc/
 Gemfile.lock
 pkg
-/spec/dummy/log/development.log
-/spec/dummy/log/test.log
-/spec/dummy/db/test.sqlite3
-/spec/dummy/db/development.sqlite3
 tmp
-spec/dummy/index/
 log
-spec/dummy/uploads/
 .sass-cache
-spec/dummy/db/test.sqlite3-journal
-spec/dummy/db/seeds.rb
-.rvmrc
+spec/dummy/uploads/
+spec/dummy/db/*.sqlite3*
+spec/dummy/public/assets
 spec/dummy/config/locales/**/*
+.rvmrc
 /coverage/
 *.gem
-/.ruby-version
 /index/
 /.bundle/
 .rbenv-version

data/.teatro.yml

@@ -0,0 +1,7 @@
+project:
+  after:
+    - apt-get -y install imagemagick
+stage:
+  before: cd spec/dummy
+  database: bin/rake db:setup RAILS_ENV=production
+  run: bin/rails server -e production

data/Gemfile

@@ -6,20 +6,16 @@ if ENV['RAILS_VERSION']
   gem 'rails', "~> #{ENV['RAILS_VERSION']}"
 end
 
-# Code coverage plattform
-gem 'coveralls', require: false
-
-group :test do
-  gem 'sqlite3'               if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
-  gem 'mysql2'                if ENV['DB'] == 'mysql'
-  gem 'pg'                    if ENV['DB'] == 'postgresql'
-  unless ENV['CI']
-    gem 'launchy'
-  end
-end
+gem 'sqlite3' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
+gem 'mysql2'  if ENV['DB'] == 'mysql'
+gem 'pg'      if ENV['DB'] == 'postgresql'
 
 group :development, :test do
+  gem 'jasmine-rails',        github: 'searls/jasmine-rails'
+  gem 'jasmine-jquery-rails', github: 'travisjeffery/jasmine-jquery-rails'
+  gem 'coveralls',            require: false
   unless ENV['CI']
+    gem 'launchy'
     gem 'annotate'
     gem 'bumpy'
     gem 'yard'
@@ -28,6 +24,10 @@ group :development, :test do
     gem 'spring'
     gem 'spring-commands-rspec'
   end
-  gem 'jasmine-rails', github: 'searls/jasmine-rails'
-  gem 'jasmine-jquery-rails', github: 'travisjeffery/jasmine-jquery-rails'
+end
+
+# We need this if we want to start the dummy app in production, ie on Teatro.io
+group :production do
+  gem 'uglifier', '>= 1.0.3'
+  gem 'therubyracer'
 end

data/README.md

@@ -261,11 +261,18 @@ Please take a look into Alchemys [Capistrano receipt](https://github.com/Alchemy
 
 If you want to contribute to Alchemy ([and we encourage you to do so](https://github.com/AlchemyCMS/alchemy_cms/blob/master/CONTRIBUTING.md)) we have a strong test suite that helps you to not break anything.
 
+### Preparation
+
+First of all you need to clone your fork to your local development machine. Then you need to install the dependencies with bundler.
+
+```shell
+$ bundle install
+```
+
 To prepare the tests of your Alchemy fork please make sure to run the preparation task:
 
 ```shell
-# ~/your/local/alchemy_cms
-$ bin/rake alchemy:spec:prepare
+$ bundle exec rake alchemy:spec:prepare
 ```
 
 to set up the database for testing.
@@ -276,7 +283,7 @@ to set up the database for testing.
 $ bundle exec rspec
 ```
 
-**Alternatively** you can just run:
+**Alternatively** you can just run*:
 
 ```shell
 $ bundle exec rake
@@ -284,6 +291,16 @@ $ bundle exec rake
 
 *) This default task executes the database preparations and runs all defined test cases.
 
+### Start the dummy app
+
+You can even start the dummy app and use it to manually test your changes with:
+
+```shell
+$ cd spec/dummy
+$ bin/rake db:setup
+$ bin/rails s
+```
+
 **A note about RSpec version:**
 
 Alchemy specs are written **in RSpec 3**. Please **do not use deprecated RSpec 2.x syntax**. Thanks

data/app/assets/javascripts/alchemy/alchemy.translations.js.coffee

@@ -22,8 +22,8 @@ Alchemy.translations =
     'File is too large': 'Datei ist zu groß.'
     'File is too small': 'Datei ist zu klein.'
     'File type not allowed': 'Dateityp nicht erlaubt.'
-    'Maximum number of files exceeded': 'Maximale Anzahl an Dateien erreicht.'
-    'Uploaded bytes exceed file size': 'Maximal erlaubte Dateigröße erreicht.'
+    'Maximum number of files exceeded': 'Maximale Anzahl gleichzeitig erlaubter Datei-Uploads erreicht.'
+    'Uploaded bytes exceed file size': 'Maximale Größe der erlaubten Dateigröße erreicht.'
 
   # English
   en:
@@ -109,7 +109,7 @@ Alchemy.translations =
     'File type not allowed': 'Этот тип файла не разрешен'
     'Maximum number of files exceeded': 'Исчерпано максимальное количество файлов.'
     'Uploaded bytes exceed file size': 'Превышен максимальный размер файла'
-      
+
   # Spanish
   es:
     allowed_chars: 'de %{count} caracteres'

data/app/assets/javascripts/alchemy/alchemy.uploader.js.coffee

@@ -25,6 +25,7 @@ Alchemy.Uploader = (settings) ->
   $("#fileupload").fileupload
     dropZone: '#dropbox'
     dataType: 'json'
+    filesContainer: $('#uploadProgressContainer')
     acceptFileTypes: new RegExp("(.|/)(#{file_types})", "i")
     maxNumberOfFiles: settings.file_upload_limit
     maxFileSize: settings.file_size_limit * 1000000
@@ -32,6 +33,10 @@ Alchemy.Uploader = (settings) ->
       form_data = form.serializeArray()
       $.merge(form_data, settings.post_params)
       form_data
+    getNumberOfFiles: ->
+      @filesContainer
+        .children()
+        .not('.progressBarInProgress').length - 1
     add: (e, data) ->
       $this = $(this)
       data.context = new Alchemy.FileProgress(data.files[0])

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

@@ -3,24 +3,44 @@ module Alchemy
     class EssenceFilesController < Alchemy::Admin::BaseController
       authorize_resource class: Alchemy::EssenceFile
 
+      before_filter :load_essence_file, only: [:edit, :update]
+
       helper "Alchemy::Admin::Contents"
 
       def edit
-        @essence_file = EssenceFile.find(params[:id])
         @content = @essence_file.content
         @options = options_from_params
       end
 
       def update
-        @essence_file = EssenceFile.find(params[:id])
-        @essence_file.update(params[:essence_file])
+        @essence_file.update(essence_file_params)
       end
 
+      # Assigns file, but does not saves it.
+      #
+      # When the user saves the element the content gets updated as well.
+      #
       def assign
         @content = Content.find_by(id: params[:content_id])
         @attachment = Attachment.find_by(id: params[:attachment_id])
         @content.essence.attachment = @attachment
         @options = options_from_params
+
+        # We need to update timestamp here because we don't save yet,
+        # but the cache needs to be get invalid.
+        # And we don't user @content.touch here, because that updates
+        # also the element and page timestamps what we don't want yet.
+        @content.update_column(:updated_at, Time.now)
+      end
+
+      private
+
+      def essence_file_params
+        params.require(:essence_file).permit(:title, :css_class)
+      end
+
+      def load_essence_file
+        @essence_file = EssenceFile.find(params[:id])
       end
     end
   end

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

@@ -36,15 +36,20 @@ module Alchemy
 
       # Assigns picture, but does not saves it.
       #
-      # When the user press save on the element, it gets saved.
+      # When the user saves the element the content gets updated as well.
       #
       def assign
         @picture = Picture.find_by(id: params[:picture_id])
         @content.essence.picture = @picture
-        @content.touch # We need to touch manually because its not saved yet.
         @element = @content.element
         @dragable = @options[:grouped]
         @options = @options.merge(dragable: @dragable)
+
+        # We need to update timestamp here because we don't save yet,
+        # but the cache needs to be get invalid.
+        # And we don't user @content.touch here, because that updates
+        # also the element and page timestamps what we don't want yet.
+        @content.update_column(:updated_at, Time.now)
       end
 
       def destroy

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

@@ -12,10 +12,7 @@ module Alchemy
 
       def index
         @size = params[:size].present? ? params[:size] : 'medium'
-        @pictures = Picture.all
-        @pictures = @pictures.tagged_with(params[:tagged_with]) if params[:tagged_with].present?
-        @pictures = @pictures.filtered_by(params[:filter]) if params[:filter]
-        @pictures = @pictures.find_paginated(params, pictures_per_page_for_size(@size))
+        @pictures = Picture.find_paginated(params, pictures_per_page_for_size(@size))
         if in_overlay?
           archive_overlay
         end

data/app/controllers/alchemy/base_controller.rb

@@ -96,11 +96,13 @@ module Alchemy
     protected
 
     def permission_denied(exception = nil)
-      Rails.logger.debug <<-WARN
+      if exception
+        Rails.logger.debug <<-WARN
 
 /!\\ Failed to permit #{exception.action} on #{exception.subject.inspect} for:
 #{current_alchemy_user.inspect}
 WARN
+      end
       if current_alchemy_user
         handle_redirect_for_user
       else

data/app/controllers/alchemy/pages_controller.rb

@@ -184,7 +184,9 @@ module Alchemy
     # @returns Boolean
     #
     def cache_page?
-      return false unless @page && Alchemy::Config.get(:cache_pages)
+      return false if @page.nil? ||
+        !Rails.application.config.action_controller.perform_caching ||
+        !Alchemy::Config.get(:cache_pages)
       page_layout = PageLayout.get(@page.page_layout)
       page_layout['cache'] != false && page_layout['searchresults'] != true
     end

data/app/models/alchemy/content.rb

@@ -37,9 +37,6 @@ module Alchemy
       "element_id = #{element_id || 'null'} AND essence_type = '#{essence_type}'"
     end
 
-    # Validations
-    validates :position, uniqueness: {scope: [:element_id, :essence_type]}
-
     # Essence scopes
     scope :essence_booleans,  -> { where(essence_type: "Alchemy::EssenceBoolean") }
     scope :essence_dates,     -> { where(essence_type: "Alchemy::EssenceDate") }

data/app/models/alchemy/element.rb

@@ -29,7 +29,7 @@ module Alchemy
     acts_as_taggable
 
     # All Elements inside a cell are a list. All Elements not in cell are in the cell_id.nil list.
-    acts_as_list :scope => [:page_id, :cell_id]
+    acts_as_list scope: [:page_id, :cell_id]
     stampable stamper_class_name: Alchemy.user_class_name
 
     has_many :contents, -> { order(:position) }, dependent: :destroy
@@ -39,7 +39,6 @@ module Alchemy
       class_name: 'Alchemy::Page',
       join_table: 'alchemy_elements_alchemy_pages'
 
-    validates_uniqueness_of :position, :scope => [:page_id, :cell_id], :if => lambda { |e| e.position != nil }
     validates_presence_of :name, :on => :create
     validates_format_of :name, :on => :create, :with => /\A[a-z0-9_-]+\z/
 

data/app/models/alchemy/page/page_scopes.rb

@@ -21,7 +21,9 @@ module Alchemy
       # All pages locked by given user
       #
       scope :all_locked_by, ->(user) {
-        all_locked.where(locked_by: user.id)
+        if user.class.respond_to? :primary_key
+          all_locked.where(locked_by: user.send(user.class.primary_key))
+        end
       }
 
       # All not locked pages

data/app/models/alchemy/page/page_users.rb

@@ -5,19 +5,19 @@ module Alchemy
     # Returns the creator of this page.
     #
     def creator
-      Alchemy.user_class.try(:find_by, {id: creator_id})
+      get_page_user(creator_id)
     end
 
     # Returns the last updater of this page.
     #
     def updater
-      Alchemy.user_class.try(:find_by, {id: updater_id})
+      get_page_user(updater_id)
     end
 
     # Returns the user currently editing this page.
     #
     def locker
-      Alchemy.user_class.try(:find_by, {id: locked_by})
+      get_page_user(locked_by)
     end
 
     # Returns the name of the creator of this page.
@@ -47,5 +47,12 @@ module Alchemy
       (locker && locker.try(:name)) || I18n.t('unknown')
     end
 
+    private
+
+    def get_page_user(id)
+      if Alchemy.user_class.respond_to? :primary_key
+        Alchemy.user_class.try(:find_by, {Alchemy.user_class.primary_key => id})
+      end
+    end
   end
 end

data/app/models/alchemy/picture.rb

@@ -62,10 +62,21 @@ module Alchemy
 
     stampable stamper_class_name: Alchemy.user_class_name
 
-    scope :named,       ->(name) { where("name LIKE ?", "%#{name}%") }
-    scope :recent,      -> { where("#{self.table_name}.created_at > ?", Time.now - 24.hours).order(:created_at) }
-    scope :deletable,   -> { where('alchemy_pictures.id NOT IN (SELECT picture_id FROM alchemy_essence_pictures)') }
-    scope :without_tag, -> { where("cached_tag_list IS NULL OR cached_tag_list = ''") }
+    scope :named, ->(name) {
+      where("#{self.table_name}.name LIKE ?", "%#{name}%")
+    }
+
+    scope :recent, -> {
+      where("#{self.table_name}.created_at > ?", Time.now - 24.hours).order(:created_at)
+    }
+
+    scope :deletable, -> {
+      where("#{self.table_name}.id NOT IN (SELECT picture_id FROM alchemy_essence_pictures)")
+    }
+
+    scope :without_tag, -> {
+      where("#{self.table_name}.cached_tag_list IS NULL OR #{self.table_name}.cached_tag_list = ''")
+    }
 
     after_update :touch_contents
 
@@ -73,8 +84,21 @@ module Alchemy
 
     class << self
 
+      # Returns filtered, paginated and ordered picture collection.
       def find_paginated(params, per_page)
-        Picture.named(params[:query]).page(params[:page] || 1).per(per_page).order(:name)
+        @pictures = Picture.all
+
+        if params[:tagged_with].present?
+          @pictures = @pictures.tagged_with(params[:tagged_with])
+        end
+        if params[:filter].present?
+          @pictures = @pictures.filtered_by(params[:filter])
+        end
+        if params[:query].present?
+          @pictures = @pictures.named(params[:query])
+        end
+
+        @pictures.page(params[:page] || 1).per(per_page).order(:name)
       end
 
       def last_upload
@@ -92,7 +116,6 @@ module Alchemy
           all
         end
       end
-
     end
 
     # Instance methods

data/app/models/alchemy/picture/transformations.rb

@@ -173,17 +173,24 @@ module Alchemy
     # This function takes a target and a base dimensions hash and returns
     # the dimensions of the image when the base dimensions hash fills
     # the target.
+    #
     # Aspect ratio will be preserved.
     #
     def size_when_fitting(target, dimensions = get_base_dimensions)
-      zoom_x = dimensions[:width].to_f / target[:width]
-      zoom_y = dimensions[:height].to_f / target[:height]
+      zoom = [
+        dimensions[:width].to_f / target[:width],
+        dimensions[:height].to_f / target[:height]
+      ].max
+
+      if zoom == 0.0
+        width = target[:width]
+        height = target[:height]
+      else
+        width = (dimensions[:width] / zoom).round
+        height = (dimensions[:height] / zoom).round
+      end
 
-      zoom = [zoom_x, zoom_y].max
-      {
-        width: (dimensions[:width] / zoom).round.to_i,
-        height: (dimensions[:height] / zoom).round.to_i
-      }
+      {width: width.to_i, height: height.to_i}
     end
 
     # Given a point as a Hash with :x and :y, and a mask with