alchemy_cms 2.0.4 → 2.0.5

data/.gitignore

@@ -14,4 +14,7 @@ tmp
 spec/dummy/index/
 log
 spec/dummy/uploads/
-spec/dummy/.sass-cache/
+spec/dummy/.sass-cache/
+spec/dummy/public/**/alchemy
+spec/dummy/db/migrate
+spec/dummy/db/seeds.rb

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 gemspec
 
 group :development, :test do
-	gem 'gettext', '>=1.9.3', :require => false
+	gem 'gettext', '>=1.93.0', :require => false
 end
 
 group :test do

data/README.md

@@ -46,7 +46,7 @@ Features
 - Completely free:
   - BSD License
   - No Enterprise Licences, or Community Editions
-- Hostable on any Server that supports RubyOnRails and ImageMagick ([Software Requirements](https://github.com/magiclabs/alchemy/wiki/Software-Requirements))
+- Hostable on any Server that supports RubyOnRails and ImageMagick ([Software Requirements](https://github.com/magiclabs/alchemy_cms/wiki/Software-Requirements))
 
 Rails Version
 -------------

data/app/controllers/admin/essence_files_controller.rb

@@ -1,6 +1,7 @@
 class Admin::EssenceFilesController < AlchemyController
 
   filter_access_to :all
+	helper :contents
 
   def edit
     @content = Content.find(params[:id])

data/app/models/attachment.rb

@@ -9,8 +9,8 @@ class Attachment < ActiveRecord::Base
   )
   validates_as_attachment
 
-  def name
-    read_attribute(:name).split('.').first
+  def urlname
+    CGI.escape(read_attribute(:filename).split('.').first)
   end
 
   def extension

data/app/models/essence_file.rb

@@ -10,7 +10,7 @@ class EssenceFile < ActiveRecord::Base
   # Saves the ingredient
   def save_ingredient(params, options = {})
     return true if params.blank?
-    self.attachment_id = params["attachment_id"].to_s
+    self.attachment_id = params["attachment"].to_s
     self.save
   end
 

data/app/views/elements/_download_editor.html.erb

@@ -0,0 +1 @@
+<%= render_essence_editor_by_name(element, 'file') %>

data/app/views/elements/_download_view.html.erb

@@ -0,0 +1,3 @@
+<div class="download" <%= element_preview_code(element) -%>>
+	<%= render_essence_view_by_name(element, 'file') %>
+</div>

data/app/views/essences/_essence_file_editor.html.erb

@@ -28,6 +28,7 @@
 			<%= content.ingredient.name rescue ("&#x2190;" + _('assign_file_from_archive')).html_safe %>
 		</div>
 		<%- unless content.ingredient.nil? -%>
+		<%= hidden_field_tag content.form_field_name, content.ingredient.id %>
 		<div class="essence_file_tools">
 			<%= link_to_overlay_window("",
 				admin_attachments_path(

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

@@ -1,6 +1,10 @@
 <%= link_to(
 	h(content.essence.attachment.name),
-	download_attachment_path(:id => content.essence.attachment.id, :name => content.essence.attachment.filename),
+	download_attachment_path(
+		:id => content.essence.attachment.id,
+		:name => content.essence.attachment.urlname,
+		:format => content.essence.attachment.suffix
+	),
 	:class => "file_link #{content.essence.css_class.blank? ? "" : content.essence.css_class}",
 	:title => "#{content.essence.title.blank? ? content.essence.attachment.filename : content.essence.title}"
 ) if content.essence.attachment %>

data/assets/stylesheets/alchemy.css

@@ -572,7 +572,7 @@ a.drop_down_select img {
 .js_filter_field_box .js_filter_field_clear {
 	width: 15px;
 	height: 15px;
-	background: url(/images/alchemy/icons.png) no-repeat 0 -104px;
+	background: url(/images/alchemy/icons.png) no-repeat 0 -70px;
 	position: absolute;
 	right: 8px;
 	top: 4px;

data/assets/stylesheets/elements.css

@@ -553,7 +553,7 @@ div.file_icon span.icon {
 div.file_icon a.assign_file {
 	display: block;
 	height: 16px;
-	background: url(/images/alchemy/icons.png) no-repeat -240px -24px;
+	background: url(/images/alchemy/icons.png) no-repeat -480px -40px;
 	width: 16px;
 	margin: 4px;
 }
@@ -583,11 +583,11 @@ div.essence_file_tools a{
 }
 
 div.essence_file_tools a.assign_file {
-	background: url(/images/alchemy/icons.png) -256px -24px;
+	background: url(/images/alchemy/icons.png) -512px -40px;
 }
 
 div.essence_file_tools a.edit_file {
-	background: url(/images/alchemy/icons.png) -16px -24px;
+	background: url(/images/alchemy/icons.png) -160px -167px;
 }
 
 td.content_editor_essence_type {

data/config/alchemy/elements.yml

@@ -191,6 +191,11 @@
   - name: subheadline
     type: EssenceText
 
+- name: download
+  contents:
+  - name: file
+    type: EssenceFile
+
 - name: news
   contents:
   - name: date

data/config/alchemy/page_layouts.yml

@@ -33,7 +33,7 @@
   autogenerate: [header, intro_image_text]
 
 - name: standard
-  elements: [article, claim, header, bild, bild_text, text, intro, headline, image_mosaic]
+  elements: [article, claim, header, bild, bild_text, text, intro, headline, image_mosaic, download]
   autogenerate: [header, claim, article]
 
 - name: contact

data/config/locales/de.yml

@@ -70,6 +70,7 @@ de:
       news_headline: "News Überschrift"
       image_mosaic:
         caption: "Mosaik Bildunterschrift"
+      file: Datei
     
     content_validations:
       errors:

data/config/routes.rb

@@ -14,7 +14,7 @@ Rails.application.routes.draw do
     :as => :leave_admin
   match '/admin/logout' => 'admin#logout',
     :as => :logout
-  match '/attachment/:id/download(/:name)(.:suffix)' => 'attachments#download',
+  match '/attachment/:id/download(/:name)(.:format)' => 'attachments#download',
     :as => :download_attachment
   match '/attachment/:id/show' => 'attachments#show',
     :as => :show_attachment

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
   
 end

data/spec/routing_spec.rb

@@ -12,7 +12,7 @@ describe "The Routing", :type => :routing do
 	    	:action => "download",
 	    	:id => "32",
 				:name => "Presseveranstaltung",
-				:suffix => "pdf"
+				:format => "pdf"
 			)
 		end
 		

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000 Z
+date: 2011-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70179184164880 !ruby/object:Gem::Requirement
+  requirement: &70254802650620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179184164880
+  version_requirements: *70254802650620
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70179184163920 !ruby/object:Gem::Requirement
+  requirement: &70254802650100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179184163920
+  version_requirements: *70254802650100
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70179184163160 !ruby/object:Gem::Requirement
+  requirement: &70254802649620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179184163160
+  version_requirements: *70254802649620
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70179184162200 !ruby/object:Gem::Requirement
+  requirement: &70254802649140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70179184162200
+  version_requirements: *70254802649140
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70179184160540 !ruby/object:Gem::Requirement
+  requirement: &70254802648660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70179184160540
+  version_requirements: *70254802648660
 - !ruby/object:Gem::Dependency
   name: gettext_i18n_rails
-  requirement: &70179184159840 !ruby/object:Gem::Requirement
+  requirement: &70254802648180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70179184159840
+  version_requirements: *70254802648180
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70179184158920 !ruby/object:Gem::Requirement
+  requirement: &70254806302460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179184158920
+  version_requirements: *70254806302460
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70179184157880 !ruby/object:Gem::Requirement
+  requirement: &70254802664160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70179184157880
+  version_requirements: *70254802664160
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70179184156820 !ruby/object:Gem::Requirement
+  requirement: &70254802663680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70179184156820
+  version_requirements: *70254802663680
 - !ruby/object:Gem::Dependency
   name: userstamp
-  requirement: &70179184156120 !ruby/object:Gem::Requirement
+  requirement: &70254802663200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70179184156120
+  version_requirements: *70254802663200
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70179184155520 !ruby/object:Gem::Requirement
+  requirement: &70254802662720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70179184155520
+  version_requirements: *70254802662720
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70179184154900 !ruby/object:Gem::Requirement
+  requirement: &70254802662240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +144,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179184154900
+  version_requirements: *70254802662240
 - !ruby/object:Gem::Dependency
   name: tinymce_hammer
-  requirement: &70179184154380 !ruby/object:Gem::Requirement
+  requirement: &70254802661760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70179184154380
+  version_requirements: *70254802661760
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70179184153720 !ruby/object:Gem::Requirement
+  requirement: &70254802661280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -166,10 +166,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70179184153720
+  version_requirements: *70254802661280
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70179184153080 !ruby/object:Gem::Requirement
+  requirement: &70254802660800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -177,10 +177,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70179184153080
+  version_requirements: *70254802660800
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70179184152520 !ruby/object:Gem::Requirement
+  requirement: &70254802660420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +188,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179184152520
+  version_requirements: *70254802660420
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70179184151620 !ruby/object:Gem::Requirement
+  requirement: &70254802659900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -199,7 +199,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179184151620
+  version_requirements: *70254802659900
 description: Alchemy is an awesome Rails CMS with an extremely flexible content storing
   architecture.
 email:
@@ -392,6 +392,8 @@ files:
 - app/views/elements/_claim_view.html.erb
 - app/views/elements/_contactform_editor.html.erb
 - app/views/elements/_contactform_view.html.erb
+- app/views/elements/_download_editor.html.erb
+- app/views/elements/_download_view.html.erb
 - app/views/elements/_editor_not_found.html.erb
 - app/views/elements/_footnote_editor.html.erb
 - app/views/elements/_footnote_view.html.erb
@@ -732,12 +734,6 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/public/javascripts/application.js
-- spec/dummy/public/javascripts/controls.js
-- spec/dummy/public/javascripts/dragdrop.js
-- spec/dummy/public/javascripts/effects.js
-- spec/dummy/public/javascripts/prototype.js
-- spec/dummy/public/javascripts/rails.js
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/factories.rb
@@ -818,12 +814,6 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/public/javascripts/application.js
-- spec/dummy/public/javascripts/controls.js
-- spec/dummy/public/javascripts/dragdrop.js
-- spec/dummy/public/javascripts/effects.js
-- spec/dummy/public/javascripts/prototype.js
-- spec/dummy/public/javascripts/rails.js
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/factories.rb