kuhsaft 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75909c39662d25ba3f5e234dc0faddeaa9b2052a
-  data.tar.gz: 5aa4fd67c0873bd503ded0fe1f40d0da5e00a6db
+  metadata.gz: ac77e66409517fb5bcb98ff2600257f33637ef2b
+  data.tar.gz: 10e4316e5017e8d9729280b4720cdee9a3c38b4a
 SHA512:
-  metadata.gz: 9f7fa3ff3063e53e1c828730a21e21c2a9e1425103893ce2d6d1483664b83de7ea7189fa46c61308c3c37ca9d03db2bac5cbd4cd0e13d37c127ee47068598e25
-  data.tar.gz: 18a94bb44f64518879fe7f1f10df92390a861712f2cb3357061f1328096c3e077c22ba2468611cb42be69b8fe316f27fdb32af80e5f2f5d7fcf270c4b770966e
+  metadata.gz: 4be55cad81853d2572bda9f90d43a3864cd1ff88b857e4177fb1e686e341912fd1cfa2f6236d7168968c3a41486ed62be98a481fbc0f50b88e20748b5e99f598
+  data.tar.gz: ee3d836f72067c597a0e71e7f20e86c349c3517239ef6dfef4c7106b4a266de3e439982bba7713dcf146c332dc9b4d17a9f1d45b5a647bf57e0f6f2706fc2af5

data/app/controllers/kuhsaft/cms/admin_controller.rb

@@ -1,7 +1,6 @@
 module Kuhsaft
   module Cms
     class AdminController < ActionController::Base
-      inherit_resources
       respond_to :html
       layout 'kuhsaft/cms/application'
       before_filter :set_content_locale

data/app/controllers/kuhsaft/cms/pages_controller.rb

@@ -33,6 +33,7 @@ module Kuhsaft
       def edit
         @page = Kuhsaft::Page.find(params[:id])
         @page.published ||= Kuhsaft::PublishState::UNPUBLISHED
+        @page.bricks.each { |brick| brick.valid? }
         respond_with @page
       end
 

data/app/models/kuhsaft/partition.rb

@@ -9,9 +9,9 @@ module Kuhsaft
 
       def self.style_for_index(style, idx)
         [
-          ['span4', 'span8'],
+          ['span8', 'span4'],
           ['span6', 'span6'],
-          ['span8', 'span4']
+          ['span4', 'span8']
         ][style][idx]
       end
     end

data/app/models/kuhsaft/text_brick.rb

@@ -5,6 +5,8 @@ module Kuhsaft
     include ActionView::Helpers::SanitizeHelper
     HTML_ENTITIES = HTMLEntities.new
 
+    validates_presence_of :text
+
     def user_can_add_childs?
       false
     end

data/lib/kuhsaft.rb

@@ -15,5 +15,4 @@ module Kuhsaft
   require 'bootstrap-sass'
   require 'haml'
   require 'ckeditor_rails'
-  require 'inherited_resources'
 end

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

data/spec/controllers/kuhsaft/pages_controller_spec.rb

@@ -75,7 +75,7 @@ describe Kuhsaft::PagesController do
           expect(response).to redirect_to('/de/redirect_page')
         end
 
-        it 'redirects to root' do 
+        it 'redirects to root' do
           page = FactoryGirl.create(:page, :page_type => 'redirect', :slug => 'dumdidum', :url => 'de/dumdidum', :redirect_url => '/')
           get :show,  { :url => page.slug, :use_route => :kuhsaft }
           expect(response).to redirect_to('/')

data/spec/factories.rb

@@ -10,6 +10,11 @@ FactoryGirl.define do
     p.url ''
   end
 
+  factory :text_brick, :class => 'Kuhsaft::TextBrick' do |tb|
+    tb.type 'Kuhsaft::TextBrick'
+    tb.text 'DummyText'
+  end
+
   factory :asset, :class => Kuhsaft::Asset do |a|
     a.file File.open("#{Kuhsaft::Engine.root}/spec/dummy/app/assets/images/spec-image.png")
   end

data/spec/features/cms_pages_spec.rb

@@ -62,4 +62,15 @@ describe 'Cms/Pages' do
       end
     end
   end
+
+  describe '#edit' do
+    it 'shows error messages on invalid bricks' do
+      @page = FactoryGirl.create(:page)
+      invalid_brick = FactoryGirl.build(:text_brick, text: nil, brick_list: @page)
+      invalid_brick.save(validate: false)
+
+      visit kuhsaft.edit_cms_page_path(@page)
+      page.should have_css('.error', :count => 1)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -378,20 +378,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: inherited_resources
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Kuhsaft is a Rails engine that offers a simple CMS.
 email: developers@screenconcept.ch
 executables: []
@@ -648,7 +634,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: kuhsaft
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A tool that helps you to manage your content within your app.