Skip to content

Instantly share code, notes, and snippets.

@avescodes
Created December 6, 2010 15:53
Show Gist options
  • Save avescodes/730470 to your computer and use it in GitHub Desktop.
Save avescodes/730470 to your computer and use it in GitHub Desktop.
RegistersRefactor => Master Merge
Removing app/controllers/activities_meta_data_controller.rb
Removing app/controllers/aspects_controller.rb
Removing app/controllers/impacts_controller.rb
Removing app/controllers/legislation_values_controller.rb
Removing app/models/activities_meta_data_store.rb
Removing app/models/activities_meta_datum.rb
Removing app/models/activities_meta_datum_methods/key_value_store.rb
Removing app/models/activity_observer.rb
Removing app/models/aspect.rb
Removing app/models/facility_register_observer.rb
Removing app/models/impact.rb
Removing app/models/legislation_info_observer.rb
Removing app/models/legislation_value_store.rb
Removing app/models/user_observer.rb
Removing app/views/activities_meta_data/_add_custom_field.html.erb
Removing app/views/activities_meta_data/create.js.erb
Removing app/views/aspects/_right_column_content.html.erb
Removing app/views/aspects/_stylesheet_link_tags_content.html.erb
Removing app/views/aspects/edit.html.erb
Removing app/views/aspects/index.html.erb
Removing app/views/aspects/new.html.erb
Removing app/views/aspects/show.html.erb
Removing app/views/impacts/_right_column_content.html.erb
Removing app/views/impacts/_stylesheet_link_tags_content.html.erb
Removing app/views/impacts/edit.html.erb
Removing app/views/impacts/index.html.erb
Removing app/views/impacts/new.html.erb
Removing app/views/impacts/show.html.erb
Removing app/views/legislation_values/_canlii_update.html.erb
Removing app/views/legislation_values/_form_fields.html.erb
Removing app/views/legislation_values/_javascript_include_tags_content.html.erb
Removing app/views/legislation_values/_legislation_other_attributes.html.erb
Removing app/views/legislation_values/_legislation_value_title.html.erb
Removing app/views/legislation_values/_right_column_content.html.erb
Removing app/views/legislation_values/_short_name.html.erb
Removing app/views/legislation_values/_source_type.html.erb
Removing app/views/legislation_values/_stylesheet_link_tags_content.html.erb
Removing app/views/legislation_values/edit.html.erb
Removing app/views/legislation_values/index.html.erb
Removing app/views/legislation_values/index.html.erb.temp
Removing app/views/legislation_values/new.html.erb
Removing db/tokyocabinet/development/activities_meta_data.tct
Removing lib/legislation_values/legislation_info_transferer.rb
Removing lib/legislation_values/one_time/legislation_infos_transferer.rb
Removing spec/controllers/activities_meta_data_controller_spec.rb
Removing spec/controllers/activities_meta_data_routing_spec.rb
Removing spec/controllers/aspects_controller_spec.rb
Removing spec/controllers/impacts_controller_spec.rb
Removing spec/controllers/legislation_values_controller_spec.rb
Removing spec/fixtures/activities_meta_data.yml
Removing spec/lib/legislation_values/legislation_info_transferer_spec.rb
Removing spec/lib/legislation_values/one_time/legislation_infos_transferer_spec.rb
Removing spec/models/activities_meta_data_store_spec.rb
Removing spec/models/activities_meta_datum_methods/key_value_store_spec.rb
Removing spec/models/activities_meta_datum_spec.rb
Removing spec/models/activity_methods/key_value_store_spec.rb
Removing spec/models/activity_observer_spec.rb
Removing spec/models/aspect_spec.rb
Removing spec/models/facility_register_observer_spec.rb
Removing spec/models/impact_spec.rb
Removing spec/models/legislation_info_observer_spec.rb
Removing spec/models/legislation_value_store_spec.rb
Removing spec/models/register_search_datum_spec.rb
Removing spec/routing/aspects_routing_spec.rb
Removing spec/routing/impacts_routing_spec.rb
Removing spec/routing/legislation_values_routing_spec.rb
Removing spec/routing/register_search_data_routing_spec.rb
Removing spec/views/aspects/edit.html.erb_spec.rb
Removing spec/views/aspects/index.html.erb_spec.rb
Removing spec/views/aspects/new.html.erb_spec.rb
Removing spec/views/aspects/show.html.erb_spec.rb
Removing spec/views/impacts/edit.html.erb_spec.rb
Removing spec/views/impacts/index.html.erb_spec.rb
Removing spec/views/impacts/new.html.erb_spec.rb
Removing spec/views/impacts/show.html.erb_spec.rb
Merge made by recursive.
Gemfile | 40 +-
Gemfile.lock | 72 +-
.../register_conductors/create_conductor.rb | 20 +-
.../register_conductors/search_conductor.rb | 47 +-
app/controllers/activities_controller.rb | 41 +-
app/controllers/activities_meta_data_controller.rb | 26 -
app/controllers/activity_files_controller.rb | 4 +-
app/controllers/application_controller.rb | 5 +
.../aspects/autocomplete_aspects_controller.rb | 7 +-
app/controllers/aspects_controller.rb | 64 --
.../impacts/autocomplete_impacts_controller.rb | 7 +-
app/controllers/impacts_controller.rb | 64 --
app/controllers/legislation_values_controller.rb | 128 ---
app/controllers/register_csvs_controller.rb | 2 +-
app/controllers/regulation_infos_controller.rb | 35 +-
app/helpers/activities_helper.rb | 61 +-
app/helpers/activity_files_helper.rb | 6 +-
app/helpers/aspect_registers_helper.rb | 14 +-
.../link/legislation_value_match_link_adder.rb | 62 +-
...ransition_legislation_value_match_link_adder.rb | 37 +-
app/models/activities_meta_data_store.rb | 49 -
app/models/activities_meta_datum.rb | 118 ---
.../key_value_store.rb | 138 ---
app/models/activity.rb | 203 ++---
app/models/activity_file.rb | 24 +-
app/models/activity_file_methods/date_filter.rb | 6 +-
app/models/activity_observer.rb | 115 --
app/models/aspect.rb | 84 --
app/models/aspect_register.rb | 122 +--
app/models/company.rb | 54 +-
app/models/facility.rb | 33 +-
app/models/facility_register.rb | 4 +-
app/models/facility_register_observer.rb | 76 --
app/models/impact.rb | 84 --
app/models/jurisdiction.rb | 15 +-
app/models/legal_register.rb | 3 +
app/models/legislation.rb | 26 +-
app/models/legislation_info.rb | 5 +-
app/models/legislation_info_observer.rb | 15 -
app/models/legislation_value_store.rb | 232 -----
app/models/register.rb | 160 ++--
app/models/register_search_datum.rb | 5 +-
app/models/sub_topic.rb | 19 +-
app/models/topic.rb | 18 +-
app/models/user_observer.rb | 13 -
app/views/activities/_add_custom_field.html.erb | 6 +-
.../_custom_fields_for_fields_list.html.erb | 15 +-
.../_custom_fields_for_list_elements.html.erb | 10 +-
app/views/activities/_fields_list.html.erb | 6 +-
app/views/activities/_form_fields.html.erb | 13 +-
app/views/activities/_list_elements.html.erb | 12 +-
.../_right_column_content_for_index.html.erb | 12 +-
app/views/activities/_upload_csv_form.html.erb | 2 +-
app/views/activities/edit.html.erb | 4 +-
app/views/activities/index.html.erb | 2 +-
app/views/activities/new.html.erb | 4 +-
app/views/activities/show.html.erb | 2 +-
.../_add_custom_field.html.erb | 5 -
app/views/activities_meta_data/create.js.erb | 2 -
.../activity_files/_right_column_content.html.erb | 2 +-
app/views/activity_files/index.html.erb | 2 +-
app/views/aspect_registers/_note.html.erb | 2 +-
app/views/aspects/_right_column_content.html.erb | 4 -
.../aspects/_stylesheet_link_tags_content.html.erb | 3 -
app/views/aspects/edit.html.erb | 24 -
app/views/aspects/index.html.erb | 25 -
app/views/aspects/new.html.erb | 25 -
app/views/aspects/show.html.erb | 19 -
app/views/events/_calendar.html.erb | 2 +-
.../facility_overviews/_facilities_list.html.erb | 2 +-
.../_right_column_content.html.haml | 4 +-
.../_right_column_content_for_facility.html.erb | 12 +-
...ght_column_content_for_shared_register.html.erb | 4 +-
...t_column_content_for_specific_register.html.erb | 4 +-
app/views/impacts/_right_column_content.html.erb | 4 -
.../impacts/_stylesheet_link_tags_content.html.erb | 3 -
app/views/impacts/edit.html.erb | 24 -
app/views/impacts/index.html.erb | 31 -
app/views/impacts/new.html.erb | 25 -
app/views/impacts/show.html.erb | 19 -
.../legislation_values/_canlii_update.html.erb | 7 -
app/views/legislation_values/_form_fields.html.erb | 43 -
.../_javascript_include_tags_content.html.erb | 3 -
.../_legislation_other_attributes.html.erb | 7 -
.../_legislation_value_title.html.erb | 2 -
.../_right_column_content.html.erb | 23 -
app/views/legislation_values/_short_name.html.erb | 9 -
app/views/legislation_values/_source_type.html.erb | 7 -
.../_stylesheet_link_tags_content.html.erb | 3 -
app/views/legislation_values/edit.html.erb | 25 -
app/views/legislation_values/index.html.erb | 59 --
app/views/legislation_values/index.html.erb.temp | 61 --
app/views/legislation_values/new.html.erb | 38 -
app/views/register_csvs/_upload_csv_form.html.erb | 2 +-
app/views/register_resources/index.html.erb | 2 +-
.../registers/_creation_method_selector.html.erb | 8 +-
app/views/registers/_register.html.erb | 4 +-
...umn_content_for_facility_with_register.html.erb | 8 +-
..._content_for_facility_without_register.html.erb | 4 +-
...ght_column_content_for_shared_register.html.erb | 16 +-
.../_facility_links_for_right_column.html.haml | 12 +-
app/views/shared/_navigation_bar.html.erb | 4 +-
.../_right_column_content.html.erb | 4 +-
app/views/values/facility_overviews/show.html.erb | 2 +-
.../_legal_register_record.html.erb | 8 +-
.../_right_column_content.html.erb | 2 +-
.../values/legal_register_records/new.html.erb | 4 +-
config/environment.rb | 2 +-
config/environments/development.rb | 4 +-
config/initializers/mongo_config.rb | 57 +
config/routes.rb | 11 +-
db/migrate/20101118214000_remove_demo_account.rb | 14 +
...225044_remove_activity_meta_data_and_friends.rb | 11 +
.../20101118225701_remove_key_value_store_id.rb | 12 +
db/schema.rb.orig | 1091 ++++++++++++++++++++
.../development/activities_meta_data.tct | Bin 528752 -> 0 bytes
legacy_models/activity.rb | 3 +
legacy_models/activity_file.rb | 15 +
legacy_models/activity_file_methods/date_filter.rb | 52 +
.../activity_legislation_info_link.rb | 0
.../activity_legislation_value_link.rb | 0
.../activity_methods/key_value_store.rb | 0
.../activity_sub_topic_link.rb | 0
legacy_models/aspect.rb | 13 +
legacy_models/aspect_register.rb | 15 +
.../models => legacy_models}/register_sub_topic.rb | 0
{app/models => legacy_models}/register_topic.rb | 0
lib/activity_csv/activity_csv_generator.rb | 25 +-
lib/activity_csv/activity_csv_importer.rb | 52 +-
.../legislation_info_transferer.rb | 37 -
.../one_time/legislation_infos_transferer.rb | 34 -
.../register_conductors/create_conductor_spec.rb | 10 +-
.../register_conductors/search_conductor_spec.rb | 117 +--
spec/controllers/activities_controller_spec.rb | 106 +--
.../activities_meta_data_controller_spec.rb | 59 --
.../activities_meta_data_routing_spec.rb | 61 --
spec/controllers/activities_routing_spec.rb | 52 +-
spec/controllers/activity_files_controller_spec.rb | 24 +-
spec/controllers/activity_files_routing_spec.rb | 26 +-
spec/controllers/admin/users_controller_spec.rb | 2 +-
.../autocomplete_aspects_controller_spec.rb | 5 +-
spec/controllers/aspects_controller_spec.rb | 139 ---
.../controllers/checklist_items_controller_spec.rb | 18 +-
spec/controllers/checklists_controller_spec.rb | 4 +-
.../autocomplete_impacts_controller_spec.rb | 5 +-
spec/controllers/impacts_controller_spec.rb | 139 ---
spec/controllers/jurisdictions_controller_spec.rb | 6 +-
.../file_legislation_infos_controller_spec.rb | 52 +-
.../legislation_infos_controller_spec.rb | 197 ++--
.../legislation_values_controller_spec.rb | 168 ---
spec/controllers/register_csvs_controller_spec.rb | 4 +-
spec/controllers/register_csvs_routing_spec.rb | 52 +-
spec/controllers/registers_controller_spec.rb | 8 +-
spec/controllers/registers_routing_spec.rb | 52 +-
.../regulation_infos_controller_spec.rb | 85 +--
spec/controllers/sub_topics_controller_spec.rb | 12 +-
spec/controllers/users_controller_spec.rb | 4 +-
spec/factories.rb | 13 -
spec/fixtures/activities_meta_data.yml | 20 -
spec/helpers/activities_helper_spec.rb | 202 ++---
spec/helpers/aspect_registers_helper_spec.rb | 22 +-
.../legislation_value_match_link_adder_spec.rb | 43 +-
...tion_legislation_value_match_link_adder_spec.rb | 46 +-
spec/helpers/users_helper_spec.rb | 18 +-
.../activity_csv/activity_csv_generator_spec.rb | 90 +--
.../lib/activity_csv/activity_csv_importer_spec.rb | 273 ++----
.../legislation_info_transferer_spec.rb | 124 ---
.../one_time/legislation_infos_transferer_spec.rb | 82 --
.../update_notification/update_notifier_spec.rb | 12 +-
spec/macros/model_macros.rb | 10 +-
spec/models/activities_meta_data_store_spec.rb | 61 --
.../key_value_store_spec.rb | 97 --
spec/models/activities_meta_datum_spec.rb | 291 ------
spec/models/activity_file_spec.rb | 27 +-
.../activity_methods/key_value_store_spec.rb | 135 ---
spec/models/activity_observer_spec.rb | 386 -------
spec/models/activity_spec.rb | 428 +-------
spec/models/aspect_register_spec.rb | 33 +-
spec/models/aspect_spec.rb | 142 ---
spec/models/company_spec.rb | 54 +-
spec/models/credit_card_spec.rb | 2 +-
spec/models/facility_register_observer_spec.rb | 85 --
spec/models/facility_spec.rb | 27 +-
spec/models/impact_spec.rb | 142 ---
spec/models/legislation_info_observer_spec.rb | 69 --
spec/models/legislation_value_store_spec.rb | 421 --------
spec/models/register_search_datum_spec.rb | 15 -
spec/models/register_spec.rb | 257 ++----
spec/models/top_legislation_info_spec.rb | 34 +-
spec/models/update_notification_mailer_spec.rb | 6 +-
spec/routing/aspects_routing_spec.rb | 63 --
spec/routing/impacts_routing_spec.rb | 63 --
spec/routing/legislation_values_routing_spec.rb | 63 --
spec/routing/register_search_data_routing_spec.rb | 63 --
spec/spec_helper.rb | 7 +
spec/views/activities/edit.html.erb_spec.rb | 43 +-
spec/views/activities/index.html.erb_spec.rb | 80 +-
spec/views/activities/new.html.erb_spec.rb | 48 +-
spec/views/activities/show.html.erb_spec.rb | 76 +-
spec/views/aspects/edit.html.erb_spec.rb | 20 -
spec/views/aspects/index.html.erb_spec.rb | 21 -
spec/views/aspects/new.html.erb_spec.rb | 20 -
spec/views/aspects/show.html.erb_spec.rb | 15 -
spec/views/impacts/edit.html.erb_spec.rb | 20 -
spec/views/impacts/index.html.erb_spec.rb | 21 -
spec/views/impacts/new.html.erb_spec.rb | 20 -
spec/views/impacts/show.html.erb_spec.rb | 15 -
207 files changed, 2659 insertions(+), 7586 deletions(-)
delete mode 100644 app/controllers/activities_meta_data_controller.rb
delete mode 100755 app/controllers/aspects_controller.rb
delete mode 100755 app/controllers/impacts_controller.rb
delete mode 100755 app/controllers/legislation_values_controller.rb
delete mode 100644 app/models/activities_meta_data_store.rb
delete mode 100644 app/models/activities_meta_datum.rb
delete mode 100644 app/models/activities_meta_datum_methods/key_value_store.rb
mode change 100755 => 100644 app/models/activity.rb
delete mode 100644 app/models/activity_observer.rb
delete mode 100755 app/models/aspect.rb
delete mode 100644 app/models/facility_register_observer.rb
delete mode 100755 app/models/impact.rb
create mode 100644 app/models/legal_register.rb
delete mode 100644 app/models/legislation_info_observer.rb
delete mode 100755 app/models/legislation_value_store.rb
mode change 100755 => 100644 app/models/register.rb
delete mode 100644 app/models/user_observer.rb
delete mode 100755 app/views/activities_meta_data/_add_custom_field.html.erb
delete mode 100755 app/views/activities_meta_data/create.js.erb
delete mode 100755 app/views/aspects/_right_column_content.html.erb
delete mode 100755 app/views/aspects/_stylesheet_link_tags_content.html.erb
delete mode 100755 app/views/aspects/edit.html.erb
delete mode 100755 app/views/aspects/index.html.erb
delete mode 100755 app/views/aspects/new.html.erb
delete mode 100755 app/views/aspects/show.html.erb
delete mode 100755 app/views/impacts/_right_column_content.html.erb
delete mode 100755 app/views/impacts/_stylesheet_link_tags_content.html.erb
delete mode 100755 app/views/impacts/edit.html.erb
delete mode 100755 app/views/impacts/index.html.erb
delete mode 100755 app/views/impacts/new.html.erb
delete mode 100755 app/views/impacts/show.html.erb
delete mode 100755 app/views/legislation_values/_canlii_update.html.erb
delete mode 100755 app/views/legislation_values/_form_fields.html.erb
delete mode 100755 app/views/legislation_values/_javascript_include_tags_content.html.erb
delete mode 100755 app/views/legislation_values/_legislation_other_attributes.html.erb
delete mode 100755 app/views/legislation_values/_legislation_value_title.html.erb
delete mode 100755 app/views/legislation_values/_right_column_content.html.erb
delete mode 100755 app/views/legislation_values/_short_name.html.erb
delete mode 100755 app/views/legislation_values/_source_type.html.erb
delete mode 100755 app/views/legislation_values/_stylesheet_link_tags_content.html.erb
delete mode 100755 app/views/legislation_values/edit.html.erb
delete mode 100755 app/views/legislation_values/index.html.erb
delete mode 100755 app/views/legislation_values/index.html.erb.temp
delete mode 100755 app/views/legislation_values/new.html.erb
create mode 100644 config/initializers/mongo_config.rb
create mode 100644 db/migrate/20101118214000_remove_demo_account.rb
create mode 100644 db/migrate/20101118225044_remove_activity_meta_data_and_friends.rb
create mode 100644 db/migrate/20101118225701_remove_key_value_store_id.rb
create mode 100644 db/schema.rb.orig
delete mode 100644 db/tokyocabinet/development/activities_meta_data.tct
create mode 100755 legacy_models/activity.rb
create mode 100644 legacy_models/activity_file.rb
create mode 100644 legacy_models/activity_file_methods/date_filter.rb
rename {app/models => legacy_models}/activity_legislation_info_link.rb (100%)
rename {app/models => legacy_models}/activity_legislation_value_link.rb (100%)
rename {app/models => legacy_models}/activity_methods/key_value_store.rb (100%)
rename {app/models => legacy_models}/activity_sub_topic_link.rb (100%)
create mode 100755 legacy_models/aspect.rb
create mode 100644 legacy_models/aspect_register.rb
create mode 100755 legacy_models/impact.rb
create mode 100755 legacy_models/register.rb
rename {app/models => legacy_models}/register_sub_topic.rb (100%)
rename {app/models => legacy_models}/register_topic.rb (100%)
delete mode 100644 lib/legislation_values/legislation_info_transferer.rb
delete mode 100644 lib/legislation_values/one_time/legislation_infos_transferer.rb
delete mode 100644 spec/controllers/activities_meta_data_controller_spec.rb
delete mode 100644 spec/controllers/activities_meta_data_routing_spec.rb
delete mode 100644 spec/controllers/aspects_controller_spec.rb
delete mode 100644 spec/controllers/impacts_controller_spec.rb
delete mode 100644 spec/controllers/legislation_values_controller_spec.rb
delete mode 100644 spec/fixtures/activities_meta_data.yml
delete mode 100644 spec/lib/legislation_values/legislation_info_transferer_spec.rb
delete mode 100644 spec/lib/legislation_values/one_time/legislation_infos_transferer_spec.rb
delete mode 100644 spec/models/activities_meta_data_store_spec.rb
delete mode 100644 spec/models/activities_meta_datum_methods/key_value_store_spec.rb
delete mode 100644 spec/models/activities_meta_datum_spec.rb
delete mode 100644 spec/models/activity_methods/key_value_store_spec.rb
delete mode 100644 spec/models/activity_observer_spec.rb
delete mode 100644 spec/models/aspect_spec.rb
delete mode 100644 spec/models/facility_register_observer_spec.rb
delete mode 100644 spec/models/impact_spec.rb
delete mode 100644 spec/models/legislation_info_observer_spec.rb
delete mode 100644 spec/models/legislation_value_store_spec.rb
delete mode 100644 spec/models/register_search_datum_spec.rb
delete mode 100644 spec/routing/aspects_routing_spec.rb
delete mode 100644 spec/routing/impacts_routing_spec.rb
delete mode 100644 spec/routing/legislation_values_routing_spec.rb
delete mode 100644 spec/routing/register_search_data_routing_spec.rb
delete mode 100644 spec/views/aspects/edit.html.erb_spec.rb
delete mode 100644 spec/views/aspects/index.html.erb_spec.rb
delete mode 100644 spec/views/aspects/new.html.erb_spec.rb
delete mode 100644 spec/views/aspects/show.html.erb_spec.rb
delete mode 100644 spec/views/impacts/edit.html.erb_spec.rb
delete mode 100644 spec/views/impacts/index.html.erb_spec.rb
delete mode 100644 spec/views/impacts/new.html.erb_spec.rb
delete mode 100644 spec/views/impacts/show.html.erb_spec.rb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment