zen 0.4 → 0.4.1

data/spec/zen/package/sections/controller/section_entries.rb

@@ -48,6 +48,10 @@ describe "Sections::Controller::SectionEntries" do
   title_field   = lang('section_entries.labels.title')
   status_field  = lang('section_entries.special.status_hash.published')
 
+  before do
+    Users::Model::User.filter(~{:email => 'spec@domain.tld'}).delete
+  end
+
   it 'Find no existing entries' do
     message = lang('section_entries.messages.no_entries')
 
@@ -164,6 +168,13 @@ describe "Sections::Controller::SectionEntries" do
       .value.should == 'chuck'
   end
 
+  it 'Gracefully handle non numeric section entry IDs' do
+    visit(Sections::Controller::SectionEntries.r(:edit, section.id, 'a').to_s)
+
+    page.current_path.should                    == index_url
+    page.has_selector?('.message.error').should == true
+  end
+
   enable_javascript
 
   it 'Automatically save a section entry' do
@@ -225,6 +236,34 @@ describe "Sections::Controller::SectionEntries" do
     ).should == true
   end
 
+  it 'Ensure that author names are preserved' do
+    spec_user = Users::Model::User[:email => 'spec@domain.tld']
+    user      = Users::Model::User.create(
+      :email    => 'user@example.com',
+      :password => '123',
+      :name     => 'User'
+    )
+
+    user.activate!
+
+    visit(index_url)
+    click_link('Spec entry')
+
+    within '#section_entry_form' do
+      select(user.name, :from => 'user_id')
+      click_on(save_button)
+    end
+
+    page.find('select[name="user_id"]').value.should == user.id.to_s
+
+    within '#section_entry_form' do
+      select(spec_user.name, :from => 'user_id')
+      click_on(save_button)
+    end
+
+    page.find('select[name="user_id"]').value.should == spec_user.id.to_s
+  end
+
   it 'Fail to delete an entry without an ID' do
     visit(index_url)
     click_on(delete_button)

data/spec/zen/package/sections/controller/sections.rb

@@ -99,6 +99,20 @@ describe "Sections::Controller::Sections" do
     page.find('input[name="slug"]').value.should == 'spec-section'
   end
 
+  it 'Gracefully handle non numeric section IDs' do
+    visit(Sections::Controller::Sections.r(:edit, 'a').to_s)
+
+    page.current_path.should                    == index_url
+    page.has_selector?('.message.error').should == true
+  end
+
+  it 'Gracefully handle non numeric section IDs' do
+    visit(Sections::Controller::Sections.r(:edit, 'a').to_s)
+
+    page.current_path.should                    == index_url
+    page.has_selector?('.message.error').should == true
+  end
+
   enable_javascript
 
   it 'Automatically save a section' do

data/spec/zen/package/users/controller/user_groups.rb

@@ -91,6 +91,13 @@ describe 'Users::Controller::UserGroups' do
     page.find('#permission_show_user').checked?.should == 'checked'
   end
 
+  it 'Gracefully handle non numeric user group IDs' do
+    visit(Users::Controller::UserGroups.r(:edit, 'a').to_s)
+
+    page.current_path.should                    == index_url
+    page.has_selector?('.message.error').should == true
+  end
+
   enable_javascript
 
   it 'Automatically save a user group' do

data/spec/zen/package/users/controller/users.rb

@@ -124,6 +124,13 @@ describe "Users::Controller::Users" do
     user.user_group_pks.include?(group.id).should == true
   end
 
+  it 'Gracefully handle non numeric user IDs' do
+    visit(Users::Controller::Users.r(:edit, 'a').to_s)
+
+    page.current_path.should                    == index_url
+    page.has_selector?('.message.error').should == true
+  end
+
   enable_javascript
 
   it 'Automatically save a user' do

data/zen.gemspec

@@ -5,7 +5,7 @@ path = File.expand_path('../', __FILE__)
 Gem::Specification.new do |s|
   s.name        = 'zen'
   s.version     = Zen::VERSION
-  s.date        = '2012-03-07'
+  s.date        = '2012-04-16'
   s.authors     = ['Yorick Peterse']
   s.email       = 'yorickpeterse@gmail.com'
   s.summary     = 'Zen is a modular CMS written using Ramaze.'
@@ -42,15 +42,15 @@ For more information see the documentation: http://zen-cms.com/documentation
   s.executables           = ['zen']
   s.required_ruby_version = '>= 1.9.2'
 
-  s.add_dependency('sequel'      , ['~> 3.33.0'])
-  s.add_dependency('ramaze'      , ['~> 2012.03.07'])
+  s.add_dependency('sequel'      , ['~> 3.34.1'])
+  s.add_dependency('ramaze'      , ['~> 2012.04.14'])
   s.add_dependency('bcrypt-ruby' , ['~> 3.0.1'])
   s.add_dependency('rake'        , ['~> 0.9.2'])
-  s.add_dependency('loofah'      , ['~> 1.2.0'])
+  s.add_dependency('loofah'      , ['~> 1.2.1'])
   s.add_dependency('ramaze-asset', ['~> 0.2.3'])
   s.add_dependency('shebang'     , ['~> 0.1'])
 
-  s.add_development_dependency('rdiscount', ['>= 1.6.8'])
+  s.add_development_dependency('redcarpet', ['>= 2.1.1'])
   s.add_development_dependency('RedCloth' , ['>= 4.2.8'])
   s.add_development_dependency('bacon'    , ['>= 1.1.0'])
   s.add_development_dependency('yard'     , ['>= 0.7.2'])
@@ -59,4 +59,5 @@ For more information see the documentation: http://zen-cms.com/documentation
   s.add_development_dependency('defensio' , ['>= 0.9.1'])
   s.add_development_dependency('simplecov', ['>= 0.4.2'])
   s.add_development_dependency('webmock'  , ['>= 1.6.4'])
+  s.add_development_dependency('raspell'  , ['>= 1.3'])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zen
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2156237640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.33.0
+        version: 3.34.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156237640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.34.1
 - !ruby/object:Gem::Dependency
   name: ramaze
-  requirement: &2156236560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2012.03.07
+        version: 2012.04.14
   type: :runtime
   prerelease: false
-  version_requirements: *2156236560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2012.04.14
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &2156235900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156235900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156235060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +69,31 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156235060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: loofah
-  requirement: &2156234200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156234200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: ramaze-asset
-  requirement: &2156233340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156233340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: shebang
-  requirement: &2156248960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,21 +117,31 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2156248960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rdiscount
-  requirement: &2156248440 !ruby/object:Gem::Requirement
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: 2.1.1
   type: :development
   prerelease: false
-  version_requirements: *2156248440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2156247860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: 4.2.8
   type: :development
   prerelease: false
-  version_requirements: *2156247860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.2.8
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2156247180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2156247180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156246460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2156246460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2156245500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *2156245500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156244800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +213,15 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *2156244800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: defensio
-  requirement: &2156244120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +229,15 @@ dependencies:
         version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *2156244120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156242940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +245,15 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *2156242940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2156241920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +261,28 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2156241920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
+  name: raspell
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: Zen is a modular CMS written using Ramaze. Zen gives you complete freedom
   to build whatever you want in whatever way you might want to build it.
 email: yorickpeterse@gmail.com
@@ -195,6 +291,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .aspell.en.pws
 - .gems
 - .gitignore
 - .mailmap
@@ -256,6 +353,7 @@ files:
 - guide/javascript.md
 - guide/javascript/zen_autosave.md
 - guide/javascript/zen_editor.md
+- guide/javascript/zen_form.md
 - guide/javascript/zen_hash.md
 - guide/javascript/zen_htmltable.md
 - guide/javascript/zen_tabs.md
@@ -517,6 +615,8 @@ files:
 - lib/zen/public/admin/zen/js/lib/editor.js
 - lib/zen/public/admin/zen/js/lib/editor/markdown.js
 - lib/zen/public/admin/zen/js/lib/editor/textile.js
+- lib/zen/public/admin/zen/js/lib/events.js
+- lib/zen/public/admin/zen/js/lib/form.js
 - lib/zen/public/admin/zen/js/lib/hash.js
 - lib/zen/public/admin/zen/js/lib/html_table.js
 - lib/zen/public/admin/zen/js/lib/tabs.js
@@ -534,6 +634,7 @@ files:
 - lib/zen/task/package.rake
 - lib/zen/task/proto.rake
 - lib/zen/task/setup.rake
+- lib/zen/task/spelling.rake
 - lib/zen/task/test.rake
 - lib/zen/task/theme.rake
 - lib/zen/theme.rb
@@ -562,6 +663,7 @@ files:
 - proto/migration.rb
 - proto/rack/thin.yml
 - proto/rack/unicorn.rb
+- spec/README.md
 - spec/Rakefile
 - spec/fixtures/zen/asset.rb
 - spec/fixtures/zen/helper/acl.rb
@@ -675,7 +777,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Zen is a modular CMS written using Ramaze.