Download as
Browse Code »

Commit 57ae8cf15f3b481b27bf0553b074d71876e36664

Authored by Gabriela Navarro
Committed by David Silva
1 parent cc6c8078
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Refactoring using the Law of Demeter 

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>
Showing 2 changed files with 6 additions and 4 deletions   Show diff stats
lib/ext/person.rb
  Diff comments   View file @57ae8cf
@@ -8,6 +8,8 @@ class Person @@ -8,6 +8,8 @@ class Person
8 8
9 attr_accessible :percentage_incomplete 9 attr_accessible :percentage_incomplete
10 10
  11 + delegate :login, :to => :user, :prefix => true
  12 +
11 scope :search, lambda { |name="", state="", city="", email=""| 13 scope :search, lambda { |name="", state="", city="", email=""|
12 like_sql = "" 14 like_sql = ""
13 values = [] 15 values = []
@@ -33,8 +35,8 @@ class Person @@ -33,8 +35,8 @@ class Person
33 end 35 end
34 like_sql = like_sql[0..like_sql.length-5] 36 like_sql = like_sql[0..like_sql.length-5]
35 37
36 - {  
37 - :joins => :user, 38 + {
  39 + :joins => :user,
38 :conditions=>[like_sql, *values] 40 :conditions=>[like_sql, *values]
39 } 41 }
40 } 42 }
test/functional/mpog_software_plugin_myprofile_controller_test.rb
  Diff comments   View file @57ae8cf
@@ -22,7 +22,7 @@ class MpogSoftwarePluginMyprofileControllerTest &lt; ActionController::TestCase @@ -22,7 +22,7 @@ class MpogSoftwarePluginMyprofileControllerTest &lt; ActionController::TestCase
22 DatabaseDescription.create(:name => "database") 22 DatabaseDescription.create(:name => "database")
23 OperatingSystemName.create(:name=>"Debian") 23 OperatingSystemName.create(:name=>"Debian")
24 24
25 - login_as(@person.user.login) 25 + login_as(@person.user_login)
26 @environment = Environment.default 26 @environment = Environment.default
27 @environment.enable_plugin('MpogSoftwarePlugin') 27 @environment.enable_plugin('MpogSoftwarePlugin')
28 @environment.save! 28 @environment.save!
@@ -64,7 +64,7 @@ class MpogSoftwarePluginMyprofileControllerTest &lt; ActionController::TestCase @@ -64,7 +64,7 @@ class MpogSoftwarePluginMyprofileControllerTest &lt; ActionController::TestCase
64 assert response.count == 0 64 assert response.count == 0
65 end 65 end
66 66
67 - should 'create a new software with all fields filled in' do 67 + should 'create a new software with all fields filled in' do
68 fields = software_fields 68 fields = software_fields
69 @environment.add_admin(@person) 69 @environment.add_admin(@person)
70 post :new_software, :profile => @person.identifier, :community => fields[1], :license_info => fields[0], 70 post :new_software, :profile => @person.identifier, :community => fields[1], :license_info => fields[0],