From 86be5aff939c3c96e1636bab025cf987bf38e375 Mon Sep 17 00:00:00 2001 From: Luciano Prestes Cavalcanti Date: Thu, 26 Nov 2015 13:32:11 +0100 Subject: [PATCH] software-communities: refactoring namespaces --- src/noosfero-spb/software_communities/lib/ext/community.rb | 4 ++-- src/noosfero-spb/software_communities/lib/ext/search_controller.rb | 6 +++--- src/noosfero-spb/software_communities/lib/software_communities_plugin/software_info.rb | 4 ++-- src/noosfero-spb/software_communities/lib/software_communities_plugin/software_language.rb | 7 ++++--- src/noosfero-spb/software_communities/lib/software_communities_plugin/software_language_helper.rb | 2 +- src/noosfero-spb/software_communities/test/helpers/plugin_test_helper.rb | 4 ++-- src/noosfero-spb/software_communities/test/helpers/software_test_helper.rb | 26 +++++++++++++------------- src/noosfero-spb/software_communities/test/unit/categories_and_tags_block_test.rb | 2 +- src/noosfero-spb/software_communities/test/unit/communities_block_test.rb | 4 ++-- src/noosfero-spb/software_communities/test/unit/create_software_test.rb | 2 +- src/noosfero-spb/software_communities/test/unit/operating_system_helper_test.rb | 6 +++--- src/noosfero-spb/software_communities/test/unit/software_info_test.rb | 2 +- src/noosfero-spb/software_communities/test/unit/software_registration_test.rb | 3 ++- src/noosfero-spb/software_communities/test/unit/software_tab_data_block_test.rb | 2 +- src/noosfero-spb/software_communities/test/unit/softwares_block_test.rb | 2 +- 15 files changed, 39 insertions(+), 37 deletions(-) diff --git a/src/noosfero-spb/software_communities/lib/ext/community.rb b/src/noosfero-spb/software_communities/lib/ext/community.rb index 6f8602f..a0f602d 100644 --- a/src/noosfero-spb/software_communities/lib/ext/community.rb +++ b/src/noosfero-spb/software_communities/lib/ext/community.rb @@ -10,7 +10,7 @@ class Community attr_accessible :visible - has_one :software_info, :dependent=>:destroy + has_one :software_info, :dependent=>:destroy, :class_name => "SoftwareCommunitiesPlugin::SoftwareInfo" settings_items :hits, :type => :integer, :default => 0 @@ -57,7 +57,7 @@ class Community def remove_of_community_search_software? return software? end - + def hit self.hits += 1 self.save! diff --git a/src/noosfero-spb/software_communities/lib/ext/search_controller.rb b/src/noosfero-spb/software_communities/lib/ext/search_controller.rb index e96cd63..cdc2116 100644 --- a/src/noosfero-spb/software_communities/lib/ext/search_controller.rb +++ b/src/noosfero-spb/software_communities/lib/ext/search_controller.rb @@ -63,11 +63,11 @@ class SearchController params[:query] ||= "" visible_communities = visible_profiles(Community) - filtered_software_list = SoftwareInfo.search_by_query(params[:query]) + filtered_software_list = SoftwareCommunitiesPlugin::SoftwareInfo.search_by_query(params[:query]) if params[:only_softwares] params[:only_softwares].collect!{ |software_name| software_name.to_slug } - filtered_software_list = SoftwareInfo.all.select{ |s| params[:only_softwares].include?(s.identifier) } + filtered_software_list = SoftwareCommunitiesPlugin::SoftwareInfo.all.select{ |s| params[:only_softwares].include?(s.identifier) } @public_software_selected = false end @@ -130,7 +130,7 @@ class SearchController return 15 if params[:software_display].nil? if params[:software_display] == "all" - SoftwareInfo.count + SoftwareCommunitiesPlugin::SoftwareInfo.count else params[:software_display].to_i end diff --git a/src/noosfero-spb/software_communities/lib/software_communities_plugin/software_info.rb b/src/noosfero-spb/software_communities/lib/software_communities_plugin/software_info.rb index 1f361c6..d9fc206 100644 --- a/src/noosfero-spb/software_communities/lib/software_communities_plugin/software_info.rb +++ b/src/noosfero-spb/software_communities/lib/software_communities_plugin/software_info.rb @@ -7,8 +7,8 @@ class SoftwareCommunitiesPlugin::SoftwareInfo < ActiveRecord::Base } SEARCHABLE_SOFTWARE_CLASSES = [ + Community, SoftwareCommunitiesPlugin::SoftwareInfo, - SoftwareCommunitiesPlugin::Community, SoftwareCommunitiesPlugin::ProgrammingLanguage, SoftwareCommunitiesPlugin::DatabaseDescription ] @@ -122,7 +122,7 @@ class SoftwareCommunitiesPlugin::SoftwareInfo < ActiveRecord::Base license_another = SoftwareCommunitiesPlugin::LicenseInfo.find_by_version("Another") if license_another && license.id == license_another.id - LicenseInfo.new( + SoftwareCommunitiesPlugin::LicenseInfo.new( :version => self.another_license_version, :link => self.another_license_link ) diff --git a/src/noosfero-spb/software_communities/lib/software_communities_plugin/software_language.rb b/src/noosfero-spb/software_communities/lib/software_communities_plugin/software_language.rb index 72f0153..cfa7735 100644 --- a/src/noosfero-spb/software_communities/lib/software_communities_plugin/software_language.rb +++ b/src/noosfero-spb/software_communities/lib/software_communities_plugin/software_language.rb @@ -1,8 +1,9 @@ class SoftwareCommunitiesPlugin::SoftwareLanguage < ActiveRecord::Base - attr_accessible :version - belongs_to :software_info, :class => "SoftwareCommunitiesPlugin::SoftwareInfo" - belongs_to :programming_language, :class => "SoftwareCommunitiesPlugin::ProgrammingLanguage" + belongs_to :software_info, :class_name => "SoftwareCommunitiesPlugin::SoftwareInfo" + belongs_to :programming_language, :class_name => "SoftwareCommunitiesPlugin::ProgrammingLanguage" + + attr_accessible :version validates_length_of( :version, diff --git a/src/noosfero-spb/software_communities/lib/software_communities_plugin/software_language_helper.rb b/src/noosfero-spb/software_communities/lib/software_communities_plugin/software_language_helper.rb index f5af2cb..4bf1791 100644 --- a/src/noosfero-spb/software_communities/lib/software_communities_plugin/software_language_helper.rb +++ b/src/noosfero-spb/software_communities/lib/software_communities_plugin/software_language_helper.rb @@ -1,4 +1,4 @@ -class SoftwareCommunitiesPlugin::SoftwareLanguageHelper < DynamicTableHelper +class SoftwareCommunitiesPlugin::SoftwareLanguageHelper < SoftwareCommunitiesPlugin::DynamicTableHelper #FIX verify MODEL_NAME MODEL_NAME = "language" FIELD_NAME = "programming_language_id" diff --git a/src/noosfero-spb/software_communities/test/helpers/plugin_test_helper.rb b/src/noosfero-spb/software_communities/test/helpers/plugin_test_helper.rb index d7458ce..4770a2c 100644 --- a/src/noosfero-spb/software_communities/test/helpers/plugin_test_helper.rb +++ b/src/noosfero-spb/software_communities/test/helpers/plugin_test_helper.rb @@ -10,7 +10,7 @@ module PluginTestHelper def create_software_info name, finality = "something", acronym = "" community = create_community(name) - software_info = SoftwareInfo.new + software_info = SoftwareCommunitiesPlugin::SoftwareInfo.new software_info.community = community software_info.finality = finality software_info.acronym = acronym @@ -55,7 +55,7 @@ module PluginTestHelper end def create_license_info version, link = "" - license = LicenseInfo.create(:version => version) + license = SoftwareCommunitiesPlugin::LicenseInfo.create(:version => version) license.link = link license.save diff --git a/src/noosfero-spb/software_communities/test/helpers/software_test_helper.rb b/src/noosfero-spb/software_communities/test/helpers/software_test_helper.rb index 285fd27..0104623 100644 --- a/src/noosfero-spb/software_communities/test/helpers/software_test_helper.rb +++ b/src/noosfero-spb/software_communities/test/helpers/software_test_helper.rb @@ -1,7 +1,7 @@ module SoftwareTestHelper def create_language language_fields - language = SoftwareLanguage.new + language = SoftwareCommunitiesPlugin::SoftwareLanguage.new language_fields[0].each do |k,v| language[k] = v @@ -12,7 +12,7 @@ module SoftwareTestHelper def create_database database_fields - database = SoftwareDatabase.new + database = SoftwareCommunitiesPlugin::SoftwareDatabase.new database_fields[0].each do |k,v| database[k] = v @@ -23,7 +23,7 @@ module SoftwareTestHelper end def create_library library_fields - library = Library.new + library = SoftwareCommunitiesPlugin::Library.new library_fields[0].each do |k,v| library[k] = v @@ -33,7 +33,7 @@ module SoftwareTestHelper end def create_operating_system operating_system_hash - operating_system = OperatingSystem.new + operating_system = SoftwareCommunitiesPlugin::OperatingSystem.new operating_system_hash[0].each do |k,v| operating_system[k] = v @@ -43,7 +43,7 @@ module SoftwareTestHelper end def create_license license_hash - license_info = LicenseInfo.new + license_info = SoftwareCommunitiesPlugin::LicenseInfo.new license_hash.each do |k,v| license_info[k] = v @@ -53,7 +53,7 @@ module SoftwareTestHelper end def create_categories categories_hash - software_categories = SoftwareCategories.new + software_categories = SoftwareCommunitiesPlugin::SoftwareCategories.new categories_hash.each do |k,v| software_categories[k] = v @@ -64,7 +64,7 @@ module SoftwareTestHelper def create_software fields - software = SoftwareInfo.new + software = SoftwareCommunitiesPlugin::SoftwareInfo.new community = Community.new software_hash = fields[2] license_system_hash = fields[0] @@ -128,7 +128,7 @@ module SoftwareTestHelper #Fields for software language fields_language['version'] = 'test' - fields_language['programming_language_id'] = ProgrammingLanguage.last.id + fields_language['programming_language_id'] = SoftwareCommunitiesPlugin::ProgrammingLanguage.last.id fields_language['operating_system'] = 'test' list_language << fields_language list_language << {} @@ -136,7 +136,7 @@ module SoftwareTestHelper #Fields for database fields_database['version'] = 'test' - fields_database['database_description_id'] = DatabaseDescription.last.id + fields_database['database_description_id'] = SoftwareCommunitiesPlugin::DatabaseDescription.last.id fields_database['operating_system'] = 'test' list_database << fields_database list_database << {} @@ -144,7 +144,7 @@ module SoftwareTestHelper #Fields for operating system fields_operating_system['version'] = 'version' - fields_operating_system['operating_system_name_id'] = OperatingSystemName.last.id + fields_operating_system['operating_system_name_id'] = SoftwareCommunitiesPlugin::OperatingSystemName.last.id list_operating_system << fields_operating_system list_operating_system << {} hash_list << list_operating_system @@ -158,7 +158,7 @@ module SoftwareTestHelper hash_list << fields_software #Fields for license - fields_license['license_infos_id'] = LicenseInfo.last.id + fields_license['license_infos_id'] = SoftwareCommunitiesPlugin::LicenseInfo.last.id hash_list << fields_license hash_list @@ -169,7 +169,7 @@ module SoftwareTestHelper #Fields for license info fields_license = { - license_infos_id: LicenseInfo.last.id + license_infos_id: SoftwareCommunitiesPlugin::LicenseInfo.last.id } hash_list << fields_license @@ -190,4 +190,4 @@ module SoftwareTestHelper end end #version: LicenseInfo.last.version, -#id: LicenseInfo.last.id \ No newline at end of file +#id: LicenseInfo.last.id diff --git a/src/noosfero-spb/software_communities/test/unit/categories_and_tags_block_test.rb b/src/noosfero-spb/software_communities/test/unit/categories_and_tags_block_test.rb index 9c8186e..2359ad9 100644 --- a/src/noosfero-spb/software_communities/test/unit/categories_and_tags_block_test.rb +++ b/src/noosfero-spb/software_communities/test/unit/categories_and_tags_block_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' require File.dirname(__FILE__) + '/../helpers/plugin_test_helper' -class SoftwareCommunitiesPlugin::CategoriesAndTagsBlockTest < ActiveSupport::TestCase +class CategoriesAndTagsBlockTest < ActiveSupport::TestCase include PluginTestHelper should 'inherit from Block' do assert_kind_of Block, SoftwareCommunitiesPlugin::CategoriesAndTagsBlock.new diff --git a/src/noosfero-spb/software_communities/test/unit/communities_block_test.rb b/src/noosfero-spb/software_communities/test/unit/communities_block_test.rb index 12675ee..e10251b 100644 --- a/src/noosfero-spb/software_communities/test/unit/communities_block_test.rb +++ b/src/noosfero-spb/software_communities/test/unit/communities_block_test.rb @@ -13,12 +13,12 @@ class CommunitiesBlockTest < ActiveSupport::TestCase @community.add_member(@person) - @comminities_block = SoftwareCommunitiesPlugin::CommunitiesBlock.new + @comminities_block = CommunitiesBlock.new @comminities_block.expects(:owner).at_least_once.returns(@person) end def teardown - SoftwareCommunitiesPlugin::CommunitiesBlock.destroy_all + CommunitiesBlock.destroy_all @person = nil @community = nil @software_info = nil diff --git a/src/noosfero-spb/software_communities/test/unit/create_software_test.rb b/src/noosfero-spb/software_communities/test/unit/create_software_test.rb index 5cc1958..460018b 100644 --- a/src/noosfero-spb/software_communities/test/unit/create_software_test.rb +++ b/src/noosfero-spb/software_communities/test/unit/create_software_test.rb @@ -26,7 +26,7 @@ class CreateSoftwareTest < ActiveSupport::TestCase should 'actually create new software community when confirmed' do task = SoftwareCommunitiesPlugin::CreateSoftware.create!(:name => 'Software Test', :target => Environment.default, :requestor => @requestor, :finality => "Any") - assert_difference 'SoftwareInfo.count' do + assert_difference 'SoftwareCommunitiesPlugin::SoftwareInfo.count' do assert_difference 'Community.count' do task.finish end diff --git a/src/noosfero-spb/software_communities/test/unit/operating_system_helper_test.rb b/src/noosfero-spb/software_communities/test/unit/operating_system_helper_test.rb index 9d9f033..77644c6 100644 --- a/src/noosfero-spb/software_communities/test/unit/operating_system_helper_test.rb +++ b/src/noosfero-spb/software_communities/test/unit/operating_system_helper_test.rb @@ -1,8 +1,8 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' -OperatingSystemName.create(:name=>"Debina") -OperatingSystemName.create(:name=>"Fedora") -OperatingSystemName.create(:name=>"CentOS") +SoftwareCommunitiesPlugin::OperatingSystemName.create(:name=>"Debina") +SoftwareCommunitiesPlugin::OperatingSystemName.create(:name=>"Fedora") +SoftwareCommunitiesPlugin::OperatingSystemName.create(:name=>"CentOS") class OperatingSystemHelperTest < ActiveSupport::TestCase diff --git a/src/noosfero-spb/software_communities/test/unit/software_info_test.rb b/src/noosfero-spb/software_communities/test/unit/software_info_test.rb index fbfd1f2..3b0e810 100644 --- a/src/noosfero-spb/software_communities/test/unit/software_info_test.rb +++ b/src/noosfero-spb/software_communities/test/unit/software_info_test.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../helpers/plugin_test_helper' class SoftwareInfoValidationTest < ActiveSupport::TestCase - include SoftwareCommunitiesPlugin::PluginTestHelper + include PluginTestHelper should "Return original license_info when license is not 'Another'" do @software_info = create_software_info("software_test") diff --git a/src/noosfero-spb/software_communities/test/unit/software_registration_test.rb b/src/noosfero-spb/software_communities/test/unit/software_registration_test.rb index 753d20d..5f3cac2 100644 --- a/src/noosfero-spb/software_communities/test/unit/software_registration_test.rb +++ b/src/noosfero-spb/software_communities/test/unit/software_registration_test.rb @@ -19,7 +19,8 @@ class SoftwareRegistrationTest < ActiveSupport::TestCase task = SoftwareCommunitiesPlugin::CreateSoftware.create!( :name => "Teste One", :requestor => person, - :environment => @environment + :environment => @environment, + :finality => "Something" ) assert_equal [task], Task.to(person).pending end diff --git a/src/noosfero-spb/software_communities/test/unit/software_tab_data_block_test.rb b/src/noosfero-spb/software_communities/test/unit/software_tab_data_block_test.rb index 0601430..520760e 100644 --- a/src/noosfero-spb/software_communities/test/unit/software_tab_data_block_test.rb +++ b/src/noosfero-spb/software_communities/test/unit/software_tab_data_block_test.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' require File.dirname(__FILE__) + '/../helpers/plugin_test_helper' class SoftwareTabDataBlockTest < ActiveSupport::TestCase - include SoftwareCommunitiesPlugin::PluginTestHelper + include PluginTestHelper def setup @software_info = create_software_info("A new Software") diff --git a/src/noosfero-spb/software_communities/test/unit/softwares_block_test.rb b/src/noosfero-spb/software_communities/test/unit/softwares_block_test.rb index c109e83..955086a 100644 --- a/src/noosfero-spb/software_communities/test/unit/softwares_block_test.rb +++ b/src/noosfero-spb/software_communities/test/unit/softwares_block_test.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' require File.dirname(__FILE__) + '/../helpers/plugin_test_helper' class SoftwaresBlockTest < ActiveSupport::TestCase - include SoftwareCommunitiesPlugin::PluginTestHelper + include PluginTestHelper should 'inherit from ProfileListBlock' do assert_kind_of ProfileListBlock, SoftwareCommunitiesPlugin::SoftwaresBlock.new end -- libgit2 0.21.2