junebug-wiki 0.0.27 → 0.0.28

data/History.txt

@@ -1,3 +1,9 @@
+= 0.0.28 2007-01-20
+
+* Fix uninitialized constant Mongrel::Camping error
+* Fix rails 2 deprecation warnings on startup
+* Added search based on Barry Arthur's work.  Thanks Barry!
+
 = 0.0.27 2006-12-18
 
 * Quick bugfix release

data/Manifest.txt

@@ -18,7 +18,6 @@ lib/junebug/config.rb
 lib/junebug/controllers.rb
 lib/junebug/ext/acts_as_versioned.rb
 lib/junebug/ext/diff.rb
-lib/junebug/ext/mosquito.rb
 lib/junebug/ext/redcloth.rb
 lib/junebug/ext/redcloth/all_formats.rb
 lib/junebug/ext/redcloth/base.rb
@@ -38,4 +37,4 @@ test/fixtures/junebug_page_versions.yml
 test/fixtures/junebug_pages.yml
 test/fixtures/junebug_users.yml
 test/test_helper.rb
-test/wiki_test.rb
+test/test_wiki.rb

data/RELEASE_NOTES.txt

@@ -1,3 +1,12 @@
+= 0.0.28 2007-01-20
+
+Existing users be sure to read the updating page at http://www.junebugwiki.com/JunebugUpdating
+
+In particular, don't forget to rake update:everything
+
+Also, I upped the required versions of the mongrel, daemons, and activerecord gems.  I've been getting lots of bug reports about deprecation warnings and niggling errors that users experienced when they were running newer gems.  Particularly with the switch to Rails 1.2.  I don't have time to test all combinations, so I'm setting the dependencies to what I'm using.
+
+
 = 0.0.26 2006-12-18
 
 A couple of changes to the config.yml parameters were made as part of the feed cleanup.  If you have an existing Junebug wiki, you may need to make the following changes:

data/Rakefile

@@ -47,11 +47,11 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   #p.changes        - A description of the release's latest changes.
   #p.spec_extras    - A hash of extra values to set in the gemspec.
   p.extra_deps = [
-      ['mongrel',      '>=0.3.13.3'],
+      ['mongrel',      '>=1.0'],
       ['camping',      '>=1.5'],
-      ['daemons',      '>=1.0.3'],
+      ['daemons',      '>=1.0.4'],
       ['sqlite3-ruby', '>=1.1.0.1'],
-      ['activerecord', '>=1.14.4']
+      ['activerecord', '>=1.15.1']
     ]
 end
 

data/deploy/public/style/base.css

@@ -20,7 +20,7 @@ input.button {
 }
 
 input, textarea {
-    padding: 2px;
+    padding: 4px 2px 1px 2px;
     margin-bottom: 5px;
 /*    font-family:"Bitstream Vera Sans Mono", "Monaco", "Courier", monospace;*/
 }
@@ -63,7 +63,7 @@ body {
 #hd {
 /*    border-top: 6px solid #809fff;*/
     background-color: #6677aa;
-    padding: 8px 25px;
+    padding: 8px 25px 10px;
     color: #ffffff;
     margin-bottom: 10px;
 }
@@ -72,6 +72,15 @@ body {
     float: right;
 }
 
+#hd #search {
+    float: right;
+    margin-top: 5px;
+}
+
+#hd #search input {
+    margin-bottom: 0px;
+}
+
 #hd a {
     color: #ffffff;
 }
@@ -157,7 +166,7 @@ body {
 /* WIKI CONTENT STYLES */
 .content {
     font-size: 107%;
-    padding: 25px;
+    padding: 20px 25px;
     min-height: 300px;
 }
 

data/lib/junebug.rb

@@ -14,6 +14,7 @@ require 'junebug/controllers'
 
 require 'yaml'
 require 'mongrel'
+require 'mongrel/camping'
 require 'fileutils'
 
 module Junebug

data/lib/junebug/controllers.rb

@@ -87,6 +87,15 @@ module Junebug::Controllers
     end
   end
 
+  class Search
+    def post 
+      @search_term = input.q
+      @page_title = "Search Results for: #{@search_term}"
+      @pages = Page.find(:all, :conditions => ["body LIKE ? OR title LIKE ?", "%#{@search_term}%", "%#{@search_term}%" ])
+      render :search
+    end
+  end
+
   class Backlinks < R '/([0-9A-Za-z_-]+)/backlinks'
     def get page_name
       page_name_spc = page_name.gsub(/_/,' ')
@@ -137,11 +146,11 @@ module Junebug::Controllers
   class Static < R '(/images/.+)', '(/style/.+)'         
     MIME_TYPES = {'.css' => 'text/css', '.js' => 'text/javascript', '.jpg' => 'image/jpeg'}
     #PATH = __FILE__[/(.*)\//, 1]
-    PATH = ENV['JUNEBUG_ROOT'] || '.'
+    PATH = ENV['JUNEBUG_ROOT'] || File.expand_path('.')
     
     def get(path)
       @headers['Content-Type'] = MIME_TYPES[path[/\.\w+$/, 0]] || "text/plain"
-      unless path =~ /\.\./ # sample test to prevent directory traversal attacks
+      unless path.include? '..' # sample test to prevent directory traversal attacks
         @headers['X-Sendfile'] = "#{PATH}/public#{path}"
       else
         "404 - Invalid path"

data/lib/junebug/models.rb

@@ -25,7 +25,7 @@ module Junebug::Models
   end
 
   class Page < Base
-    belongs_to :user, :class_name=>"Junebug::Models::User" # Hack to prevent camping error on initial load
+    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 }
@@ -46,7 +46,7 @@ module Junebug::Models
   end
   
   class Page::Version < Base
-    belongs_to :user, :class_name=>"Junebug::Models::User" # Hack to prevent camping error on initial load
+    belongs_to :user, :class_name=>"Junebug::Models::User", :foreign_key=>'user_id' # Hack to prevent camping error on initial load
   end
 
   class CreateJunebug < V 1.0
@@ -90,7 +90,12 @@ module Junebug::Models
       
       # Install some default pages
       pages_file = File.dirname(__FILE__) + "/../../dump/junebug_pages.yml"
-      YAML.load_file(pages_file).each {|page_data|Page.create(page_data) } if File.exist?(pages_file)
+      if File.exist?(pages_file)
+        puts "Loading fixtures"
+        YAML.load_file(pages_file).each {|page_data|Page.create(page_data) }
+      else
+        puts "Could not find fixtures: #{pages_file}" 
+      end
     end
     def self.down
       drop_table :junebug_pages

data/lib/junebug/tasks/update.rake

@@ -1,4 +1,5 @@
 require 'junebug'
+require 'junebug/config'
 
 namespace :update do
 

data/lib/junebug/version.rb

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

data/lib/junebug/views.rb

@@ -120,6 +120,25 @@ module Junebug::Views
   end
 
 
+  def search
+    _header :show
+    _body do
+      h1 "Search results"
+
+      form :action => R(Search), :method => 'post' do
+        input :name => 'q', :type => 'text', :value=>@search_term, :accesskey => 's' 
+        input :type => 'submit', :name => 'search', :value => 'Search',
+          :style=>'margin: 0 0 5px 5px;'
+      end
+
+      ul {
+        @pages.each { |p| li{ a p.title, :href => R(Show, p.title_url) } }
+      }
+    end
+    _footer { '' }
+  end
+
+
   def backlinks
     _header :show
     _body do
@@ -246,13 +265,24 @@ module Junebug::Views
       span :id=>'navlinks' do
         a 'Home',  :href => R(Show, Junebug.config['startpage'])
         text ' | '
-        a 'RecentChanges', :href => R(Recent)
+        a 'Recent Changes', :href => R(Recent)
         text ' | '
         a 'All Pages', :href => R(List)
         text ' | '
         a 'Help', :href => R(Show, "Junebug_help") 
       end
-            
+      
+      span :id=>'search' do
+        text 'Search: '
+        form :action => R(Search), :method => 'post' do
+          input :name => 'q', :type => 'text', :value=>(''), :accesskey => 's' 
+          #input :type => 'submit', :name => 'search', :value => 'Search',
+          #  :style=>'margin: 0 0 5px 5px;'
+        end
+      end
+
+      br :clear => 'all'
+      
       # if type == :static
       #   h1 page_title
       # elsif type == :backlinks

data/test/{wiki_test.rb → test_wiki.rb}

@@ -1,19 +1,19 @@
-require File.dirname(__FILE__) + "/../lib/junebug/ext/mosquito"
+require 'rubygems'
+require 'mosquito'
 require File.dirname(__FILE__) + "/../lib/junebug"
 
 Junebug.create
 include Junebug::Models
 
-class JunebugTest < Camping::FunctionalTest
+class TestJunebug < Camping::FunctionalTest
 
   #fixtures :junebug_users
-  
   def setup
     super
   end
   
   def test_index
-    get
+    get '/'
     assert_response :redirect
     assert_redirected_to '/Welcome_to_Junebug'
   end
@@ -91,6 +91,10 @@ class JunebugTest < Camping::FunctionalTest
     assert_equal page.user_id, page2.user_id
     assert_equal page.readonly, page2.readonly
     assert_equal page.version+1, page2.version
+    
+    # set it back
+    post "/#{page2.title_url}/edit", :post_title=>page.title, :post_body=>page.body, :post_readonly=>page.readonly, :submit=>'save'
+
   end
 
 
@@ -107,10 +111,14 @@ class JunebugTest < Camping::FunctionalTest
 # 
 end
 
-class PageTest < Camping::UnitTest
+class TestPage < Camping::UnitTest
 
   fixtures :junebug_users, :junebug_pages, :junebug_page_versions
-      
+
+  def setup
+    super
+  end
+
   def test_create
     page = create
     assert page.valid?
@@ -179,16 +187,16 @@ class PageTest < Camping::UnitTest
   end
   
   def test_unique_title
-    page1 = create(:title => 'TestTitle')
+    page1 = create(:title => 'TestTitle12')
     assert page1.valid?
     
     # identical
-    page2 = create
+    page2 = create(:title => 'TestTitle12')
     deny page2.valid?
     assert_not_nil page2.errors.on(:title)
 
     # lowercase
-    page2 = create(:title => 'testtitle')
+    page2 = create(:title => 'testtitle12')
     assert page2.valid?
   end
 
@@ -275,10 +283,11 @@ class UserTest < Camping::UnitTest
   end
 
   def test_spaces
-    user = create(:username => 'aaaaaa  ', :password =>'aaaaaa  ')
+    user = create(:username => 'bbbbbb  ', :password =>'bbbbbb  ')
+    # puts user.inspect
     assert user.valid?
-    assert user.username == 'aaaaaa'
-    assert user.password == 'aaaaaa'
+    assert user.username == 'bbbbbb'
+    assert user.password == 'bbbbbb'
   end
   
   def test_lowercase

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug-wiki
 version: !ruby/object:Gem::Version 
-  version: 0.0.27
-date: 2006-12-18 00:00:00 -08:00
+  version: 0.0.28
+date: 2007-01-20 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki running on Camping.
 require_paths: 
 - lib
@@ -49,7 +49,6 @@ files:
 - lib/junebug/controllers.rb
 - lib/junebug/ext/acts_as_versioned.rb
 - lib/junebug/ext/diff.rb
-- lib/junebug/ext/mosquito.rb
 - lib/junebug/ext/redcloth.rb
 - lib/junebug/ext/redcloth/all_formats.rb
 - lib/junebug/ext/redcloth/base.rb
@@ -69,9 +68,9 @@ files:
 - test/fixtures/junebug_pages.yml
 - test/fixtures/junebug_users.yml
 - test/test_helper.rb
-- test/wiki_test.rb
-test_files: 
-- test/wiki_test.rb
+- test/test_wiki.rb
+test_files: []
+
 rdoc_options: []
 
 extra_rdoc_files: []
@@ -90,7 +89,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.13.3
+        version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: camping
@@ -108,7 +107,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.3
+        version: 1.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
@@ -126,5 +125,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.14.4
+        version: 1.15.1
     version: 

data/lib/junebug/ext/mosquito.rb

@@ -1,210 +0,0 @@
-%w(
-  rubygems
-  test/unit
-  active_record
-  active_record/fixtures
-  active_support/binding_of_caller
-  camping
-  fileutils
-  stringio
-  cgi
-).each { |lib| require lib }
-
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ":memory:")
-ActiveRecord::Base.logger = Logger.new("test/test.log")
-
-Test::Unit::TestCase.fixture_path = "test/fixtures/"
-
-class Test::Unit::TestCase #:nodoc:
-  def create_fixtures(*table_names)
-    if block_given?
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
-    else
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
-    end
-  end
-
-  # Turn off transactional fixtures if you're working with MyISAM tables in MySQL
-  self.use_transactional_fixtures = true
-  # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david)
-  self.use_instantiated_fixtures  = false
-end
-
-class MockRequest
-  def initialize
-    @headers = {
-      'SERVER_NAME' => 'localhost',
-      'PATH_INFO' => '',
-      'HTTP_ACCEPT_ENCODING' => 'gzip,deflate',
-      'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.8.0.1) Gecko/20060214 Camino/1.0',
-      'SCRIPT_NAME' => '/',
-      'SERVER_PROTOCOL' => 'HTTP/1.1',
-      'HTTP_CACHE_CONTROL' => 'max-age=0',
-      'HTTP_ACCEPT_LANGUAGE' => 'en,ja;q=0.9,fr;q=0.9,de;q=0.8,es;q=0.7,it;q=0.7,nl;q=0.6,sv;q=0.5,nb;q=0.5,da;q=0.4,fi;q=0.3,pt;q=0.3,zh-Hans;q=0.2,zh-Hant;q=0.1,ko;q=0.1',
-      'HTTP_HOST' => 'localhost',
-      'REMOTE_ADDR' => '127.0.0.1',
-      'SERVER_SOFTWARE' => 'Mongrel 0.3.12.4',
-      'HTTP_KEEP_ALIVE' => '300',
-      'HTTP_REFERER' => 'http://localhost/',
-      'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
-      'HTTP_VERSION' => 'HTTP/1.1',
-      'REQUEST_URI' => '/',
-      'SERVER_PORT' => '80',
-      'GATEWAY_INTERFACE' => 'CGI/1.2',
-      'HTTP_ACCEPT' => 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
-      'HTTP_CONNECTION' => 'keep-alive',
-      'REQUEST_METHOD' => 'GET',
-    }
-  end
-
-  def set(key, val)
-    @headers[key] = val
-  end
-    
-  def to_hash
-    @headers
-  end
-
-  def [](key)
-    @headers[key]
-  end
-
-  def []=(key, value)
-    @headers[key] = value
-  end
-
-  ##
-  # Allow getters like this:
-  #  o.REQUEST_METHOD
-
-  def method_missing(method_name, *args)
-    if @headers.has_key?(method_name.to_s)
-      return @headers[method_name.to_s]
-    else
-      super(method_name, args)
-    end
-  end
-
-end
-
-
-module Camping
-
-  class Test < Test::Unit::TestCase
-    
-    def test_dummy; end
-          
-    def deny(condition, message='')
-      assert !condition, message
-    end
-
-    # http://project.ioni.st/post/217#post-217
-    #
-    #  def test_new_publication
-    #    assert_difference(Publication, :count) do
-    #      post :create, :publication_title => ...
-    #      # ...
-    #    end
-    #  end
-    # 
-    # Is the number of items different?
-    #
-    # Can be used for increment and decrement.
-    #
-    def assert_difference(object, method = :count, difference = 1)
-      initial_value = object.send(method)
-      yield
-      assert_equal initial_value + difference, object.send(method), "#{object}##{method}"
-    end
-    def assert_no_difference(object, method, &block)
-      assert_difference object, method, 0, &block
-    end
-    
-  end
-  
-  class FunctionalTest < Test
-
-    def setup
-      @class_name_abbr = self.class.name.gsub(/Test$/, '')
-      @request = MockRequest.new
-    end
-
-    def get(url='/')
-      send_request url, {}, 'GET'
-    end
-
-    def post(url, post_vars={})
-      send_request url, post_vars, 'POST'
-    end
-
-    def send_request(url, post_vars, method)
-      @request['REQUEST_METHOD'] = method
-      @request['SCRIPT_NAME'] = '/' + @class_name_abbr.downcase
-      @request['PATH_INFO'] = '/' + url
-      @request['REQUEST_URI'] = [@request.SCRIPT_NAME, @request.PATH_INFO].join('')
-      
-      @request['HTTP_COOKIE'] = @cookies.map {|k,v| "#{k}=#{v}" }.join('; ') if @cookies
-      
-      @response = eval("#{@class_name_abbr}.run StringIO.new('#{qs_build(post_vars)}'), @request")
-      
-      @cookies = @response.headers['Set-Cookie'].inject(@cookies||{}) do |res,header|
-        data = header.split(';').first
-        name, value = data.split('=')
-        res[name] = value
-        res
-      end
-
-      if @response.headers['X-Sendfile']
-        @response.body = File.read(@response.headers['X-Sendfile'])
-      end      
-    end
-
-    def assert_response(status_code)
-      case status_code
-      when :success
-        assert_equal 200, @response.status
-      when :redirect
-        assert_equal 302, @response.status
-      when :error
-        assert @response.status >= 500
-      else
-        assert_equal status_code, @response.status
-      end
-    end
-
-    def assert_match_body(regex, message=nil)
-      assert_match regex, @response.body, message
-    end    
-    def assert_no_match_body(regex, message=nil)
-      assert_no_match regex, @response.body, message
-    end
-    
-    def assert_redirected_to(url, message=nil)
-      assert_equal  url, 
-                    @response.headers['Location'].path.gsub(%r!/#{@class_name_abbr.downcase}!, ''), 
-                    message
-    end
-    
-    def assert_cookie(name, pat, message=nil)
-        assert_match pat, @cookies[name], message
-    end
-
-    def test_dummy; end
-
-    private
-
-    def qs_build(var_hash)
-      var_hash.map do |k, v|
-        [Camping.escape(k.to_s), Camping.escape(v.to_s)].join('=')
-      end.join('&')
-    end
-
-  end
-
-  class UnitTest < Test
-    
-    def test_dummy; end
-  
-  end
-  
-end