alchemy_cms 3.1.0.beta1 → 3.1.0.beta2

data/config/locales/simple_form.es.yml

@@ -0,0 +1,6 @@
+es:
+  simple_form:
+    labels:
+      user:
+        login: Usuario
+        password: Contraseña

data/config/locales/simple_form.ru.yml

@@ -0,0 +1,25 @@
+ru:
+  simple_form:
+    "yes": 'Да'
+    "no": 'Нет'
+    required:
+      text: 'обязательные поля'
+      mark: '*'
+      # You can uncomment the line below if you need to overwrite the whole required html.
+      # When using html, text and mark won't be used.
+      # html: '<abbr title="required">*</abbr>'
+    error_notification:
+      default_message: "Пожалуйста, исправьте эти ошибки:"
+    # Labels and hints examples
+    # labels:
+    #   defaults:
+    #     password: 'Password'
+    #   user:
+    #     new:
+    #       email: 'E-mail to sign in.'
+    #     edit:
+    #       email: 'E-mail.'
+    # hints:
+    #   defaults:
+    #     username: 'User name to sign in.'
+    #     password: 'No special characters, please.'

data/lib/alchemy/engine.rb

@@ -83,6 +83,17 @@ module Alchemy
       NonStupidDigestAssets.whitelist += [/^tinymce\//]
     end
 
+    # We need to require each essence class in development mode,
+    # so it can register itself as essence relation on Page and Element models
+    # @see lib/alchemy/essence.rb:71
+    initializer 'alchemy.load_essence_classes' do |app|
+      unless Rails.application.config.cache_classes
+        Dir.glob(File.join(File.dirname(__FILE__), '../../app/models/alchemy/essence_*.rb')).each do |essence|
+          require essence
+        end
+      end
+    end
+
     config.after_initialize do
       require_relative './userstamp'
       # In order to have Alchemy's helpers and basic controller methods

data/lib/alchemy/essence.rb

@@ -24,6 +24,8 @@ module Alchemy #:nodoc:
       #   Specify the column for the preview_text method.
       #
       def acts_as_essence(options={})
+        register_as_essence_association!
+
         configuration = {
           ingredient_column: 'body'
         }.update(options)
@@ -41,7 +43,9 @@ module Alchemy #:nodoc:
           scope :available,    -> { joins(:element).merge(Element.available) }
           scope :from_element, ->(name) { joins(:element).where(alchemy_elements: { name: name }) }
 
-          delegate :public?, to: :element
+          delegate :restricted?, to: :page,    allow_nil: true
+          delegate :trashed?,    to: :element, allow_nil: true
+          delegate :public?,     to: :element, allow_nil: true
 
           after_update :touch_content
 
@@ -63,6 +67,13 @@ module Alchemy #:nodoc:
         EOV
       end
 
+      # Register the current class as has_many association on +Alchemy::Page+ and +Alchemy::Element+ models
+      def register_as_essence_association!
+        klass_name = self.model_name.to_s
+        arguments = [:has_many, klass_name.demodulize.tableize.to_sym, through: :contents,
+          source: :essence, source_type: klass_name]
+        %w(Page Element).each { |k| "Alchemy::#{k}".constantize.send(*arguments) }
+      end
     end
 
     module InstanceMethods

data/lib/alchemy/resources_helper.rb

@@ -95,6 +95,8 @@ module Alchemy
             type: 'date',
             value: l(resource_instance_variable.send(attribute[:name]) || Time.now, format: :datepicker)
           }
+      when 'time'
+        options.merge(as: 'time')
       when 'text'
         options.merge(as: 'text', input_html: {rows: 4})
       else
@@ -104,7 +106,7 @@ module Alchemy
 
     # Renders the human model name with a count as h1 header
     def resources_header
-      content_tag :h1, "#{resources_instance_variable.total_count} #{resource_model.model_name.human(:count => resources_instance_variable.total_count)}"
+      content_tag :h1, "#{resources_instance_variable.total_count} #{resource_model.model_name.human(count: resources_instance_variable.total_count)}", class: 'resources-header'
     end
 
     # Returns true if the resource contains any relations

data/lib/alchemy/test_support/essence_shared_examples.rb

@@ -153,4 +153,41 @@ shared_examples_for "an essence" do
       end
     end
   end
+
+  context 'delegations' do
+    let(:page)    { create(:restricted_page) }
+    let(:element) { create(:element, name: 'headline', create_contents_after_create: true, page: page) }
+    let(:content) { element.contents.find_by(essence_type: 'Alchemy::EssenceText') }
+    let(:essence) { content.essence }
+
+    it "delegates restricted? to page" do
+      expect(page.restricted?).to be(true)
+      expect(essence.restricted?).to be(true)
+    end
+
+    it "delegates trashed? to element" do
+      element.update!(position: nil)
+      expect(element.trashed?).to be true
+      expect(essence.trashed?).to be true
+    end
+
+    it "delegates public? to element" do
+      element.update!(public: false)
+      expect(element.public?).to be false
+      expect(essence.public?).to be false
+    end
+  end
+
+  describe 'essence relations' do
+    let(:page)    { create(:restricted_page) }
+    let(:element) { create(:element) }
+
+    it "registers itself on page as essence relation" do
+      expect(page.respond_to?(essence.class.model_name.route_key)).to be(true)
+    end
+
+    it "registers itself on element as essence relation" do
+      expect(element.respond_to?(essence.class.model_name.route_key)).to be(true)
+    end
+  end
 end

data/lib/alchemy/test_support/factories.rb

@@ -134,6 +134,8 @@ FactoryGirl.define do
     hidden_name 'not shown'
     starts_at DateTime.new(2012, 03, 02, 8, 15)
     ends_at DateTime.new(2012, 03, 02, 19, 30)
+    lunch_starts_at DateTime.new(2012, 03, 02, 12, 15)
+    lunch_ends_at DateTime.new(2012, 03, 02, 13, 45)
     description "something\nfancy"
     published false
     entrance_fee 12.3

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.1.0.beta1"
+  VERSION = "3.1.0.beta2"
 
   def self.version
     VERSION

data/lib/rails/generators/alchemy/module/templates/module_config.rb.tt

@@ -5,11 +5,13 @@ Alchemy::Modules.register_module({
     name: 'modules.<%= @module_name %>',
     controller: '/admin/<%= @module_name %>',
     action: 'index',
-    image: '/assets/<%= @module_name %>.png',
+    image: 'alchemy/<%= @module_name %>_module.png',
     sub_navigation: [{
       name: 'modules.<%= @module_name %>',
       controller: '/admin/<%= @module_name %>',
       action: 'index'
     }]
   }
-})
+})
+
+Alchemy.register_ability(<%= @class_name %>Ability)

data/lib/rails/generators/alchemy/scaffold/files/alchemy.es.yml

@@ -0,0 +1,31 @@
+es:
+  alchemy:
+
+    # Translations for page layout names
+    page_layout_names:
+      index: Inicio
+
+    # Translations for element names
+    element_names:
+      article: Artículo
+
+    # Translations for content names
+    content_names:
+      headline: Titular
+      text: Texto
+      picture: Imagen
+
+    # Default texts for new contents created
+    default_content_texts:
+      article_headline: "Bienvenido a tu primera página de Alchemy CMS"
+      article_text: '<p><strong>Como empezar.</strong></p><p>Lo primero de todo deberías leer sobre Alchemy y su arquitectura en las <a class="external" href="http://guides.alchemy-cms.com/edge/alchemy_approach.html" target="_blank" data-link-target="blank">guías</a>.</p><p>Las cosas más importantes que debes saber sobre Alchemy son elementos (<i>elements</i>) y disposiciones de página (<i>page layouts</i>).</p><p><span style="text-decoration: underline;"><strong>Elementos:</strong></span></p><p>Con Alchemy puedes dividir las páginas en partes de contenido, elementos. Estos elementos se pueden definir mediante varios tipos de contenido básicos: esencias (<i>essences</i>). Las esencias básicas son:</p><ul><li>EssenceText - <em>Un única línea de texto</em></li><li>EssenceRichtext - <em>Un bloque de texto formateado mediante TinyMCE</em></li><li>EssencePicture - <em>Una referencia a una imagen</em></li><li>EssenceHtml - <em>Código HTML empotrado</em></li><li>EssenceSelect - <em>Una selección de valores</em></li><li>EssenceBoolean - <em>Una casilla de verificación</em></li></ul><p>Los elementos se definen en el fichero YAML <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/elements.html" target="_blank" data-link-target="blank">Lee más sobre elementos y cómo definirlos en las guías.</a></p><p><span style="text-decoration: underline;"><strong>Tipos de página:</strong></span></p><p>Puedes definir varios tipos de páginas, llamados disposiciones de páginas (<i>page layouts</i>). Puedes asignar elementos a las disposiciones de páginas y controlar cómo se comportan los elementos y una página con una disposición concreta.</p><p>Las disposiciones de páginas se definen en el fichero YAML <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/page_layouts.html" target="_blank" data-link-target="blank">Lee más sobre definir disposiciones de páginas en las guías.</a></p>'
+    
+    # Hint texts for elements
+    element_hints:
+      article: "Este es el texto de ayuda del elemento artículo. Puedes cambiar este texto en `config/locales/alchemy.en.yml`. Siéntete libre de cambiarlo a tu gusto, es tuyo."
+
+    # Hint texts for contents
+    content_hints:
+      headline: "Esta es una sencilla linea de texto sin formato"
+      picture: "Las imágenes se almacenan en la librería. Puedes asignar una imagen varias veces en tu sitio. Alchemy tiene una herramienta de recorte de imagen integrada."
+      text: "Este es un bloque de texto enriquecido mediante el editor TinyMCE. Puedes cambiar la configuración del editor. Ver http://guides.alchemy-cms.com/edge/customize_tinymce.html"

data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb

@@ -32,6 +32,7 @@ module Alchemy
         template "page_layouts.yml.tt", "#{Rails.root}/config/alchemy/page_layouts.yml"
         copy_file "#{current_path}/files/alchemy.en.yml", "#{Rails.root}/config/locales/alchemy.en.yml"
         copy_file "#{current_path}/files/alchemy.de.yml", "#{Rails.root}/config/locales/alchemy.de.yml"
+        copy_file "#{current_path}/files/alchemy.es.yml", "#{Rails.root}/config/locales/alchemy.es.yml"
         copy_file "#{current_path}/files/application.html.erb", "#{Rails.root}/app/views/layouts/application.html.erb"
         copy_file "#{current_path}/files/_standard.html.erb", "#{Rails.root}/app/views/alchemy/page_layouts/_standard.html.erb"
         copy_file "#{current_path}/files/_article_view.html.erb", "#{Rails.root}/app/views/alchemy/elements/_article_view.html.erb"

data/lib/rails/templates/alchemy.rb

@@ -4,3 +4,5 @@ require File.expand_path('../../../alchemy/version', __FILE__)
 gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: 'master'
 gem 'alchemy-devise', github: 'magiclabs/alchemy-devise', branch: 'master'
 gem 'capistrano', '~> 2.15.5', group: 'development'
+
+run 'bundle install'

data/lib/tasks/alchemy/install.rake

@@ -28,19 +28,23 @@ namespace :alchemy do
 
   desc "Installs Alchemy CMS into your app."
   task :install do
-    puts "\nAlchemy Installer"
-    puts "-----------------"
+    unless ENV['from_binary']
+      puts "\nAlchemy Installer"
+      puts "-----------------"
+    end
     Rake::Task["alchemy:mount"].invoke
-    system('rails g alchemy:scaffold') || exit!(1)
+    system("rails g alchemy:scaffold#{ ENV['from_binary'] ? ' --force' : '' }") || exit!(1)
     Alchemy::InstallTask.new.set_primary_language
     Rake::Task["db:create"].invoke
     Rake::Task["alchemy:install:migrations"].invoke
     Rake::Task["db:migrate"].invoke
     Rake::Task["alchemy:db:seed"].invoke
-    puts "\nAlchemy successfully installed."
-    puts "\nNow start the server with:"
-    puts "\n$ bin/rails server"
-    puts "\nand point your browser to http://localhost:3000/admin and follow the onscreen instructions to finalize the installation."
+    unless ENV['from_binary']
+      puts "\nAlchemy successfully installed."
+      puts "\nNow start the server with:"
+      puts "\n$ bin/rails server"
+      puts "\nand point your browser to http://localhost:3000/admin and follow the onscreen instructions to finalize the installation."
+    end
   end
 
   desc "Mounts Alchemy into your routes."

data/spec/controllers/admin/attachments_controller_spec.rb

@@ -40,6 +40,27 @@ module Alchemy
           end
         end
       end
+
+      describe 'only and expect options' do
+        let!(:png) { create(:attachment) }
+        let!(:jpg) { create(:attachment, file: File.new(File.expand_path('../../../../spec/fixtures/image3.jpeg', __FILE__))) }
+
+        context 'with params[:only]' do
+          it 'only loads attachments with matching content type' do
+            get :index, only: 'jpeg'
+            expect(assigns(:attachments).to_a).to eq([jpg])
+            expect(assigns(:attachments).to_a).to_not eq([png])
+          end
+        end
+
+        context 'with params[:except]' do
+          it 'does not load attachments with matching content type' do
+            get :index, except: 'jpeg'
+            expect(assigns(:attachments).to_a).to eq([png])
+            expect(assigns(:attachments).to_a).to_not eq([jpg])
+          end
+        end
+      end
     end
 
     describe '#show' do

data/spec/controllers/admin/essence_files_controller_spec.rb

@@ -6,23 +6,25 @@ module Alchemy
       sign_in(admin_user)
     end
 
-    let(:content)      { mock_model('Content', essence: essence_file) }
-    let(:essence_file) { mock_model('EssenceFile', :attachment= => nil) }
+    let(:essence_file) { mock_model('EssenceFile', :attachment= => nil, content: content) }
+    let(:content)      { mock_model('Content') }
     let(:attachment)   { mock_model('Attachment') }
 
     describe '#edit' do
       before do
-        expect(Content).to receive(:find).and_return(content)
+        expect(EssenceFile).to receive(:find)
+          .with(essence_file.id.to_s)
+          .and_return(essence_file)
       end
 
-      it "should assign @content with the Content found by id" do
-        get :edit, content_id: content.id
-        expect(assigns(:content)).to eq(content)
+      it "assigns @essence_file with the EssenceFile found by id" do
+        get :edit, id: essence_file.id
+        expect(assigns(:essence_file)).to eq(essence_file)
       end
 
-      it "should assign @essence_file with content's essence" do
-        get :edit, content_id: content.id
-        expect(assigns(:essence_file)).to eq(content.essence)
+      it "should assign @content with essence_file's content" do
+        get :edit, id: essence_file.id
+        expect(assigns(:content)).to eq(content)
       end
     end
 
@@ -32,7 +34,7 @@ module Alchemy
       end
 
       it "should update the attributes of essence_file" do
-        expect(essence_file).to receive(:update_attributes).and_return(true)
+        expect(essence_file).to receive(:update).and_return(true)
         xhr :put, :update, id: essence_file.id
       end
     end
@@ -41,6 +43,7 @@ module Alchemy
       before do
         expect(Content).to receive(:find_by).and_return(content)
         expect(Attachment).to receive(:find_by).and_return(attachment)
+        allow(content).to receive(:essence).and_return(essence_file)
       end
 
       it "should assign @attachment with the Attachment found by attachment_id" do
@@ -52,8 +55,6 @@ module Alchemy
         expect(content.essence).to receive(:attachment=).with(attachment)
         xhr :put, :assign, content_id: content.id, attachment_id: attachment.id
       end
-
     end
-
   end
 end

data/spec/controllers/alchemy/api/contents_controller_spec.rb

@@ -30,9 +30,9 @@ module Alchemy
 
     describe '#show' do
       context 'with no other params given' do
-        let(:page)    { build_stubbed(:page) }
-        let(:element) { build_stubbed(:element, page: page, position: 1) }
-        let(:content) { build_stubbed(:content, element: element) }
+        let(:page)    { create(:page) }
+        let(:element) { create(:element, page: page) }
+        let(:content) { create(:content, element: element) }
 
         before do
           expect(Content).to receive(:find).and_return(content)
@@ -45,7 +45,7 @@ module Alchemy
         end
 
         context 'requesting an restricted content' do
-          let(:page) { build_stubbed(:page, restricted: true) }
+          let(:page) { create(:page, restricted: true) }
 
           it "responds with 403" do
             get :show, id: content.id, format: :json

data/spec/controllers/attachments_controller_spec.rb

@@ -8,6 +8,24 @@ module Alchemy
       expect { get :download, id: 0 }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
+    context 'with public attachment' do
+      before do
+        allow(Attachment).to receive(:find).and_return(attachment)
+      end
+
+      it "sends download as attachment." do
+        get :download, :id => attachment.id
+        expect(response.status).to eq(200)
+        expect(response.headers['Content-Disposition']).to match(/attachment/)
+      end
+
+      it "sends download inline." do
+        get :show, :id => attachment.id
+        expect(response.status).to eq(200)
+        expect(response.headers['Content-Disposition']).to match(/inline/)
+      end
+    end
+
     context 'with restricted attachment' do
       before do
         allow(attachment).to receive(:restricted?).and_return(true)

data/spec/controllers/pages_controller_spec.rb

@@ -143,11 +143,20 @@ module Alchemy
         let!(:legacy_url) { LegacyPageUrl.create(urlname: 'legacy-url', page: page) }
         let(:legacy_url2) { LegacyPageUrl.create(urlname: 'legacy-url', page: second_page) }
         let(:legacy_url3) { LegacyPageUrl.create(urlname: 'index.php?id=2', page: second_page) }
+        let(:legacy_url4) { LegacyPageUrl.create(urlname: 'index.php?option=com_content&view=article&id=48&Itemid=69', page: second_page) }
+        let(:legacy_url5) { LegacyPageUrl.create(urlname: 'nested/legacy/url', page: second_page) }
 
-        it "should redirect permanently to page that belongs to legacy page url." do
-          get :show, urlname: legacy_url.urlname
+        it "should redirect permanently to page that belongs to legacy page url even if url has an unknown format & get parameters" do
+          expect(request).to receive(:fullpath).at_least(:once).and_return(legacy_url4.urlname)
+          get :show, urlname: "index.php"
           expect(response.status).to eq(301)
-          expect(response).to redirect_to("/#{page.urlname}")
+          expect(response).to redirect_to("/#{second_page.urlname}")
+        end
+
+        it "should not pass query string for legacy routes" do
+          expect(request).to receive(:fullpath).at_least(:once).and_return(legacy_url3.urlname)
+          get :show, urlname: "index.php"
+          expect(URI.parse(response["Location"]).query).to be_nil
         end
 
         it "should only redirect to legacy url if no page was found for urlname" do
@@ -157,14 +166,22 @@ module Alchemy
         end
 
         it "should redirect to last page that has that legacy url" do
+          expect(request).to receive(:fullpath).at_least(:once).and_return(legacy_url2.urlname)
           get :show, urlname: legacy_url2.urlname
           expect(response).to redirect_to("/#{second_page.urlname}")
         end
 
         it "should redirect even if the url has get parameters" do
+          expect(request).to receive(:fullpath).at_least(:once).and_return(legacy_url3.urlname)
           get :show, urlname: legacy_url3.urlname
           expect(response).to redirect_to("/#{second_page.urlname}")
         end
+
+        it "should redirect even if the url has nested urlname" do
+          expect(request).to receive(:fullpath).at_least(:once).and_return(legacy_url5.urlname)
+          get :show, urlname: legacy_url5.urlname
+          expect(response).to redirect_to("/#{second_page.urlname}")
+        end
       end
     end
 

data/spec/dummy/db/migrate/20121026104128_create_events.rb

@@ -6,6 +6,8 @@ class CreateEvents < ActiveRecord::Migration
       t.string   "hidden_name"
       t.datetime "starts_at"
       t.datetime "ends_at"
+      t.time     "lunch_starts_at"
+      t.time     "lunch_ends_at"
       t.text     "description"
       t.decimal  "entrance_fee", :precision => 6, :scale => 2
       t.boolean  "published"