junebug 0.0.9 → 0.0.10

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.0.10 2006-11-12
+
+ * Submit bugfix
+ * More unit tests
+ 
 v0.0.9 2006-11-10
 
  * Mosquito unit tests
@@ -5,7 +10,7 @@ v0.0.9 2006-11-10
 v0.0.8 2006-11-08
 
  * Style work
- * Addd rss link to head
+ * Add rss link to head
  * Stylesheet update rake task
 
 v0.0.7 2006-11-07

data/README

@@ -5,8 +5,6 @@ Junebug is a minimalist wiki, running on Camping.
 
 == Status
 
-Junebug v0.0.9 release, 2006-11-10
-
 This is an alpha release.  Use at your own risk.  Please do not use this for anything important.
 
 

data/Rakefile

@@ -12,7 +12,7 @@ Gem.manage_gems
 
 gem_spec = Gem::Specification.new do |s|
   s.name = 'junebug'
-  s.version = '0.0.9'
+  s.version = '0.0.10'
   s.summary = "Junebug is a minimalist ruby wiki."
   s.description = "Junebug is a minimalist ruby wiki running on Camping."
   s.author = "Tim Myrtle"
@@ -33,19 +33,19 @@ gem_spec = Gem::Specification.new do |s|
   s.add_dependency('activerecord', '>=1.14.4')
 end
 
+
 Rake::GemPackageTask.new(gem_spec) do |pkg|
   pkg.need_zip = false
   pkg.need_tar = false
 end
 
+
 desc "View tidy html from dev server in editor"
 task :tidy do
   system("curl http://localhost:3301/#{ENV['PAGE']} | tidy -i -wrap 1000 | #{ENV['VISUAL'] || ENV['EDITOR'] || 'vim' }")
 end
 
 
-
-
 desc "Clean up directory"
 task :clean => :clobber_package do
   rm 'deploy/junebug.db', :force => true

data/lib/junebug/controllers.rb

@@ -34,13 +34,15 @@ module Junebug::Controllers
       if input.submit == 'delete'
         Page.find_by_title(page_name).destroy() if @state.user_id == 1
         redirect Junebug.startpage
-      else
+      elsif input.submit == 'save'
         attrs = { :body => input.post_body, :title => input.post_title }
         attrs[:readonly] = input.post_readonly if @state.user_id == 1
         if Page.find_or_create_by_title(page_name).update_attributes( attrs )
           # redirect Show, input.post_title
           redirect "#{Junebug.config['url']}/#{input.post_title}"
         end
+      else
+        redirect "#{Junebug.config['url']}/#{page_name}"
       end
     end
   end

data/lib/junebug/models.rb

@@ -48,7 +48,7 @@ module Junebug::Models
         t.column :title, :string, :limit => 255
         t.column :body, :text
         t.column :user_id, :integer, :null => false
-        t.column :readonly, :boolean
+        t.column :readonly, :boolean, :default => false
         t.column :created_at, :datetime
         t.column :updated_at, :datetime
       end

data/lib/junebug/views.rb

@@ -75,7 +75,7 @@ module Junebug::Views
               text " Readonly"
               br
             end
-            _button 'cancel', :href => R(Show, @page.title, @page.version), :style=>'float: right;'
+            input :type => 'submit', :name=>'submit', :value=>'cancel', :class=>'button', :style=>'float: right;'
             input :type => 'submit', :name=>'submit', :value=>'save', :class=>'button', :style=>'float: right;'
             input :type => 'submit', :name=>'submit', :value=>'delete', :class=>'button', :onclick=>'return confirm("You sure?")'
           end

data/test/fixtures/junebug_pages.yml

@@ -0,0 +1,5 @@
+page_1:
+  id: 1
+  user_id: 1
+  title: TestTitle1
+  body: The quick fox jumped over the lazy dog.

data/test/wiki_test.rb

@@ -36,15 +36,15 @@ include Junebug::Models
 #   end
 # 
 #   def test_login
-#     post 'login', :username => 'quentin', :password => 'password'
+#     page 'login', :username => 'quentin', :password => 'password'
 #     assert_match_body 'login success'
 #   end
 # 
 #   def test_comment
 #     assert_difference(Comment) {
-#       post 'comment', :post_username => 'jim', 
-#                       :post_body => 'Nice article.', 
-#                       :post_id => 1
+#       page 'comment', :page_username => 'jim', 
+#                       :page_body => 'Nice article.', 
+#                       :page_id => 1
 #       assert_response :redirect
 #       assert_redirected_to '/view/1'
 #     }
@@ -52,36 +52,61 @@ include Junebug::Models
 # 
 # end
 # 
-# class PostTest < Camping::UnitTest
-# 
-#   fixtures :junebug_users
-#       
-#   def test_create
-#     post = create
-#     assert post.valid?
-#   end
-# 
-#   def test_assoc
-#     post = Post.find :first
-#     assert_kind_of User, post.user
-#     assert_equal 1, post.user.id
-#   end
-# 
-#   def test_destroy
-#     original_count = Post.count
-#     Post.destroy 1
-#     assert_equal original_count - 1, Post.count
-#   end
-# 
-# private
-# 
-#   def create(options={})
-#     Post.create({ :user_id => 1, 
-#                   :title => "Title", 
-#                   :body => "Body"}.merge(options))
-#   end
-#     
-# end
+class PageTest < Camping::UnitTest
+
+  fixtures :junebug_users, :junebug_pages, :junebug_page_versions
+      
+  def test_create
+    page = create
+    assert page.valid?
+  end
+
+  def test_user_assoc
+    page = Page.find :first
+    assert_kind_of User, page.user
+    assert_equal 1, page.user.id
+  end
+
+  def test_destroy
+    original_count = Page.count
+    Page.destroy 1
+    assert_equal original_count - 1, Page.count
+  end
+  
+  def test_valid_title
+    page = create(:title => nil)
+    deny page.valid?
+    assert_not_nil page.errors.on(:title)
+
+    page = create(:title => '')
+    deny page.valid?
+    assert_not_nil page.errors.on(:title)
+
+    page = create(:title => 'Test')
+    deny page.valid?
+    assert_not_nil page.errors.on(:title)
+  end
+  
+  def test_unique_title
+    page1 = create
+    assert page1.valid?
+
+    page2 = create
+    deny page2.valid?
+    assert_not_nil page2.errors.on(:title)
+  end
+
+private
+
+  def create(options={})
+    Page.create({ :title => "TestTitle", 
+                  :body => "Body",
+                  :user_id => 1,
+                    }.merge(options))
+  end
+    
+end
+
 
 class UserTest < Camping::UnitTest
 
@@ -138,6 +163,12 @@ class UserTest < Camping::UnitTest
     assert user.username == 'aaaaaa'
     assert user.password == 'aaaaaa'
   end
+  
+  def test_lowercase
+    user = create(:username => 'AAaaaa')
+    assert user.valid?
+    assert user.username == 'aaaaaa'
+  end
 
 
 private

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
-date: 2006-11-10 00:00:00 -08:00
+  version: 0.0.10
+date: 2006-11-12 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki.
 require_paths: 
 - lib
@@ -61,6 +61,8 @@ files:
 test_files: 
 - test/fixtures
 - test/wiki_test.rb
+- test/fixtures/junebug_page_versions.yml
+- test/fixtures/junebug_pages.yml
 - test/fixtures/junebug_users.yml
 rdoc_options: []