alchemy_cms 3.1.3 → 3.2.0.beta

data/spec/controllers/pictures_controller_spec.rb

@@ -8,33 +8,45 @@ end
 module Alchemy
   describe PicturesController do
 
-    let(:public_page)        { FactoryGirl.create(:public_page, restricted: false) }
-    let(:restricted_page)    { FactoryGirl.create(:public_page, restricted: true) }
-    let(:element)            { FactoryGirl.create(:element, page: public_page, name: 'bild', create_contents_after_create: true) }
-    let(:restricted_element) { FactoryGirl.create(:element, page: restricted_page, name: 'bild', create_contents_after_create: true) }
-    let(:picture)            { Picture.create(image_file: fixture_file_upload(File.expand_path('../../fixtures/image.png', __FILE__), 'image/png')) }
+    let(:public_page)        { create(:public_page, restricted: false) }
+    let(:restricted_page)    { create(:public_page, restricted: true) }
+    let(:element)            { create(:element, page: public_page, name: 'bild', create_contents_after_create: true) }
+    let(:restricted_element) { create(:element, page: restricted_page, name: 'bild', create_contents_after_create: true) }
+    let(:picture)            { create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/image.png', __FILE__), 'image/png')) }
 
     describe '#zoom' do
-      let(:picture) { Picture.create(image_file: fixture_file_upload(File.expand_path('../../fixtures/80x60.png', __FILE__), 'image/png')) }
+      let(:picture) do
+        create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/80x60.png', __FILE__), 'image/png'))
+      end
 
       before { sign_in(editor_user) }
 
       it "renders the original image without any resizing" do
-        get :zoom, id: picture.id, format: :png, sh: picture.security_token
+        alchemy_get :zoom, id: picture.id, name: picture.urlname, format: :png, sh: picture.security_token
         expect(response.body[0x10..0x18].unpack('NN')).to eq([80, 60])
       end
     end
 
+    describe '#show' do
+      it "skips the session cookie" do
+        expect {
+          alchemy_get :show, id: picture.id, name: picture.urlname, format: :png, sh: picture.security_token
+        }.to change {
+          request.session_options.fetch(:skip) { false }
+        }.to(true)
+      end
+    end
+
     context "Requesting a picture with tempared security token" do
       it "should render status 400" do
-        get :show, id: picture.id, format: :png, sh: '14m4b4dh4ck3r'
+        alchemy_get :show, id: picture.id, name: picture.urlname, format: :png, sh: '14m4b4dh4ck3r'
         expect(response.status).to eq(400)
       end
     end
 
     context "Requesting a picture with another format then the original image" do
       it "should convert the picture format" do
-        get :show, id: picture.id, format: :jpeg, sh: picture.security_token
+        alchemy_get :show, id: picture.id, name: picture.urlname, format: :jpeg, sh: picture.security_token
         expect(response.content_type).to eq('image/jpeg')
       end
     end
@@ -42,47 +54,49 @@ module Alchemy
     context "Requesting a picture with not allowed format" do
       it "should raise error" do
         expect {
-          get :show, id: picture.id, format: :wim, sh: picture.security_token
+          alchemy_get :show, id: picture.id, name: picture.urlname, format: :wim, sh: picture.security_token
         }.to raise_error(ActionController::UnknownFormat)
       end
     end
 
     describe '#thumbnail' do
-      let(:picture) { Picture.create(image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png')) }
+      let(:picture) do
+        create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png'))
+      end
 
       before { sign_in(author_user) }
 
       context 'with size param set to small' do
         it "resizes the image to 80x60 while maintaining aspect ratio" do
-          get :thumbnail, id: picture.id, size: 'small', format: :png, sh: picture.security_token(size: 'small')
+          alchemy_get :thumbnail, id: picture.id, name: picture.urlname, size: 'small', format: :png, sh: picture.security_token(size: 'small')
           expect(response.body[0x10..0x18].unpack('NN')).to eq([60, 60])
         end
       end
 
       context 'with size param set to medium' do
         it "resizes the image to 160x120 while maintaining aspect ratio" do
-          get :thumbnail, id: picture.id, size: 'medium', format: :png, sh: picture.security_token(size: 'medium')
+          alchemy_get :thumbnail, id: picture.id, name: picture.urlname, size: 'medium', format: :png, sh: picture.security_token(size: 'medium')
           expect(response.body[0x10..0x18].unpack('NN')).to eq([120, 120])
         end
       end
 
       context 'with size param set to large' do
         it "resizes the image to 240x180 while maintaining aspect ratio" do
-          get :thumbnail, id: picture.id, size: 'large', format: :png, sh: picture.security_token(size: 'large')
+          alchemy_get :thumbnail, id: picture.id, name: picture.urlname, size: 'large', format: :png, sh: picture.security_token(size: 'large')
           expect(response.body[0x10..0x18].unpack('NN')).to eq([180, 180])
         end
       end
 
       context 'with size param set to nil' do
         it "resizes the image to 111x93 while maintaining aspect ratio" do
-          get :thumbnail, id: picture.id, format: :png, sh: picture.security_token
+          alchemy_get :thumbnail, id: picture.id, name: picture.urlname, format: :png, sh: picture.security_token
           expect(response.body[0x10..0x18].unpack('NN')).to eq([93, 93])
         end
       end
 
       context 'with size param set to another value' do
         it "resizes the image to the given size while maintaining aspect ratio" do
-          get :thumbnail, id: picture.id, size: '33x33', format: :png, sh: picture.security_token(size: '33x33')
+          alchemy_get :thumbnail, id: picture.id, name: picture.urlname, size: '33x33', format: :png, sh: picture.security_token(size: '33x33')
           expect(response.body[0x10..0x18].unpack('NN')).to eq([33, 33])
         end
       end
@@ -96,16 +110,18 @@ module Alchemy
 
       it "raises missing file error" do
         expect {
-          get :show, id: picture.id, format: :png, sh: picture.security_token
+          alchemy_get :show, id: picture.id, name: picture.urlname, format: :png, sh: picture.security_token
         }.to raise_error(Alchemy::MissingImageFileError)
       end
     end
 
     context "Requesting a picture with crop_from and crop_size parameters" do
-      let(:picture) { Picture.create(image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png')) }
+      let(:picture) do
+        create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png'))
+      end
 
       it "renders the cropped picture" do
-        get :show, id: picture.id, crop: 'crop', size: '123x44', crop_size: '123x44',
+        alchemy_get :show, id: picture.id, name: picture.urlname, crop: 'crop', size: '123x44', crop_size: '123x44',
           crop_from: '0x0', format: :png,
           sh: picture.security_token(crop_size: '123x44', crop_from: '0x0', crop: true, size: '123x44')
         expect(response.body[0x10..0x18].unpack('NN')).to eq([123, 44])
@@ -113,11 +129,14 @@ module Alchemy
     end
 
     context "Requesting a picture with crop_from and crop_size parameters with different size param" do
-      let(:picture) { Picture.create(image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png')) }
+      let(:picture) do
+        create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png'))
+      end
 
       it "renders the cropped picture" do
-        get :show,
+        alchemy_get :show,
           id: picture.id,
+          name: picture.urlname,
           crop: 'crop',
           size: '100x100',
           crop_size: '200x200',
@@ -134,11 +153,14 @@ module Alchemy
     end
 
     context "Requesting a picture with crop_from and crop_size parameters with larger size param" do
-      let(:picture) { Picture.create(image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png')) }
+      let(:picture) do
+        create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png'))
+      end
 
       it "renders the cropped picture without upsampling" do
-        get :show,
+        alchemy_get :show,
           id: picture.id,
+          name: picture.urlname,
           crop: 'crop',
           size: '400x400',
           crop_size: '200x200',
@@ -155,11 +177,14 @@ module Alchemy
     end
 
     context "Requesting a picture with crop_from and crop_size parameters with larger size param and upsample set" do
-      let(:picture) { Picture.create(image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png')) }
+      let(:picture) do
+        create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png'))
+      end
 
       it "renders the cropped picture with upsampling" do
-        get :show,
+        alchemy_get :show,
           id: picture.id,
+          name: picture.urlname,
           crop: 'crop',
           size: '400x400',
           crop_size: '200x200',
@@ -179,7 +204,7 @@ module Alchemy
 
     context "Requesting a picture that is not assigned with any page" do
       it "should render the picture" do
-        get :show, id: picture.id, format: :png, sh: picture.security_token
+        alchemy_get :show, id: picture.id, name: picture.urlname, format: :png, sh: picture.security_token
         expect(response.status).to eq(200)
       end
     end
@@ -197,7 +222,7 @@ module Alchemy
 
       context "as guest user" do
         it "should render the picture" do
-          get :show, id: picture.id, format: :png, sh: picture.security_token
+          alchemy_get :show, id: picture.id, name: picture.urlname, format: :png, sh: picture.security_token
           expect(response.status).to eq(200)
         end
       end
@@ -212,7 +237,7 @@ module Alchemy
 
       context "as guest user" do
         it "should not render the picture, but redirect to login path" do
-          get :show, id: picture.id, sh: picture.security_token
+          alchemy_get :show, id: picture.id, name: picture.urlname, format: :png, sh: picture.security_token
           expect(response.status).to eq(302)
           expect(response).to redirect_to(Alchemy.login_path)
         end
@@ -224,14 +249,16 @@ module Alchemy
         end
 
         it "should render the picture" do
-          get :show, id: picture.id, format: :png, sh: picture.security_token
+          alchemy_get :show, id: picture.id, name: picture.urlname, format: :png, sh: picture.security_token
           expect(response.status).to eq(200)
         end
       end
     end
 
     describe 'Picture processing' do
-      let(:big_picture) { Picture.create(:image_file => fixture_file_upload(File.expand_path('../../fixtures/80x60.png', __FILE__), 'image/png')) }
+      let(:big_picture) do
+        create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/80x60.png', __FILE__), 'image/png'))
+      end
 
       context "with crop and size parameters" do
         it "should return a cropped image." do
@@ -240,20 +267,20 @@ module Alchemy
             size: '10x10',
             format: 'png'
           }
-          get :show, options.merge(id: big_picture.id, sh: big_picture.security_token(options))
+          alchemy_get :show, options.merge(id: big_picture.id, name: big_picture.urlname, sh: big_picture.security_token(options))
           expect(response.body[0x10..0x18].unpack('NN')).to eq([10,10])
         end
 
         context "without a full size specification" do
           it "should raise an error" do
             options = {
-              :crop => 'crop',
-              :size => '10',
-              :format => 'png'
+              crop: 'crop',
+              size: '10',
+              format: 'png'
             }
-            expect do
-              get :show, options.merge(:id => big_picture.id, :sh => big_picture.security_token(options))
-            end.to raise_error ArgumentError
+            expect {
+              alchemy_get :show, options.merge(id: big_picture.id, name: big_picture.urlname, sh: big_picture.security_token(options))
+            }.to raise_error ArgumentError
           end
         end
 
@@ -264,7 +291,7 @@ module Alchemy
               size: '10x10',
               format: 'png'
             }
-            get :show, options.merge(id: picture.id, sh: picture.security_token(options))
+            alchemy_get :show, options.merge(id: picture.id, name: big_picture.urlname, sh: picture.security_token(options))
             expect(response.body[0x10..0x18].unpack('NN')).to eq([1,1])
           end
         end
@@ -277,7 +304,7 @@ module Alchemy
               upsample: 'true',
               format: 'png'
             }
-            get :show, options.merge(id: picture.id, sh: picture.security_token(options))
+            alchemy_get :show, options.merge(id: picture.id, name: big_picture.urlname, sh: picture.security_token(options))
             expect(response.body[0x10..0x18].unpack('NN')).to eq([10,10])
           end
         end
@@ -286,32 +313,31 @@ module Alchemy
       context "without crop but with size parameter" do
         it "should resize the image preserving aspect ratio" do
           options = {
-            :size => '40x40',
-            :format => 'png'
+            size: '40x40',
+            format: 'png'
           }
-          get :show, options.merge(:id => big_picture.id, :sh => big_picture.security_token(options))
+          alchemy_get :show, options.merge(id: big_picture.id, name: big_picture.urlname, sh: big_picture.security_token(options))
           expect(response.body[0x10..0x18].unpack('NN')).to eq([40,30])
         end
 
         it "should resize the image inferring the height if not given" do
           options = {
-            :size => '40x',
-            :format => 'png'
+            size: '40x',
+            format: 'png'
           }
-          get :show, options.merge(:id => big_picture.id, :sh => big_picture.security_token(options))
+          alchemy_get :show, options.merge(id: big_picture.id, name: big_picture.urlname, sh: big_picture.security_token(options))
           expect(response.body[0x10..0x18].unpack('NN')).to eq([40,30])
         end
 
         it "should resize the image inferring the width if not given" do
           options = {
-            :size => 'x30',
-            :format => 'png'
+            size: 'x30',
+            format: 'png'
           }
-          get :show, options.merge(:id => big_picture.id, :sh => big_picture.security_token(options))
+          alchemy_get :show, options.merge(id: big_picture.id, name: big_picture.urlname, sh: big_picture.security_token(options))
           expect(response.body[0x10..0x18].unpack('NN')).to eq([40,30])
         end
       end
     end
-
   end
 end

data/spec/dummy/Rakefile

@@ -3,4 +3,4 @@
 
 require File.expand_path('../config/application', __FILE__)
 
-Dummy::Application.load_tasks
+Rails.application.load_tasks

data/spec/dummy/app/assets/stylesheets/application.css

@@ -5,9 +5,11 @@
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
  * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
  *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
  *
- *= require_self
  *= require_tree .
+ *= require_self
  */

data/spec/dummy/config/application.rb

@@ -1,6 +1,12 @@
 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 "action_view/railtie"
+require "sprockets/railtie"
+# require "rails/test_unit/railtie"
 
 Bundler.require(*Rails.groups)
 require "alchemy_cms"
@@ -18,5 +24,9 @@ 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
+
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end
+

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environment.rb

@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the Rails application.
-Dummy::Application.initialize!
+Rails.application.initialize!

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

@@ -1,4 +1,4 @@
-Dummy::Application.configure do
+Rails.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
@@ -19,11 +19,23 @@ Dummy::Application.configure do
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Raise an error on page load if there are pending migrations
+  # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
   config.assets.debug = true
+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end

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

@@ -1,11 +1,11 @@
-Dummy::Application.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Code is not reloaded between requests.
   config.cache_classes = true
 
   # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both thread web servers
+  # your application in memory, allowing both threaded web servers
   # and those relying on copy on write to perform better.
   # Rake tasks automatically ignore this option for performance.
   config.eager_load = true
@@ -16,11 +16,12 @@ Dummy::Application.configure do
 
   # Enable Rack::Cache to put a simple HTTP cache in front of your application
   # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
   # config.action_dispatch.rack_cache = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  # Disable Rails's static asset server (Apache or NGINX will already do this).
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
@@ -29,21 +30,21 @@ Dummy::Application.configure do
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = true
 
-  # Generate digests for assets URLs.
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
-  # Version of your assets, change this if you want to expire all your assets.
-  config.assets.version = '1.0'
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
   # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # Set to :debug to see everything in the log.
-  config.log_level = :info
+  # Decrease the log volume.
+  # config.log_level = :info
 
   # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
@@ -55,26 +56,22 @@ Dummy::Application.configure do
   # config.cache_store = :mem_cache_store
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets.
-  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-  # config.assets.precompile += %w( search.js )
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found).
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Disable automatic flushing of the log to improve performance.
-  # config.autoflush_log = false
-
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 end