alchemy_cms 2.1.rc4 → 2.1.rc5

data/.travis.yml

@@ -1,3 +1,4 @@
+bundler_args: --without development
 rvm:
   - 1.8.7
   - 1.9.2

data/Gemfile

@@ -3,7 +3,9 @@ source "http://rubygems.org"
 gemspec
 
 group :test do
-	gem 'factory_girl_rails'
+	gem 'rspec-rails'
+	gem 'sqlite3'
+	gem 'factory_girl_rails', '1.4.0'
 	gem "capybara"
 	gem 'capybara-webkit'
 	gem "launchy"
@@ -17,12 +19,8 @@ group :assets do
 end
 
 group :development do
-	if !ENV["CI"]
-		gem 'ruby-debug-base19', '~> 0.11.26', :platform => :ruby_19
-		gem 'linecache19', '~> 0.5.13', :platform => :ruby_19
-		gem 'ruby-debug19', '~> 0.11.6', :require => 'ruby-debug', :platform => :ruby_19
-		gem 'ruby-debug', :platform => :ruby_18
-		gem 'guard-spork'
-		gem 'yard'
-	end
+	gem 'ruby-debug19', :require => 'ruby-debug', :platform => :ruby_19
+	gem 'ruby-debug', :platform => :ruby_18
+	gem 'guard-spork'
+	gem 'yard'
 end

data/app/helpers/alchemy/essences_helper.rb

@@ -1,8 +1,43 @@
 module Alchemy
+
+	# This helper contains methods to render the +essence+ from an +Element+ +Content+.
+	# 
+	# Essences have two kinds of partials. An +editor+ and a +view+ partial.
+	# 
+	# They both resist in +'app/views/alchemy/essences'+
+	# 
+	# The partials are suffixed with the type of part.
+	# 
+	# == Example:
+	# 
+	# For an EssenceText
+	# 
+	# The view partial is:
+	# 
+	# +_essence_text_view.html.erb+
+	# 
+	# The editor partial is:
+	# 
+	# +_essence_text_editor.html.erb+
+	# 
+	# == Usage:
+	# 
+	# For front end web development you should mostly use the +render_essence_view_by_name+ helper.
+	# 
+	# And the +render_essence_editor_by_name+ helper for Alchemy backend views.
+	# 
 	module EssencesHelper
 
-		# Renders the Content view partial from the passed Element for passed content name.
-		# For options see -> render_essence
+		# Renders the +Essence+ view partial from +Element+ by name.
+		# 
+		# Pass the name of the +Content+ from +Element+ as second argument.
+		# 
+		# == Example:
+		# 
+		# This renders the +Content+ named "intro" from element.
+		# 
+		#   <%= render_essence_view_by_name(element, "intro") %>
+		# 
 		def render_essence_view_by_name(element, name, options = {}, html_options = {})
 			if element.blank?
 				warning('Element is nil')
@@ -12,66 +47,18 @@ module Alchemy
 			render_essence(content, :view, {:for_view => options}, html_options)
 		end
 
-		# Renders the Content partial that is given (:editor, or :view).
-		# You can pass several options that are used by the different contents.
-		#
-		# For the view partial:
-		# :image_size => "111x93"                        Used by EssencePicture to render the image via RMagick to that size.
-		# :css_class => ""                               This css class gets attached to the content view.
-		# :date_format => "Am %d. %m. %Y, um %H:%Mh"     Espacially fot the EssenceDate. See Date.strftime for date formatting.
-		# :caption => true                               Pass true to enable that the EssencePicture.caption value gets rendered.
-		# :blank_value => ""                             Pass a String that gets rendered if the content.essence is blank.
-		#
-		# For the editor partial:
-		# :css_class => ""                               This css class gets attached to the content editor.
-		# :last_image_deletable => false                 Pass true to enable that the last image of an imagecollection (e.g. image gallery) is deletable.
-		def render_essence(content, part = :view, options = {}, html_options = {})
-			if content.nil?
-				return part == :view ? "" : warning('Content is nil', t("content_not_found"))
-			elsif content.essence.nil?
-				return part == :view ? "" : warning('Essence is nil', t("content_essence_not_found"))
-			end
-			defaults = {
-				:for_editor => {
-					:as => 'text_field',
-					:css_class => 'long',
-					:render_format => "html"
-				},
-				:for_view => {
-					:image_size => "120x90",
-					:css_class => "",
-					:date_format => "%d. %m. %Y, %H:%Mh",
-					:caption => true,
-					:blank_value => "",
-					:render_format => "html"
-				}
-			}
-			if options["for_#{part}".to_sym].nil?
-				options_for_partial = defaults["for_#{part}".to_sym]
-			else
-				options_for_partial = defaults.fetch("for_#{part}".to_sym).merge(options["for_#{part}".to_sym])
-			end
-			options = options.merge(defaults)
-			render(
-				:partial => "alchemy/essences/#{content.essence_partial_name}_#{part.to_s}.#{options_for_partial[:render_format]}.erb",
-				:locals => {
-					:content => content,
-					:options => options_for_partial,
-					:html_options => html_options
-				}
-			)
-		end
-
-		# Renders the Content view partial from the given Content.
-		# For options see -> render_essence
-		def render_essence_view(content, options = {}, html_options = {})
-			render_essence(content, :view, {:for_view => options}, html_options)
-		end
-
-		# Renders the Content view partial from the given Element for the essence_type (e.g. EssenceRichtext).
-		# For multiple contents of same kind inside one element just pass a position so that will be rendered.
-		# Otherwise the first content found for this type will be rendered.
-		# For options see -> render_essence
+		# Renders the +Essence+ view partial from given +Element+ and +Essence+ type.
+		# 
+		# Pass the type of +Essence+ you want to render from +element+ as second argument.
+		# 
+		# By default the first essence gets rendered. You may pass a different position value as third argument.
+		# 
+		# == Example:
+		# 
+		# This renders the first +Content+ with type of +EssencePicture+ from element.
+		# 
+		#   <%= render_essence_view_by_type(element, "EssencePicture", 1, {:image_size => "120x80", :crop => true}) %>
+		# 
 		def render_essence_view_by_type(element, type, position = 1, options = {}, html_options = {})
 			if element.blank?
 				warning('Element is nil')
@@ -82,17 +69,72 @@ module Alchemy
 			else
 				content = element.contents.find_by_essence_type_and_position(Alchemy::Content.normalize_essence_type(type), position)
 			end
-			render_essence(content, :view, :for_view => options)
+			render_essence_view(content, options, html_options)
 		end
 
-		# Renders the Content view partial from the given Element by position (e.g. 1).
-		# For options see -> render_essence
+		# Renders the +Essence+ view partial from +Element+ by position.
+		# 
+		# Pass the position of the +Content+ inside the Element as second argument.
+		# 
+		# == Example:
+		# 
+		# This renders the second +Content+ from element.
+		# 
+		#   <%= render_essence_view_by_type(element, 2) %>
+		# 
 		def render_essence_view_by_position(element, position, options = {}, html_options = {})
 			if element.blank?
 				warning('Element is nil')
 				return ""
 			end
 			content = element.contents.find_by_position(position)
+			render_essence_view(content, options, html_options)
+		end
+
+		# Renders the +Esssence+ partial for given +Content+.
+		# 
+		# The helper renders the view partial as default.
+		# 
+		# Pass +:editor+ as second argument to render the editor partial
+		# 
+		# == Options:
+		# 
+		# You can pass a options Hash to each type of essence partial as third argument.
+		# 
+		# This Hash is available as +options+ local variable.
+		# 
+		#   :for_view => {}
+		#   :for_editor => {}
+		# 
+		def render_essence(content, part = :view, options = {}, html_options = {})
+			if content.nil?
+				return part == :view ? "" : warning('Content is nil', t("content_not_found"))
+			elsif content.essence.nil?
+				return part == :view ? "" : warning('Essence is nil', t("content_essence_not_found"))
+			end
+			render(
+				:partial => "alchemy/essences/#{content.essence_partial_name}_#{part.to_s}",
+				:locals => {
+					:content => content,
+					:options => options["for_#{part}".to_sym],
+					:html_options => html_options
+				}
+			)
+		end
+
+		# Renders the +Esssence+ view partial for given +Content+.
+		# 
+		# == Options:
+		# 
+		#   :image_size => "111x93"                        # Used by EssencePicture to render the image via RMagick to that size. [Default nil]
+		#   :date_format => "Am %d. %m. %Y, um %H:%Mh"     # Espacially for EssenceDate. See Rubys Date.strftime for date formatting options. [Default nil]
+		#   :caption => true                               # Pass Boolean to enable/disable the EssencePicture.caption. [Default true]
+		#   :blank_value => "Not found"                    # Pass a String that gets rendered if the content.essence is blank. [Default nil]
+		# 
+		def render_essence_view(content, options = {}, html_options = {})
+			defaults = {
+				:caption => true
+			}
 			render_essence(content, :view, {:for_view => options}, html_options)
 		end
 

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

@@ -1,10 +1,9 @@
 <%- unless content.essence.picture.nil? -%>
-	<%- image_size = options[:image_size] -%>
 	<%- img_tag = image_tag(
 		alchemy.show_picture_path(
 			:id => content.essence.picture.id,
 			:name => content.essence.picture.urlname,
-			:size => image_size,
+			:size => options[:image_size],
 			:crop => options[:crop] ? 'crop' : nil,
 			:crop_from => options[:crop] && !content.essence.crop_from.blank? ? content.essence.crop_from : nil,
 			:crop_size => options[:crop] && !content.essence.crop_size.blank? ? content.essence.crop_size : nil,
@@ -16,7 +15,8 @@
 		{
 			:alt => (content.essence.alt_tag.blank? ? nil : content.essence.alt_tag),
 			:title => (content.essence.title.blank? ? nil : content.essence.title),
-			:id => dom_id(content.essence.picture)
+			:id => dom_id(content.essence.picture),
+			:style => (options[:crop] && !options[:image_size].blank?) || (!options[:crop] && options[:image_size].blank?) ? "width: #{options[:image_size].blank? ? content.essence.picture.image_width : options[:image_size].split('x')[0]}px; height: #{options[:image_size].blank? ? content.essence.picture.image_height : options[:image_size].split('x')[1]}px" : nil
 		}.merge(html_options)
 	) -%>
 

data/app/views/alchemy/pictures/show.gif.flexi

@@ -1,13 +1,13 @@
 @picture.operate do |image|
   
-  if !@crop_from.blank? && !@crop_size.blank?
+  if !@crop_from.blank? && !@crop_size.blank? && !@size.blank?
     image.crop(
       :from => @crop_from,
       :size => @crop_size
     )
-    image.resize(@size, :upsample => @upsample) unless @size.nil?
-  else
-    image.resize(@size, :upsample => @upsample, :crop => @crop, :padding => @padding) unless @size.nil?
+    image.resize(@size, :upsample => @upsample)
+  elsif !@size.blank?
+    image.resize(@size, :upsample => @upsample, :crop => @crop, :padding => @padding)
   end
   image.image_overlay(@overlay[:file], :alignment => @overlay[:alignment]) unless @overlay.nil?
   unless @options.blank?

data/app/views/alchemy/pictures/show.jpg.flexi

@@ -1,13 +1,13 @@
 @picture.operate do |image|
   
-  if !@crop_from.blank? && !@crop_size.blank?
+  if !@crop_from.blank? && !@crop_size.blank? && !@size.blank?
     image.crop(
       :from => @crop_from,
       :size => @crop_size
     )
-    image.resize(@size, :upsample => @upsample) unless @size.nil?
-  else
-    image.resize(@size, :upsample => @upsample, :crop => @crop, :padding => @padding) unless @size.nil?
+    image.resize(@size, :upsample => @upsample)
+  elsif !@size.blank?
+    image.resize(@size, :upsample => @upsample, :crop => @crop, :padding => @padding)
   end
   image.image_overlay(@overlay[:file], :alignment => @overlay[:alignment]) unless @overlay.nil?
   unless @options.blank?

data/app/views/alchemy/pictures/show.png.flexi

@@ -1,13 +1,13 @@
 @picture.operate do |image|
   
-  if !@crop_from.blank? && !@crop_size.blank?
+  if !@crop_from.blank? && !@crop_size.blank? && !@size.blank?
     image.crop(
       :from => @crop_from,
       :size => @crop_size
     )
-    image.resize(@size, :upsample => @upsample) unless @size.nil?
-  else
-    image.resize(@size, :upsample => @upsample, :crop => @crop, :padding => @padding) unless @size.nil?
+    image.resize(@size, :upsample => @upsample)
+  elsif !@size.blank?
+    image.resize(@size, :upsample => @upsample, :crop => @crop, :padding => @padding)
   end
   image.image_overlay(@overlay[:file], :alignment => @overlay[:alignment]) unless @overlay.nil?
   unless @options.blank?

data/config/routes.rb

@@ -26,7 +26,7 @@ Alchemy::Engine.routes.draw do
 	match '/attachment/:id/show' => 'attachments#show',
 		:as => :show_attachment
 
-	match "/pictures/:id/show/:size(/:crop)(/:crop_from/:crop_size)/:name.:format" => 'pictures#show',
+	match "/pictures/:id/show(/:size)(/:crop)(/:crop_from/:crop_size)/:name.:format" => 'pictures#show',
 		:as => :show_picture, :defaults => { :format => Alchemy::Config.get(:image_output_format) }
 	match '/pictures/:id/zoom/:name.:format' => 'pictures#zoom',
 		:as => :zoom_picture, :defaults => { :format => Alchemy::Config.get(:image_store_format) }

data/lib/alchemy/capistrano.rb

@@ -46,17 +46,17 @@ Capistrano::Configuration.instance(:must_exist).load do
 			desc "Creates the database.yml file"
 			task :create do
 				db_config = ERB.new <<-EOF
-				production:
-				  adapter: mysql
-				  encoding: utf8
-				  reconnect: false
-				  pool: 5
-				  database: #{ Capistrano::CLI.ui.ask("Database name: ") }
-				  username: #{ Capistrano::CLI.ui.ask("Database username: ") }
-				  password: #{ Capistrano::CLI.ui.ask("Database password: ") }
-				  socket: #{ Capistrano::CLI.ui.ask("Database socket: ") }
-				  host: #{ Capistrano::CLI.ui.ask("Database host: ") }
-				EOF
+production:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  pool: 5
+  database: #{ Capistrano::CLI.ui.ask("Database name: ") }
+  username: #{ Capistrano::CLI.ui.ask("Database username: ") }
+  password: #{ Capistrano::CLI.ui.ask("Database password: ") }
+  socket: #{ Capistrano::CLI.ui.ask("Database socket: ") }
+  host: #{ Capistrano::CLI.ui.ask("Database host: ") }
+EOF
 				run "mkdir -p #{shared_path}/config"
 				put db_config.result, "#{shared_path}/config/database.yml"
 			end
@@ -68,16 +68,16 @@ Capistrano::Configuration.instance(:must_exist).load do
 
 		end
 
-  end
+		namespace :db do
 
-	namespace :db do
+			desc "Seeds the database with essential data."
+			task :seed, :roles => :app do
+				run "cd #{current_path} && RAILS_ENV=#{fetch(:rails_env, 'production')} #{rake} alchemy:db:seed"
+			end
 
-		desc "Seeds the database with essential data."
-		task :seed, :roles => :app do
-			run "cd #{current_path} && RAILS_ENV=#{fetch(:rails_env, 'production')} #{rake} alchemy:db:seed"
 		end
 
-	end
+  end
 
 	namespace :ferret do
 

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-	VERSION = "2.1.rc4"
+	VERSION = "2.1.rc5"
 
 end

data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt

@@ -39,7 +39,7 @@ before "deploy:restart", "deploy:migrate"
 
 <%- if @database_type == "mysql" -%>
 after "deploy:setup", "alchemy:database_yml:create"
-after "deploy:symlink", "alchemy:database_yml:symlink"
+after "deploy:assets:symlink", "alchemy:database_yml:symlink"
 <%- end -%>
 after "deploy", "deploy:cleanup"
 

data/lib/rails/generators/alchemy/elements/templates/editor.html.erb

@@ -1,6 +1,6 @@
 <%- unless @contents.blank? -%>
 	<%- @contents.each do |content| -%>
-		<%- unless content["type"] == "Alchemy::EssencePicture" -%>
+		<%- unless content["type"] == "Alchemy::EssencePicture" || content["type"] == "EssencePicture" -%>
 <%%= render_essence_editor_by_name(element, '<%= content["name"] %>') %>
 		<%- else -%>
 <%%= render_picture_editor(element) %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.rc4
+  version: 2.1.rc5
   prerelease: 4
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000 Z
+date: 2012-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70214478485880 !ruby/object:Gem::Requirement
+  requirement: &70208029023740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70214478485880
+  version_requirements: *70208029023740
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70214478485160 !ruby/object:Gem::Requirement
+  requirement: &70208029023320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214478485160
+  version_requirements: *70208029023320
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70214478484460 !ruby/object:Gem::Requirement
+  requirement: &70208029022760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214478484460
+  version_requirements: *70208029022760
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70214478483780 !ruby/object:Gem::Requirement
+  requirement: &70208029022240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70214478483780
+  version_requirements: *70208029022240
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70214478483180 !ruby/object:Gem::Requirement
+  requirement: &70208029021740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70214478483180
+  version_requirements: *70208029021740
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70214478482600 !ruby/object:Gem::Requirement
+  requirement: &70208029021260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214478482600
+  version_requirements: *70208029021260
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70214478481900 !ruby/object:Gem::Requirement
+  requirement: &70208029020780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70214478481900
+  version_requirements: *70208029020780
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70214478480640 !ruby/object:Gem::Requirement
+  requirement: &70208029020300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70214478480640
+  version_requirements: *70208029020300
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70214478479260 !ruby/object:Gem::Requirement
+  requirement: &70208029019820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70214478479260
+  version_requirements: *70208029019820
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70214478511660 !ruby/object:Gem::Requirement
+  requirement: &70208029035700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70214478511660
+  version_requirements: *70208029035700
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70214478510520 !ruby/object:Gem::Requirement
+  requirement: &70208029035220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *70214478510520
+  version_requirements: *70208029035220
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70214478509380 !ruby/object:Gem::Requirement
+  requirement: &70208029034740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +144,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70214478509380
+  version_requirements: *70208029034740
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70214478508660 !ruby/object:Gem::Requirement
+  requirement: &70208029034200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70214478508660
+  version_requirements: *70208029034200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70214478507840 !ruby/object:Gem::Requirement
+  requirement: &70208029033660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,7 +166,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214478507840
+  version_requirements: *70208029033660
 description: Alchemy is an awesome Rails CMS with an extremely flexible content storing
   architecture.
 email:
@@ -793,7 +793,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4031528361938782580
+      hash: -607147014317575995
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: