From 79f2972ae1b82dda9344e40c75c4b99a8ec3c0da Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Tue, 1 Dec 2015 13:03:19 -0300 Subject: [PATCH] overall adjusts on lib files --- src/noosfero-spb/software_communities/lib/create_software.rb | 4 ++-- src/noosfero-spb/software_communities/lib/software_communities_plugin.rb | 16 ++++++++-------- src/noosfero-spb/software_communities/lib/software_communities_plugin/api.rb | 2 +- src/noosfero-spb/software_communities/lib/software_highlights_block.rb | 2 +- src/noosfero-spb/software_communities/lib/softwares_block.rb | 2 +- src/noosfero-spb/software_communities/lib/tasks/create_sample_softwares.rake | 16 ++++++++-------- src/noosfero-spb/software_communities/lib/tasks/export.rake | 40 ++++++++++++++++++++-------------------- src/noosfero-spb/software_communities/lib/tasks/templates.rake | 6 +++--- 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/noosfero-spb/software_communities/lib/create_software.rb b/src/noosfero-spb/software_communities/lib/create_software.rb index aebe23e..15d4731 100644 --- a/src/noosfero-spb/software_communities/lib/create_software.rb +++ b/src/noosfero-spb/software_communities/lib/create_software.rb @@ -18,7 +18,7 @@ class CreateSoftware < Task end def perform - software_template = Community["software"] + software_template = Software["software-template"] if (!software_template.blank? && software_template.is_template) template_id = software_template.id end @@ -116,7 +116,7 @@ class CreateSoftware < Task private def mount_url - identifier = Community.where(:name => self.name).first.identifier + identifier = Software.where(:name => self.name).first.identifier # The use of url_for doesn't allow the /social within the Public Software # portal. That's why the url is mounted so 'hard coded' url = "#{environment.top_url}/myprofile/#{identifier}/profile_editor/edit_software_community" diff --git a/src/noosfero-spb/software_communities/lib/software_communities_plugin.rb b/src/noosfero-spb/software_communities/lib/software_communities_plugin.rb index f61da9e..43a6fe2 100644 --- a/src/noosfero-spb/software_communities/lib/software_communities_plugin.rb +++ b/src/noosfero-spb/software_communities/lib/software_communities_plugin.rb @@ -38,17 +38,17 @@ class SoftwareCommunitiesPlugin < Noosfero::Plugin def self.extra_blocks { SoftwaresBlock => { :type => [Environment, Person] }, - SoftwareInformationBlock => { :type => [Community] }, - DownloadBlock => { :type => [Community] }, - RepositoryBlock => { :type => [Community] }, - CategoriesAndTagsBlock => { :type => [Community] }, + SoftwareInformationBlock => { :type => [Software] }, + DownloadBlock => { :type => [Software] }, + RepositoryBlock => { :type => [Software] }, + CategoriesAndTagsBlock => { :type => [Software] }, CategoriesSoftwareBlock => { :type => [Environment] }, SearchCatalogBlock => { :type => [Environment] }, SoftwareHighlightsBlock => { :type => [Environment] }, - SoftwareTabDataBlock => {:type => [Community], :position => 1}, - WikiBlock => {:type => [Community]}, - StatisticBlock => { :type => [Community] }, - SoftwareEventsBlock => { :type => [Community] } + SoftwareTabDataBlock => {:type => [Software], :position => 1}, + WikiBlock => {:type => [Software]}, + StatisticBlock => { :type => [Software] }, + SoftwareEventsBlock => { :type => [Software] } } end diff --git a/src/noosfero-spb/software_communities/lib/software_communities_plugin/api.rb b/src/noosfero-spb/software_communities/lib/software_communities_plugin/api.rb index 3b6d59f..9d1bd6d 100644 --- a/src/noosfero-spb/software_communities/lib/software_communities_plugin/api.rb +++ b/src/noosfero-spb/software_communities/lib/software_communities_plugin/api.rb @@ -8,7 +8,7 @@ class SoftwareCommunitiesPlugin::API < Grape::API resource :software_communities do get do authenticate! - softwares = select_filtered_collection_of(environment,'communities',params).joins(:software_info) + softwares = select_filtered_collection_of(environment,'softwares',params).joins(:software_info) present softwares.map{|o|o.software_info}, :with => Entities::SoftwareInfo end diff --git a/src/noosfero-spb/software_communities/lib/software_highlights_block.rb b/src/noosfero-spb/software_communities/lib/software_highlights_block.rb index a8b2a1c..243b7cf 100644 --- a/src/noosfero-spb/software_communities/lib/software_highlights_block.rb +++ b/src/noosfero-spb/software_communities/lib/software_highlights_block.rb @@ -7,7 +7,7 @@ class SoftwareHighlightsBlock < HighlightsBlock def help _('This block displays the softwares icon into a highlight') end - + def content(args={}) softwares = self.settings[:images].collect {|h| h[:address].split('/').last} block = self diff --git a/src/noosfero-spb/software_communities/lib/softwares_block.rb b/src/noosfero-spb/software_communities/lib/softwares_block.rb index f6a6d5a..7ba73a3 100644 --- a/src/noosfero-spb/software_communities/lib/softwares_block.rb +++ b/src/noosfero-spb/software_communities/lib/softwares_block.rb @@ -47,7 +47,7 @@ class SoftwaresBlock < CommunitiesBlock end def profiles - owner.communities + owner.softwares end def profile_list diff --git a/src/noosfero-spb/software_communities/lib/tasks/create_sample_softwares.rake b/src/noosfero-spb/software_communities/lib/tasks/create_sample_softwares.rake index 1cd00cf..4627754 100644 --- a/src/noosfero-spb/software_communities/lib/tasks/create_sample_softwares.rake +++ b/src/noosfero-spb/software_communities/lib/tasks/create_sample_softwares.rake @@ -44,23 +44,23 @@ namespace :software do end end -def create_community(name) - community = Community.new - community.name = name - community.save - community +def create_software(name) + software = Software.new + software.name = name + software.save + software end def create_software_info(name, acronym = "", finality = "default") - community = create_community(name) + community = create_software(name) software_info = SoftwareInfo.new - software_info.community = community + software_info.software = software software_info.public_software = true software_info.acronym = acronym software_info.finality = finality software_info.license_info = LicenseInfo.first - if software_info.community.valid? && software_info.valid? + if software_info.softare.valid? && software_info.valid? print "." software_info.save software_info diff --git a/src/noosfero-spb/software_communities/lib/tasks/export.rake b/src/noosfero-spb/software_communities/lib/tasks/export.rake index 224ae25..e8fb11c 100644 --- a/src/noosfero-spb/software_communities/lib/tasks/export.rake +++ b/src/noosfero-spb/software_communities/lib/tasks/export.rake @@ -37,24 +37,24 @@ namespace :export do "home_page_published_at" ] - SoftwareInfo.all.each do |software| - if software.community + SoftwareInfo.all.each do |software_info| + if software_info.software begin csv << [ - software.id, - software.community.id, - software.community.identifier, - software.community.name, - software.finality, - software.acronym, - software.community.created_at, - (software.community.image.nil? ? nil : software.community.image.filename), - (software.community.home_page.nil? ? nil : software.community.home_page.name), - (software.community.home_page.nil? ? nil : software.community.home_page.slug), - (software.community.home_page.nil? ? nil : software.community.home_page.path), - (software.community.home_page.nil? ? nil : software.community.home_page.body), - (software.community.home_page.nil? ? nil : software.community.home_page.abstract), - (software.community.home_page.nil? ? nil : software.community.home_page.published_at), + software_info.id, + software_info.software.id, + software_info.software.identifier, + software_info.software.name, + software_info.finality, + software_info.acronym, + software_info.software.created_at, + (software_info.software.image.nil? ? nil : software_info.software.image.filename), + (software_info.software.home_page.nil? ? nil : software_info.software.home_page.name), + (software_info.software.home_page.nil? ? nil : software_info.software.home_page.slug), + (software_info.software.home_page.nil? ? nil : software_info.software.home_page.path), + (software_info.software.home_page.nil? ? nil : software_info.software.home_page.body), + (software_info.software.home_page.nil? ? nil : software_info.software.home_page.abstract), + (software_info.software.home_page.nil? ? nil : software_info.software.home_page.published_at), ] print '.' @@ -104,12 +104,12 @@ namespace :export do "category_id" ] - SoftwareInfo.all.each do |software| - if software.community - software.community.categories.each do |category| + SoftwareInfo.all.each do |software_info| + if software_info.software + software_info.software.categories.each do |category| begin csv << [ - software.id, + software_info.id, category.id ] diff --git a/src/noosfero-spb/software_communities/lib/tasks/templates.rake b/src/noosfero-spb/software_communities/lib/tasks/templates.rake index 46ad264..00aea16 100644 --- a/src/noosfero-spb/software_communities/lib/tasks/templates.rake +++ b/src/noosfero-spb/software_communities/lib/tasks/templates.rake @@ -13,10 +13,10 @@ namespace :templates do task :software => :environment do Environment.all.each do |env| if env.plugin_enabled?("MpogSoftware") or env.plugin_enabled?("SoftwareCommunitiesPlugin") - software = Community["software"] + software = Software["software_template"] if software.nil? - software = Community.create!(:name => "Software", :identifier => "software") + software = Software.new(:name => "Software Template", :identifier => "software-template") end software.layout_template = "default" @@ -33,7 +33,7 @@ namespace :templates do task :destroy => :environment do Environment.all.each do |env| if env.plugin_enabled?("MpogSoftware") or env.plugin_enabled?("SoftwareCommunitiesPlugin") - Community["software"].destroy unless Community["software"].nil? + Software["software-template"].destroy unless Software["software-template"].nil? puts "Software template destoyed with success!" end end -- libgit2 0.21.2