zen 0.4.2 → 0.4.3

data/spec/zen/package/sections/model/revision.rb

@@ -0,0 +1,76 @@
+require File.expand_path('../../../../../helper', __FILE__)
+
+describe 'Sections::Model::Revision' do
+  behaves_like :capybara
+
+  textbox_id  = CustomFields::Model::CustomFieldType[:name => 'textbox'].id
+  section     = Sections::Model::Section.create(
+    :name                    => 'Spec section',
+    :comment_allow           => true,
+    :comment_require_account => true,
+    :comment_moderate        => true,
+    :comment_format          => 'plain'
+  )
+
+  group = CustomFields::Model::CustomFieldGroup.create(:name => 'Spec fields')
+
+  field = CustomFields::Model::CustomField.create(
+    :name                  => 'Spec field',
+    :sort_order            => 0,
+    :format                => 'markdown',
+    :required              => true,
+    :text_editor           => false,
+    :custom_field_group_id => group.id,
+    :custom_field_type_id  => textbox_id
+  )
+
+  section.custom_field_group_pks = [group.id]
+
+  entries_url = Sections::Controller::SectionEntries.r(:index, section.id).to_s
+  new_button  = lang('section_entries.buttons.new')
+  save_button = lang('section_entries.buttons.save')
+  title_field = lang('section_entries.labels.title')
+
+  it 'The last revision should not be deleted' do
+    visit(entries_url)
+
+    click_on(new_button)
+
+    within '#section_entry_form' do
+      fill_in(title_field, :with => 'Title')
+      fill_in(field.name, :with => 'Original value')
+
+      click_on(save_button)
+    end
+
+    page.has_selector?('.message.error').should == false
+
+    10.times do |t|
+      within '#section_entry_form' do
+        fill_in(field.name, :with => "Modified #{t}")
+
+        click_on(save_button)
+      end
+    end
+
+    entry     = Sections::Model::SectionEntry[:title => 'Title']
+    revisions = entry.revisions
+
+    revisions.length.should == 10
+
+    revisions[1..-1].each { |rev| rev.destroy }
+
+    should.raise?(Sequel::Error::InvalidOperation) do
+      revisions[0].destroy
+    end
+
+    Sections::Model::Revision \
+      .filter(:section_entry_id => entry.id) \
+      .count \
+      .should == 1
+  end
+
+  field.destroy
+  section.destroy
+  group.destroy
+end

data/zen.gemspec

@@ -1,11 +1,9 @@
 require File.expand_path('../lib/zen/version', __FILE__)
 
-path = File.expand_path('../', __FILE__)
-
 Gem::Specification.new do |s|
   s.name        = 'zen'
   s.version     = Zen::VERSION
-  s.date        = '2012-04-16'
+  s.date        = '2012-06-10'
   s.authors     = ['Yorick Peterse']
   s.email       = 'yorickpeterse@gmail.com'
   s.summary     = 'Zen is a modular CMS written using Ramaze.'
@@ -37,27 +35,31 @@ After the database has been migrated you can start your application:
 For more information see the documentation: http://zen-cms.com/documentation
   TXT
 
-  s.files                 = `cd #{path}; git ls-files`.split("\n").sort
+  s.files = File.read(File.expand_path('../MANIFEST', __FILE__)).split("\n")
+
   s.has_rdoc              = 'yard'
   s.executables           = ['zen']
   s.required_ruby_version = '>= 1.9.2'
 
-  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.1'])
+  s.add_dependency('sequel',       ['~> 3.35.0'])
+  s.add_dependency('ramaze',       ['~> 2012.04.14'])
+  s.add_dependency('bcrypt-ruby',  ['~> 3.0.1'])
+  s.add_dependency('rake',         ['~> 0.9.2.2'])
+  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('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'])
-  s.add_development_dependency('capybara' , ['>= 1.1.1'])
-  s.add_development_dependency('sqlite3'  , ['>= 1.3.4'])
-  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'])
+  s.add_dependency('shebang',      ['~> 0.1'])
+  s.add_dependency('diff-lcs',     ['~> 1.1.3'])
+
+  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.8.1'])
+  s.add_development_dependency('capybara',   ['>= 1.1.1'])
+  s.add_development_dependency('defensio',   ['>= 0.9.1'])
+  s.add_development_dependency('simplecov',  ['>= 0.6.4'])
+  s.add_development_dependency('webmock',    ['>= 1.8.7'])
+  s.add_development_dependency('ffi-aspell', ['>= 0.0.2'])
+  s.add_development_dependency('sqlite3',    ['>= 1.3.4'])
+  s.add_development_dependency('pg',         ['>= 0.13.2'])
+  s.add_development_dependency('mysql2',     ['>= 0.3.11'])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zen
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.34.1
+        version: 3.35.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.34.1
+        version: 3.35.0
 - !ruby/object:Gem::Dependency
   name: ramaze
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
   name: loofah
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +194,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +202,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -204,13 +220,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: defensio
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,15 +234,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: defensio
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -234,15 +250,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 1.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -250,15 +266,47 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 1.8.7
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: ffi-aspell
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+- !ruby/object:Gem::Dependency
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 0.13.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -266,15 +314,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 0.13.2
 - !ruby/object:Gem::Dependency
-  name: raspell
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.3.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -282,7 +330,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.3.11
 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
@@ -299,6 +347,7 @@ files:
 - .travis.yml
 - .yardopts
 - LICENSE
+- MANIFEST
 - README.md
 - Rakefile
 - bin/zen
@@ -339,6 +388,9 @@ files:
 - guide/images/sections/edit_section_general.png
 - guide/images/sections/edit_section_groups.png
 - guide/images/sections/entries.png
+- guide/images/sections/revisions.png
+- guide/images/sections/revisions_diff.png
+- guide/images/sections/revisions_diff_multiple.png
 - guide/images/sections/sections.png
 - guide/images/settings/overview_general.png
 - guide/images/settings/overview_security.png
@@ -380,6 +432,7 @@ files:
 - lib/zen/helper/search.rb
 - lib/zen/helper/stacked_aspect.rb
 - lib/zen/helper/theme.rb
+- lib/zen/html_diff.rb
 - lib/zen/language.rb
 - lib/zen/language/en/zen_general.rb
 - lib/zen/language/en/zen_models.rb
@@ -393,7 +446,6 @@ files:
 - lib/zen/migrator.rb
 - lib/zen/model/helper.rb
 - lib/zen/model/init.rb
-- lib/zen/model/methods.rb
 - lib/zen/model/plugin/events.rb
 - lib/zen/package.rb
 - lib/zen/package/all.rb
@@ -457,6 +509,7 @@ files:
 - lib/zen/package/custom_fields/migrations/1295255665_create_schema.rb
 - lib/zen/package/custom_fields/migrations/1310659580_custom_field_types.rb
 - lib/zen/package/custom_fields/migrations/1311694920_rename_css_class.rb
+- lib/zen/package/custom_fields/migrations/1336171490_revisions.rb
 - lib/zen/package/dashboard/lib/dashboard.rb
 - lib/zen/package/dashboard/lib/dashboard/controller/dashboard.rb
 - lib/zen/package/dashboard/lib/dashboard/language/en/dashboard.rb
@@ -498,17 +551,23 @@ files:
 - lib/zen/package/menus/migrations/1308671733_rename_order_column.rb
 - lib/zen/package/menus/migrations/1311695030_rename_css_class.rb
 - lib/zen/package/sections/lib/sections.rb
+- lib/zen/package/sections/lib/sections/controller/revisions.rb
 - lib/zen/package/sections/lib/sections/controller/section_entries.rb
 - lib/zen/package/sections/lib/sections/controller/sections.rb
+- lib/zen/package/sections/lib/sections/helper/revision.rb
 - lib/zen/package/sections/lib/sections/helper/section.rb
 - lib/zen/package/sections/lib/sections/helper/section_frontend.rb
+- lib/zen/package/sections/lib/sections/language/en/revisions.rb
 - lib/zen/package/sections/lib/sections/language/en/section_entries.rb
 - lib/zen/package/sections/lib/sections/language/en/sections.rb
+- lib/zen/package/sections/lib/sections/language/nl/revisions.rb
 - lib/zen/package/sections/lib/sections/language/nl/section_entries.rb
 - lib/zen/package/sections/lib/sections/language/nl/sections.rb
+- lib/zen/package/sections/lib/sections/model/revision.rb
 - lib/zen/package/sections/lib/sections/model/section.rb
 - lib/zen/package/sections/lib/sections/model/section_entry.rb
 - lib/zen/package/sections/lib/sections/model/section_entry_status.rb
+- lib/zen/package/sections/lib/sections/view/admin/revisions/index.xhtml
 - lib/zen/package/sections/lib/sections/view/admin/section-entries/form.xhtml
 - lib/zen/package/sections/lib/sections/view/admin/section-entries/index.xhtml
 - lib/zen/package/sections/lib/sections/view/admin/section-entries/recent_entries.xhtml
@@ -520,6 +579,7 @@ files:
 - lib/zen/package/sections/migrations/1306772479_remove_unique_slug.rb
 - lib/zen/package/sections/migrations/1308672298_use_id_for_default_section.rb
 - lib/zen/package/sections/migrations/1308813320_section_entry_statuses.rb
+- lib/zen/package/sections/migrations/1335711557_revisions.rb
 - lib/zen/package/settings/lib/settings.rb
 - lib/zen/package/settings/lib/settings/blue_form_parameters.rb
 - lib/zen/package/settings/lib/settings/controller/settings.rb
@@ -606,6 +666,7 @@ files:
 - lib/zen/public/admin/zen/images/icons/settings.png
 - lib/zen/public/admin/zen/images/icons/template.png
 - lib/zen/public/admin/zen/images/icons/ul.png
+- lib/zen/public/admin/zen/images/icons/undo.png
 - lib/zen/public/admin/zen/images/icons/user.png
 - lib/zen/public/admin/zen/images/icons/user_group.png
 - lib/zen/public/admin/zen/js/index.js
@@ -629,11 +690,9 @@ files:
 - lib/zen/spec/simplecov.rb
 - lib/zen/task.rb
 - lib/zen/task/build.rake
-- lib/zen/task/clean.rake
 - lib/zen/task/db.rake
 - 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
@@ -643,7 +702,6 @@ files:
 - lib/zen/view/bottom.xhtml
 - lib/zen/view/head.xhtml
 - lib/zen/view/search.xhtml
-- pkg/.gitkeep
 - proto/app/Rakefile
 - proto/app/app.rb
 - proto/app/config.ru
@@ -732,10 +790,12 @@ files:
 - spec/zen/package/menus/helper/menu_frontend.rb
 - spec/zen/package/menus/model/menu.rb
 - spec/zen/package/menus/model/menu_item.rb
+- spec/zen/package/sections/controller/revisions.rb
 - spec/zen/package/sections/controller/section_entries.rb
 - spec/zen/package/sections/controller/sections.rb
 - spec/zen/package/sections/helper/section.rb
 - spec/zen/package/sections/helper/section_frontend.rb
+- spec/zen/package/sections/model/revision.rb
 - spec/zen/package/sections/widget.rb
 - spec/zen/package/settings/controller/settings.rb
 - spec/zen/package/settings/settings.rb
@@ -777,9 +837,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Zen is a modular CMS written using Ramaze.
 test_files: []
-has_rdoc: yard