diff --git a/Gemfile b/Gemfile index 9df5fe6..86521b1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" -gem 'rails', '~> 3.2.22' +gem 'rails', '~> 4.0' gem 'minitest', '~> 3.2.0' gem 'fast_gettext', '~> 0.6.8' gem 'acts-as-taggable-on', '~> 3.4.2' @@ -24,6 +24,17 @@ gem 'eita-jrails', '~> 0.9.5', require: 'jrails' gem 'uglifier', '>= 1.0.3' gem 'sass-rails' +# gems to enable rails3 behaviour +gem 'protected_attributes' +gem 'rails-observers' +gem 'actionpack-page_caching' +gem 'actionpack-action_caching' +gem 'activerecord-session_store' + + +# FIXME list here all actual dependencies (i.e. the ones in debian/control), +# with their GEM names (not the Debian package names) + group :production do gem 'dalli', '~> 2.7.0' end @@ -46,6 +57,14 @@ end # Requires custom dependencies eval(File.read('config/Gemfile'), binding) rescue nil +vendor = Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins'] +vendor.each do |dir| + plugin = File.basename dir + version = if Dir.glob("#{dir}/*.gemspec").length > 0 then '> 0.0.0' else '0.0.0' end + + gem plugin, version, path: dir +end + # include gemfiles from enabled plugins # plugins in baseplugins/ are not included on purpose. They should not have any # dependencies. diff --git a/config/initializers/action_tracker.rb b/config/initializers/action_tracker.rb index c35809d..9034fc1 100644 --- a/config/initializers/action_tracker.rb +++ b/config/initializers/action_tracker.rb @@ -1,4 +1,5 @@ require 'noosfero/i18n' +require 'action_tracker_config' # ActionTracker plugin stuff @@ -6,25 +7,25 @@ require 'noosfero/i18n' ActionTrackerConfig.verbs = { - :create_article => { + :create_article => { :description => proc { _('published an article: %{title}') % { :title => '{{link_to(truncate(ta.get_name), ta.get_url)}}' } } }, - :new_friendship => { + :new_friendship => { :description => proc { n_('has made 1 new friend:
%{name}', 'has made %{num} new friends:
%{name}', get_friend_name.size) % { :num => get_friend_name.size, :name => '{{ta.collect_group_with_index(:friend_name){ |n,i| link_to(image_tag(ta.get_friend_profile_custom_icon[i] || default_or_themed_icon("/images/icons-app/person-icon.png")), ta.get_friend_url[i], :title => n)}.join}}' } }, :type => :groupable }, - :join_community => { + :join_community => { :description => proc { n_('has joined 1 community:
%{name}', 'has joined %{num} communities:
%{name}', get_resource_name.size) % { :num => get_resource_name.size, :name => '{{ta.collect_group_with_index(:resource_name){ |n,i| link_to(image_tag(ta.get_resource_profile_custom_icon[i] || default_or_themed_icon("/images/icons-app/community-icon.png")), ta.get_resource_url[i], :title => n)}.join}}' } }, :type => :groupable }, - :add_member_in_community => { + :add_member_in_community => { :description => proc { _('has joined the community.') }, }, - :upload_image => { + :upload_image => { :description => proc do total = get_view_url.size n_('uploaded 1 image', 'uploaded %d images', total) % total + diff --git a/config/initializers/dependencies.rb b/config/initializers/dependencies.rb index 20bc6cc..2c9f99c 100644 --- a/config/initializers/dependencies.rb +++ b/config/initializers/dependencies.rb @@ -1,3 +1,15 @@ +# third-party libraries +require 'will_paginate' +require 'will_paginate/array' +require 'nokogiri' + +# dependencies at vendor, firstly loaded on Gemfile +vendor = (Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins']) +vendor.each do |dir| + init_rb = "#{Rails.root}/#{dir}/init.rb" + require init_rb if File.file? init_rb +end + # locally-developed modules require 'acts_as_filesystem' require 'acts_as_having_settings' @@ -10,8 +22,3 @@ require 'set_profile_region_from_city_state' require 'authenticated_system' require 'needs_profile' require 'white_list_filter' - -# third-party libraries -require 'will_paginate' -require 'will_paginate/array' -require 'nokogiri' diff --git a/vendor/plugins/ruby_bosh/ruby_bosh.gemspec b/vendor/plugins/ruby_bosh/ruby_bosh.gemspec index 8d7fb14..6a45ef3 100644 --- a/vendor/plugins/ruby_bosh/ruby_bosh.gemspec +++ b/vendor/plugins/ruby_bosh/ruby_bosh.gemspec @@ -24,15 +24,12 @@ Gem::Specification.new do |s| if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then s.add_runtime_dependency(%q, [">= 0"]) s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) else s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) end else s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) end end -- libgit2 0.21.2