kuhsaft 0.2.5 → 0.3.0

data/.gitignore

@@ -15,4 +15,3 @@ spec/dummy/public/javascripts/**/*
 Gemfile.lock
 .DS_Store
 .sass-cache
-tags

data/README.md

@@ -36,14 +36,18 @@ to get the gem
 
 Then install the assets and the migrations and run them:
 
-    rails generate kuhsaft:install:assets
     rails generate kuhsaft:install:migrations
     rake db:migrate
-    
+
 If you are upgrading, run those installers again and hopefully we will generate just the migrations you need.
 
 (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
@@ -69,5 +73,5 @@ Create a toplevel page and set the page type to "navigation". You can now get th
     navigation_for(:slug => 'main-navigation') { |pages| ... }
 
 # LICENSE
-
+  
 See the file LICENSE.

data/app/{stylesheets → assets/stylesheets}/kuhsaft/cms/partials/_generic.sass

@@ -130,10 +130,6 @@ body
   
 .colored-box
   background: $color3
-  border:
-    left: 1px solid $color3
-    right: 1px solid $color3
-    bottom: 1px solid $color3
   @extend .box
 
 .draggable-box 
@@ -328,7 +324,7 @@ ul.pages-root
   +float_right
   
 .will-drag
-  border: 1px solid #666 !important
+  border: 1px solid #666
   +single-box-shadow(rgba(0,0,0,0.2), 0px, 5px, 20px)
   
 .container

data/app/controllers/kuhsaft/pages_controller.rb

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

data/app/helpers/cms_helper.rb

@@ -2,14 +2,4 @@ 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,9 +2,5 @@
   - 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/config/locales/kuhsaft.en.yml

@@ -1,5 +1,4 @@
 en:
-  404: '404, Page not found'
   layouts:
     kuhsaft:
       admin:
@@ -14,10 +13,8 @@ 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

@@ -19,22 +19,23 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_development_dependency 'rspec-rails', '>= 2.6'
+  s.add_development_dependency 'rspec-rails'
   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', '>= 0.6'
+  s.add_development_dependency 'guard'
   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 'haml', '~> 3.1'
   s.add_dependency 'compass', '>= 0.11.1'
-  s.add_dependency 'simple_form', '>= 1.4'
-  s.add_dependency 'carrierwave', '>= 0.5.7'
+  s.add_dependency 'simple_form'
+  s.add_dependency 'carrierwave', '0.5.2'
   s.add_dependency 'rmagick', '2.12.2'
-  s.add_dependency 'rdiscount', '>= 1.6'
-  s.add_dependency 'acts-as-taggable-on', '>= 2.0.6'
+  s.add_dependency 'rdiscount'
+  s.add_dependency 'acts-as-taggable-on', '2.0.6'
 end

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 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-1
-    @page = Factory(:page)
+    # create page with slug=english-title
+    @page = Factory.create :page
   end
   
   after do
@@ -16,15 +16,8 @@ describe Kuhsaft::PagesController do
   
   describe 'should render successfully' do
     it '#show' do
-      get :show, :locale => 'en', :url => 'english-title-1'
-      response.response_code.should eq(200)
+      get :show, :locale => 'en', :url => '/english-title'
       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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kuhsaft
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Immanuel H\xC3\xA4ussermann"
@@ -17,7 +17,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-29 00:00:00 Z
+date: 2011-08-08 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
@@ -27,11 +28,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 2
-        - 6
-        version: "2.6"
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -102,11 +102,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 0
-        - 6
-        version: "0.6"
+        version: "0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -152,9 +151,24 @@ dependencies:
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rails
+  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 
     none: false
     requirements: 
     - - ~>
@@ -165,11 +179,11 @@ dependencies:
         - 0
         version: "3.0"
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -180,11 +194,11 @@ dependencies:
         - 1
         version: "3.1"
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: compass
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -196,42 +210,41 @@ dependencies:
         - 1
         version: 0.11.1
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: simple_form
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 1
-        - 4
-        version: "1.4"
+        - 0
+        version: "0"
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: carrierwave
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 15
         segments: 
         - 0
         - 5
-        - 7
-        version: 0.5.7
+        - 2
+        version: 0.5.2
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: rmagick
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -243,29 +256,28 @@ dependencies:
         - 2
         version: 2.12.2
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: rdiscount
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 1
-        - 6
-        version: "1.6"
+        - 0
+        version: "0"
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: acts-as-taggable-on
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
@@ -274,7 +286,7 @@ dependencies:
         - 6
         version: 2.0.6
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id018
 description: Kuhsaft is a Rails engine that offers a simple CMS.
 email: developers@screenconcept.ch
 executables: []
@@ -287,12 +299,37 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
-- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/images/kuhsaft/add-child-page.png
+- app/assets/images/kuhsaft/closedhand.cur
+- app/assets/images/kuhsaft/delete.png
+- app/assets/images/kuhsaft/header-bg.jpg
+- app/assets/images/kuhsaft/module-nav-tab-bg.png
+- app/assets/images/kuhsaft/openhand.cur
+- app/assets/images/kuhsaft/page-edit-icon.png
+- app/assets/images/kuhsaft/page-new-icon.png
+- app/assets/images/kuhsaft/page-part-draggable-area.png
+- app/assets/images/kuhsaft/page-tree-breadcrumb-arrow.png
+- app/assets/images/kuhsaft/pages-breadcrumb-icon.png
+- app/assets/images/kuhsaft/tab-bg.png
+- app/assets/images/kuhsaft/toggle-arrow-closed.png
+- app/assets/images/kuhsaft/toggle-arrow-open.png
+- app/assets/images/kuhsaft/wrapper-bg.png
+- app/assets/javascripts/kuhsaft/cms/application.js
+- app/assets/javascripts/kuhsaft/cms/jquery-ui-1.8.12.custom.min.js
+- app/assets/javascripts/kuhsaft/cms/jquery.elastic.source.js
+- app/assets/javascripts/kuhsaft/cms/jquery.min.js
+- app/assets/javascripts/kuhsaft/cms/jquery_ujs.js
+- app/assets/stylesheets/kuhsaft/cms/partials/_assets.sass
+- app/assets/stylesheets/kuhsaft/cms/partials/_buttons.sass
+- app/assets/stylesheets/kuhsaft/cms/partials/_forms.sass
+- app/assets/stylesheets/kuhsaft/cms/partials/_generic.sass
+- app/assets/stylesheets/kuhsaft/cms/partials/_simple_form.sass
+- app/assets/stylesheets/kuhsaft/cms/screen.sass
 - app/controllers/kuhsaft/cms/admin_controller.rb
 - app/controllers/kuhsaft/cms/assets_controller.rb
 - app/controllers/kuhsaft/cms/page_parts_controller.rb
@@ -308,12 +345,6 @@ files:
 - app/models/kuhsaft/page_part/markdown.rb
 - app/models/kuhsaft/page_type.rb
 - app/models/kuhsaft/publish_state.rb
-- app/stylesheets/kuhsaft/cms/partials/_assets.sass
-- app/stylesheets/kuhsaft/cms/partials/_buttons.sass
-- app/stylesheets/kuhsaft/cms/partials/_forms.sass
-- app/stylesheets/kuhsaft/cms/partials/_generic.sass
-- app/stylesheets/kuhsaft/cms/partials/_simple_form.sass
-- app/stylesheets/kuhsaft/cms/screen.sass
 - app/uploaders/kuhsaft/asset_uploader.rb
 - app/views/kuhsaft/cms/assets/_form.html.haml
 - app/views/kuhsaft/cms/assets/_list.html.haml
@@ -359,26 +390,6 @@ files:
 - lib/templates/kuhsaft/install/create_kuhsaft_localized_pages.rb
 - lib/templates/kuhsaft/install/create_kuhsaft_pages.rb
 - lib/templates/kuhsaft/install/create_page_part_contents.rb
-- public/images/kuhsaft/add-child-page.png
-- public/images/kuhsaft/closedhand.cur
-- public/images/kuhsaft/delete.png
-- public/images/kuhsaft/header-bg.jpg
-- public/images/kuhsaft/module-nav-tab-bg.png
-- public/images/kuhsaft/openhand.cur
-- public/images/kuhsaft/page-edit-icon.png
-- public/images/kuhsaft/page-new-icon.png
-- public/images/kuhsaft/page-part-draggable-area.png
-- public/images/kuhsaft/page-tree-breadcrumb-arrow.png
-- public/images/kuhsaft/pages-breadcrumb-icon.png
-- public/images/kuhsaft/tab-bg.png
-- public/images/kuhsaft/toggle-arrow-closed.png
-- public/images/kuhsaft/toggle-arrow-open.png
-- public/images/kuhsaft/wrapper-bg.png
-- public/javascripts/kuhsaft/cms/application.js
-- public/javascripts/kuhsaft/cms/jquery-ui-1.8.12.custom.min.js
-- public/javascripts/kuhsaft/cms/jquery.elastic.source.js
-- public/javascripts/kuhsaft/cms/jquery.min.js
-- public/javascripts/kuhsaft/cms/jquery_ujs.js
 - spec/controllers/cms_assets_controller_spec.rb
 - spec/controllers/cms_pages_controller_spec.rb
 - spec/controllers/page_parts_controller_spec.rb
@@ -411,7 +422,6 @@ files:
 - 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
@@ -427,6 +437,7 @@ 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: []
 
@@ -456,7 +467,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: kuhsaft
-rubygems_version: 1.8.6
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: A tool that helps you to manage your content within your app.
@@ -493,7 +504,6 @@ test_files:
 - 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

data/CHANGELOG.md

@@ -1,67 +0,0 @@
-## master / rails31
-
-### Bug fixes
-
-### Improvements
-
-- fix README on how to integrate devise (rails31) ([@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][])
-
-### New features
-
-## 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][])
-
-### New features
-
-## 0.3.0 - August 8, 2011
-
-### Improvements
-
-- 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
-[melinda]: http://www.melinda-lini.de/

data/spec/helpers/cms_helper_spec.rb

@@ -1,22 +0,0 @@
-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