From e0b0cbde246d50edfdc0f4d7445c55dc758bb067 Mon Sep 17 00:00:00 2001 From: Gabriela Navarro Date: Thu, 11 Dec 2014 12:06:11 +0000 Subject: [PATCH] Remove trailing whitespace --- db/migrate/20140528193905_create_software_infos_table.rb | 10 +++++----- db/migrate/20140812143218_remove_field_role_from_user.rb | 4 ++-- db/migrate/20140814125947_add_new_fields_to_public_institution.rb | 2 +- db/migrate/20140814131606_create_juridical_natures_table.rb | 3 +-- db/migrate/20141007140419_add_finality_field_to_software_table.rb | 1 - lib/ext/user.rb | 4 ++-- lib/institution.rb | 6 +++--- lib/operating_system_helper.rb | 4 ++-- lib/public_institution.rb | 2 -- lib/search_catalog_block.rb | 1 - lib/software_language.rb | 2 +- lib/software_language_helper.rb | 4 ++-- test/unit/governmental_power_test.rb | 2 +- test/unit/software_database_test.rb | 16 ++++++++-------- test/unit/software_language_validation.rb | 2 +- 15 files changed, 29 insertions(+), 34 deletions(-) diff --git a/db/migrate/20140528193905_create_software_infos_table.rb b/db/migrate/20140528193905_create_software_infos_table.rb index 0f21241..5d7944a 100644 --- a/db/migrate/20140528193905_create_software_infos_table.rb +++ b/db/migrate/20140528193905_create_software_infos_table.rb @@ -3,11 +3,11 @@ class CreateSoftwareInfosTable < ActiveRecord::Migration create_table :software_infos do |t| t.references :license_info t.references :community - t.boolean :e_mag, :default => false - t.boolean :icp_brasil,:default => false - t.boolean :intern, :default => false - t.boolean :e_ping, :default => false - t.boolean :e_arq, :default => false + t.boolean :e_mag, :default => false + t.boolean :icp_brasil,:default => false + t.boolean :intern, :default => false + t.boolean :e_ping, :default => false + t.boolean :e_arq, :default => false t.string :name, :default => ' ' t.string :operating_platform t.string :demonstration_url diff --git a/db/migrate/20140812143218_remove_field_role_from_user.rb b/db/migrate/20140812143218_remove_field_role_from_user.rb index 5bc9d9e..e4d4fc6 100644 --- a/db/migrate/20140812143218_remove_field_role_from_user.rb +++ b/db/migrate/20140812143218_remove_field_role_from_user.rb @@ -1,13 +1,13 @@ class RemoveFieldRoleFromUser < ActiveRecord::Migration def up change_table :users do |t| - t.remove :role + t.remove :role end end def down change_table :users do |t| - t.string :role + t.string :role end end end diff --git a/db/migrate/20140814125947_add_new_fields_to_public_institution.rb b/db/migrate/20140814125947_add_new_fields_to_public_institution.rb index 6b8f668..232f50a 100644 --- a/db/migrate/20140814125947_add_new_fields_to_public_institution.rb +++ b/db/migrate/20140814125947_add_new_fields_to_public_institution.rb @@ -6,6 +6,6 @@ class AddNewFieldsToPublicInstitution < ActiveRecord::Migration def down remove_column :institutions, :sisp - add_column :institutions, :juridical_nature, :string + add_column :institutions, :juridical_nature, :string end end diff --git a/db/migrate/20140814131606_create_juridical_natures_table.rb b/db/migrate/20140814131606_create_juridical_natures_table.rb index 2946e9a..40d55da 100644 --- a/db/migrate/20140814131606_create_juridical_natures_table.rb +++ b/db/migrate/20140814131606_create_juridical_natures_table.rb @@ -3,11 +3,10 @@ class CreateJuridicalNaturesTable < ActiveRecord::Migration create_table :juridical_natures do |t| t.string :name end - SoftwareHelper.create_list_with_file("plugins/mpog_software/public/static/juridical_nature.txt", JuridicalNature) end def down - drop_table :juridical_natures + drop_table :juridical_natures end end diff --git a/db/migrate/20141007140419_add_finality_field_to_software_table.rb b/db/migrate/20141007140419_add_finality_field_to_software_table.rb index 181c4fb..941ce26 100644 --- a/db/migrate/20141007140419_add_finality_field_to_software_table.rb +++ b/db/migrate/20141007140419_add_finality_field_to_software_table.rb @@ -1,7 +1,6 @@ class AddFinalityFieldToSoftwareTable < ActiveRecord::Migration def up add_column :software_infos, :finality, :string, :limit => 140 - end def down diff --git a/lib/ext/user.rb b/lib/ext/user.rb index 96289cd..fb608fc 100644 --- a/lib/ext/user.rb +++ b/lib/ext/user.rb @@ -18,9 +18,9 @@ class User def email_has_already_been_used? user_already_saved = User.find(:first, :conditions=>["email = ?", self.email]) - if user_already_saved.nil? + if user_already_saved.nil? primary_email_hasnt_been_used = User.primary_or_secondary_email_already_used?(self.email).empty? - if !self.secondary_email.nil? and self.secondary_email.empty? + if !self.secondary_email.nil? and self.secondary_email.empty? self.secondary_email = nil end secondary_email_hasnt_been_used = User.primary_or_secondary_email_already_used?(self.secondary_email).empty? diff --git a/lib/institution.rb b/lib/institution.rb index 2569b00..f4f45ae 100644 --- a/lib/institution.rb +++ b/lib/institution.rb @@ -13,8 +13,8 @@ class Institution < ActiveRecord::Base has_and_belongs_to_many :users - attr_accessible :name, :acronym, :unit_code, :parent_code, :unit_type, - :sub_juridical_nature, :normalization_level, + attr_accessible :name, :acronym, :unit_code, :parent_code, :unit_type, + :sub_juridical_nature, :normalization_level, :version, :cnpj, :type, :governmental_power, :governmental_sphere, :sisp, :juridical_nature, :corporate_name @@ -25,7 +25,7 @@ class Institution < ActiveRecord::Base before_save :verify_institution_type belongs_to :community - + scope :search_institution, lambda{ |value| where("name ilike ? OR acronym ilike ?", "%#{value}%", "%#{value}%" ) } diff --git a/lib/operating_system_helper.rb b/lib/operating_system_helper.rb index 8340c81..07ee2cb 100644 --- a/lib/operating_system_helper.rb +++ b/lib/operating_system_helper.rb @@ -35,8 +35,8 @@ module OperatingSystemHelper lambdas_list = [] if not show_information - return operating_system_html_structure({:operating_system_name_id => "", :version => ""}, have_delete_button) if list_operating_system.nil? - + return operating_system_html_structure({:operating_system_name_id => "", :version => ""}, have_delete_button) if list_operating_system.nil? + list_operating_system.each do |operating_system| lambdas_list << operating_system_html_structure(operating_system,have_delete_button) end diff --git a/lib/public_institution.rb b/lib/public_institution.rb index cfe008c..7b5f854 100644 --- a/lib/public_institution.rb +++ b/lib/public_institution.rb @@ -3,6 +3,4 @@ class PublicInstitution < Institution validates :acronym, :allow_blank => true, :allow_nil => true, :uniqueness=>true validates :cnpj, :uniqueness=>true validates_format_of :cnpj, :with => /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/, :allow_nil => true, :allow_blank => true - - end diff --git a/lib/search_catalog_block.rb b/lib/search_catalog_block.rb index 71c28b0..4f7b517 100644 --- a/lib/search_catalog_block.rb +++ b/lib/search_catalog_block.rb @@ -10,7 +10,6 @@ class SearchCatalogBlock < Block def help _('This block displays the search categories field ') - end def content(args={}) diff --git a/lib/software_language.rb b/lib/software_language.rb index a24b00e..3870ff0 100644 --- a/lib/software_language.rb +++ b/lib/software_language.rb @@ -1,6 +1,6 @@ class SoftwareLanguage < ActiveRecord::Base attr_accessible :version, :operating_system - + belongs_to :software_info belongs_to :programming_language diff --git a/lib/software_language_helper.rb b/lib/software_language_helper.rb index a2f689f..e3c8f85 100644 --- a/lib/software_language_helper.rb +++ b/lib/software_language_helper.rb @@ -45,7 +45,7 @@ module SoftwareLanguageHelper ActionView::Helpers::FormOptionsHelper, ApplicationHelper ) - + lambdas_list = [] if not show_information @@ -55,7 +55,7 @@ module SoftwareLanguageHelper lambdas_list << language_html_structure(language) end - else + else list_languages.each do |language| lambdas_list << language_html_show_structure(language) end diff --git a/test/unit/governmental_power_test.rb b/test/unit/governmental_power_test.rb index 937de21..ef4ce13 100644 --- a/test/unit/governmental_power_test.rb +++ b/test/unit/governmental_power_test.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' require File.dirname(__FILE__) + '/../helpers/institution_test_helper' class GovernmentalPowerTest < ActiveSupport::TestCase - + def setup @gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere") @juridical_nature = JuridicalNature.create(:name => "Autarquia") diff --git a/test/unit/software_database_test.rb b/test/unit/software_database_test.rb index c70bbd0..fa6d3fa 100644 --- a/test/unit/software_database_test.rb +++ b/test/unit/software_database_test.rb @@ -13,31 +13,31 @@ class SoftwareDatabaseTest < ActiveSupport::TestCase end should "save if all informations of @software_database are filled" do - assert @software_database.save, "Database should have been saved" + assert @software_database.save, "Database should have been saved" end - + should "not save if database description id is empty" do @software_database.database_description_id = nil - assert !@software_database.save, "Database description must be filled" + assert !@software_database.save, "Database description must be filled" end should "not save if version is empty" do @software_database.version = nil - assert !@software_database.save, "Version must be filled" + assert !@software_database.save, "Version must be filled" end should "not save if version has more than 20 characters" do @software_database.version = "a"*21 - assert !@software_database.save, "Version must have until 20 characters" + assert !@software_database.save, "Version must have until 20 characters" end should "not save if operating system is empty" do @software_database.operating_system = nil - assert !@software_database.save, "Operating system must be filled" + assert !@software_database.save, "Operating system must be filled" end - + should "not save if operating system has more than 20 characters" do @software_database.operating_system = "a"*21 - assert !@software_database.save, "Operating system must have until 20 characters" + assert !@software_database.save, "Operating system must have until 20 characters" end end diff --git a/test/unit/software_language_validation.rb b/test/unit/software_language_validation.rb index 605094c..5a6cf72 100644 --- a/test/unit/software_language_validation.rb +++ b/test/unit/software_language_validation.rb @@ -67,7 +67,7 @@ class SoftwareLanguageValidationTest < ActiveSupport::TestCase software_info.intern = true software_info.e_ping = true software_info.e_arq = true - software_info.operating_platform = 'GNU/Linux' + software_info.operating_platform = 'GNU/Linux' software_info.features = "Do a lot of things" software_info.objectives = "All tests should pass !" software_info -- libgit2 0.21.2