alchemy_cms 2.2.rc3 → 2.2.rc6

data/spec/dummy/app/models/event.rb

@@ -1,3 +1,4 @@
 class Event < ActiveRecord::Base
+  attr_accessible :name, :hidden_name, :starts_at, :ends_at, :description, :published, :entrance_fee
   validates_presence_of :name
 end

data/spec/dummy/config/application.rb

@@ -1,9 +1,19 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
+# Pick the frameworks you want:
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "active_resource/railtie"
+require "sprockets/railtie"
+# require "rails/test_unit/railtie"
 
-Bundler.require
-require "alchemy_cms"
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
 
 module Dummy
   class Application < Rails::Application
@@ -27,21 +37,29 @@ module Dummy
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
+    config.filter_parameters += [:password, :password_confirmation]
+
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    config.active_record.whitelist_attributes = true
 
     # Enable the asset pipeline
     config.assets.enabled = true
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
-
-    # Delegates Exceptions to /404 /500 etc.
-    config.exceptions_app = self.routes
   end
 end
-

data/spec/dummy/config/environments/development.rb

@@ -2,7 +2,7 @@ Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
+  # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
@@ -10,7 +10,7 @@ Dummy::Application.configure do
   config.whiny_nils = true
 
   # Show full error reports and disable caching
-  config.consider_all_requests_local = true
+  config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
@@ -22,16 +22,16 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Do not compress assets
-  config.assets.compress = false
-
-  # Expands the lines which load the assets
-  config.assets.debug = true
-
   # Raise exception on mass assignment protection for Active Record models
   config.active_record.mass_assignment_sanitizer = :strict
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   config.active_record.auto_explain_threshold_in_seconds = 0.5
+
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
 end

data/spec/dummy/config/environments/production.rb

@@ -5,7 +5,7 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Full error reports are disabled and caching is turned on
-  config.consider_all_requests_local = false
+  config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
@@ -33,8 +33,11 @@ Dummy::Application.configure do
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
+
   # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
@@ -57,4 +60,8 @@ Dummy::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

data/spec/dummy/config/environments/test.rb

@@ -2,9 +2,9 @@ Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
@@ -15,28 +15,23 @@ Dummy::Application.configure do
   config.whiny_nils = true
 
   # Show full error reports and disable caching
-  config.consider_all_requests_local = true
+  config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
   # Raise exceptions instead of rendering exception templates
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection = false
+  config.action_controller.allow_forgery_protection    = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
 end

data/spec/factories.rb

@@ -41,7 +41,7 @@ FactoryGirl.define do
 
     language { Alchemy::Language.find_by_language_code('kl') || Factory(:language) }
     name "A Page"
-    parent_id { Factory(:language_root_page).id }
+    parent_id { (Alchemy::Page.find_by_language_root(true) || Factory(:language_root_page)).id }
     page_layout "standard"
 
     factory :language_root_page do

data/spec/helpers/elements_helper_spec.rb

@@ -54,13 +54,13 @@ describe Alchemy::ElementsHelper do
 
     context "with from_page option" do
       it "should render all elements from a certain page" do
-        @another_page = Factory(:public_page)
+        @another_page = Factory(:public_page, :name => 'Another Page')
         @element_on_other_page = Factory(:element, :name => 'headline', :page => @another_page)
         helper.render_elements(:from_page => @another_page).should match(/id="#{@element_on_other_page.name}_\d*"/)
       end
 
       it "should not render any elements in a cell from the given page" do
-        @another_page = Factory(:public_page)
+        @another_page = Factory(:public_page, :name => 'And Another Page')
         @cell = Factory(:cell, :name => "Celltest", :page => @another_page)
         @element_not_in_cell = Factory(:element, :name => 'headline', :page => @another_page)
         @element_in_cell = Factory(:element, :name => 'article', :cell => @cell, :page => @another_page)
@@ -69,7 +69,7 @@ describe Alchemy::ElementsHelper do
 
       context "and from_cell option" do
         it "should render all elements from the page's cell" do
-          @another_page = Factory(:public_page)
+          @another_page = Factory(:public_page, :name => 'And even another page')
           @cell = Factory(:cell, :name => "Celltest", :page => @another_page)
           @element_not_in_cell = Factory(:element, :name => 'headline', :page => @another_page)
           @element_in_cell = Factory(:element, :name => 'article', :cell => @cell, :page => @another_page)
@@ -119,7 +119,7 @@ describe Alchemy::ElementsHelper do
     context "with offset option" do
       it "should render all elements beginning with the second." do
         @page.elements.delete_all
-        @another_page = Factory(:public_page)
+        @another_page = Factory(:public_page, :name => 'And even one more page')
         @another_element_1 = Factory(:element, :page => @page)
         @another_element_2 = Factory(:element, :page => @page)
         @another_element_3 = Factory(:element, :page => @page)

data/spec/models/language_spec.rb

@@ -76,7 +76,7 @@ describe Alchemy::Language do
     describe "#set_pages_language if language´s code has changed" do
       it "should update all its pages with the new code" do
         @page = Factory(:page, :language => @language)
-        @other_page = Factory(:page, :language => @language)
+        @other_page = Factory(:page, :language => @language, :name => 'Another page')
         @language.update_attributes(:code => "fo")
         @language.reload; @page.reload; @other_page.reload
         [@page.language_code, @other_page.language_code].should == [@language.code, @language.code]
@@ -85,7 +85,7 @@ describe Alchemy::Language do
     describe "#unpublish_pages" do
       it "should set all pages to unpublic if it gets set to unpublic" do
         @page = Factory(:page, :language => @language)
-        @other_page = Factory(:page, :language => @language)
+        @other_page = Factory(:page, :language => @language, :name => 'Another page')
         @language.update_attributes(:public => false)
         @language.reload; @page.reload; @other_page.reload
         [@page.public?, @other_page.public?].should == [false, false]

data/spec/models/page_spec.rb

@@ -300,7 +300,7 @@ describe Alchemy::Page do
 
       it "should return the pages" do
         page_1 = Factory(:page, :language => @language)
-        page_2 = Factory(:page, :language => @language)
+        page_2 = Factory(:page, :language => @language, :name => 'Another page')
         clipboard = [
           {:id => page_1.id, :action => "copy"},
           {:id => page_2.id, :action => "copy"}
@@ -326,7 +326,7 @@ describe Alchemy::Page do
 
       it "should return one page" do
         page_1 = Factory(:page, :language => @language, :page_layout => 'standard')
-        page_2 = Factory(:page, :language => @language, :page_layout => 'contact')
+        page_2 = Factory(:page, :name => 'Another page', :language => @language, :page_layout => 'contact')
         clipboard = [
           {:id => page_1.id, :action => "copy"},
           {:id => page_2.id, :action => "copy"}

data/spec/spec_helper.rb

@@ -49,10 +49,9 @@ end
 def seed
   # This code will be run each time you run your specs.
   DatabaseCleaner.clean
-
   # Seed the database
   Alchemy::Seeder.seed!
-
+  ::I18n.locale = :en
 end
 
 if defined?(Spork)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.2.rc3
+  version: 2.2.rc6
   prerelease: 4
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70340562760500 !ruby/object:Gem::Requirement
+  requirement: &70293532196300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70340562760500
+  version_requirements: *70293532196300
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70340562759060 !ruby/object:Gem::Requirement
+  requirement: &70293532195080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70340562759060
+  version_requirements: *70293532195080
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70340562757580 !ruby/object:Gem::Requirement
+  requirement: &70293532238980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70340562757580
+  version_requirements: *70293532238980
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70340562772820 !ruby/object:Gem::Requirement
+  requirement: &70293528320600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70340562772820
+  version_requirements: *70293528320600
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70340562771240 !ruby/object:Gem::Requirement
+  requirement: &70293528318900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340562771240
+  version_requirements: *70293528318900
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70340562769020 !ruby/object:Gem::Requirement
+  requirement: &70293528317760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340562769020
+  version_requirements: *70293528317760
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70340562767580 !ruby/object:Gem::Requirement
+  requirement: &70293528292680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +90,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70340562767580
+  version_requirements: *70293528292680
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70340562766000 !ruby/object:Gem::Requirement
+  requirement: &70293527994060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70340562766000
+  version_requirements: *70293527994060
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70340562780540 !ruby/object:Gem::Requirement
+  requirement: &70293528067980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,10 +112,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70340562780540
+  version_requirements: *70293528067980
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70340562778260 !ruby/object:Gem::Requirement
+  requirement: &70293528110100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -123,10 +123,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70340562778260
+  version_requirements: *70293528110100
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70340562776060 !ruby/object:Gem::Requirement
+  requirement: &70293532268800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +134,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340562776060
+  version_requirements: *70293532268800
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70340562774640 !ruby/object:Gem::Requirement
+  requirement: &70293532339160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -145,10 +145,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70340562774640
+  version_requirements: *70293532339160
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70340562789440 !ruby/object:Gem::Requirement
+  requirement: &70293532445540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -156,10 +156,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70340562789440
+  version_requirements: *70293532445540
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70340562787180 !ruby/object:Gem::Requirement
+  requirement: &70293532480560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -167,10 +167,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70340562787180
+  version_requirements: *70293532480560
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70340562786520 !ruby/object:Gem::Requirement
+  requirement: &70293532475840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -178,10 +178,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70340562786520
+  version_requirements: *70293532475840
 - !ruby/object:Gem::Dependency
   name: jasminerice
-  requirement: &70340562785620 !ruby/object:Gem::Requirement
+  requirement: &70293532496700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,7 +189,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70340562785620
+  version_requirements: *70293532496700
 description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 email:
 - alchemy@magiclabs.de
@@ -539,6 +539,7 @@ files:
 - app/views/alchemy/pictures/show.jpg.flexi
 - app/views/alchemy/pictures/show.png.flexi
 - app/views/alchemy/pictures/thumbnail.png.flexi
+- app/views/alchemy/pictures/zoom.jpg.flexi
 - app/views/alchemy/pictures/zoom.png.flexi
 - app/views/alchemy/search/_result.html.erb
 - app/views/alchemy/user_sessions/leave.html.erb
@@ -852,10 +853,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2870462332409198212
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: