[Logilogi-svn] SF.net SVN: logilogi:[1534] trunk
Status: Beta
Brought to you by:
wybow
Menu
▾
▴
[Logilogi-svn] SF.net SVN: logilogi:[1534] trunk
|
From: <wy...@us...> - 2009-07-20 20:45:47
|
Revision: 1534
http://logilogi.svn.sourceforge.net/logilogi/?rev=1534&view=rev
Author: wybow
Date: 2009-07-20 20:45:45 +0000 (Mon, 20 Jul 2009)
Log Message:
-----------
API uses standard H auth now, cleaned up readme, first code
for introduction of LogLog
Modified Paths:
--------------
trunk/app/controllers/logis_controller.rb
trunk/app/models/logi.rb
trunk/config/config.rb.tmpl
trunk/config/environment.rb
trunk/db/schema.rb
trunk/doc/README_FOR_APP
Added Paths:
-----------
trunk/app/models/log_log_message.rb
trunk/db/migrate/20090718203605_add_log_log.rb
Modified: trunk/app/controllers/logis_controller.rb
===================================================================
--- trunk/app/controllers/logis_controller.rb 2009-07-14 20:32:48 UTC (rev 1533)
+++ trunk/app/controllers/logis_controller.rb 2009-07-20 20:45:45 UTC (rev 1534)
@@ -113,6 +113,7 @@
end
def create
+ puts request.headers
respond_to do |format|
format.html do
@logi, @logi_version = self.create_logi(params[:logi])
Added: trunk/app/models/log_log_message.rb
===================================================================
--- trunk/app/models/log_log_message.rb (rev 0)
+++ trunk/app/models/log_log_message.rb 2009-07-20 20:45:45 UTC (rev 1534)
@@ -0,0 +1,19 @@
+#--#
+# Copyright: (c) 2006-2009 The LogiLogi Foundation <fou...@lo...>
+#
+# License:
+# This file is part of the LogiLogi program. LogiLogi is Free Software.
+# You can run/distribute/modify LogiLogi under the terms of the GNU Affero
+# General Public License version 3. The Affero GPL states that running a
+# modified version or a derivative work also requires you to make the source
+# code of that work available to everyone that can interact with it. We
+# chose the Affero GPL to ensure that LogiLogi remains open and libre
+# (doc/LICENSE contains the full text of the legally binding license).
+#++#
+
+class LogLogMessage < ActiveResource::Base
+ if GlobalConfig.done_with_basics? and GlobalConfig.use_log_log
+ self.site = GlobalConfig.log_log_site
+ self.user = GlobalConfig.log_log_api_key
+ end
+end
Modified: trunk/app/models/logi.rb
===================================================================
--- trunk/app/models/logi.rb 2009-07-14 20:32:48 UTC (rev 1533)
+++ trunk/app/models/logi.rb 2009-07-20 20:45:45 UTC (rev 1534)
@@ -102,6 +102,7 @@
before_validation :tags_strings_before_validation # see TagsStringsModule
before_save :use_or_release_tags
after_save :set_re_resolve_on_to_links
+ after_create :loglog
after_destroy :set_re_resolve_on_matchless_links, :release_used_tags
###### Validations
@@ -490,6 +491,21 @@
end
end
+ # Logs to log.logilogi.org
+ #
+ def loglog
+ if GlobalConfig.use_log_log
+ LogLogMessage.new(
+ :kind => "Logi",
+ :channels => [self.loglog_channel,
+ self.creator.log_log_channel].join(','),
+ :title => self.current_title,
+ :author => self.creator.name,
+ :text => self.current_snippet,
+ :url => self.link.to_s)
+ end
+ end
+
# Sets re_resolve to true on links that matched this logi.
#
def set_re_resolve_on_matchless_links
Modified: trunk/config/config.rb.tmpl
===================================================================
--- trunk/config/config.rb.tmpl 2009-07-14 20:32:48 UTC (rev 1533)
+++ trunk/config/config.rb.tmpl 2009-07-20 20:45:45 UTC (rev 1534)
@@ -12,6 +12,12 @@
#
:my_openid_affiliate_id => 108,
+ # LogLog, for logging events and RSS-feeds.
+ #
+ :use_log_log => false,
+ :log_log_site => 'http://logi-manta.org:3001/app/ll',
+ :log_log_api_key => 'Bozzz',
+
# The admin-account
#
:admin_settings => {
Modified: trunk/config/environment.rb
===================================================================
--- trunk/config/environment.rb 2009-07-14 20:32:48 UTC (rev 1533)
+++ trunk/config/environment.rb 2009-07-20 20:45:45 UTC (rev 1534)
@@ -24,14 +24,15 @@
Rails::Initializer.run do |config|
# The Gems Manta needs
+ config.gem 'daemons'
+ config.gem 'ruby-openid', :lib => 'openid'
config.gem 'rubyzip', :lib => 'zip/zip'
- config.gem 'ruby-openid', :lib => 'openid'
- config.gem 'daemons'
config.gem "authlogic"
config.gem "authlogic-oid", :lib => "authlogic_openid"
+ config.gem "quantipay-authlogic_haapi", :lib => "authlogic_haapi"
+ config.gem "ratom", :lib => "atom"
config.gem "positionrange", :version => '>= 0.6.6'
config.gem "difflcs"
- config.gem "ratom", :lib => "atom"
config.gem "textweaver"
config.gem 'mislav-will_paginate', :lib => 'will_paginate',
:source => 'http://gems.github.com'
Added: trunk/db/migrate/20090718203605_add_log_log.rb
===================================================================
--- trunk/db/migrate/20090718203605_add_log_log.rb (rev 0)
+++ trunk/db/migrate/20090718203605_add_log_log.rb 2009-07-20 20:45:45 UTC (rev 1534)
@@ -0,0 +1,13 @@
+class AddLogLog < ActiveRecord::Migration
+ def self.up
+ add_column :global_configs, :use_log_log, :boolean, :default => false, :null => false
+ add_column :global_configs, :log_log_site, :string
+ add_column :global_configs, :log_log_api_key, :string
+ end
+
+ def self.down
+ remove_column :global_configs, :use_log_log
+ remove_column :global_configs, :log_log_site
+ remove_column :global_configs, :log_log_api_key
+ end
+end
Modified: trunk/db/schema.rb
===================================================================
--- trunk/db/schema.rb 2009-07-14 20:32:48 UTC (rev 1533)
+++ trunk/db/schema.rb 2009-07-20 20:45:45 UTC (rev 1534)
@@ -9,7 +9,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20090606175849) do
+ActiveRecord::Schema.define(:version => 20090718203605) do
create_table "acts_as_xapian_jobs", :force => true do |t|
t.string "model", :null => false
@@ -35,38 +35,41 @@
end
create_table "global_configs", :force => true do |t|
- t.integer "progress", :default => 0, :null => false
- t.string "domain", :null => false
- t.integer "domain_levels", :null => false
- t.boolean "use_language_subdomains", :null => false
- t.integer "my_openid_affiliate_id", :null => false
- t.string "title_line", :null => false
- t.string "header_keywords", :null => false
- t.string "header_description", :null => false
- t.string "available_language_codes_string", :null => false
- t.integer "minimum_diff_size", :null => false
- t.integer "maximum_logi_size", :null => false
- t.integer "maximum_logi_version_size", :null => false
- t.integer "half_life", :null => false
+ t.integer "progress", :default => 0, :null => false
+ t.string "domain", :null => false
+ t.integer "domain_levels", :null => false
+ t.boolean "use_language_subdomains", :null => false
+ t.integer "my_openid_affiliate_id", :null => false
+ t.string "title_line", :null => false
+ t.string "header_keywords", :null => false
+ t.string "header_description", :null => false
+ t.string "available_language_codes_string", :null => false
+ t.integer "minimum_diff_size", :null => false
+ t.integer "maximum_logi_size", :null => false
+ t.integer "maximum_logi_version_size", :null => false
+ t.integer "half_life", :null => false
t.float "daily_fraction"
t.float "float"
- t.integer "powerless_age", :null => false
- t.float "anonymous_power", :null => false
- t.float "member_power", :null => false
- t.float "admin_power", :null => false
+ t.integer "powerless_age", :null => false
+ t.float "anonymous_power", :null => false
+ t.float "member_power", :null => false
+ t.float "admin_power", :null => false
t.integer "anonymous_user_id"
t.integer "admin_user_id"
t.integer "system_user_group_id"
t.integer "public_user_group_id"
t.integer "public_peer_group_id"
- t.string "main_page_tag_string", :null => false
- t.string "user_tag_string", :null => false
- t.string "user_group_tag_string", :null => false
- t.string "peer_group_tag_string", :null => false
- t.string "replace_tag_string", :null => false
- t.string "sandbox_tag_string", :null => false
- t.string "trash_can_tag_string", :null => false
- t.string "untagged_tag_string", :null => false
+ t.string "main_page_tag_string", :null => false
+ t.string "user_tag_string", :null => false
+ t.string "user_group_tag_string", :null => false
+ t.string "peer_group_tag_string", :null => false
+ t.string "replace_tag_string", :null => false
+ t.string "sandbox_tag_string", :null => false
+ t.string "trash_can_tag_string", :null => false
+ t.string "untagged_tag_string", :null => false
+ t.boolean "use_log_log", :default => false, :null => false
+ t.string "log_log_site"
+ t.string "log_log_api_key"
end
create_table "invitations", :force => true do |t|
Modified: trunk/doc/README_FOR_APP
===================================================================
--- trunk/doc/README_FOR_APP 2009-07-14 20:32:48 UTC (rev 1533)
+++ trunk/doc/README_FOR_APP 2009-07-20 20:45:45 UTC (rev 1534)
@@ -78,29 +78,34 @@
instead)
And it requires the daemons[http://svn.kylemaxwell.com/rails_plugins/daemon_generator],
-rmagick[http://rmagick.rubyforge.org/], version 2.2.2 or more, *with svg
-support*, ruby-openid[http://www.openidenabled.com/openid/libraries/ruby],
-mysql[http://discuss.joyent.com/viewtopic.php?id=5992],
-gettext[http://www.yotabanana.com/hiki/ruby-gettext.html],
rubyzip[http://rubyzip.sourceforge.net],
+ruby-openid[http://www.openidenabled.com/openid/libraries/ruby],
+authlogic[http://authlogic.rubyforge.org] and
+authlogic-oid[http://authlogic-oid.rubyforge.org],
+quantipay-authlogic_haapi[http://github.com/quantipay/authlogic_haapi/tree/master],
+ratom[http://ratom.rubyforge.org/],
+mislav-will_paginate[http://wiki.github.com/mislav/will_paginate/],
positionrange[http://positionrange.rubyforge.org],
difflcs[http://difflcs.rubyforge.org],
textweaver[http://positionrange.rubyforge.org],
-mislav-will_paginate[http://wiki.github.com/mislav/will_paginate/],
-authlogic[http://authlogic.rubyforge.org] and
-authlogic-oid[http://authlogic-oid.rubyforge.org],
-ratom[http://ratom.rubyforge.org/],
+mysql[http://discuss.joyent.com/viewtopic.php?id=5992],
+rmagick[http://rmagick.rubyforge.org/] (version > 2.2.2, *with svg*,
+this one is optional but important for the UI),
gems[http://rubyforge.org/projects/rubygems] (version >= 1.0).
Also see the Installation Notes at the bottom for how to meet the few
dependencies of the gems.
You can install them with:
- gem install daemons rmagick ruby-openid mysql gettext rubyzip
- positionrange difflcs textweaver mislav-will_paginate authlogic
- authlogic-oid ratom
+ gem install daemons rubyzip ruby-openid authlogic authlogic-oid
+ quantipay-authlogic_haapi ratom mislav-will_paginate authlogic
+ positionrange difflcs textweaver mysql rmagick
(as root, same here as with Rails installation)
+If you encounter not-found errors you might have to try again after
+running:
+gem sources -a http://gems.github.com
+
Then you can get Manta directly from our
{Subversion repository}[http://sourceforge.net/svn/?group_id=78643]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|