Download as
Browse Code »

Commit 12fdb928b25e6dd8ecefa5c6bb148c8eb4ee83da

Authored by Rodrigo Souto
1 parent 34268f13
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

noosfero-load: avoid multiple loads of noosfero module

Showing 8 changed files with 10 additions and 9 deletions   Show diff stats
config/environment.rb
  Diff comments   View file @12fdb92
... ... @@ -120,7 +120,8 @@ Noosfero.default_locale = nil
120 120 Tag.hierarchical = true
121 121  
122 122 # several local libraries
123   -require 'noosfero'
  123 +
  124 +require_dependency 'noosfero'
124 125 require 'sqlite_extension'
125 126  
126 127 # load a local configuration if present, but not under test environment.
... ...
config/routes.rb
  Diff comments   View file @12fdb92
1   -require 'noosfero'
  1 +require_dependency 'noosfero'
2 2  
3 3 ActionController::Routing::Routes.draw do |map|
4 4 # The priority is based upon order of creation: first created -> highest priority.
... ...
lib/noosfero/plugin.rb
  Diff comments   View file @12fdb92
1   -require 'noosfero'
  1 +require_dependency 'noosfero'
2 2 include ActionView::Helpers::AssetTagHelper
3 3  
4 4 class Noosfero::Plugin
... ...
lib/tasks/doc.rake
  Diff comments   View file @12fdb92
... ... @@ -92,7 +92,7 @@ namespace :noosfero do
92 92  
93 93 po4a_conf = 'tmp/po4a.conf'
94 94 file po4a_conf => english_xhtml do
95   - require 'noosfero'
  95 + require_dependency 'noosfero'
96 96 begin
97 97 File.open(po4a_conf, 'w') do |file|
98 98 file.puts "[po4a_langs] #{(Noosfero.locales.keys - ['en']).join(' ')}"
... ... @@ -136,7 +136,7 @@ namespace :noosfero do
136 136 desc "Translates Noosfero online documentation (does not touch PO files)"
137 137 task :translate => [:link_plugins_textiles, :do_translation]
138 138 task :do_translation => english_xhtml do
139   - require 'noosfero'
  139 + require_dependency 'noosfero'
140 140 languages = Noosfero.locales.keys - ['en']
141 141 languages.each do |lang|
142 142 po = "po/#{lang}/noosfero-doc.po"
... ...
lib/tasks/gettext.rake
  Diff comments   View file @12fdb92
... ... @@ -39,7 +39,7 @@ end
39 39 desc "Update pot/po files to match new version."
40 40 task :updatepo do
41 41 require 'gettext_rails/tools'
42   - require 'noosfero'
  42 + require_dependency 'noosfero'
43 43  
44 44 GetText::RubyParser::ID << '__'
45 45 GetText::RubyParser::PLURAL_ID << 'n__'
... ...
lib/tasks/package.rake
  Diff comments   View file @12fdb92
1 1  
2 2 desc "Generate source tarball"
3 3 task :package => 'package:clobber' do
4   - require 'noosfero'
  4 + require_dependency 'noosfero'
5 5 begin
6 6 sh 'test -d .git'
7 7 rescue
... ...
lib/tasks/release.rake
  Diff comments   View file @12fdb92
... ... @@ -39,7 +39,7 @@ namespace :noosfero do
39 39 end
40 40  
41 41 def version
42   - require 'noosfero'
  42 + require_dependency 'noosfero'
43 43 Noosfero::VERSION
44 44 end
45 45  
... ...
lib/tasks/version.rake
  Diff comments   View file @12fdb92
1 1 desc "shows noosfero version"
2 2 task :version do
3   - require 'noosfero'
  3 + require_dependency 'noosfero'
4 4 puts "noosfero, version #{Noosfero::VERSION}"
5 5 end
... ...