junebug-wiki 0.0.28 → 0.0.29

data/History.txt

@@ -1,3 +1,9 @@
+= 0.0.29 2007-04-15
+
+* Support Unicode wikiwords. Thanks Julian Tarkhanov
+* Disable suprious warnings when running tests.  Thanks Julian Tarkhanov
+* Css tweak to prevent overflow in pre tags. Thanks Leslie Viljoen
+
 = 0.0.28 2007-01-20
 
 * Fix uninitialized constant Mongrel::Camping error

data/Rakefile

@@ -55,8 +55,11 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
     ]
 end
 
-#rake test RUBY_FLAGS=''
+# Disable suprious warnings when running tests
+# submitted by Julian Tarkhanov
 
+Hoe::RUBY_FLAGS.replace ENV['RUBY_FLAGS'] || "-I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}" +
+  (Hoe::RUBY_DEBUG ? " #{RUBY_DEBUG}" : '')
 
 
 

data/deploy/public/style/base.css

@@ -270,6 +270,7 @@ body {
     border: 1px solid #ddd;
     padding: 8px 20px;
     margin: 15px 0px;
+    overflow: auto;
 }
 
 .content pre.clean {

data/lib/junebug.rb

@@ -1,5 +1,5 @@
 $:.unshift File.dirname(__FILE__) # for running in foreground in dev
-
+$KCODE = 'u'
 require 'rubygems'
 require_gem 'camping', '>=1.5'
 require 'camping/session'

data/lib/junebug/controllers.rb

@@ -1,6 +1,11 @@
 require 'junebug/ext/diff'
 
+
 module Junebug::Controllers
+  # DRY and besides otherwise you need to escape every \d
+  def self.slug(after  = '')
+    "/(#{Junebug::Models::Page::PAGE_SLUG})" + after
+  end
   
   class Index < R '/'
     def get
@@ -8,7 +13,7 @@ module Junebug::Controllers
     end
   end
 
-  class Show < R '/([0-9A-Za-z_-]+)', '/([0-9A-Za-z_-]+)/(\d+)'
+  class Show < R slug, slug('/(\d+)')
     def get page_name, version = nil
       redirect(Edit, page_name, 1) and return unless @page = Page.find_by_title(page_name.gsub(/_/,' '))
       @page_title = @page.title
@@ -17,7 +22,8 @@ module Junebug::Controllers
     end
   end
 
-  class Edit < R '/([0-9A-Za-z_-]+)/edit', '/([0-9A-Za-z_-]+)/(\d+)/edit' 
+  class Edit < R slug('/edit'), slug('/(\d+)/edit') 
+    
     def get page_name, version = nil
       redirect("/login?return_to=#{CGI::escape(@env['REQUEST_URI'])}") and return unless logged_in?
       page_name_spc = page_name.gsub(/_/,' ')
@@ -52,7 +58,7 @@ module Junebug::Controllers
     end
   end
   
-  class Delete < R '/([0-9A-Za-z_-]+)/delete'
+  class Delete < R slug('/delete')
     def get page_name
       redirect("/login") and return unless logged_in?
       Page.find_by_title(page_name.gsub(/_/,' ')).destroy() if is_admin?
@@ -61,7 +67,7 @@ module Junebug::Controllers
     
   end
 
-  class Revert < R '/([0-9A-Za-z_-]+)/(\d+)/revert'
+  class Revert < R slug('/(\d)/revert')
     def get page_name, version
       redirect("/login") and return unless logged_in?
       Page.find_by_title(page_name.gsub(/_/,' ')).revert_to!(version) if is_admin?
@@ -69,7 +75,7 @@ module Junebug::Controllers
     end
   end
 
-  class Versions < R '/([0-9A-Za-z_-]+)/versions'
+  class Versions < R slug('/versions')
     def get page_name
       page_name_spc = page_name.gsub(/_/,' ')
       @page = Page.find_by_title(page_name_spc)
@@ -96,7 +102,7 @@ module Junebug::Controllers
     end
   end
 
-  class Backlinks < R '/([0-9A-Za-z_-]+)/backlinks'
+  class Backlinks < R slug('/backlinks')
     def get page_name
       page_name_spc = page_name.gsub(/_/,' ')
       @page = Page.find_by_title(page_name_spc)
@@ -114,7 +120,7 @@ module Junebug::Controllers
     end
   end
   
-  class Diff < R '/([0-9A-Za-z_-]+)/(\d+)/(\d+)/diff'
+  class Diff < R slug('/(\d+)/(\d+)/diff')
     include HTMLDiff
     def get page_name, v1, v2
       page_name_spc = page_name.gsub(/_/,' ')

data/lib/junebug/models.rb

@@ -25,14 +25,20 @@ module Junebug::Models
   end
 
   class Page < Base
-    belongs_to :user, :class_name=>"Junebug::Models::User", :foreign_key=>'user_id' # Hack to prevent camping error on initial load
-    #PAGE_LINK = /\[\[([^\]|]*)[|]?([^\]]*)\]\]/
-    PAGE_LINK = /\[\[([0-9A-Za-z -]+)[|]?([^\]]*)\]\]/
-    #before_save { |r| r.title = r.title.underscore }
-    #PAGE_LINK = /([A-Z][a-z]+[A-Z]\w+)/
-    validates_uniqueness_of :title
-    validates_format_of :title, :with => /^[0-9A-Za-z -]+$/
+    belongs_to :user, :class_name=>"Junebug::Models::User", :foreign_key=>'user_id' # Hack to prevent
+    # camping error on initial load
+    
+    PAGE_TITLE = '[\w0-9A-Za-z -]+' # We need the \w for other UTF chars
+    PAGE_SLUG = PAGE_TITLE.gsub(/ /, '_')
+    DENY_UNDERSCORES =  /^([^_]+)$/
+    PAGE_LINK = /\[\[(#{PAGE_TITLE})[|]?([^\]]*)\]\]/
+    
     validates_presence_of :title
+    validates_uniqueness_of :title
+    validates_format_of :title, :with => /^(#{PAGE_TITLE})$/
+    # Underscores have to be checked separately because they are included in \w
+    validates_format_of :title, :with => /^(#{DENY_UNDERSCORES})$/
+    
     acts_as_versioned
     non_versioned_fields.push 'title'
     
@@ -41,7 +47,7 @@ module Junebug::Models
     end
     
     def title_url
-      title.gsub(' ','_')
+      title.gsub(/\s/,'_')
     end
   end
   

data/lib/junebug/version.rb

@@ -2,7 +2,7 @@ module Junebug #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 28
+    TINY  = 29
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_wiki.rb

@@ -24,6 +24,17 @@ class TestJunebug < Camping::FunctionalTest
     assert_match_body %r!title>Welcome to Junebug</title!
   end
 
+  def test_unicody_slug
+    unic_page = Page.create({ :title => "ВикиСлово", 
+                  :body => "Слово сказано",
+                  :user_id => 1,
+                    })
+      
+    get '/ВикиСлово'
+    assert_response :success
+    assert_match_body /Слово сказано/
+  end
+  
   def test_login
     post '/login', :username => 'admin', :password => 'password'
     assert_response :redirect
@@ -158,6 +169,8 @@ class TestPage < Camping::UnitTest
     page = create(:title => '1')
     assert page.valid?
 
+    page = create(:title => 'вики слово')
+    assert page.valid?
   end
   
   def test_invalid_title
@@ -184,6 +197,7 @@ class TestPage < Camping::UnitTest
     page = create(:title => 'test_title')
     deny page.valid?
     assert_not_nil page.errors.on(:title)
+
   end
   
   def test_unique_title

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: junebug-wiki
 version: !ruby/object:Gem::Version 
-  version: 0.0.28
-date: 2007-01-20 00:00:00 -08:00
+  version: 0.0.29
+date: 2007-04-15 00:00:00 -07:00
 summary: Junebug is a minimalist ruby wiki running on Camping.
 require_paths: 
 - lib
@@ -127,3 +127,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.15.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.0
+    version: