kuhsaft 0.3.1 → 0.3.2

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## Master
+## master
 
 ### Bug fixes
 
@@ -6,13 +6,71 @@
 
 ### New features
 
+## 0.3.2 - September 15, 2011
+
+*Development of Kuhsaft for Rails 3.1 moved to master, rails30 will
+maintain rails 3.0 compatibility*
+
+### Bug fixes
+
+- fix asset pipeline compatibility when in production ([@effkay][])
+
+### Improvements
+
+- fix README on how to integrate devise ([@effkay][])
+
+
+## 0.2.5 - August 29, 2011
+
+### Bug fixes
+
+- fix a bug where virtual page tree wasn't available ([@manufaktor][])
+
+## 0.2.4 - August 29, 2011
+
+### Improvements
+
+- handle 404s with an ActionController::RoutingError, controllers can optionally implement a `handle_404` method to change behavior ([@manufaktor][])
+- Backend now shows the hierarchy breadcrumb when creating a new page ([@manufaktor][])
+
+## 0.2.3 - August 19, 2011
+
+### Bug fixes
+
+- update gem versions of dependencies, because some contain bugfixes (linecache, carrierwave) ([@manufaktor][])
+
+## 0.3.1 - August 9, 2011
+
+### Bug fixes
+
+- fix image paths and update readme concerning asset pipeline ([@effkay][])
+
+### Improvements
+
+- we have a changelog now! ([@effkay][])
+
 ## 0.3.0 - August 8, 2011
 
 ### Improvements
 
-- moved assets to a rails 3.1 compatible location. ([@effkay][])
+- moved assets to a rails 3.1 compatible location ([@effkay][])
+
+## 0.2.2 - August 5, 2011
+
+### Bug fixes
+
+- `params[:locale]` is now recognized by the PagesController ([@manufaktor][])
+
+### Improvements
+
+- Lots of styling improvements for the backend ([@iphilgood][] & [melinda][])
+- Formatted Text textareas now resize smartly according to its content ([@iphilgood][] & [melinda][])
+- Added specific delete messages for pages and assets ([@manufaktor][])
+- Updated to latest UJS Jquery ([@manufaktor][])
+- Backend recognizes a current_user and will display a logout possibility ([@iphilgood][])
 
 [@manufaktor]: https://github.com/manufaktor
 [@effkay]: https://github.com/effkay
 [@iphilgood]: https://github.com/iphilgood
+[@tscholz]: https://github.com/tscholz
 [melinda]: http://www.melinda-lini.de/

data/README.md

@@ -43,11 +43,6 @@ If you are upgrading, run those installers again and hopefully we will generate
 
 (NOTE: Steps below should hopefully not be necessary in future versions:)
 
-In order to load the engine's assets you need to require them in your
-application.css:
-
-    //= require kuhsaft
-
 Finally, you need to add a before filter to the application controller (for now...)
 
     ApplicationController < ActionController::Base

data/app/assets/stylesheets/kuhsaft/cms/partials/_generic.sass

@@ -11,7 +11,7 @@ body
   background: #cccccb
   
 #kuhsaft-wrapper
-  //background: #e9e9e9 url(/assets/kuhsaft/wrapper-bg.png) repeat-x left 100px
+  //background: #e9e9e9 image_url('kuhsaft/wrapper-bg.png') repeat-x left 100px
   width: 960px
   margin: 0 auto
 
@@ -19,7 +19,7 @@ body
   display: none
 
 .cms-header
-  background: url(/assets/kuhsaft/header-bg.jpg)
+  background: image_url('kuhsaft/header-bg.jpg')
   border-bottom: 1px solid #cccccb
   +min-height(150px)
 
@@ -34,11 +34,11 @@ body
 
 .page-tree-breadcrumb
   margin-bottom: 20px
-  background: url(/assets/kuhsaft/pages-breadcrumb-icon.png) no-repeat left 5px
+  background: image_url('kuhsaft/pages-breadcrumb-icon.png') no-repeat left 5px
   padding-left: 18px
   
   a
-    background: url(/assets/kuhsaft/page-tree-breadcrumb-arrow.png) no-repeat right center
+    background: image_url('kuhsaft/page-tree-breadcrumb-arrow.png') no-repeat right center
     padding-right: 15px
     
   a:last-child
@@ -65,7 +65,7 @@ body
   li.current
     border-left: 1px solid #7c7a7f
     a
-      background: #cccccb url(/assets/kuhsaft/module-nav-tab-bg.png) repeat-x
+      background: #cccccb image_url('kuhsaft/module-nav-tab-bg.png') repeat-x
       border-left: 1px solid #e6e6e6
       +text-shadow(#efefef, 0px, 1px, 0px)
       +link-colors($color1, $color2, $color1, $color1, $color1)
@@ -76,7 +76,7 @@ body
 .language-tabs
   border:
     bottom: 1px solid #cfcfcf
-  background: #e3e3e3 url(/assets/kuhsaft/tab-bg.png) repeat-x
+  background: #e3e3e3 image_url('kuhsaft/tab-bg.png') repeat-x
   height: 40px
   
   li
@@ -130,6 +130,10 @@ body
   
 .colored-box
   background: $color3
+  border:
+    left: 1px solid $color3
+    right: 1px solid $color3
+    bottom: 1px solid $color3
   @extend .box
 
 .draggable-box 
@@ -147,10 +151,10 @@ h1
     color: #858592
   
 .new-page
-  background: url(/assets/kuhsaft/page-new-icon.png) no-repeat left 3px
+  background: image_url('kuhsaft/page-new-icon.png') no-repeat left 3px
   
 .edit-page
-  background: url(/assets/kuhsaft/page-edit-icon.png) no-repeat left 7px
+  background: image_url('kuhsaft/page-edit-icon.png') no-repeat left 7px
   
 a
   text-decoration: none
@@ -289,12 +293,12 @@ ul.pages-root
     left: 1px solid #b2b2b2
 
 .icon.add-child-page
-  background: url(/assets/kuhsaft/add-child-page.png) no-repeat center center
+  background: image_url('kuhsaft/add-child-page.png') no-repeat center center
   width: 28px
   border-right: 0px
 
 .icon.delete
-  background: url(/assets/kuhsaft/delete.png) no-repeat center center
+  background: image_url('kuhsaft/delete.png') no-repeat center center
   width: 22px
   border-left: 0px
 
@@ -307,14 +311,14 @@ ul.pages-root
     +float_right
 
 .drag-handler
-  background: $color3 url(/assets/kuhsaft/page-part-draggable-area.png) no-repeat top right
+  background: $color3 image_url('kuhsaft/page-part-draggable-area.png') no-repeat top right
   width: 91px
   height: 22px
   margin: 0px 7px 0px 0px
   float: right
-  cursor: url(/assets/kuhsaft/openhand.cur), default !important
+  cursor: image_url('kuhsaft/openhand.cur'), default !important
   &:active
-    cursor: url(/assets/kuhsaft/closedhand.cur), default !important
+    cursor: image_url('kuhsaft/closedhand.cur'), default !important
 
 .destroy-handler  
   text-align: right
@@ -324,7 +328,7 @@ ul.pages-root
   +float_right
   
 .will-drag
-  border: 1px solid #666
+  border: 1px solid #666 !important
   +single-box-shadow(rgba(0,0,0,0.2), 0px, 5px, 20px)
   
 .container

data/app/assets/stylesheets/kuhsaft/cms/partials/_simple_form.sass

@@ -44,10 +44,10 @@ select
 .toggle
   color: $color1
   padding-left: 20px
-  background: url(/assets/kuhsaft/toggle-arrow-open.png) no-repeat left center
+  background: image_url('kuhsaft/toggle-arrow-open.png') no-repeat left center
 
 .toggle.closed
-  background: url(/assets/kuhsaft/toggle-arrow-closed.png) no-repeat left center
+  background: image_url('kuhsaft/toggle-arrow-closed.png') no-repeat left center
 
 #kuhsaft_page_page_part_type
   +float_left

data/app/controllers/kuhsaft/pages_controller.rb

@@ -6,7 +6,15 @@ module Kuhsaft
     
     def show
       @page = Kuhsaft::Page.find_by_url(params[:url])
-      respond_with @page
+      if @page.present?
+        respond_with @page
+      else
+        if respond_to?(:handle_404)
+          handle_404
+        else
+          raise ActionController::RoutingError.new('Not Found')
+        end
+      end
     end
     
     private

data/app/helpers/cms_helper.rb

@@ -2,4 +2,14 @@ module CmsHelper
   def admin_tab title, path
     content_tag :li, link_to(title, path), :class => (:current if request.path.include?(path))
   end
+  
+  def available_parent_pages
+    pages = []
+    pages << { :title => t('kuhsaft.cms.pages.new.pages'), :link => cms_pages_path(:locale => :en) }
+    if params[:parent_id].present?
+      parent_page = Kuhsaft::Page.find(params[:parent_id])
+      pages += parent_page.parent_pages
+    end
+    pages << { :title => t('kuhsaft.cms.pages.new.new_page'), :link => '#' }
+  end
 end

data/app/views/kuhsaft/cms/pages/new.html.haml

@@ -2,5 +2,9 @@
   - Kuhsaft::Page.translation_locales.each do |locale|
     %li{ :class => (:current if params[:locale] == locale.to_s) }= link_to locale.to_s, new_cms_page_path(:locale => locale)
 
+.page-tree-breadcrumb
+  - available_parent_pages.each do |parent_page|
+    = link_to((parent_page[:title].presence || parent_page.title), parent_page[:link].presence || edit_cms_page_path(parent_page))
+
 .box-container    
   = render :partial => 'form', :locals => { :url => cms_pages_path, :page_title => t('.new') }

data/app/views/layouts/kuhsaft/admin.html.haml

@@ -2,6 +2,7 @@
 %html
   %head
     = stylesheet_link_tag 'kuhsaft/cms/screen.css', :media => 'screen, projection'
+    = stylesheet_link_tag 'cms/application.css', :media => 'screen, projection'
     = javascript_include_tag 'kuhsaft/cms/jquery.min.js'
     = javascript_include_tag 'kuhsaft/cms/jquery-ui-1.8.12.custom.min.js'
     = javascript_include_tag 'kuhsaft/cms/jquery_ujs.js'

data/config/initializers/page_parts.rb

@@ -1,6 +1,7 @@
 Dir.glob("#{Kuhsaft::Engine.root}/app/models/kuhsaft/page_part/*.rb").sort.each { |file| require file }
 
 # https://rails.lighthouseapp.com/projects/8994/tickets/6306-collection-associations-build-method-not-supported-for-sti
+# updated: https://github.com/rails/rails/issues/815
 
 class ActiveRecord::Reflection::AssociationReflection
   def build_association(*opts)

data/config/locales/kuhsaft.en.yml

@@ -1,4 +1,5 @@
 en:
+  404: '404, Page not found'
   layouts:
     kuhsaft:
       admin:
@@ -13,8 +14,10 @@ en:
           create: 'Create new page'
         new:
           new: 'Creating new page'
+          pages: 'Pages'
         edit:
           edit_html: 'Editing page: <span>%{title}</span>'
+          pages: 'Pages'
         branch:
           add: 'Add page'
           create: 'Create new page'

data/kuhsaft.gemspec

@@ -18,24 +18,22 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
-  s.add_development_dependency 'rspec-rails'
+
+  s.add_development_dependency 'rspec-rails', '>= 2.6'
   s.add_development_dependency 'factory_girl_rails'
   s.add_development_dependency 'capybara', '>= 0.4.0'
-  s.add_development_dependency 'ruby-debug'
-  s.add_development_dependency 'sqlite3-ruby', '1.2.5'
-  s.add_development_dependency 'guard'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'guard', '>= 0.6'
   s.add_development_dependency 'guard-spork'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'growl'
-  s.add_development_dependency 'linecache', '0.42'
 
-  s.add_dependency 'rails', '~>3.0'
+  s.add_dependency 'rails', '~>3.1'
   s.add_dependency 'haml', '~> 3.1'
   s.add_dependency 'compass', '>= 0.11.1'
-  s.add_dependency 'simple_form'
-  s.add_dependency 'carrierwave', '0.5.2'
+  s.add_dependency 'simple_form', '>= 1.4'
+  s.add_dependency 'carrierwave', '>= 0.5.7'
   s.add_dependency 'rmagick', '2.12.2'
-  s.add_dependency 'rdiscount'
-  s.add_dependency 'acts-as-taggable-on', '2.0.6'
+  s.add_dependency 'rdiscount', '>= 1.6'
+  s.add_dependency 'acts-as-taggable-on', '>= 2.0.6'
 end

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/controllers/pages_controller_spec.rb

@@ -5,8 +5,8 @@ describe Kuhsaft::PagesController do
   
   before do
     set_lang :en
-    # create page with slug=english-title
-    @page = Factory.create :page
+    # create page with slug=english-title-1
+    @page = Factory(:page)
   end
   
   after do
@@ -16,8 +16,15 @@ describe Kuhsaft::PagesController do
   
   describe 'should render successfully' do
     it '#show' do
-      get :show, :locale => 'en', :url => '/english-title'
+      get :show, :locale => 'en', :url => 'english-title-1'
+      response.response_code.should eq(200)
       response.should be_success
     end
   end
+  
+  describe 'should render 404' do
+    it 'should raise RoutingError by default' do
+      expect{ get :show, :locale => 'en', :url => '/i-dont-know' }.to raise_error(ActionController::RoutingError)
+    end
+  end
 end

data/spec/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

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

@@ -0,0 +1,7 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. 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.
+ *= require_self
+ *= require_tree . 
+*/

data/spec/dummy/app/views/layouts/application.html.erb

@@ -2,8 +2,9 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag :all %>
-  <%= csrf_meta_tag %>
+  <%= stylesheet_link_tag    "application" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
 </head>
 <body>
 

data/spec/dummy/config/application.rb

@@ -1,13 +1,13 @@
 require File.expand_path('../boot', __FILE__)
 
-require "active_model/railtie"
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_view/railtie"
-require "action_mailer/railtie"
+require 'rails/all'
 
-Bundler.require
-require "kuhsaft"
+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
@@ -33,13 +33,16 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w()
-
     # 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]
+
+    # 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'
   end
-end
+end

data/spec/dummy/config/boot.rb

@@ -3,8 +3,7 @@ gemfile = File.expand_path('../../../../Gemfile', __FILE__)
 
 if File.exist?(gemfile)
   ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
+  require 'bundler/setup'
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

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

@@ -3,7 +3,7 @@ Dummy::Application.configure do
 
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
@@ -11,7 +11,6 @@ Dummy::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
@@ -22,5 +21,10 @@ Dummy::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
-end
 
+  # 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

@@ -1,7 +1,6 @@
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
-  # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
 
@@ -9,14 +8,27 @@ Dummy::Application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+
+  # Generate digests for assets URLs
+  config.assets.digest = true
 
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+  # Defaults to Rails.root.join("public/assets")
+  # config.assets.manifest = YOUR_PATH
 
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
+  # 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
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
 
   # See everything in the log (default is :info)
   # config.log_level = :debug
@@ -27,13 +39,12 @@ Dummy::Application.configure do
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
 
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-
-  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # 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 are already added)
+  # config.assets.precompile += %w( search.js )
+
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 

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

@@ -7,7 +7,11 @@ Dummy::Application.configure do
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
 
   # Show full error reports and disable caching
@@ -32,4 +36,7 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
+  config.assets.allow_debugging = true
 end

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'e858af03f4de97209019c290429a4521b2cdd2ad0468f2fb3a89f8dca4be149148701c4a297af75a580b05b0102270b2a80874ddc62302bc06058f46ad822b66'
+Dummy::Application.config.secret_token = '0d5c3beaf628d165c2d8241c7a09690eb1a25e5d03829f090b43a23783ea0c7596b6aed009f996a37911532f60831363719babc47ffdf3cc2632784879f9164b'

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters :format => [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end

data/spec/factories.rb

@@ -15,7 +15,7 @@ Factory.define :page, :class => Kuhsaft::Page do |p|
 end
 
 Factory.define :asset, :class => Kuhsaft::Asset do |a|
-  a.file File.open("#{Kuhsaft::Engine.root}/spec/dummy/public/images/spec-image.png")
+  a.file File.open("#{Kuhsaft::Engine.root}/spec/dummy/app/assets/images/spec-image.png")
 end
 
 Factory.sequence(:title) { |n| n }

data/spec/helpers/cms_helper_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe CmsHelper do
+  context 'when the user creates a toplevel page' do
+    describe '#available_parent_pages' do
+      it 'should return the 2 pages' do
+        helper.available_parent_pages.should have(2).pages
+      end
+    end  
+  end
+  
+  describe '#available_parent_pages' do
+    before do
+      page1, page2, page3 = create_page_tree
+      helper.stub!(:params).and_return(:parent_id => page3.id)
+    end    
+    
+    it 'should return the parent pages' do
+      helper.available_parent_pages.should have_at_least(3).pages
+    end
+  end
+end

data/spec/models/asset_spec.rb

@@ -5,7 +5,7 @@ describe Kuhsaft::Asset do
     Kuhsaft::AssetUploader.enable_processing = true
     @asset = Factory(:asset)
     @uploader = Kuhsaft::AssetUploader.new(@asset, :file)
-    @uploader.store!(File.open(File.join(Kuhsaft::Engine.root, 'spec', 'dummy', 'public', 'images', 'spec-image.png')))
+    @uploader.store!(File.open(File.join(Kuhsaft::Engine.root, 'spec', 'dummy', 'app', 'assets', 'images', 'spec-image.png')))
   end
   
   after do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kuhsaft
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - "Immanuel H\xC3\xA4ussermann"
@@ -17,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 +02:00
-default_executable: 
+date: 2011-09-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
@@ -28,10 +27,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 6
+        version: "2.6"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: sqlite3
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -79,23 +79,22 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: guard
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 7
         segments: 
-        - 1
-        - 2
-        - 5
-        version: 1.2.5
+        - 0
+        - 6
+        version: "0.6"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: guard
+  name: guard-spork
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -109,7 +108,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: guard-spork
+  name: guard-rspec
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -123,7 +122,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: guard-rspec
+  name: growl
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -136,54 +135,25 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: growl
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: linecache
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 95
-        segments: 
-        - 0
-        - 42
-        version: "0.42"
-  type: :development
-  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 3
-        - 0
-        version: "3.0"
+        - 1
+        version: "3.1"
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -194,11 +164,11 @@ dependencies:
         - 1
         version: "3.1"
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: compass
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -210,41 +180,42 @@ dependencies:
         - 1
         version: 0.11.1
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: simple_form
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        version: "1.4"
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: carrierwave
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 5
         segments: 
         - 0
         - 5
-        - 2
-        version: 0.5.2
+        - 7
+        version: 0.5.7
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rmagick
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -256,28 +227,29 @@ dependencies:
         - 2
         version: 2.12.2
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: rdiscount
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 6
+        version: "1.6"
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: acts-as-taggable-on
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
@@ -286,7 +258,7 @@ dependencies:
         - 6
         version: 2.0.6
   type: :runtime
-  version_requirements: *id018
+  version_requirements: *id016
 description: Kuhsaft is a Rails engine that offers a simple CMS.
 email: developers@screenconcept.ch
 executables: []
@@ -396,6 +368,10 @@ files:
 - spec/controllers/page_parts_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/images/rails.png
+- spec/dummy/app/assets/images/spec-image.png
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -412,17 +388,21 @@ files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/.gitkeep
+- spec/dummy/lib/assets/.gitkeep
+- spec/dummy/lib/tasks/.gitkeep
+- spec/dummy/log/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/public/images/spec-image.png
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/factories.rb
+- spec/helpers/cms_helper_spec.rb
 - spec/helpers/pages_helper_spec.rb
 - spec/integration/navigation_spec.rb
 - spec/kuhsaft_spec.rb
@@ -438,7 +418,6 @@ files:
 - spec/routing/pages_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/kuhsaft_spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/screenconcept/kuhsaft
 licenses: []
 
@@ -468,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: kuhsaft
-rubygems_version: 1.6.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A tool that helps you to manage your content within your app.
@@ -478,6 +457,10 @@ test_files:
 - spec/controllers/page_parts_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/images/rails.png
+- spec/dummy/app/assets/images/spec-image.png
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -494,17 +477,21 @@ test_files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/.gitkeep
+- spec/dummy/lib/assets/.gitkeep
+- spec/dummy/lib/tasks/.gitkeep
+- spec/dummy/log/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/public/images/spec-image.png
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/factories.rb
+- spec/helpers/cms_helper_spec.rb
 - spec/helpers/pages_helper_spec.rb
 - spec/integration/navigation_spec.rb
 - spec/kuhsaft_spec.rb