junebug-wiki 0.0.20 → 0.0.21

data/History.txt

@@ -1,3 +1,9 @@
+= 0.0.21 2006-11-26
+
+* *EXISTING USERS PLEASE READ THE RELEASE NOTES*
+* INT and TERM signals handling -- Thanks zimbatm!
+* Support for databases other than sqlite3 -- Thanks Robert Gogolok
+
 = 0.0.20 2006-11-23
 
 * Rake task to update local documentation (rake update:help)

data/RELEASE_NOTES.txt

@@ -1,3 +1,16 @@
+= 0.0.21 2006-11-26
+
+The database configuration in config.yml has been changed to allow easy support for databases other than sqlite3. Existing junebug installations will need to make the following changes:
+
+In config.yml, add the following lines:
+
+dbconnection:
+  adapter: sqlite3
+  database: junebug.db
+
+And be sure to use spaces to indent!
+
+
 = 0.0.19 2006-11-22
 
 Existing junebug installations will need to make the following changes:

data/deploy/config.yml

@@ -8,6 +8,27 @@ port: 3301
 # if you want to have the wiki root running on something other than /
 sitepath: /
 
+# database configuration
+dbconnection:
+#
+# sqlite3 configuration
+  adapter: sqlite3
+  database: junebug.db
+#
+## postgresql configuration
+#  adapter: postgresql
+#  database: junebug
+#  username:
+#  password:
+#  socket: /tmp
+#
+## mysql configuration
+#  adapter: mysql
+#  database: junebug
+#  username:
+#  password:
+#  host: localhost
+
 # configuring rss
 feedtitle: 'Wiki Updates'
 url: http://localhost:3301

data/lib/junebug.rb

@@ -25,7 +25,7 @@ module Junebug
   end
   
   def self.connect
-    Junebug::Models::Base.establish_connection :adapter => 'sqlite3', :database => 'junebug.db'
+    Junebug::Models::Base.establish_connection(Junebug.config['dbconnection'])
     Junebug::Models::Base.logger = Logger.new('junebug.log')
     Junebug::Models::Base.threaded_connections=false
   end
@@ -51,5 +51,15 @@ if __FILE__ == $0 || ENV['DAEMONS_ARGV']
 
   puts "** Junebug is running at http://#{Junebug.config['host']}:#{Junebug.config['port']}#{Junebug.config['sitepath']}"
 
-  server.run.join
+  thread = server.run
+
+  stop_method = lambda do
+    puts "** Junebug is stopping"
+    thread.kill
+  end
+
+  trap "INT", &stop_method
+  trap "TERM", &stop_method
+  
+  thread.join
 end

data/lib/junebug/controllers.rb

@@ -99,7 +99,7 @@ module Junebug::Controllers
   class Recent < R '/all/recent'
     def get
       @page_title = "Recent Changes"
-      @pages = Page.find(:all, :order => 'updated_at DESC', :conditions => "julianday('now')-julianday(updated_at) < 30.0")
+      @pages = Page.find(:all, :order => 'updated_at DESC', :conditions => "updated_at > '#{30.days.ago.strftime("%Y-%m-%d %H:%M:%S")}'")
       render :recent
     end
   end
@@ -184,4 +184,4 @@ module Junebug::Controllers
         input.return_to.blank? ? redirect(Junebug.startpage) : redirect(Junebug.config['url'] + input.return_to)
       end
   end
-end
+end

data/lib/junebug/tasks/update.rake

@@ -32,7 +32,7 @@ namespace :update do
       page_data['user_id'] = 1
       page = Junebug::Models::Page.find_by_title(page_data['title'])
       if page
-        page.update_attributes(page_data)
+        page.update_attributes(page_data) unless page.body == page_data['body']
       else
         Junebug::Models::Page.create(page_data)
       end

data/lib/junebug/version.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug-wiki
 version: !ruby/object:Gem::Version 
-  version: 0.0.20
-date: 2006-11-23 00:00:00 -08:00
+  version: 0.0.21
+date: 2006-11-26 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki running on Camping.
 require_paths: 
 - lib