brisk-bills 0.7.0 → 0.8.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +7 -0
- data/Gemfile +11 -0
- data/Gemfile.lock +55 -0
- data/TODO.txt +36 -67
- data/app/controllers/admin/activities_controller.rb +4 -3
- data/app/controllers/admin/activities_with_prices_controller.rb +28 -14
- data/app/controllers/admin/client_accounting_controller.rb +11 -8
- data/app/controllers/admin/client_representatives_controller.rb +34 -5
- data/app/controllers/admin/clients_controller.rb +1 -1
- data/app/controllers/admin/draft_invoices_controller.rb +92 -0
- data/app/controllers/admin/{employee_client_labor_rate_controller.rb → employee_client_labor_rates_controller.rb} +1 -1
- data/app/controllers/admin/employees_controller.rb +3 -4
- data/app/controllers/admin/invoices_controller.rb +111 -53
- data/app/controllers/admin/payments_controller.rb +168 -41
- data/app/controllers/authentication_controller.rb +3 -3
- data/app/helpers/admin/activities_helper.rb +16 -13
- data/app/helpers/admin/activities_helper/labor_helper.rb +4 -4
- data/app/helpers/admin/activities_helper/proposal_helper.rb +1 -1
- data/app/helpers/admin/activities_helper/slimtimer_helper.rb +1 -1
- data/app/helpers/admin/activities_with_prices_helper.rb +2 -2
- data/app/helpers/admin/activity_type_controller_helper.rb +6 -0
- data/app/helpers/admin/activity_type_field_helper.rb +9 -9
- data/app/helpers/admin/adjustments_helper.rb +9 -1
- data/app/helpers/admin/client_accounting_helper.rb +2 -2
- data/app/helpers/admin/client_financial_transactions_helper.rb +1 -1
- data/app/helpers/admin/client_representatives_helper.rb +16 -12
- data/app/helpers/admin/clients_helper.rb +2 -0
- data/app/helpers/admin/draft_invoices_helper.rb +24 -0
- data/app/helpers/admin/{employee_client_labor_rate_helper.rb → employee_client_labor_rates_helper.rb} +8 -8
- data/app/helpers/admin/employees_helper.rb +6 -0
- data/app/helpers/admin/has_credential_column_helper.rb +8 -8
- data/app/helpers/admin/invoices_helper.rb +71 -16
- data/app/helpers/admin/is_active_column_helper.rb +2 -2
- data/app/helpers/admin/labors_helper.rb +12 -1
- data/app/helpers/admin/labors_helper/slimtimer_helper.rb +1 -1
- data/app/helpers/admin/materials_helper.rb +11 -0
- data/app/helpers/admin/payments_helper.rb +204 -29
- data/app/helpers/admin/proposals_helper.rb +10 -0
- data/app/helpers/admin/settings_helper.rb +1 -1
- data/app/helpers/admin_layout_helper.rb +3 -6
- data/app/helpers/authentication_helper.rb +7 -10
- data/app/helpers/money_model_helper.rb +1 -2
- data/app/models/activity.rb +17 -7
- data/app/models/client.rb +35 -8
- data/app/{model_views → models}/client_financial_transaction.rb +0 -0
- data/app/models/client_representative.rb +6 -14
- data/app/models/credential.rb +1 -1
- data/app/models/employee.rb +9 -11
- data/app/models/invoice.rb +13 -9
- data/app/models/invoice_payment.rb +1 -1
- data/app/models/notifier.rb +2 -2
- data/app/models/payment.rb +51 -7
- data/app/models/setting.rb +3 -1
- data/app/views/active_scaffold_overrides/add_existing.js.rjs +25 -0
- data/app/views/admin/activities/_adjustment_column.html.erb +10 -0
- data/app/views/admin/activities/{_form.rhtml → _form.html.erb} +0 -0
- data/app/views/admin/activities/{_form_attribute.rhtml → _form_attribute.html.erb} +0 -0
- data/app/views/admin/activities/{_labor_column.rhtml → _labor_column.html.erb} +0 -0
- data/app/views/admin/activities/{_material_column.rhtml → _material_column.html.erb} +0 -0
- data/app/views/admin/activities/{_proposal_column.rhtml → _proposal_column.html.erb} +0 -0
- data/app/views/admin/activities_with_prices/{move_to_invoice.rhtml → move_to_invoice.html.erb} +2 -2
- data/app/views/admin/activities_with_prices/move_to_invoice.js.rjs +5 -0
- data/app/views/admin/draft_invoices/batch_create.html.erb +73 -0
- data/app/views/admin/draft_invoices/batch_create.js.rjs +5 -0
- data/app/views/admin/invoices/confirm_publish_modal.html.erb +48 -0
- data/app/views/admin/payments/commit_payment_warning.html.erb +8 -0
- data/app/views/admin/payments/observation_error.js.rjs +28 -0
- data/app/views/admin/payments/on_assignment_observation.js.rjs +28 -0
- data/app/views/authentication/{email.rjs → email.js.rjs} +0 -0
- data/app/views/authentication/{login.rhtml → login.html.erb} +21 -26
- data/app/views/authentication/{login.rjs → login.js.rjs} +0 -0
- data/app/views/authentication/{reset_password_via_token.rhtml → reset_password_via_token.html.erb} +0 -0
- data/app/views/authentication/{reset_password_via_token.rjs → reset_password_via_token.js.rjs} +0 -0
- data/app/views/authentication/{sign_in_error.rjs → sign_in_error.js.rjs} +0 -0
- data/app/views/layouts/{_navigation_tree.rhtml → _navigation_tree.html.erb} +0 -0
- data/app/views/layouts/{admin.rhtml → admin.html.erb} +0 -0
- data/app/views/layouts/{public.rhtml → public.html.erb} +0 -0
- data/app/views/notifier/{_email_footer.html.rhtml → _email_footer.html.erb} +0 -0
- data/app/views/notifier/{_email_footer.plain.rhtml → _email_footer.plain.erb} +0 -0
- data/app/views/notifier/{_email_header.html.rhtml → _email_header.html.erb} +0 -0
- data/app/views/notifier/invoice_available.html.erb +5 -0
- data/app/views/notifier/{invoice_available.plain.rhtml → invoice_available.plain.erb} +1 -1
- data/app/views/notifier/{reset_password_requested.html.rhtml → reset_password_requested.html.erb} +2 -2
- data/app/views/notifier/{reset_password_requested.plain.rhtml → reset_password_requested.plain.erb} +1 -1
- data/config/environment.rb +6 -5
- data/config/locale/en.rb +9 -0
- data/db/migrate/001_create_employees.rb +1 -1
- data/db/migrate/002_create_employee_slimtimers.rb +1 -1
- data/db/migrate/003_create_slimtimer_tasks.rb +1 -1
- data/db/migrate/004_create_slimtimer_time_entries.rb +1 -1
- data/db/migrate/005_create_clients.rb +1 -1
- data/db/migrate/006_create_client_representatives.rb +1 -1
- data/db/migrate/008_create_activities.rb +1 -1
- data/db/migrate/009_create_activity_labors.rb +1 -1
- data/db/migrate/010_create_employee_client_labor_rates.rb +1 -1
- data/db/migrate/011_create_activity_adjustments.rb +1 -1
- data/db/migrate/012_create_activity_materials.rb +1 -1
- data/db/migrate/013_create_activity_proposals.rb +1 -1
- data/db/migrate/014_create_invoices.rb +1 -1
- data/db/migrate/015_create_payments.rb +1 -1
- data/db/migrate/016_create_payment_methods.rb +1 -1
- data/db/migrate/017_create_invoice_payments.rb +1 -1
- data/db/migrate/018_create_activity_types.rb +2 -2
- data/db/migrate/019_create_settings.rb +1 -1
- data/db/migrate/023_create_credentials_migrate_representatives.rb +2 -2
- data/db/migrate/028_money_to_cents.rb +2 -2
- data/db/schema.rb +10 -10
- data/lib/brisk-bills.rb +2 -2
- data/lib/brisk-bills/initializer.rb +2 -2
- data/lib/generators/instance/templates/instance_environment.rb +1 -1
- data/lib/libpptable.rb +48 -0
- data/lib/tasks/create_last_months_invoices.rake +1 -14
- data/lib/tasks/first_time_setup.rake +2 -2
- data/lib/tasks/package.rake +2 -1
- data/lib/tasks/payment_assignment_consistency_check.rake +110 -0
- data/lib/utilities.rb +4 -4
- data/public/images/page-new.gif +0 -0
- data/public/javascripts/active_scaffold/default/active_scaffold.js +532 -430
- data/public/javascripts/active_scaffold/default/dhtml_history.js +1 -1
- data/public/javascripts/active_scaffold/default/form_enhancements.js +7 -4
- data/public/stylesheets/active_scaffold/default/stylesheet-ie.css +5 -5
- data/public/stylesheets/active_scaffold/default/stylesheet.css +54 -18
- data/public/stylesheets/admin/global.css +1 -1
- data/public/stylesheets/admin/pages.css +29 -0
- data/test/unit/activity/adjustment_test.rb +1 -1
- data/test/unit/activity/labor_test.rb +1 -1
- data/test/unit/activity/material_test.rb +1 -1
- data/test/unit/activity/proposal_test.rb +1 -1
- data/test/unit/activity_test.rb +1 -1
- data/test/unit/activity_type_test.rb +1 -1
- data/test/unit/client_eventlog_test.rb +1 -1
- data/test/unit/client_financial_transaction_test.rb +1 -1
- data/test/unit/client_representative_test.rb +1 -1
- data/test/unit/client_test.rb +37 -6
- data/test/unit/credential_test.rb +1 -1
- data/test/unit/employee/slimtimer_test.rb +1 -1
- data/test/unit/employee_client_labor_rate_test.rb +1 -1
- data/test/unit/employee_test.rb +1 -1
- data/test/unit/helpers/admin/draft_invoices_helper_test.rb +4 -0
- data/test/unit/invoice_payment_test.rb +90 -50
- data/test/unit/invoice_test.rb +48 -8
- data/test/unit/notifier_test.rb +1 -1
- data/test/unit/payment_method_test.rb +1 -1
- data/test/unit/payment_test.rb +7 -7
- data/test/unit/setting_test.rb +1 -1
- data/test/unit/slimtimer_task_test.rb +1 -1
- data/test/unit/slimtimer_time_entry_test.rb +1 -1
- data/vendor/plugins/active_scaffold/CHANGELOG +3 -1
- data/vendor/plugins/active_scaffold/README +18 -5
- data/vendor/plugins/active_scaffold/environment.rb +1 -1
- data/vendor/plugins/active_scaffold/frontends/default/javascripts/active_scaffold.js +532 -430
- data/vendor/plugins/active_scaffold/frontends/default/javascripts/dhtml_history.js +1 -1
- data/vendor/plugins/active_scaffold/frontends/default/javascripts/form_enhancements.js +7 -4
- data/vendor/plugins/active_scaffold/frontends/default/stylesheets/stylesheet-ie.css +5 -5
- data/vendor/plugins/active_scaffold/frontends/default/stylesheets/stylesheet.css +54 -18
- data/vendor/plugins/active_scaffold/frontends/default/views/_add_existing_form.html.erb +3 -7
- data/vendor/plugins/active_scaffold/frontends/default/views/_create_form.html.erb +10 -7
- data/vendor/plugins/active_scaffold/frontends/default/views/_field_search.html.erb +7 -12
- data/vendor/plugins/active_scaffold/frontends/default/views/_form.html.erb +3 -3
- data/vendor/plugins/active_scaffold/frontends/default/views/_form_association.html.erb +15 -20
- data/vendor/plugins/active_scaffold/frontends/default/views/_form_association_footer.html.erb +8 -10
- data/vendor/plugins/active_scaffold/frontends/default/views/_form_attribute.html.erb +5 -2
- data/vendor/plugins/active_scaffold/frontends/default/views/_form_hidden_attribute.html.erb +2 -1
- data/vendor/plugins/active_scaffold/frontends/default/views/_horizontal_subform.html.erb +19 -21
- data/vendor/plugins/active_scaffold/frontends/default/views/{_form_association_header.html.erb → _horizontal_subform_header.html.erb} +2 -2
- data/vendor/plugins/active_scaffold/frontends/default/views/_horizontal_subform_record.html.erb +31 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/_list.html.erb +4 -18
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_actions.html.erb +18 -5
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_calculations.html.erb +2 -9
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_column_headings.html.erb +4 -4
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_header.html.erb +6 -6
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_inline_adapter.html.erb +2 -1
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_messages.html.erb +20 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_pagination.html.erb +11 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_pagination_links.html.erb +3 -5
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_record.html.erb +2 -26
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_record_columns.html.erb +9 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/_nested.html.erb +3 -12
- data/vendor/plugins/active_scaffold/frontends/default/views/_render_fields.js.rjs +11 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/_search.html.erb +17 -11
- data/vendor/plugins/active_scaffold/frontends/default/views/_show.html.erb +3 -3
- data/vendor/plugins/active_scaffold/frontends/default/views/_show_columns.html.erb +8 -7
- data/vendor/plugins/active_scaffold/frontends/default/views/_update_actions.html.erb +3 -3
- data/vendor/plugins/active_scaffold/frontends/default/views/_update_form.html.erb +9 -6
- data/vendor/plugins/active_scaffold/frontends/default/views/_vertical_subform.html.erb +7 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/_vertical_subform_record.html.erb +38 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/add_existing.js.rjs +2 -1
- data/vendor/plugins/active_scaffold/frontends/default/views/delete.html.erb +1 -1
- data/vendor/plugins/active_scaffold/frontends/default/views/destroy.js.rjs +2 -2
- data/vendor/plugins/active_scaffold/frontends/default/views/edit_associated.js.rjs +20 -15
- data/vendor/plugins/active_scaffold/frontends/default/views/list.html.erb +12 -8
- data/vendor/plugins/active_scaffold/frontends/default/views/list.js.rjs +1 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/mark.js.rjs +6 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/on_create.js.rjs +12 -8
- data/vendor/plugins/active_scaffold/frontends/default/views/on_update.js.rjs +13 -6
- data/vendor/plugins/active_scaffold/frontends/default/views/render_field.js.rjs +1 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/search.html.erb +2 -2
- data/vendor/plugins/active_scaffold/frontends/default/views/update.html.erb +2 -2
- data/vendor/plugins/active_scaffold/frontends/default/views/update_column.js.rjs +4 -3
- data/vendor/plugins/active_scaffold/frontends/default/views/update_row.js.rjs +2 -0
- data/vendor/plugins/active_scaffold/init.rb +2 -2
- data/vendor/plugins/active_scaffold/install.rb +1 -2
- data/vendor/plugins/active_scaffold/install_assets.rb +1 -1
- data/vendor/plugins/active_scaffold/lib/active_record_permissions.rb +53 -42
- data/vendor/plugins/active_scaffold/lib/active_scaffold.rb +96 -23
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/common_search.rb +18 -0
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/core.rb +152 -102
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/create.rb +81 -49
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/delete.rb +44 -17
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/field_search.rb +60 -46
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/list.rb +42 -37
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/mark.rb +72 -0
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/nested.rb +94 -92
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/search.rb +54 -40
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/show.rb +30 -10
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/update.rb +62 -47
- data/vendor/plugins/active_scaffold/lib/active_scaffold/attribute_params.rb +187 -185
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/base.rb +28 -3
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/core.rb +43 -3
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/create.rb +8 -15
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/delete.rb +3 -4
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/field_search.rb +19 -17
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/form.rb +2 -9
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/list.rb +46 -9
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/nested.rb +17 -7
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/search.rb +36 -16
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/show.rb +5 -12
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/subform.rb +8 -6
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/update.rb +12 -8
- data/vendor/plugins/active_scaffold/lib/active_scaffold/configurable.rb +2 -2
- data/vendor/plugins/active_scaffold/lib/active_scaffold/constraints.rb +173 -178
- data/vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/action_columns.rb +101 -97
- data/vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/action_link.rb +29 -19
- data/vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/column.rb +74 -34
- data/vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/columns.rb +74 -74
- data/vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/set.rb +57 -62
- data/vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/sorting.rb +73 -3
- data/vendor/plugins/active_scaffold/lib/active_scaffold/finder.rb +304 -234
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/association_helpers.rb +40 -40
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/controller_helpers.rb +39 -24
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/country_helpers.rb +32 -28
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/form_column_helpers.rb +157 -86
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/id_helpers.rb +7 -7
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/list_column_helpers.rb +278 -85
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/pagination_helpers.rb +38 -12
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/search_column_helpers.rb +74 -35
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/show_column_helpers.rb +53 -46
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/view_helpers.rb +51 -17
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/de.yml +69 -0
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/en.yml +72 -0
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/es.yml +23 -13
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/fr.yml +68 -0
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/hu.yml +24 -14
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/ja.yml +69 -0
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/ru.yml +72 -0
- data/vendor/plugins/active_scaffold/lib/active_scaffold/marked_model.rb +38 -0
- data/vendor/plugins/active_scaffold/lib/bridges/calendar_date_select/lib/as_cds_bridge.rb +47 -13
- data/vendor/plugins/active_scaffold/lib/bridges/dependent_protect/bridge.rb +10 -0
- data/vendor/plugins/active_scaffold/lib/bridges/dependent_protect/lib/dependent_protect_bridge.rb +11 -0
- data/vendor/plugins/active_scaffold/lib/bridges/file_column/lib/as_file_column_bridge.rb +3 -6
- data/vendor/plugins/active_scaffold/lib/bridges/file_column/lib/form_ui.rb +10 -2
- data/vendor/plugins/active_scaffold/lib/bridges/paperclip/bridge.rb +13 -0
- data/vendor/plugins/active_scaffold/lib/bridges/paperclip/lib/form_ui.rb +20 -0
- data/vendor/plugins/active_scaffold/lib/bridges/paperclip/lib/list_ui.rb +16 -0
- data/vendor/plugins/active_scaffold/lib/bridges/paperclip/lib/paperclip_bridge.rb +32 -0
- data/vendor/plugins/active_scaffold/lib/bridges/paperclip/lib/paperclip_bridge_helpers.rb +18 -0
- data/vendor/plugins/active_scaffold/lib/bridges/record_select/bridge.rb +5 -0
- data/vendor/plugins/active_scaffold/lib/bridges/record_select/lib/record_select_bridge.rb +79 -0
- data/vendor/plugins/active_scaffold/lib/bridges/semantic_attributes/bridge.rb +5 -0
- data/vendor/plugins/active_scaffold/lib/bridges/semantic_attributes/lib/semantic_attributes_bridge.rb +20 -0
- data/vendor/plugins/active_scaffold/lib/bridges/tiny_mce/bridge.rb +5 -0
- data/vendor/plugins/active_scaffold/lib/bridges/tiny_mce/lib/tiny_mce_bridge.rb +57 -0
- data/vendor/plugins/active_scaffold/lib/bridges/unobtrusive_date_picker/bridge.rb +9 -0
- data/vendor/plugins/active_scaffold/lib/bridges/unobtrusive_date_picker/lib/form_ui.rb +14 -0
- data/vendor/plugins/active_scaffold/lib/bridges/unobtrusive_date_picker/lib/unobtrusive_date_picker_bridge.rb +15 -0
- data/vendor/plugins/active_scaffold/lib/bridges/unobtrusive_date_picker/lib/view_helpers.rb +16 -0
- data/vendor/plugins/active_scaffold/lib/bridges/validation_reflection/bridge.rb +9 -0
- data/vendor/plugins/active_scaffold/lib/bridges/validation_reflection/lib/validation_reflection_bridge.rb +19 -0
- data/vendor/plugins/active_scaffold/lib/extensions/action_view_rendering.rb +20 -8
- data/vendor/plugins/active_scaffold/lib/extensions/generic_view_paths.rb +2 -2
- data/vendor/plugins/active_scaffold/lib/extensions/paginator_extensions.rb +26 -0
- data/vendor/plugins/active_scaffold/lib/extensions/resources.rb +6 -5
- data/vendor/plugins/active_scaffold/lib/extensions/reverse_associations.rb +26 -20
- data/vendor/plugins/active_scaffold/lib/extensions/unsaved_associated.rb +1 -1
- data/vendor/plugins/active_scaffold/lib/paginator.rb +1 -1
- data/vendor/plugins/active_scaffold/lib/responds_to_parent.rb +1 -1
- data/vendor/plugins/active_scaffold/shoulda_macros/macros.rb +136 -0
- data/vendor/plugins/active_scaffold/test/bridges/active_scaffold_dependent_protect_test.rb +34 -0
- data/vendor/plugins/active_scaffold/test/bridges/bridge_test.rb +43 -0
- data/vendor/plugins/active_scaffold/test/bridges/company.rb +81 -0
- data/vendor/plugins/active_scaffold/test/bridges/paperclip_test.rb +68 -0
- data/vendor/plugins/active_scaffold/test/bridges/tiny_mce_test.rb +27 -0
- data/vendor/plugins/active_scaffold/test/bridges/unobtrusive_date_picker_test.rb +49 -0
- data/vendor/plugins/active_scaffold/test/bridges/validation_reflection_test.rb +57 -0
- data/vendor/plugins/active_scaffold/test/config/base_test.rb +15 -0
- data/vendor/plugins/active_scaffold/test/config/core_test.rb +58 -0
- data/vendor/plugins/active_scaffold/test/config/create_test.rb +9 -6
- data/vendor/plugins/active_scaffold/test/config/delete_test.rb +33 -0
- data/vendor/plugins/active_scaffold/test/config/field_search_test.rb +47 -0
- data/vendor/plugins/active_scaffold/test/config/list_test.rb +66 -11
- data/vendor/plugins/active_scaffold/test/config/nested_test.rb +62 -0
- data/vendor/plugins/active_scaffold/test/config/search_test.rb +60 -0
- data/vendor/plugins/active_scaffold/test/config/show_test.rb +43 -0
- data/vendor/plugins/active_scaffold/test/config/subform_test.rb +17 -0
- data/vendor/plugins/active_scaffold/test/config/update_test.rb +27 -4
- data/vendor/plugins/active_scaffold/test/data_structures/action_columns_test.rb +2 -8
- data/vendor/plugins/active_scaffold/test/data_structures/action_link_test.rb +11 -11
- data/vendor/plugins/active_scaffold/test/data_structures/action_links_test.rb +5 -5
- data/vendor/plugins/active_scaffold/test/data_structures/association_column_test.rb +4 -3
- data/vendor/plugins/active_scaffold/test/data_structures/column_test.rb +29 -5
- data/vendor/plugins/active_scaffold/test/data_structures/sorting_test.rb +31 -1
- data/vendor/plugins/active_scaffold/test/data_structures/standard_column_test.rb +3 -13
- data/vendor/plugins/active_scaffold/test/data_structures/virtual_column_test.rb +0 -11
- data/vendor/plugins/active_scaffold/test/extensions/{array.rb → array_test.rb} +0 -0
- data/vendor/plugins/active_scaffold/test/helpers/form_column_helpers_test.rb +31 -0
- data/vendor/plugins/active_scaffold/test/helpers/list_column_helpers_test.rb +42 -0
- data/vendor/plugins/active_scaffold/test/helpers/pagination_helpers_test.rb +59 -0
- data/vendor/plugins/active_scaffold/test/misc/active_record_permissions_test.rb +154 -0
- data/vendor/plugins/active_scaffold/test/misc/attribute_params_test.rb +146 -0
- data/vendor/plugins/active_scaffold/test/misc/configurable_test.rb +2 -2
- data/vendor/plugins/active_scaffold/test/misc/constraints_test.rb +26 -8
- data/vendor/plugins/active_scaffold/test/misc/finder_test.rb +41 -19
- data/vendor/plugins/active_scaffold/test/misc/lang_test.rb +5 -6
- data/vendor/plugins/active_scaffold/test/mock_app/app/controllers/application_controller.rb +10 -0
- data/vendor/plugins/active_scaffold/test/mock_app/app/helpers/application_helper.rb +3 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/boot.rb +110 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/environment.rb +43 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/environments/development.rb +17 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/environments/production.rb +28 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/environments/test.rb +28 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/initializers/backtrace_silencers.rb +7 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/initializers/inflections.rb +10 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/initializers/mime_types.rb +5 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/initializers/new_rails_defaults.rb +19 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/initializers/session_store.rb +15 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/locales/en.yml +5 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/routes.rb +43 -0
- data/vendor/plugins/active_scaffold/test/mock_app/db/test.sqlite3 +1 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/blank.html +33 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/DO_NOT_EDIT +2 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/add.gif +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/arrow_down.gif +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/arrow_up.gif +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/close.gif +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/cross.png +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/indicator-small.gif +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/indicator.gif +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/magnifier.png +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/javascripts/active_scaffold/DO_NOT_EDIT +2 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/javascripts/active_scaffold/default/active_scaffold.js +532 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/javascripts/active_scaffold/default/dhtml_history.js +867 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/javascripts/active_scaffold/default/form_enhancements.js +117 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/javascripts/active_scaffold/default/rico_corner.js +370 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/stylesheets/active_scaffold/DO_NOT_EDIT +2 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/stylesheets/active_scaffold/default/stylesheet-ie.css +35 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/stylesheets/active_scaffold/default/stylesheet.css +845 -0
- data/vendor/plugins/active_scaffold/test/model_stub.rb +17 -1
- data/vendor/plugins/active_scaffold/test/test_helper.rb +31 -5
- data/vendor/plugins/active_scaffold/uninstall.rb +2 -1
- data/vendor/plugins/active_scaffold_form_observation/init.rb +1 -1
- data/vendor/plugins/active_scaffold_form_observation/lib/active_scaffold_form_observation.rb +1 -2
- data/vendor/plugins/active_scaffold_full_refresh/init.rb +2 -0
- data/vendor/plugins/active_scaffold_full_refresh/lib/active_scaffold_full_refresh.rb +29 -0
- data/vendor/plugins/acts_as_money/{tasks → lib/tasks}/money_tasks.rake +0 -0
- metadata +668 -563
- data/app/model_views/client_accounting.rb +0 -5
- data/app/model_views/invoices_with_total.rb +0 -41
- data/app/views/admin/activities/_adjustment_column.rhtml +0 -23
- data/app/views/admin/activities_with_prices/move_to_invoice.rjs +0 -9
- data/app/views/notifier/invoice_available.html.rhtml +0 -5
- data/public/javascripts/prototype.js-1.6.0.3 +0 -4320
- data/test/functional/admin/activities_controller_test.rb +0 -8
- data/test/functional/admin/adjustments_controller_test.rb +0 -8
- data/test/functional/admin/client_accounting_controller_test.rb +0 -8
- data/test/functional/admin/client_financial_transactions_controller_test.rb +0 -8
- data/test/functional/admin/client_representatives_controller_test.rb +0 -8
- data/test/functional/admin/clients_controller_test.rb +0 -8
- data/test/functional/admin/employee_client_labor_rate_controller_test.rb +0 -8
- data/test/functional/admin/employees/slimtimer_controller_test.rb +0 -8
- data/test/functional/admin/employees_controller_test.rb +0 -8
- data/test/functional/admin/invoices_controller_test.rb +0 -8
- data/test/functional/admin/labors_controller_test.rb +0 -8
- data/test/functional/admin/materials_controller_test.rb +0 -8
- data/test/functional/admin/payments_controller_test.rb +0 -8
- data/test/functional/admin/proposals_controller_test.rb +0 -8
- data/test/functional/admin/settings_controller_test.rb +0 -8
- data/test/functional/authentication_controller_test.rb +0 -8
- data/vendor/plugins/active_scaffold/frontends/default/views/_form_association_record.html.erb +0 -27
- data/vendor/plugins/active_scaffold/frontends/default/views/_live_search.html.erb +0 -25
- data/vendor/plugins/active_scaffold/frontends/default/views/form_messages_on_create.js.rjs +0 -2
- data/vendor/plugins/active_scaffold/frontends/default/views/form_messages_on_update.js.rjs +0 -2
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/live_search.rb +0 -46
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/live_search.rb +0 -52
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/en.rb +0 -66
- data/vendor/plugins/active_scaffold/lib/extensions/name_option_for_datetime.rb +0 -12
- data/vendor/plugins/active_scaffold/test/misc/active_record_permissions.rb +0 -154
@@ -0,0 +1,146 @@
|
|
1
|
+
require File.join(File.dirname(__FILE__), '../test_helper.rb')
|
2
|
+
|
3
|
+
class NumberModel < ActiveRecord::Base
|
4
|
+
abstract_class = true
|
5
|
+
def self.columns
|
6
|
+
@columns ||= [ActiveRecord::ConnectionAdapters::Column.new('number', '', 'double(10,2)')]
|
7
|
+
end
|
8
|
+
end
|
9
|
+
|
10
|
+
class AttributeParamsTest < Test::Unit::TestCase
|
11
|
+
include ActiveScaffold::AttributeParams
|
12
|
+
|
13
|
+
def setup
|
14
|
+
I18n.backend.store_translations :en, :number => {:format => {
|
15
|
+
:delimiter => ',',
|
16
|
+
:separator => '.'
|
17
|
+
}}
|
18
|
+
I18n.backend.store_translations :es, :number => {:format => {
|
19
|
+
:delimiter => '.',
|
20
|
+
:separator => ','
|
21
|
+
}}
|
22
|
+
I18n.backend.store_translations :ru, :number => {:currency => {
|
23
|
+
:format => {
|
24
|
+
:separator => ',',
|
25
|
+
:delimiter => ''
|
26
|
+
}
|
27
|
+
}}
|
28
|
+
|
29
|
+
@config = config_for('number_model')
|
30
|
+
class << @config.list.columns
|
31
|
+
include ActiveScaffold::DataStructures::ActionColumns::AfterConfiguration
|
32
|
+
end
|
33
|
+
@config.list.columns.set_columns @config.columns
|
34
|
+
end
|
35
|
+
|
36
|
+
def teardown
|
37
|
+
I18n.locale = :en
|
38
|
+
end
|
39
|
+
|
40
|
+
def test_english_format_with_decimal_separator_using_english_language
|
41
|
+
I18n.locale = :en
|
42
|
+
assert_equal 0.1, convert_number('.1')
|
43
|
+
assert_equal 0.1, convert_number('.100')
|
44
|
+
assert_equal 0.1, convert_number('0.1')
|
45
|
+
assert_equal 0.345, convert_number('0.345')
|
46
|
+
assert_equal 0.345, convert_number('+0.345')
|
47
|
+
assert_equal -0.345, convert_number('-0.345')
|
48
|
+
assert_equal 9.345, convert_number('9.345')
|
49
|
+
assert_equal 9.1, convert_number('9.1')
|
50
|
+
assert_equal 90.1, convert_number('90.1')
|
51
|
+
end
|
52
|
+
|
53
|
+
def test_english_format_with_thousand_delimiter_using_english_language
|
54
|
+
I18n.locale = :en
|
55
|
+
assert_equal 1000, convert_number('1,000')
|
56
|
+
assert_equal 1000, convert_number('+1,000')
|
57
|
+
assert_equal -1000, convert_number('-1,000')
|
58
|
+
assert_equal 1000000, convert_number('1,000,000')
|
59
|
+
end
|
60
|
+
|
61
|
+
def test_english_format_with_separator_and_delimiter_using_english_language
|
62
|
+
I18n.locale = :en
|
63
|
+
assert_equal 1234.1, convert_number('1,234.1')
|
64
|
+
assert_equal 1234.1, convert_number('1,234.100')
|
65
|
+
assert_equal 1234.345, convert_number('+1,234.345')
|
66
|
+
assert_equal -1234.345, convert_number('-1,234.345')
|
67
|
+
assert_equal 1234000.1, convert_number('1,234,000.100')
|
68
|
+
end
|
69
|
+
|
70
|
+
def test_english_format_with_decimal_separator_using_spanish_language
|
71
|
+
I18n.locale = :es
|
72
|
+
assert_equal 0.1, convert_number('.1')
|
73
|
+
assert_equal 0.1, convert_number('0.1')
|
74
|
+
assert_equal 0.12, convert_number('+0.12')
|
75
|
+
assert_equal -0.12, convert_number('-0.12')
|
76
|
+
assert_equal 9.1, convert_number('9.1')
|
77
|
+
assert_equal 90.1, convert_number('90.1')
|
78
|
+
end
|
79
|
+
|
80
|
+
def test_spanish_format_with_decimal_separator_using_spanish_language
|
81
|
+
I18n.locale = :es
|
82
|
+
assert_equal 0.1, convert_number(',1')
|
83
|
+
assert_equal 0.1, convert_number(',100')
|
84
|
+
assert_equal 0.1, convert_number('0,1')
|
85
|
+
assert_equal 0.345, convert_number('0,345')
|
86
|
+
assert_equal 0.345, convert_number('+0,345')
|
87
|
+
assert_equal -0.345, convert_number('-0,345')
|
88
|
+
assert_equal 9.1, convert_number('9,1')
|
89
|
+
assert_equal 90.1, convert_number('90,1')
|
90
|
+
assert_equal 9.1, convert_number('9,100')
|
91
|
+
end
|
92
|
+
|
93
|
+
def test_spanish_format_with_thousand_delimiter_using_spanish_language
|
94
|
+
I18n.locale = :es
|
95
|
+
assert_equal 1000, convert_number('1.000')
|
96
|
+
assert_equal 1000, convert_number('+1.000')
|
97
|
+
assert_equal -1000, convert_number('-1.000')
|
98
|
+
assert_equal 1000000, convert_number('1.000.000')
|
99
|
+
end
|
100
|
+
|
101
|
+
def test_spanish_format_with_separator_and_decimal_using_spanish_language
|
102
|
+
I18n.locale = :es
|
103
|
+
assert_equal 1230.1, convert_number('1.230,1')
|
104
|
+
assert_equal 1230.1, convert_number('1.230,100')
|
105
|
+
assert_equal 1234.345, convert_number('+1.234,345')
|
106
|
+
assert_equal -1234.345, convert_number('-1.234,345')
|
107
|
+
assert_equal 1234000.1, convert_number('1.234.000,100')
|
108
|
+
end
|
109
|
+
|
110
|
+
def test_english_currency_format_with_decimal_separator_using_russian_language
|
111
|
+
I18n.locale = :ru
|
112
|
+
assert_equal 0.1, convert_number('.1', :currency)
|
113
|
+
assert_equal 0.1, convert_number('0.1', :currency)
|
114
|
+
assert_equal 0.12, convert_number('+0.12', :currency)
|
115
|
+
assert_equal -0.12, convert_number('-0.12', :currency)
|
116
|
+
assert_equal 9.1, convert_number('9.1', :currency)
|
117
|
+
assert_equal 90.1, convert_number('90.1', :currency)
|
118
|
+
end
|
119
|
+
|
120
|
+
def test_russian_currency_format_with_decimal_separator_using_russian_language
|
121
|
+
I18n.locale = :ru
|
122
|
+
assert_equal 0.1, convert_number(',1', :currency)
|
123
|
+
assert_equal 0.1, convert_number(',100', :currency)
|
124
|
+
assert_equal 0.1, convert_number('0,1', :currency)
|
125
|
+
assert_equal 0.345, convert_number('0,345', :currency)
|
126
|
+
assert_equal 0.345, convert_number('+0,345', :currency)
|
127
|
+
assert_equal -0.345, convert_number('-0,345', :currency)
|
128
|
+
assert_equal 9.1, convert_number('9,1', :currency)
|
129
|
+
assert_equal 90.1, convert_number('90,1', :currency)
|
130
|
+
assert_equal 9.1, convert_number('9,100', :currency)
|
131
|
+
end
|
132
|
+
|
133
|
+
def test_english_format_with_decimal_separator_with_no_localized_format
|
134
|
+
I18n.locale = :ru
|
135
|
+
assert_equal 0.1, convert_number('.1')
|
136
|
+
assert_equal 0.1, convert_number('0.1')
|
137
|
+
end
|
138
|
+
|
139
|
+
private
|
140
|
+
def convert_number(value, format = nil)
|
141
|
+
record = NumberModel.new
|
142
|
+
@config.columns[:number].options[:format] = format unless format.nil?
|
143
|
+
update_record_from_params(record, @config.list.columns, HashWithIndifferentAccess.new({:number => value}))
|
144
|
+
record.number
|
145
|
+
end
|
146
|
+
end
|
@@ -39,7 +39,7 @@ class ConfigurableTest < Test::Unit::TestCase
|
|
39
39
|
# variables
|
40
40
|
assert_equal configurable_class, configurable_class.configure {configurable_class}
|
41
41
|
# constants
|
42
|
-
assert_equal HELLO, configurable_class.configure {HELLO}
|
42
|
+
assert_equal ConfigurableTest::HELLO, configurable_class.configure {ConfigurableTest::HELLO}
|
43
43
|
|
44
44
|
##
|
45
45
|
## test extra "localized" block behavior
|
@@ -74,7 +74,7 @@ class ConfigurableTest < Test::Unit::TestCase
|
|
74
74
|
# variables
|
75
75
|
assert_equal ConfigurableClass, ConfigurableClass.configure {ConfigurableClass}
|
76
76
|
# constants
|
77
|
-
assert_equal HELLO, ConfigurableClass.configure {HELLO}
|
77
|
+
assert_equal ConfigurableTest::HELLO, ConfigurableClass.configure {ConfigurableTest::HELLO}
|
78
78
|
|
79
79
|
##
|
80
80
|
## test extra "localized" block behavior
|
@@ -7,6 +7,7 @@ module ModelStubs
|
|
7
7
|
def self.table_name
|
8
8
|
to_s.split('::').last.underscore.pluralize
|
9
9
|
end
|
10
|
+
self.store_full_sti_class = false
|
10
11
|
end
|
11
12
|
|
12
13
|
##
|
@@ -56,7 +57,7 @@ module ModelStubs
|
|
56
57
|
class OtherService < ModelStub
|
57
58
|
set_table_name 'services'
|
58
59
|
has_many :other_subscriptions, :class_name => 'ModelStubs::OtherSubscription', :foreign_key => 'service_id'
|
59
|
-
has_many :other_users, :through => :
|
60
|
+
has_many :other_users, :through => :other_subscriptions # :class_name and :foreign_key are ignored for :through
|
60
61
|
end
|
61
62
|
|
62
63
|
class OtherSubscription < ModelStub
|
@@ -69,12 +70,21 @@ module ModelStubs
|
|
69
70
|
set_table_name 'roles'
|
70
71
|
has_and_belongs_to_many :other_users, :class_name => 'ModelStubs::OtherUser', :foreign_key => 'role_id', :association_foreign_key => 'user_id', :join_table => 'roles_users'
|
71
72
|
end
|
73
|
+
|
74
|
+
class PrimaryKeyUser < ModelStub
|
75
|
+
has_many :locations, :class_name => 'PrimaryKeyLocation', :foreign_key => :username, :primary_key => :name
|
76
|
+
end
|
77
|
+
|
78
|
+
class PrimaryKeyLocation < ModelStub
|
79
|
+
belongs_to :user, :class_name => 'PrimaryKeyUser', :foreign_key => :username, :primary_key => :name
|
80
|
+
end
|
72
81
|
end
|
73
82
|
|
74
83
|
class ConstraintsTestObject
|
75
84
|
# stub out what the mixin expects to find ...
|
76
85
|
def self.before_filter(*args); end
|
77
|
-
attr_accessor :
|
86
|
+
attr_accessor :active_scaffold_includes
|
87
|
+
attr_accessor :active_scaffold_habtm_joins
|
78
88
|
attr_accessor :active_scaffold_config
|
79
89
|
attr_accessor :params
|
80
90
|
def merge_conditions(old, new)
|
@@ -88,7 +98,8 @@ class ConstraintsTestObject
|
|
88
98
|
attr_accessor :active_scaffold_constraints
|
89
99
|
|
90
100
|
def initialize
|
91
|
-
@
|
101
|
+
@active_scaffold_includes = []
|
102
|
+
@active_scaffold_habtm_joins = []
|
92
103
|
@params = {}
|
93
104
|
end
|
94
105
|
end
|
@@ -108,7 +119,7 @@ class ConstraintsTest < Test::Unit::TestCase
|
|
108
119
|
assert_constraint_condition({:address => 11}, ['addresses.id = ?', 11], 'find the user with address #11')
|
109
120
|
# reverse of a has_many :through
|
110
121
|
assert_constraint_condition({:subscription => {:service => 5}}, ['services.id = ?', 5], 'find all users subscribed to service #5')
|
111
|
-
assert(@test_object.
|
122
|
+
assert(@test_object.active_scaffold_includes.include?({:subscription => :service}), 'multi-level association include')
|
112
123
|
|
113
124
|
@test_object.active_scaffold_config = config_for('subscription')
|
114
125
|
# belongs_to (vs has_one)
|
@@ -159,7 +170,14 @@ class ConstraintsTest < Test::Unit::TestCase
|
|
159
170
|
|
160
171
|
def test_constraint_conditions_for_normal_attributes
|
161
172
|
@test_object.active_scaffold_config = config_for('user')
|
162
|
-
assert_constraint_condition({'foo' => 'bar'}, ['users.foo = ?', 'bar'], 'normal column-based constraint')
|
173
|
+
assert_constraint_condition({'foo' => 'bar'}, ['"users"."foo" = ?', 'bar'], 'normal column-based constraint')
|
174
|
+
end
|
175
|
+
|
176
|
+
def test_constraint_conditions_for_associations_with_primary_key_option
|
177
|
+
@test_object.active_scaffold_config = config_for('primary_key_location')
|
178
|
+
#user = ModelStubs::PrimaryKeyUser.new(:id => 1, :name => 'User Name')
|
179
|
+
ModelStubs::PrimaryKeyUser.expects(:find).with(1).returns(stub(:id => 1, :name => 'User Name'))
|
180
|
+
assert_constraint_condition({'user' => 1}, ['primary_key_locations.username = ?', 'User Name'], 'association with primary-key constraint')
|
163
181
|
end
|
164
182
|
|
165
183
|
protected
|
@@ -169,7 +187,7 @@ class ConstraintsTest < Test::Unit::TestCase
|
|
169
187
|
assert_equal condition, @test_object.send(:conditions_from_constraints), message
|
170
188
|
end
|
171
189
|
|
172
|
-
def config_for(klass)
|
173
|
-
|
190
|
+
def config_for(klass, namespace = nil)
|
191
|
+
super(klass, "model_stubs/")
|
174
192
|
end
|
175
|
-
end
|
193
|
+
end
|
@@ -3,11 +3,23 @@ require File.join(File.dirname(__FILE__), '../test_helper.rb')
|
|
3
3
|
|
4
4
|
class ClassWithFinder
|
5
5
|
include ActiveScaffold::Finder
|
6
|
+
def conditions_for_collection; end
|
7
|
+
def conditions_from_params; end
|
8
|
+
def conditions_from_constraints; end
|
9
|
+
def joins_for_collection; end
|
10
|
+
def custom_finder_options
|
11
|
+
{}
|
12
|
+
end
|
13
|
+
def beginning_of_chain
|
14
|
+
active_scaffold_config.model
|
15
|
+
end
|
6
16
|
end
|
7
17
|
|
8
18
|
class FinderTest < Test::Unit::TestCase
|
9
19
|
def setup
|
10
20
|
@klass = ClassWithFinder.new
|
21
|
+
@klass.stubs(:active_scaffold_config).returns(mock { stubs(:model).returns(ModelStub) })
|
22
|
+
@klass.stubs(:active_scaffold_session_storage).returns({})
|
11
23
|
end
|
12
24
|
|
13
25
|
def test_create_conditions_for_columns
|
@@ -21,31 +33,18 @@ class FinderTest < Test::Unit::TestCase
|
|
21
33
|
]
|
22
34
|
|
23
35
|
expected_conditions = [
|
24
|
-
'(
|
36
|
+
'("model_stubs"."a" LIKE ? OR "model_stubs"."b" LIKE ?) AND ("model_stubs"."a" LIKE ? OR "model_stubs"."b" LIKE ?)',
|
25
37
|
'%foo%', '%foo%', '%bar%', '%bar%'
|
26
38
|
]
|
27
|
-
assert_equal expected_conditions,
|
39
|
+
assert_equal expected_conditions, ClassWithFinder.create_conditions_for_columns(tokens, columns)
|
28
40
|
|
29
41
|
expected_conditions = [
|
30
|
-
'(
|
42
|
+
'("model_stubs"."a" LIKE ? OR "model_stubs"."b" LIKE ?)',
|
31
43
|
'%foo%', '%foo%'
|
32
44
|
]
|
33
|
-
assert_equal expected_conditions,
|
34
|
-
|
35
|
-
assert_equal nil, ActiveScaffold::Finder.create_conditions_for_columns('foo', [])
|
36
|
-
end
|
37
|
-
|
38
|
-
def test_build_order_clause
|
39
|
-
columns = ActiveScaffold::DataStructures::Columns.new(ModelStub, :a, :b, :c, :d)
|
40
|
-
sorting = ActiveScaffold::DataStructures::Sorting.new(columns)
|
41
|
-
|
42
|
-
assert @klass.send(:build_order_clause, nil).nil?
|
43
|
-
assert @klass.send(:build_order_clause, sorting).nil?
|
44
|
-
|
45
|
-
sorting << [:a, 'desc']
|
46
|
-
sorting << [:b, 'asc']
|
45
|
+
assert_equal expected_conditions, ClassWithFinder.create_conditions_for_columns('foo', columns)
|
47
46
|
|
48
|
-
assert_equal
|
47
|
+
assert_equal nil, ClassWithFinder.create_conditions_for_columns('foo', [])
|
49
48
|
end
|
50
49
|
|
51
50
|
def test_method_sorting
|
@@ -67,4 +66,27 @@ class FinderTest < Test::Unit::TestCase
|
|
67
66
|
collection = [3, 1, 2]
|
68
67
|
assert_equal collection.sort, @klass.send(:sort_collection_by_column, collection, column, 'asc')
|
69
68
|
end
|
70
|
-
|
69
|
+
|
70
|
+
def test_count_with_group
|
71
|
+
@klass.expects(:custom_finder_options).returns({:group => :a})
|
72
|
+
ModelStub.expects(:count).returns(ActiveSupport::OrderedHash['foo', 5])
|
73
|
+
ModelStub.expects(:find).with(:all, has_entries(:limit => 20, :offset => 0))
|
74
|
+
page = @klass.send :find_page, :per_page => 20, :pagination => true
|
75
|
+
page.items
|
76
|
+
|
77
|
+
assert_kind_of Integer, page.pager.count
|
78
|
+
assert_equal 1, page.pager.count
|
79
|
+
assert_nothing_raised { page.pager.number_of_pages }
|
80
|
+
end
|
81
|
+
|
82
|
+
def test_disabled_pagination
|
83
|
+
ModelStub.expects(:find).with(:all, Not(has_entries(:limit => 20, :offset => 0)))
|
84
|
+
page = @klass.send :find_page, :per_page => 20, :pagination => false
|
85
|
+
page.items
|
86
|
+
end
|
87
|
+
|
88
|
+
def test_infinite_pagination
|
89
|
+
ModelStub.expects(:count).never
|
90
|
+
page = @klass.send :find_page, :pagination => :infinite
|
91
|
+
end
|
92
|
+
end
|
@@ -3,10 +3,9 @@ require File.join(File.dirname(__FILE__), '../test_helper.rb')
|
|
3
3
|
class LocalizationTest < Test::Unit::TestCase
|
4
4
|
|
5
5
|
def test_localization
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
assert_equal "
|
10
|
-
assert_equal "Create Test", as_(:create, :model => 'Test')
|
6
|
+
assert_equal "Dutch", as_(:dutch)
|
7
|
+
assert_equal "dutch", as_('dutch')
|
8
|
+
I18n.backend.store_translations :en, :active_scaffold => {:create_model => 'Create %{model}'}
|
9
|
+
assert_equal "Create Test", as_(:create_model, :model => 'Test')
|
11
10
|
end
|
12
|
-
end
|
11
|
+
end
|
@@ -0,0 +1,10 @@
|
|
1
|
+
# Filters added to this controller apply to all controllers in the application.
|
2
|
+
# Likewise, all the methods added will be available for all controllers.
|
3
|
+
|
4
|
+
class ApplicationController < ActionController::Base
|
5
|
+
helper :all # include all helpers, all the time
|
6
|
+
protect_from_forgery # See ActionController::RequestForgeryProtection for details
|
7
|
+
|
8
|
+
# Scrub sensitive parameters from your log
|
9
|
+
# filter_parameter_logging :password
|
10
|
+
end
|
@@ -0,0 +1,110 @@
|
|
1
|
+
# Don't change this file!
|
2
|
+
# Configure your app in config/environment.rb and config/environments/*.rb
|
3
|
+
|
4
|
+
RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
|
5
|
+
|
6
|
+
module Rails
|
7
|
+
class << self
|
8
|
+
def boot!
|
9
|
+
unless booted?
|
10
|
+
preinitialize
|
11
|
+
pick_boot.run
|
12
|
+
end
|
13
|
+
end
|
14
|
+
|
15
|
+
def booted?
|
16
|
+
defined? Rails::Initializer
|
17
|
+
end
|
18
|
+
|
19
|
+
def pick_boot
|
20
|
+
(vendor_rails? ? VendorBoot : GemBoot).new
|
21
|
+
end
|
22
|
+
|
23
|
+
def vendor_rails?
|
24
|
+
File.exist?("#{RAILS_ROOT}/vendor/rails")
|
25
|
+
end
|
26
|
+
|
27
|
+
def preinitialize
|
28
|
+
load(preinitializer_path) if File.exist?(preinitializer_path)
|
29
|
+
end
|
30
|
+
|
31
|
+
def preinitializer_path
|
32
|
+
"#{RAILS_ROOT}/config/preinitializer.rb"
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
class Boot
|
37
|
+
def run
|
38
|
+
load_initializer
|
39
|
+
Rails::Initializer.run(:set_load_path)
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
class VendorBoot < Boot
|
44
|
+
def load_initializer
|
45
|
+
require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
|
46
|
+
Rails::Initializer.run(:install_gem_spec_stubs)
|
47
|
+
Rails::GemDependency.add_frozen_gem_path
|
48
|
+
end
|
49
|
+
end
|
50
|
+
|
51
|
+
class GemBoot < Boot
|
52
|
+
def load_initializer
|
53
|
+
self.class.load_rubygems
|
54
|
+
load_rails_gem
|
55
|
+
require 'initializer'
|
56
|
+
end
|
57
|
+
|
58
|
+
def load_rails_gem
|
59
|
+
if version = self.class.gem_version
|
60
|
+
gem 'rails', version
|
61
|
+
else
|
62
|
+
gem 'rails'
|
63
|
+
end
|
64
|
+
rescue Gem::LoadError => load_error
|
65
|
+
$stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
|
66
|
+
exit 1
|
67
|
+
end
|
68
|
+
|
69
|
+
class << self
|
70
|
+
def rubygems_version
|
71
|
+
Gem::RubyGemsVersion rescue nil
|
72
|
+
end
|
73
|
+
|
74
|
+
def gem_version
|
75
|
+
if defined? RAILS_GEM_VERSION
|
76
|
+
RAILS_GEM_VERSION
|
77
|
+
elsif ENV.include?('RAILS_GEM_VERSION')
|
78
|
+
ENV['RAILS_GEM_VERSION']
|
79
|
+
else
|
80
|
+
parse_gem_version(read_environment_rb)
|
81
|
+
end
|
82
|
+
end
|
83
|
+
|
84
|
+
def load_rubygems
|
85
|
+
require 'rubygems'
|
86
|
+
min_version = '1.3.1'
|
87
|
+
unless rubygems_version >= min_version
|
88
|
+
$stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
|
89
|
+
exit 1
|
90
|
+
end
|
91
|
+
|
92
|
+
rescue LoadError
|
93
|
+
$stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
|
94
|
+
exit 1
|
95
|
+
end
|
96
|
+
|
97
|
+
def parse_gem_version(text)
|
98
|
+
$1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
|
99
|
+
end
|
100
|
+
|
101
|
+
private
|
102
|
+
def read_environment_rb
|
103
|
+
File.read("#{RAILS_ROOT}/config/environment.rb")
|
104
|
+
end
|
105
|
+
end
|
106
|
+
end
|
107
|
+
end
|
108
|
+
|
109
|
+
# All that for this:
|
110
|
+
Rails.boot!
|