@@ -17,3 +17,5 @@ end require 'tasks/rails' require 'thinking_sphinx/tasks' +require 'thinking_sphinx/deltas/datetime_delta/tasks' + Rakefile @@ -45,7 +45,7 @@ class Comment < ActiveRecord::Base indexes user.name, :as => :user where "state = 'published'" set_property :field_weights => { :title => 5, :user => 2, :body => 1 } - set_property :delta => :datetime, :threshold => 1.hour + set_property :delta => :datetime, :threshold => 75.minutes end ### Reading status ### app/models/comment.rb @@ -39,7 +39,7 @@ class Diary < Content indexes user.name, :as => :user where "state = 'published'" set_property :field_weights => { :title => 10, :user => 4, :body => 2 } - set_property :delta => :datetime, :threshold => 1.hour + set_property :delta => :datetime, :threshold => 75.minutes end ### ACL ### app/models/diary.rb @@ -41,7 +41,7 @@ class Interview < Content indexes title, body where "state != 'draft'" set_property :field_weights => { :title => 20, :body => 4 } - set_property :delta => :datetime, :threshold => 1.hour + set_property :delta => :datetime, :threshold => 75.minutes end ### Workflow ### app/models/interview.rb @@ -61,7 +61,7 @@ class News < Content indexes section.title, :as => :section, :facet => true where "news.state = 'published'" set_property :field_weights => { :title => 25, :user => 10, :body => 3, :second_part => 2, :section => 4 } - set_property :delta => :datetime, :threshold => 1.hour + set_property :delta => :datetime, :threshold => 75.minutes end ### Workflow ### @@ -97,12 +97,6 @@ class News < Content attr_accessor :commit_message attr_accessor :committer - versioning(:title, :body, :second_part) do |v| - v.repository = Rails.root.join('git_store', 'news.git') - v.message = lambda { |news| news.commit_message } - v.committer = lambda { |news| [news.author_name, news.author_email] } - end - ### ACL ### def readable_by?(user) app/models/news.rb @@ -35,7 +35,7 @@ class Poll < Content indexes answers.answer, :as => :answers where "state IN ('published', 'archived')" set_property :field_weights => { :title => 10, :user => 3, :answers => 4 } - set_property :delta => :datetime, :threshold => 1.hour + set_property :delta => :datetime, :threshold => 75.minutes end ### Workflow ### app/models/poll.rb @@ -40,7 +40,7 @@ class Post < Content indexes forum.title, :as => :forum, :facet => true where "posts.state = 'published'" set_property :field_weights => { :title => 10, :user => 4, :body => 2, :forum => 3 } - set_property :delta => :datetime, :threshold => 1.hour + set_property :delta => :datetime, :threshold => 75.minutes end ### ACL ### app/models/post.rb @@ -41,7 +41,7 @@ class Tracker < Content indexes user.name, :as => :user indexes category.title, :as => :category, :facet => true set_property :field_weights => { :title => 2, :user => 1, :body => 1, :category => 1 } - set_property :delta => :datetime, :threshold => 1.hour + set_property :delta => :datetime, :threshold => 75.minutes end ### Workflow ### app/models/tracker.rb @@ -54,7 +54,7 @@ class User < ActiveRecord::Base indexes name, homesite, jabber_id where "role != 'inactive'" set_property :field_weights => { :name => 5, :homesite => 1, :jabber_id => 1 } - set_property :delta => :datetime, :threshold => 1.hour + set_property :delta => :datetime, :threshold => 75.minutes end ### Avatar ### app/models/user.rb @@ -32,7 +32,7 @@ class WikiPage < Content indexes user.name, :as => :user where "state = 'public'" set_property :field_weights => { :title => 15, :user => 1, :body => 5 } - set_property :delta => :datetime, :threshold => 1.hour + set_property :delta => :datetime, :threshold => 75.minutes end ### Versioning ### @@ -40,12 +40,6 @@ class WikiPage < Content attr_accessor :commit_message attr_accessor :committer - versioning(:title, :body) do |v| - v.repository = Rails.root.join('git_store', 'wiki.git') - v.message = lambda { |page| page.commit_message } - v.committer = lambda { |page| [page.committer.name, page.committer.email] } - end - ### ACL ### def creatable_by?(user) app/models/wiki_page.rb @@ -28,9 +28,10 @@ Rails::Initializer.run do |config| config.gem 'paperclip', :version => '~>2.1' config.gem 'wikitext', :version => '~>1.9' config.gem 'authlogic', :version => '~>2.1' - config.gem 'rubyist-aasm', :lib => 'aasm', :version => '~>2.1' - config.gem 'mislav-will_paginate', :lib => 'will_paginate', :version => '~>2.3' - config.gem 'freelancing-god-thinking-sphinx', :lib => 'thinking_sphinx', :version => '~>1.2' + config.gem 'aasm', :version => '~>2.1' + config.gem 'will_paginate', :version => '~>2.3' + config.gem 'thinking-sphinx', :version => '~>1.3' + config.gem 'ts-datetime-delta', :lib => 'thinking_sphinx/deltas/datetime_delta', :version => '~>1.0' #config.gem 'json', :version => '~>1.1' #ActiveSupport::JSON.backend = "JSONGem" #config.gem 'libxml-ruby', :version => '~>0.9' config/environment.rb 5451448f846a5cd592d35b548347fe5994ffc7e7 Bruno Michel bmichel@menfin.info http://github.com/nono/linuxfr.org/commit/10d95d0cc8ed3e7c099c59145f529f7e249b4fc3 10d95d0cc8ed3e7c099c59145f529f7e249b4fc3 2009-11-08T12:43:01-08:00 2009-11-08T12:43:01-08:00 No more gems from github and update thinking_sphinx 31bf99244b572e325b0a39b2ef4be64cbb457d8f Bruno Michel bmichel@menfin.info