alchemy_cms 2.2.rc8 → 2.2.rc11

data/spec/page_layout_spec.rb

@@ -14,7 +14,7 @@ describe Alchemy::PageLayout do
 
     it "should return the users page_layouts if exists in the application" do
       @config_path = Rails.root.join("config/alchemy")
-      FileUtils.mkdir_p(@config_path)
+      FileUtils.mv(File.join(@config_path, 'page_layouts.yml'), File.join(@config_path, 'page_layouts.bak'))
       layouts_file = File.join(@config_path, 'page_layouts.yml')
       File.open(layouts_file, 'w') do |page_layouts|
         page_layouts.puts "- name: testlayout\n  elements:"
@@ -23,7 +23,7 @@ describe Alchemy::PageLayout do
     end
 
     after(:each) do
-      FileUtils.rm_rf(@config_path)
+      FileUtils.mv(File.join(@config_path, 'page_layouts.bak'), File.join(@config_path, 'page_layouts.yml'))
     end
 
   end

data/spec/support/alchemy/specs_helpers.rb

@@ -1,8 +1,11 @@
+require 'declarative_authorization/maintenance'
+
 module Alchemy
   module Specs
     # Helpers for integration specs
     # This file is auto included in rspec integration/request tests.
     module Helpers
+      include Authorization::TestHelper
 
       # Capybara actions to login into Alchemy Backend
       #
@@ -13,7 +16,7 @@ module Alchemy
       # === Example:
       #
       #   before(:all) do
-      #     FactoryGirl.build(:admin_user).save_without_session_maintenance
+      #     create_admin_user
       #   end
       #
       def login_into_alchemy
@@ -23,6 +26,18 @@ module Alchemy
         click_on('Login')
       end
 
+      # Load additional authorization_rules for specs.
+      # For some strange reason, this isn't done automatically while running the specs
+      def load_authorization_rules
+        instance = Alchemy::AuthEngine.get_instance
+        instance.load(File.join(File.dirname(__FILE__), '../../dummy', 'config/authorization_rules.rb'))
+      end
+
+      # Creates an admin user in a way it works
+      def create_admin_user
+        @user = FactoryGirl.build(:admin_user).save_without_session_maintenance
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.2.rc8
+  version: 2.2.rc11
   prerelease: 4
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70331181302120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,15 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70331181302120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70331181301520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +40,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70331181301520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70331181300780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +56,15 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70331181300780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70331181299840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +72,15 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70331181299840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70331181299160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +88,15 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70331181299160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70331181298360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +104,15 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70331181298360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70331181297520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +120,15 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70331181297520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70331181296980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +136,15 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70331181296980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70331180893820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,10 +152,15 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70331180893820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70331180892420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -123,10 +168,15 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70331180892420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70331180891480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +184,15 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70331180891480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70331180890840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -145,10 +200,15 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70331180890840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70331180890000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -156,10 +216,15 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70331180890000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70331180888980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -167,10 +232,15 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70331180888980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70331180888460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -178,10 +248,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331180888460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jasminerice
-  requirement: &70331180887520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,7 +264,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331180887520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 email:
 - alchemy@magiclabs.de
@@ -643,9 +723,9 @@ files:
 - lib/rails/generators/alchemy/plugin/templates/plugin.rb
 - lib/rails/generators/alchemy/plugin/templates/routes.rb
 - lib/rails/generators/alchemy/scaffold/files/elements.yml
-- lib/rails/generators/alchemy/scaffold/files/page_layouts.yml
 - lib/rails/generators/alchemy/scaffold/files/pages.html.erb
 - lib/rails/generators/alchemy/scaffold/scaffold_generator.rb
+- lib/rails/generators/alchemy/scaffold/templates/page_layouts.yml.tt
 - lib/rails/templates/alchemy.rb
 - lib/tasks/ferret.rake
 - lib/tasks/fleximage.rake
@@ -740,7 +820,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/alchemy/controller_hacks.rb
 - spec/support/alchemy/specs_helpers.rb
-- spec/support/integration_spec_helper.rb
 - vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js
 - vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.min.js
 - vendor/assets/javascripts/jquery_plugins/jquery.html5uploader.js
@@ -864,7 +943,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An extremly flexbile CMS for Rails 3.2
@@ -957,5 +1036,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/alchemy/controller_hacks.rb
 - spec/support/alchemy/specs_helpers.rb
-- spec/support/integration_spec_helper.rb
 has_rdoc: 

data/spec/support/integration_spec_helper.rb

@@ -1,24 +0,0 @@
-require 'declarative_authorization/maintenance'
-include Authorization::TestHelper
-
-# Trying to load additional authorization-rules in dummy-app.
-# When accessing dummy-app in development-env it works without loading,
-# in capybara-test this doesn't work. Unfortunately the method below doesn't work neither.
-# I leave it here as a reminder
-def load_authorization_rules
-  Alchemy::AuthEngine.get_instance.load(File.join(File.dirname(__FILE__), '../..', 'config/authorization_rules.rb'))
-  Alchemy::AuthEngine.get_instance.load(File.join(File.dirname(__FILE__), '../dummy' 'config/authorization_rules.rb'))
-end
-
-def create_admin_user
-  @user = Alchemy::User.create!(:login => 'admin_user', :password => 's3cr3t', :password_confirmation => 's3cr3t', :email => 'jdoe2@example.com', :role => :admin)
-end
-
-def login_with_admin_user
-  visit '/alchemy/admin/login'
-  fill_in('alchemy_user_session_login', :with => 'admin_user')
-  fill_in('alchemy_user_session_password', :with => 's3cr3t')
-  click_on('Login')
-end
-
-