spree 0.7.1 → 0.8.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of spree might be problematic. Click here for more details.
- data/CHANGELOG +44 -11
- data/CONTRIBUTORS +1 -1
- data/INSTALL +4 -5
- data/README.markdown +1 -34
- data/app/controllers/admin/base_controller.rb +6 -0
- data/app/controllers/admin/configurations_controller.rb +7 -1
- data/app/controllers/admin/creditcard_payments_controller.rb +6 -56
- data/app/controllers/admin/products_controller.rb +9 -0
- data/app/controllers/admin/prototypes_controller.rb +4 -8
- data/app/controllers/admin/shipments_controller.rb +37 -0
- data/{vendor/extensions/shipping/app → app}/controllers/admin/shipping_categories_controller.rb +1 -1
- data/{vendor/extensions/shipping/app → app}/controllers/admin/shipping_methods_controller.rb +1 -1
- data/app/controllers/admin/users_controller.rb +6 -3
- data/app/controllers/admin/zones_controller.rb +17 -36
- data/app/controllers/application.rb +74 -12
- data/app/controllers/content_controller.rb +4 -0
- data/app/controllers/orders_controller.rb +52 -26
- data/app/controllers/password_resets_controller.rb +44 -0
- data/app/controllers/spree/base_controller.rb +1 -1
- data/app/controllers/states_controller.rb +8 -10
- data/app/controllers/taxons_controller.rb +0 -6
- data/app/controllers/user_sessions_controller.rb +38 -0
- data/app/controllers/users_controller.rb +29 -14
- data/app/helpers/admin/base_helper.rb +127 -4
- data/app/helpers/admin/orders_helper.rb +1 -1
- data/{vendor/extensions/shipping/app → app}/helpers/admin/shipping_categories_helper.rb +0 -0
- data/{vendor/extensions/shipping/app → app}/helpers/admin/shipping_methods_helper.rb +0 -0
- data/app/helpers/admin/zones_helper.rb +4 -4
- data/app/helpers/application_helper.rb +0 -13
- data/app/helpers/orders_helper.rb +0 -11
- data/app/helpers/spree/base_helper.rb +51 -3
- data/app/helpers/taxons_helper.rb +13 -12
- data/app/models/address.rb +0 -1
- data/app/models/app_configuration.rb +4 -1
- data/app/models/country.rb +2 -2
- data/app/models/creditcard.rb +10 -6
- data/app/models/creditcard_payment.rb +1 -0
- data/app/models/image.rb +1 -1
- data/app/models/line_item.rb +2 -0
- data/app/models/option_type.rb +1 -0
- data/app/models/order.rb +51 -29
- data/app/models/order_mailer.rb +4 -4
- data/app/models/product.rb +27 -1
- data/app/models/product_property.rb +0 -1
- data/app/models/property.rb +3 -0
- data/app/models/prototype.rb +1 -0
- data/app/models/shipment.rb +13 -17
- data/app/models/tax_category.rb +1 -0
- data/app/models/user.rb +32 -117
- data/app/models/user_mailer.rb +11 -0
- data/app/models/user_session.rb +2 -0
- data/app/models/variant.rb +6 -2
- data/app/models/zone.rb +34 -18
- data/app/models/zone_member.rb +9 -3
- data/app/views/account/login.html.erb +2 -0
- data/app/views/admin/configurations/index.html.erb +1 -1
- data/app/views/admin/creditcard_payments/edit.html.erb +11 -9
- data/app/views/admin/creditcard_payments/new.html.erb +14 -27
- data/app/views/admin/general_settings/edit.html.erb +28 -11
- data/app/views/admin/general_settings/show.html.erb +29 -16
- data/app/views/admin/inventory_settings/edit.html.erb +20 -11
- data/app/views/admin/inventory_settings/show.html.erb +9 -11
- data/app/views/admin/mail_settings/edit.html.erb +109 -80
- data/app/views/admin/mail_settings/show.html.erb +55 -41
- data/app/views/admin/option_types/_form.html.erb +18 -22
- data/app/views/admin/option_types/_option_value.html.erb +1 -1
- data/app/views/admin/option_types/available.html.erb +26 -30
- data/app/views/admin/option_types/edit.html.erb +5 -2
- data/app/views/admin/option_types/index.html.erb +36 -35
- data/app/views/admin/option_types/new.html.erb +7 -4
- data/app/views/admin/option_types/selected.html.erb +28 -28
- data/app/views/admin/orders/index.html.erb +86 -112
- data/app/views/admin/orders/show.html.erb +31 -51
- data/app/views/admin/overview/index.html.erb +1 -1
- data/app/views/admin/payments/index.html.erb +14 -6
- data/app/views/admin/product_properties/_product_property.html.erb +1 -1
- data/app/views/admin/product_properties/index.html.erb +21 -16
- data/app/views/admin/products/_form.html.erb +79 -71
- data/app/views/admin/products/_images.html.erb +27 -30
- data/app/views/admin/products/_option_types.html.erb +2 -2
- data/app/views/admin/products/_properties_form.erb +7 -0
- data/app/views/admin/products/edit.html.erb +9 -6
- data/app/views/admin/products/index.html.erb +79 -67
- data/app/views/admin/products/new.html.erb +51 -5
- data/app/views/admin/properties/_form.html.erb +12 -14
- data/app/views/admin/properties/edit.html.erb +3 -2
- data/app/views/admin/properties/index.html.erb +26 -17
- data/app/views/admin/properties/new.html.erb +5 -3
- data/app/views/admin/prototypes/_form.html.erb +38 -15
- data/app/views/admin/prototypes/available.html.erb +7 -7
- data/app/views/admin/prototypes/edit.html.erb +2 -2
- data/app/views/admin/prototypes/index.html.erb +24 -16
- data/app/views/admin/prototypes/new.html.erb +4 -2
- data/app/views/admin/reports/index.html.erb +18 -23
- data/app/views/admin/reports/sales_total.html.erb +25 -26
- data/app/views/admin/shared/_additional_field.html.erb +5 -0
- data/app/views/admin/shared/_address.html.erb +13 -0
- data/app/views/admin/shared/_configuration_menu.html.erb +18 -0
- data/app/views/admin/shared/_edit_resource_links.html.erb +4 -0
- data/app/views/admin/shared/_form_address.html.erb +50 -0
- data/app/views/admin/shared/_new_resource_links.html.erb +4 -0
- data/app/views/admin/shared/_order_details.html.erb +36 -0
- data/{vendor/plugins/has_many_polymorphs/test/fixtures/eaters_foodstuffs.yml → app/views/admin/shared/_order_sub_menu.html.erb} +0 -0
- data/app/views/admin/shared/_order_tabs.html.erb +27 -0
- data/app/views/admin/shared/_product_sub_menu.html.erb +8 -0
- data/app/views/admin/shared/_product_tabs.html.erb +35 -0
- data/app/views/admin/shared/_report_criteria.html.erb +23 -0
- data/app/views/admin/shared/_show_resource_links.html.erb +5 -0
- data/app/views/admin/shipments/_details.html.erb +19 -0
- data/app/views/admin/shipments/_form.html.erb +21 -0
- data/app/views/admin/shipments/edit.html.erb +12 -0
- data/{vendor/extensions/shipping/app → app}/views/admin/shipments/index.html.erb +8 -8
- data/app/views/admin/shipments/new.html.erb +14 -0
- data/{vendor/extensions/shipping/app → app}/views/admin/shipping_categories/_form.html.erb +0 -0
- data/{vendor/extensions/shipping/app → app}/views/admin/shipping_categories/edit.html.erb +1 -1
- data/app/views/admin/shipping_categories/index.html.erb +27 -0
- data/{vendor/extensions/shipping/app → app}/views/admin/shipping_categories/new.html.erb +1 -1
- data/{vendor/extensions/shipping/app → app}/views/admin/shipping_methods/_form.html.erb +1 -1
- data/{vendor/extensions/shipping/app → app}/views/admin/shipping_methods/edit.html.erb +1 -1
- data/app/views/admin/shipping_methods/index.html.erb +34 -0
- data/{vendor/extensions/shipping/app → app}/views/admin/shipping_methods/new.html.erb +1 -1
- data/app/views/admin/states/_form.html.erb +9 -10
- data/app/views/admin/states/_state_list.html.erb +10 -7
- data/app/views/admin/states/edit.html.erb +4 -2
- data/app/views/admin/states/index.html.erb +11 -4
- data/app/views/admin/states/new.html.erb +4 -2
- data/app/views/admin/tax_categories/_form.html.erb +9 -11
- data/app/views/admin/tax_categories/edit.html.erb +4 -2
- data/app/views/admin/tax_categories/index.html.erb +19 -9
- data/app/views/admin/tax_categories/new.html.erb +4 -2
- data/app/views/admin/tax_categories/show.html.erb +1 -0
- data/app/views/admin/taxonomies/_form.html.erb +5 -9
- data/app/views/admin/taxonomies/_list.html.erb +4 -4
- data/app/views/admin/taxonomies/_yui_head.html.erb +2 -16
- data/app/views/admin/taxonomies/edit.html.erb +13 -12
- data/app/views/admin/taxonomies/index.html.erb +11 -2
- data/app/views/admin/taxonomies/new.html.erb +7 -4
- data/app/views/admin/taxons/_taxon_table.html.erb +9 -9
- data/app/views/admin/taxons/available.js.erb +8 -8
- data/app/views/admin/taxons/selected.html.erb +10 -9
- data/app/views/admin/users/_form.html.erb +35 -36
- data/app/views/admin/users/edit.html.erb +3 -3
- data/app/views/admin/users/index.html.erb +45 -47
- data/app/views/admin/users/new.html.erb +5 -5
- data/app/views/admin/users/show.html.erb +8 -5
- data/app/views/admin/variants/_form.html.erb +36 -31
- data/app/views/admin/variants/edit.html.erb +5 -4
- data/app/views/admin/variants/index.html.erb +52 -50
- data/app/views/admin/variants/new.html.erb +3 -3
- data/app/views/admin/zones/_country_member.html.erb +5 -0
- data/app/views/admin/zones/_form.html.erb +26 -65
- data/app/views/admin/zones/_member_type.html.erb +15 -0
- data/app/views/admin/zones/_state_member.html.erb +5 -0
- data/app/views/admin/zones/_zone_member.html.erb +5 -0
- data/app/views/admin/zones/edit.html.erb +6 -4
- data/app/views/admin/zones/index.html.erb +18 -7
- data/app/views/admin/zones/new.html.erb +6 -4
- data/app/views/{checkout → content}/cvv.html.erb +0 -2
- data/app/views/layouts/admin.html.erb +75 -60
- data/app/views/layouts/application.html.erb +51 -75
- data/app/views/orders/_billing.html.erb +53 -0
- data/app/views/orders/_checkout_form.html.erb +14 -0
- data/app/views/{checkout/_confirm_order.erb → orders/_confirmation.html.erb} +3 -1
- data/app/views/orders/_form.html.erb +1 -2
- data/app/views/orders/_line_item.html.erb +15 -16
- data/app/views/orders/_payment.html.erb +30 -0
- data/app/views/orders/_registration.html.erb +60 -0
- data/app/views/orders/_shipping.html.erb +54 -0
- data/app/views/orders/_shipping_method.html.erb +10 -0
- data/app/views/orders/checkout.html.erb +15 -0
- data/app/views/orders/edit.html.erb +20 -20
- data/app/views/orders/new.html.erb +9 -8
- data/app/views/orders/show.html.erb +2 -4
- data/app/views/password_resets/edit.html.erb +12 -0
- data/app/views/password_resets/new.html.erb +11 -0
- data/app/views/products/_cart_form.html.erb +46 -0
- data/app/views/products/_properties.html.erb +8 -0
- data/app/views/products/_thumbnails.html.erb +27 -5
- data/app/views/products/index.html.erb +3 -8
- data/app/views/products/show.html.erb +23 -68
- data/app/views/shared/_footer.html.erb +8 -3
- data/app/views/shared/_login.html.erb +17 -16
- data/app/views/shared/_login_bar.html.erb +6 -0
- data/app/views/shared/_new_resource_links.html.erb +1 -1
- data/app/views/shared/_order_details.html.erb +8 -8
- data/app/views/shared/_products.html.erb +21 -17
- data/app/views/shared/_store_menu.html.erb +2 -5
- data/app/views/shared/_taxonomies.html.erb +8 -5
- data/app/views/states/index.js.erb +1 -10
- data/app/views/taxons/_taxon.html.erb +2 -3
- data/app/views/taxons/show.html.erb +10 -6
- data/app/views/user_mailer/password_reset_instructions.erb +9 -0
- data/app/views/{account → user_sessions}/authorization_failure.html.erb +0 -0
- data/app/views/user_sessions/new.html.erb +6 -0
- data/app/views/users/_form.html.erb +16 -23
- data/app/views/users/new.html.erb +11 -19
- data/config/boot.rb +1 -1
- data/config/database.yml +5 -5
- data/config/database.yml.example +2 -2
- data/config/environment.rb +11 -24
- data/config/initializers/backtrace_silencers.rb +7 -0
- data/config/initializers/compass.rb +8 -0
- data/config/initializers/inflections.rb +10 -0
- data/config/initializers/mime_types.rb +0 -3
- data/config/initializers/new_rails_defaults.rb +19 -0
- data/config/initializers/session_store.rb +15 -0
- data/config/locales/de.yml +57 -2
- data/config/locales/de_rails.yml +27 -7
- data/config/locales/en-GB.yml +59 -4
- data/config/locales/en-GB_rails.yml +6 -6
- data/config/locales/en-US.yml +60 -5
- data/config/locales/en-US_rails.yml +80 -39
- data/config/locales/es.yml +318 -263
- data/config/locales/es_rails.yml +26 -8
- data/config/locales/fr-FR.yml +55 -0
- data/config/locales/fr-FR_rails.yml +51 -43
- data/config/locales/it.yml +57 -2
- data/config/locales/it_rails.yml +60 -18
- data/config/locales/nb-NO.yml +67 -469
- data/config/locales/nl-BE.yml +522 -0
- data/config/locales/nl-BE_rails.yml +155 -0
- data/config/locales/pl.yml +57 -2
- data/config/locales/pt-BR.yml +272 -217
- data/config/locales/pt-BR_rails.yml +132 -98
- data/config/locales/pt-PT.yml +56 -1
- data/config/locales/pt-PT_rails.yml +25 -4
- data/config/locales/ru-RU.yml +56 -1
- data/config/locales/ru-RU_rails.yml +156 -110
- data/config/routes.rb +17 -8
- data/config/spree_permissions.yml +8 -5
- data/{vendor/extensions/shipping/db → db}/migrate/20081003211336_create_shipping_methods.rb +0 -0
- data/{vendor/extensions/shipping/db → db}/migrate/20081003233427_create_shipping_categories.rb +0 -0
- data/{vendor/extensions/shipping/db → db}/migrate/20081015001711_create_shipments.rb +0 -0
- data/{vendor/extensions/shipping/db → db}/migrate/20081023134446_add_product_dimensions.rb +0 -0
- data/{vendor/extensions/shipping/db → db}/migrate/20081205155619_add_shipped_at_property.rb +0 -0
- data/{vendor/extensions/shipping/db → db}/migrate/20081221201510_create_shipping_addresses.rb +0 -0
- data/db/migrate/20090302221152_give_all_users_user_role.rb +1 -0
- data/db/migrate/20090320113300_authlogic_changes.rb +24 -0
- data/db/migrate/20090324164010_create_option_types_prototypes.rb +12 -0
- data/db/migrate/20090401120636_meta_data_fields_for_products.rb +11 -0
- data/db/migrate/20090401203712_remove_hmp_stuff_in_zones.rb +12 -0
- data/db/migrate/{20080706233224_create_eu_vat_zone.rb → 20090401223217_create_eu_vat_zone_again.rb} +8 -3
- data/db/migrate/20090402002244_add_user_login.rb +17 -0
- data/db/migrate/20090402161055_add_order_token.rb +13 -0
- data/db/migrate/20090402200317_add_email_to_order.rb +19 -0
- data/db/migrate/20090406174645_refactor_addresses.rb +53 -0
- data/db/migrate/20090420021303_remove_viewable_id_from_products.rb +10 -0
- data/db/migrate/20090427000000_upgrade_taxons.rb +14 -0
- data/db/sample/addresses.yml +24 -14
- data/db/sample/creditcards.yml +2 -1
- data/db/sample/orders.yml +4 -1
- data/db/sample/products.yml +9 -9
- data/{vendor/extensions/shipping/db → db}/sample/shipments.yml +2 -1
- data/{vendor/extensions/shipping/db → db}/sample/shipping_categories.yml +0 -0
- data/{vendor/extensions/shipping/db → db}/sample/shipping_methods.yml +0 -0
- data/db/sample/users.yml +2 -1
- data/db/sample/zone_members.yml +16 -0
- data/{vendor/extensions/shipping/db → db}/sample/zones.yml +0 -0
- data/lib/easy_role_requirement_system.rb +32 -1
- data/lib/generators/generator_base_extension.rb +2 -2
- data/lib/generators/instance/instance_generator.rb +13 -9
- data/lib/generators/instance/templates/session_store.rb +15 -0
- data/lib/plugins/extension_patches/lib/fixture_loading_extension.rb +3 -1
- data/lib/plugins/monkey_patches/init.rb +1 -0
- data/lib/plugins/monkey_patches/lib/monkey_patches.rb +59 -0
- data/{vendor/plugins/calendar_date_select → lib/plugins/option_tags_with_disable}/MIT-LICENSE +20 -20
- data/lib/plugins/option_tags_with_disable/README.rdoc +35 -0
- data/lib/plugins/option_tags_with_disable/Rakefile +23 -0
- data/lib/plugins/option_tags_with_disable/init.rb +1 -0
- data/lib/plugins/option_tags_with_disable/lib/option_tags_will_disable.rb +85 -0
- data/lib/plugins/option_tags_with_disable/test/option_tags_will_disable_test.rb +72 -0
- data/lib/plugins/option_tags_with_disable/test/test_helper.rb +8 -0
- data/lib/role_requirement_system.rb +2 -2
- data/lib/spree.rb +2 -2
- data/lib/spree/checkout.rb +74 -0
- data/lib/spree/initializer.rb +0 -1
- data/lib/spree/setup.rb +2 -1
- data/{vendor/extensions/shipping/lib → lib}/spree/shipping_error.rb +0 -0
- data/lib/tasks/database.rake +2 -0
- data/lib/tasks/release.rake +8 -6
- data/lib/tasks/upgrade.rake +3 -0
- data/public/assets/products/1009/large/IMG_3408.jpg +0 -0
- data/public/assets/products/1009/mini/IMG_3408.jpg +0 -0
- data/public/assets/products/1009/original/IMG_3408.jpg +0 -0
- data/public/assets/products/1009/product/IMG_3408.jpg +0 -0
- data/public/assets/products/1009/small/IMG_3408.jpg +0 -0
- data/public/images/add-to-cart.png +0 -0
- data/public/images/admin/bg/active-tab.png +0 -0
- data/public/images/admin/bg/admin_tab_back.png +0 -0
- data/public/images/admin/bg/admin_tab_selected_back.png +0 -0
- data/public/images/admin/bg/content-back-blue.png +0 -0
- data/public/images/admin/bg/content-back-green.png +0 -0
- data/public/images/admin/bg/content-back.png +0 -0
- data/public/images/admin/bg/flash-error.png +0 -0
- data/public/images/admin/bg/flash-notice.png +0 -0
- data/public/images/admin/bg/green-stripes.gif +0 -0
- data/public/images/admin/bg/green-stripes.png +0 -0
- data/public/images/admin/bg/grid_header_back.png +0 -0
- data/public/images/admin/bg/grid_header_back_green.png +0 -0
- data/public/images/admin/bg/header-bg.png +0 -0
- data/public/images/admin/bg/header_bg.jpg +0 -0
- data/public/images/admin/bg/menu-current.png +0 -0
- data/public/images/admin/bg/red-stripes.gif +0 -0
- data/public/images/admin/bg/red-stripes.png +0 -0
- data/public/images/admin/bg/spree_50.png +0 -0
- data/public/images/admin/bg/subnav-divider.png +0 -0
- data/public/images/admin/bg/subnav.png +0 -0
- data/public/images/admin/bg/tab-back.png +0 -0
- data/public/images/admin/buttons/blue/left_01.png +0 -0
- data/public/images/admin/buttons/blue/right_01.png +0 -0
- data/public/images/admin/buttons/drag-handle-green.png +0 -0
- data/public/images/admin/buttons/green/left_01.png +0 -0
- data/public/images/admin/buttons/green/right_01.png +0 -0
- data/public/images/admin/buttons/left_01.png +0 -0
- data/public/images/admin/buttons/left_01_small.png +0 -0
- data/public/images/admin/buttons/orange/left_03.png +0 -0
- data/public/images/admin/buttons/orange/right_03.png +0 -0
- data/public/images/admin/buttons/right_01.png +0 -0
- data/public/images/admin/buttons/right_01_small.png +0 -0
- data/public/images/admin/icons/16x16/1.png +0 -0
- data/public/images/admin/icons/16x16/10.png +0 -0
- data/public/images/admin/icons/16x16/2.png +0 -0
- data/public/images/admin/icons/16x16/3.png +0 -0
- data/public/images/admin/icons/16x16/4.png +0 -0
- data/public/images/admin/icons/16x16/5.png +0 -0
- data/public/images/admin/icons/16x16/6.png +0 -0
- data/public/images/admin/icons/16x16/7.png +0 -0
- data/public/images/admin/icons/16x16/8.png +0 -0
- data/public/images/admin/icons/16x16/9.png +0 -0
- data/public/images/admin/icons/32x32/1.png +0 -0
- data/public/images/admin/icons/32x32/10.png +0 -0
- data/public/images/admin/icons/32x32/11.png +0 -0
- data/public/images/admin/icons/32x32/2.png +0 -0
- data/public/images/admin/icons/32x32/3.png +0 -0
- data/public/images/admin/icons/32x32/4.png +0 -0
- data/public/images/admin/icons/32x32/5.png +0 -0
- data/public/images/admin/icons/32x32/6.png +0 -0
- data/public/images/admin/icons/32x32/7.png +0 -0
- data/public/images/admin/icons/32x32/8.png +0 -0
- data/public/images/admin/icons/32x32/9.png +0 -0
- data/public/images/admin/icons/accept.png +0 -0
- data/public/images/admin/icons/add.gif +0 -0
- data/public/images/admin/icons/add.png +0 -0
- data/public/images/admin/icons/arrow-down.gif +0 -0
- data/public/images/admin/icons/cross.png +0 -0
- data/public/images/admin/icons/delete.gif +0 -0
- data/public/images/admin/icons/delete.png +0 -0
- data/public/images/admin/icons/drag.gif +0 -0
- data/public/images/admin/icons/edit.gif +0 -0
- data/public/images/admin/icons/edit.png +0 -0
- data/public/images/admin/icons/email.png +0 -0
- data/public/images/admin/icons/error.png +0 -0
- data/public/images/admin/icons/exclamation.png +0 -0
- data/public/images/admin/icons/feed.png +0 -0
- data/public/images/admin/icons/pdf.png +0 -0
- data/public/images/admin/icons/reorder.gif +0 -0
- data/public/images/admin/icons/search.gif +0 -0
- data/public/images/admin/icons/send-email.png +0 -0
- data/public/images/admin/icons/stop.png +0 -0
- data/public/images/admin/icons/tick.png +0 -0
- data/public/images/admin/icons/up.gif +0 -0
- data/public/images/admin/icons/xls.png +0 -0
- data/public/images/admin/tabs/off-left.png +0 -0
- data/public/images/admin/tabs/off-right.png +0 -0
- data/public/images/admin/tabs/on-left.png +0 -0
- data/public/images/admin/tabs/on-right.png +0 -0
- data/public/images/bg-button-hover.png +0 -0
- data/public/images/bg-button-pressed.png +0 -0
- data/public/images/bg-button.gif +0 -0
- data/public/images/bg-button.png +0 -0
- data/public/images/blue/left_01.png +0 -0
- data/public/images/blue/right_01.png +0 -0
- data/public/images/body-back.png +0 -0
- data/public/images/bottom_shine.png +0 -0
- data/public/images/button-dark-hover.png +0 -0
- data/public/images/button-dark.png +0 -0
- data/public/images/buttons/bg-button-hover.png +0 -0
- data/public/images/buttons/bg-button-pressed.png +0 -0
- data/public/images/buttons/bg-button.gif +0 -0
- data/public/images/buttons/bg-button.png +0 -0
- data/public/images/buttons/blue/left_01.png +0 -0
- data/public/images/buttons/blue/right_01.png +0 -0
- data/public/images/buttons/button-dark-hover.png +0 -0
- data/public/images/buttons/button-dark.png +0 -0
- data/public/images/buttons/drag-handle-green.png +0 -0
- data/public/images/buttons/green/left_01.png +0 -0
- data/public/images/buttons/green/right_01.png +0 -0
- data/public/images/buttons/left_01.png +0 -0
- data/public/images/buttons/left_01_small.png +0 -0
- data/public/images/buttons/orange/left_03.png +0 -0
- data/public/images/buttons/orange/right_03.png +0 -0
- data/public/images/buttons/right_01.png +0 -0
- data/public/images/buttons/right_01_small.png +0 -0
- data/public/images/buttons/sxsw-ribbon-v1.png +0 -0
- data/public/images/buttons/top-shine.png +0 -0
- data/public/images/cart-empty.png +0 -0
- data/public/images/cart-empty_x32.png +0 -0
- data/public/images/cart-full.png +0 -0
- data/public/images/cart-full_x32.png +0 -0
- data/public/images/checkout.png +0 -0
- data/public/images/drag-handle-green.png +0 -0
- data/public/images/green/left_01.png +0 -0
- data/public/images/green/right_01.png +0 -0
- data/public/images/grid.png +0 -0
- data/public/images/left_01.png +0 -0
- data/public/images/left_01_small.png +0 -0
- data/public/images/menu-current.png +0 -0
- data/public/images/menu-hover.png +0 -0
- data/public/images/orange/left_03.png +0 -0
- data/public/images/orange/right_03.png +0 -0
- data/public/images/right_01.png +0 -0
- data/public/images/right_01_small.png +0 -0
- data/public/images/separator.png +0 -0
- data/public/images/shadow-top.png +0 -0
- data/public/images/shadow_top.png +0 -0
- data/public/images/steps/1.png +0 -0
- data/public/images/steps/1_small.png +0 -0
- data/public/images/steps/2.png +0 -0
- data/public/images/steps/2_small.png +0 -0
- data/public/images/steps/3.png +0 -0
- data/public/images/steps/3_small.png +0 -0
- data/public/images/steps/4.png +0 -0
- data/public/images/steps/4_small.png +0 -0
- data/public/images/steps/5.png +0 -0
- data/public/images/steps/5_small.png +0 -0
- data/public/images/steps/6.png +0 -0
- data/public/images/steps/6_small.png +0 -0
- data/public/images/sxsw-ribbon-v1.png +0 -0
- data/public/images/top-shine.png +0 -0
- data/public/images/tree-nav-icons/treeview-loading.gif +0 -0
- data/public/images/tree-nav-icons/treeview-sprite.gif +0 -0
- data/public/images/update.png +0 -0
- data/public/images/wrapper-back-2.png +0 -0
- data/public/images/wrapper-back.png +0 -0
- data/public/images/yui-menubaritem_submenuindicator.png +0 -0
- data/public/images/yui-menubaritem_submenuindicator_disabled.png +0 -0
- data/public/images/yui-menuitem_checkbox.png +0 -0
- data/public/images/yui-menuitem_checkbox_disabled.png +0 -0
- data/public/images/yui-menuitem_submenuindicator.png +0 -0
- data/public/images/yui-menuitem_submenuindicator_disabled.png +0 -0
- data/public/images/yui-sprite.png +0 -0
- data/public/javascripts/checkout.js +191 -55
- data/public/javascripts/nested-attribute.js +25 -0
- data/public/javascripts/spree-yui.js +1 -1
- data/public/javascripts/yui-includes.js +57 -0
- data/public/javascripts/zone.js +48 -0
- data/public/stylesheets/admin/admin-forms.css +159 -0
- data/public/stylesheets/admin/admin-reset.css +67 -0
- data/public/stylesheets/admin/admin-tables.css +31 -0
- data/public/stylesheets/admin/admin-typography.css +117 -0
- data/public/stylesheets/admin/admin.css +426 -0
- data/public/stylesheets/admin/david-admin.css +210 -0
- data/public/stylesheets/admin/grids.css +314 -0
- data/public/stylesheets/admin/reset-fonts-grids-2-6-0.css +7 -0
- data/public/stylesheets/admin/yui-includes.css +14 -0
- data/public/stylesheets/compiled/ie.css +25 -0
- data/public/stylesheets/compiled/print.css +62 -0
- data/public/stylesheets/compiled/screen.css +1615 -0
- data/public/stylesheets/sass/ie.sass +3 -0
- data/public/stylesheets/sass/print.sass +3 -0
- data/public/stylesheets/sass/screen.sass +565 -0
- data/{vendor/extensions/shipping/spec/controllers → spec/controllers/admin}/shipments_controller_spec.rb +3 -3
- data/{vendor/extensions/shipping/spec → spec}/controllers/admin/shipping_categories_controller_spec.rb +0 -0
- data/{vendor/extensions/shipping/spec → spec}/controllers/admin/shipping_methods_controller_spec.rb +0 -0
- data/spec/controllers/countries_controller_spec.rb +3 -3
- data/spec/controllers/orders_controller_spec.rb +11 -9
- data/spec/controllers/states_controller_spec.rb +3 -3
- data/spec/helpers/spree/base_helper_spec.rb +5 -5
- data/spec/lib/easy_role_requirement_system_spec.rb +2 -2
- data/spec/models/address_spec.rb +3 -3
- data/spec/models/order_spec.rb +43 -1
- data/spec/models/product_property_spec.rb +0 -7
- data/spec/models/product_spec.rb +1 -1
- data/{vendor/extensions/shipping/spec → spec}/models/shipment_spec.rb +0 -0
- data/{vendor/extensions/shipping/spec → spec}/models/shipping_category_spec.rb +0 -0
- data/{vendor/extensions/shipping/spec → spec}/models/shipping_method_spec.rb +0 -0
- data/{vendor/extensions/shipping/spec → spec}/models/shipping_order_spec.rb +13 -6
- data/spec/models/tax_category_spec.rb +1 -1
- data/spec/models/zone_spec.rb +46 -42
- data/vendor/extensions/localization/app/views/shared/_language_bar.html.erb +8 -10
- data/vendor/extensions/localization/localization_extension.rb +2 -2
- data/vendor/extensions/payment_gateway/app/views/admin/gateway_configurations/_form.html.erb +5 -4
- data/vendor/extensions/payment_gateway/app/views/admin/gateway_configurations/edit.html.erb +4 -2
- data/vendor/extensions/payment_gateway/app/views/admin/gateway_option_values/_options.html.erb +4 -4
- data/vendor/extensions/payment_gateway/lib/spree/payment_gateway.rb +2 -2
- data/vendor/extensions/tax_calculator/app/controllers/admin/tax_settings_controller.rb +13 -0
- data/vendor/extensions/tax_calculator/app/views/admin/tax_rates/index.html.erb +27 -25
- data/vendor/extensions/tax_calculator/app/views/admin/tax_settings/edit.html.erb +17 -0
- data/vendor/extensions/tax_calculator/app/views/admin/tax_settings/show.html.erb +14 -0
- data/vendor/extensions/tax_calculator/config/locales/en-US.yml +2 -0
- data/vendor/extensions/tax_calculator/config/routes.rb +1 -0
- data/vendor/extensions/tax_calculator/lib/spree/vat_calculator.rb +3 -8
- data/vendor/extensions/tax_calculator/tax_calculator_extension.rb +1 -0
- data/vendor/gems/haml-2.1.0/FAQ +138 -0
- data/vendor/gems/haml-2.1.0/MIT-LICENSE +20 -0
- data/vendor/gems/haml-2.1.0/README.rdoc +332 -0
- data/vendor/gems/haml-2.1.0/REVISION +1 -0
- data/vendor/gems/haml-2.1.0/Rakefile +185 -0
- data/vendor/gems/haml-2.1.0/VERSION +1 -0
- data/vendor/gems/haml-2.1.0/bin/css2sass +7 -0
- data/vendor/gems/haml-2.1.0/bin/haml +9 -0
- data/vendor/gems/haml-2.1.0/bin/html2haml +7 -0
- data/vendor/gems/haml-2.1.0/bin/sass +8 -0
- data/vendor/gems/haml-2.1.0/extra/haml-mode.el +434 -0
- data/vendor/gems/haml-2.1.0/extra/sass-mode.el +98 -0
- data/vendor/gems/haml-2.1.0/init.rb +8 -0
- data/vendor/gems/haml-2.1.0/lib/haml.rb +1042 -0
- data/vendor/gems/haml-2.1.0/lib/haml/buffer.rb +255 -0
- data/vendor/gems/haml-2.1.0/lib/haml/engine.rb +268 -0
- data/vendor/gems/haml-2.1.0/lib/haml/error.rb +22 -0
- data/vendor/gems/haml-2.1.0/lib/haml/exec.rb +395 -0
- data/vendor/gems/haml-2.1.0/lib/haml/filters.rb +276 -0
- data/vendor/gems/haml-2.1.0/lib/haml/helpers.rb +468 -0
- data/vendor/gems/haml-2.1.0/lib/haml/helpers/action_view_extensions.rb +45 -0
- data/vendor/gems/haml-2.1.0/lib/haml/helpers/action_view_mods.rb +181 -0
- data/vendor/gems/haml-2.1.0/lib/haml/html.rb +218 -0
- data/vendor/gems/haml-2.1.0/lib/haml/precompiler.rb +889 -0
- data/vendor/gems/haml-2.1.0/lib/haml/shared.rb +45 -0
- data/vendor/gems/haml-2.1.0/lib/haml/template.rb +51 -0
- data/vendor/gems/haml-2.1.0/lib/haml/template/patch.rb +58 -0
- data/vendor/gems/haml-2.1.0/lib/haml/template/plugin.rb +72 -0
- data/vendor/gems/haml-2.1.0/lib/haml/util.rb +77 -0
- data/vendor/gems/haml-2.1.0/lib/haml/version.rb +47 -0
- data/vendor/gems/haml-2.1.0/lib/sass.rb +1062 -0
- data/vendor/gems/haml-2.1.0/lib/sass/css.rb +388 -0
- data/vendor/gems/haml-2.1.0/lib/sass/engine.rb +499 -0
- data/vendor/gems/haml-2.1.0/lib/sass/environment.rb +33 -0
- data/vendor/gems/haml-2.1.0/lib/sass/error.rb +35 -0
- data/vendor/gems/haml-2.1.0/lib/sass/plugin.rb +203 -0
- data/vendor/gems/haml-2.1.0/lib/sass/plugin/merb.rb +56 -0
- data/vendor/gems/haml-2.1.0/lib/sass/plugin/rails.rb +24 -0
- data/vendor/gems/haml-2.1.0/lib/sass/repl.rb +51 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script.rb +38 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/bool.rb +13 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/color.rb +97 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/funcall.rb +28 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/functions.rb +122 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/lexer.rb +152 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/literal.rb +60 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/number.rb +231 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/operation.rb +30 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/parser.rb +142 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/string.rb +42 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/unary_operation.rb +21 -0
- data/vendor/gems/haml-2.1.0/lib/sass/script/variable.rb +20 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/attr_node.rb +64 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/comment_node.rb +34 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/debug_node.rb +22 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/directive_node.rb +50 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/file_node.rb +27 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/for_node.rb +29 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/if_node.rb +27 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/mixin_def_node.rb +18 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/mixin_node.rb +34 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/node.rb +99 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/rule_node.rb +120 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/variable_node.rb +24 -0
- data/vendor/gems/haml-2.1.0/lib/sass/tree/while_node.rb +20 -0
- data/vendor/gems/haml-2.1.0/rails/init.rb +1 -0
- data/vendor/gems/haml-2.1.0/test/benchmark.rb +99 -0
- data/vendor/gems/haml-2.1.0/test/haml/engine_test.rb +734 -0
- data/vendor/gems/haml-2.1.0/test/haml/helper_test.rb +224 -0
- data/vendor/gems/haml-2.1.0/test/haml/html2haml_test.rb +92 -0
- data/vendor/gems/haml-2.1.0/test/haml/markaby/standard.mab +52 -0
- data/vendor/gems/haml-2.1.0/test/haml/mocks/article.rb +6 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/content_for_layout.xhtml +15 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/eval_suppressed.xhtml +9 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/filters.xhtml +62 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/helpers.xhtml +93 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/helpful.xhtml +10 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/just_stuff.xhtml +68 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/list.xhtml +12 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/nuke_inner_whitespace.xhtml +40 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/nuke_outer_whitespace.xhtml +148 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/original_engine.xhtml +20 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/partial_layout.xhtml +5 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/partials.xhtml +21 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/render_layout.xhtml +3 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/silent_script.xhtml +74 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/standard.xhtml +42 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/tag_parsing.xhtml +23 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/very_basic.xhtml +5 -0
- data/vendor/gems/haml-2.1.0/test/haml/results/whitespace_handling.xhtml +89 -0
- data/vendor/gems/haml-2.1.0/test/haml/rhtml/_av_partial_1.rhtml +12 -0
- data/vendor/gems/haml-2.1.0/test/haml/rhtml/_av_partial_2.rhtml +8 -0
- data/vendor/gems/haml-2.1.0/test/haml/rhtml/action_view.rhtml +62 -0
- data/vendor/gems/haml-2.1.0/test/haml/rhtml/standard.rhtml +54 -0
- data/vendor/gems/haml-2.1.0/test/haml/template_test.rb +204 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_av_partial_1.haml +9 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_av_partial_1_ugly.haml +9 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_av_partial_2.haml +5 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_av_partial_2_ugly.haml +5 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_layout.erb +3 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_layout_for_partial.haml +3 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_partial.haml +8 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/_text_area.haml +3 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/action_view.haml +47 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/action_view_ugly.haml +47 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/breakage.haml +8 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/content_for_layout.haml +10 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/eval_suppressed.haml +11 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/filters.haml +66 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/helpers.haml +95 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/helpful.haml +11 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/just_stuff.haml +83 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/list.haml +12 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/nuke_inner_whitespace.haml +32 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/nuke_outer_whitespace.haml +144 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/original_engine.haml +17 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/partial_layout.haml +3 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/partialize.haml +1 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/partials.haml +12 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/render_layout.haml +2 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/silent_script.haml +40 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/standard.haml +42 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/standard_ugly.haml +42 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/tag_parsing.haml +21 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/very_basic.haml +4 -0
- data/vendor/gems/haml-2.1.0/test/haml/templates/whitespace_handling.haml +87 -0
- data/vendor/gems/haml-2.1.0/test/linked_rails.rb +12 -0
- data/vendor/gems/haml-2.1.0/test/sass/css2sass_test.rb +193 -0
- data/vendor/gems/haml-2.1.0/test/sass/engine_test.rb +769 -0
- data/vendor/gems/haml-2.1.0/test/sass/functions_test.rb +96 -0
- data/vendor/gems/haml-2.1.0/test/sass/more_results/more1.css +9 -0
- data/vendor/gems/haml-2.1.0/test/sass/more_results/more1_with_line_comments.css +26 -0
- data/vendor/gems/haml-2.1.0/test/sass/more_results/more_import.css +29 -0
- data/vendor/gems/haml-2.1.0/test/sass/more_templates/_more_partial.sass +2 -0
- data/vendor/gems/haml-2.1.0/test/sass/more_templates/more1.sass +23 -0
- data/vendor/gems/haml-2.1.0/test/sass/more_templates/more_import.sass +11 -0
- data/vendor/gems/haml-2.1.0/test/sass/plugin_test.rb +208 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/alt.css +4 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/basic.css +9 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/compact.css +5 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/complex.css +87 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/compressed.css +1 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/expanded.css +19 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/import.css +29 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/line_numbers.css +49 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/mixins.css +95 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/multiline.css +24 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/nested.css +22 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/parent_ref.css +13 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/script.css +16 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/subdir/nested_subdir/nested_subdir.css +1 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/subdir/subdir.css +3 -0
- data/vendor/gems/haml-2.1.0/test/sass/results/units.css +11 -0
- data/vendor/gems/haml-2.1.0/test/sass/script_test.rb +153 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/_partial.sass +2 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/alt.sass +16 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/basic.sass +23 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/bork.sass +2 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/bork2.sass +2 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/compact.sass +17 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/complex.sass +309 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/compressed.sass +15 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/expanded.sass +17 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/import.sass +11 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/importee.sass +19 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/line_numbers.sass +13 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/mixins.sass +76 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/multiline.sass +20 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/nested.sass +25 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/parent_ref.sass +25 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/script.sass +101 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/subdir/nested_subdir/_nested_partial.sass +2 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/subdir/nested_subdir/nested_subdir.sass +3 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/subdir/subdir.sass +6 -0
- data/vendor/gems/haml-2.1.0/test/sass/templates/units.sass +11 -0
- data/vendor/gems/haml-2.1.0/test/test_helper.rb +21 -0
- data/vendor/plugins/enumerable_constants/lib/enumerable_constants.rb +1 -1
- data/vendor/plugins/find_by_param/README.markdown +1 -1
- metadata +544 -427
- data/app/controllers/account_controller.rb +0 -31
- data/app/controllers/checkout_controller.rb +0 -96
- data/app/helpers/payments_helper.rb +0 -2
- data/app/helpers/store_helper.rb +0 -3
- data/app/helpers/tax_categories_helper.rb +0 -2
- data/app/helpers/users_helper.rb +0 -2
- data/app/presenters/checkout_presenter.rb +0 -58
- data/app/presenters/payment_presenter.rb +0 -3
- data/app/views/admin/zones/_country.html.erb +0 -15
- data/app/views/admin/zones/_function.rjs +0 -11
- data/app/views/admin/zones/_state.html.erb +0 -15
- data/app/views/admin/zones/_zone.html.erb +0 -15
- data/app/views/admin/zones/index.js.erb +0 -1
- data/app/views/admin/zones/show.html.erb +0 -4
- data/app/views/checkout/_billing.html.erb +0 -49
- data/app/views/checkout/_form.html.erb +0 -33
- data/app/views/checkout/_payment.erb +0 -24
- data/app/views/checkout/_shipping.html.erb +0 -50
- data/app/views/checkout/_shipping_method.html.erb +0 -5
- data/app/views/checkout/new.html.erb +0 -6
- data/app/views/shared/_address.html.erb +0 -35
- data/app/views/shared/_form_address.html.erb +0 -46
- data/app/views/shared/_states.html.erb +0 -14
- data/app/views/users/index.html.erb +0 -21
- data/lib/authenticated_system.rb +0 -124
- data/lib/authenticated_test_helper.rb +0 -10
- data/public/stylesheets/checkout.css +0 -25
- data/public/stylesheets/fullscreen.css +0 -63
- data/public/stylesheets/orders/_controller.css +0 -82
- data/public/stylesheets/prototypes/_controller.css +0 -9
- data/public/stylesheets/spree-admin.css +0 -563
- data/public/stylesheets/spree.css +0 -420
- data/spec/helpers/tax_categories_helper_spec.rb +0 -11
- data/spec/views/admin/mail_settings/edit.html.erb_spec.rb +0 -14
- data/spec/views/admin/mail_settings/show.html.erb_spec.rb +0 -12
- data/spec/views/admin/products/edit.html.erb_spec.rb +0 -88
- data/spec/views/admin/variants/eidt.html.erb_spec.rb +0 -90
- data/vendor/extensions/shipping/README.markdown +0 -3
- data/vendor/extensions/shipping/Rakefile +0 -120
- data/vendor/extensions/shipping/app/controllers/admin/shipments_controller.rb +0 -68
- data/vendor/extensions/shipping/app/models/shipment_presenter.rb +0 -3
- data/vendor/extensions/shipping/app/views/admin/shipments/_form.html.erb +0 -35
- data/vendor/extensions/shipping/app/views/admin/shipments/edit.html.erb +0 -11
- data/vendor/extensions/shipping/app/views/admin/shipments/new.html.erb +0 -12
- data/vendor/extensions/shipping/app/views/admin/shipping_categories/index.html.erb +0 -24
- data/vendor/extensions/shipping/app/views/admin/shipping_methods/index.html.erb +0 -28
- data/vendor/extensions/shipping/config/locales/de.yml +0 -25
- data/vendor/extensions/shipping/config/locales/en-GB.yml +0 -25
- data/vendor/extensions/shipping/config/locales/en-US.yml +0 -25
- data/vendor/extensions/shipping/config/locales/es.yml +0 -25
- data/vendor/extensions/shipping/config/locales/it.yml +0 -25
- data/vendor/extensions/shipping/config/locales/nb-NO.yml +0 -25
- data/vendor/extensions/shipping/config/locales/pl.yml +0 -25
- data/vendor/extensions/shipping/config/locales/pt-BR.yml +0 -25
- data/vendor/extensions/shipping/config/locales/ru-RU.yml +0 -25
- data/vendor/extensions/shipping/config/routes.rb +0 -10
- data/vendor/extensions/shipping/db/sample/addresses.yml +0 -14
- data/vendor/extensions/shipping/db/sample/zone_members.yml +0 -16
- data/vendor/extensions/shipping/lib/spree/shipping_calculator.rb +0 -28
- data/vendor/extensions/shipping/lib/tasks/shipping_extension_tasks.rake +0 -29
- data/vendor/extensions/shipping/shipping_extension.rb +0 -40
- data/vendor/extensions/shipping/spec/spec.opts +0 -6
- data/vendor/extensions/shipping/spec/spec_helper.rb +0 -37
- data/vendor/extensions/tax_calculator/spec/controllers/admin/tax_rates_controller_spec.rb +0 -22
- data/vendor/extensions/tax_calculator/spec/models/order_tax_calc_spec.rb +0 -22
- data/vendor/gems/active_presenter-0.0.6/.specification +0 -64
- data/vendor/gems/active_presenter-0.0.6/LICENSE +0 -22
- data/vendor/gems/active_presenter-0.0.6/README +0 -82
- data/vendor/gems/active_presenter-0.0.6/Rakefile +0 -10
- data/vendor/gems/active_presenter-0.0.6/lib/active_presenter.rb +0 -7
- data/vendor/gems/active_presenter-0.0.6/lib/active_presenter/base.rb +0 -204
- data/vendor/gems/active_presenter-0.0.6/lib/active_presenter/version.rb +0 -9
- data/vendor/gems/active_presenter-0.0.6/lib/tasks/doc.rake +0 -19
- data/vendor/gems/active_presenter-0.0.6/lib/tasks/gem.rake +0 -62
- data/vendor/gems/active_presenter-0.0.6/test/base_test.rb +0 -188
- data/vendor/gems/active_presenter-0.0.6/test/test_helper.rb +0 -74
- data/vendor/plugins/calendar_date_select/History.txt +0 -231
- data/vendor/plugins/calendar_date_select/Manifest.txt +0 -42
- data/vendor/plugins/calendar_date_select/Rakefile +0 -31
- data/vendor/plugins/calendar_date_select/Readme.txt +0 -16
- data/vendor/plugins/calendar_date_select/calendar_date_select.gemspec +0 -33
- data/vendor/plugins/calendar_date_select/init.rb +0 -1
- data/vendor/plugins/calendar_date_select/js_test/functional/cds_test.html +0 -334
- data/vendor/plugins/calendar_date_select/js_test/prototype.js +0 -4184
- data/vendor/plugins/calendar_date_select/js_test/test.css +0 -40
- data/vendor/plugins/calendar_date_select/js_test/unit/cds_helper_methods.html +0 -46
- data/vendor/plugins/calendar_date_select/js_test/unittest.js +0 -564
- data/vendor/plugins/calendar_date_select/lib/calendar_date_select.rb +0 -33
- data/vendor/plugins/calendar_date_select/lib/calendar_date_select/calendar_date_select.rb +0 -116
- data/vendor/plugins/calendar_date_select/lib/calendar_date_select/form_helpers.rb +0 -223
- data/vendor/plugins/calendar_date_select/lib/calendar_date_select/includes_helper.rb +0 -29
- data/vendor/plugins/calendar_date_select/public/blank_iframe.html +0 -2
- data/vendor/plugins/calendar_date_select/public/images/calendar_date_select/calendar.gif +0 -0
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/calendar_date_select.js +0 -443
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_american.js +0 -34
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_db.js +0 -27
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_euro_24hr.js +0 -7
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_euro_24hr_ymd.js +0 -7
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_finnish.js +0 -32
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_hyphen_ampm.js +0 -36
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_iso_date.js +0 -46
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/format_italian.js +0 -24
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/de.js +0 -11
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/fi.js +0 -10
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/fr.js +0 -10
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/pl.js +0 -10
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/pt.js +0 -11
- data/vendor/plugins/calendar_date_select/public/javascripts/calendar_date_select/locale/ru.js +0 -10
- data/vendor/plugins/calendar_date_select/public/stylesheets/calendar_date_select/blue.css +0 -130
- data/vendor/plugins/calendar_date_select/public/stylesheets/calendar_date_select/default.css +0 -135
- data/vendor/plugins/calendar_date_select/public/stylesheets/calendar_date_select/plain.css +0 -128
- data/vendor/plugins/calendar_date_select/public/stylesheets/calendar_date_select/red.css +0 -135
- data/vendor/plugins/calendar_date_select/public/stylesheets/calendar_date_select/silver.css +0 -133
- data/vendor/plugins/calendar_date_select/spec/calendar_date_select/calendar_date_select_spec.rb +0 -14
- data/vendor/plugins/calendar_date_select/spec/calendar_date_select/form_helpers_spec.rb +0 -161
- data/vendor/plugins/calendar_date_select/spec/spec_helper.rb +0 -26
- data/vendor/plugins/has_many_polymorphs/CHANGELOG +0 -83
- data/vendor/plugins/has_many_polymorphs/LICENSE +0 -184
- data/vendor/plugins/has_many_polymorphs/Manifest +0 -174
- data/vendor/plugins/has_many_polymorphs/README +0 -205
- data/vendor/plugins/has_many_polymorphs/Rakefile +0 -28
- data/vendor/plugins/has_many_polymorphs/TODO +0 -2
- data/vendor/plugins/has_many_polymorphs/examples/hmph.rb +0 -69
- data/vendor/plugins/has_many_polymorphs/generators/tagging/tagging_generator.rb +0 -97
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/migration.rb +0 -28
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tag.rb +0 -39
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tag_test.rb +0 -15
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging.rb +0 -16
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging_extensions.rb +0 -159
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging_test.rb +0 -85
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/taggings.yml +0 -23
- data/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tags.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/init.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs.rb +0 -27
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/association.rb +0 -159
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/autoload.rb +0 -70
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/base.rb +0 -60
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/class_methods.rb +0 -600
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/configuration.rb +0 -19
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/debugging_tools.rb +0 -103
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/rake_task_redefine_task.rb +0 -35
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/reflection.rb +0 -58
- data/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/support_methods.rb +0 -84
- data/vendor/plugins/has_many_polymorphs/test/fixtures/bow_wows.yml +0 -10
- data/vendor/plugins/has_many_polymorphs/test/fixtures/cats.yml +0 -18
- data/vendor/plugins/has_many_polymorphs/test/fixtures/fish.yml +0 -12
- data/vendor/plugins/has_many_polymorphs/test/fixtures/frogs.yml +0 -5
- data/vendor/plugins/has_many_polymorphs/test/fixtures/keep_your_enemies_close.yml +0 -0
- data/vendor/plugins/has_many_polymorphs/test/fixtures/little_whale_pupils.yml +0 -0
- data/vendor/plugins/has_many_polymorphs/test/fixtures/people.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/test/fixtures/petfoods.yml +0 -11
- data/vendor/plugins/has_many_polymorphs/test/fixtures/whales.yml +0 -5
- data/vendor/plugins/has_many_polymorphs/test/fixtures/wild_boars.yml +0 -10
- data/vendor/plugins/has_many_polymorphs/test/generator/tagging_generator_test.rb +0 -42
- data/vendor/plugins/has_many_polymorphs/test/integration/app/README +0 -182
- data/vendor/plugins/has_many_polymorphs/test/integration/app/Rakefile +0 -19
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/controllers/application.rb +0 -7
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/controllers/bones_controller.rb +0 -5
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/addresses_helper.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/application_helper.rb +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/bones_helper.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/sellers_helper.rb +0 -28
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/states_helper.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/helpers/users_helper.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/bone.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/double_sti_parent.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/double_sti_parent_relationship.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/organic_substance.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/single_sti_parent.rb +0 -4
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/single_sti_parent_relationship.rb +0 -4
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/stick.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/models/stone.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/addresses/edit.html.erb +0 -12
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/addresses/index.html.erb +0 -18
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/addresses/new.html.erb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/addresses/show.html.erb +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/bones/index.rhtml +0 -5
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/layouts/addresses.html.erb +0 -17
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/layouts/sellers.html.erb +0 -17
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/layouts/states.html.erb +0 -17
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/layouts/users.html.erb +0 -17
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/sellers/edit.html.erb +0 -12
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/sellers/index.html.erb +0 -20
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/sellers/new.html.erb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/sellers/show.html.erb +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/states/edit.html.erb +0 -12
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/states/index.html.erb +0 -19
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/states/new.html.erb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/states/show.html.erb +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/users/edit.html.erb +0 -12
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/users/index.html.erb +0 -22
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/users/new.html.erb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/app/views/users/show.html.erb +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/boot.rb +0 -110
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/database.yml +0 -17
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/environment.rb +0 -19
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/environment.rb.canonical +0 -19
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/environments/development.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/environments/production.rb +0 -18
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/environments/test.rb +0 -19
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/routes.rb +0 -33
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/ultrasphinx/default.base +0 -56
- data/vendor/plugins/has_many_polymorphs/test/integration/app/config/ultrasphinx/development.conf.canonical +0 -155
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/001_create_sticks.rb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/002_create_stones.rb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/003_create_organic_substances.rb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/004_create_bones.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/005_create_single_sti_parents.rb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/006_create_double_sti_parents.rb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/007_create_single_sti_parent_relationships.rb +0 -13
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/008_create_double_sti_parent_relationships.rb +0 -14
- data/vendor/plugins/has_many_polymorphs/test/integration/app/db/migrate/009_create_library_model.rb +0 -11
- data/vendor/plugins/has_many_polymorphs/test/integration/app/doc/README_FOR_APP +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/generators/commenting_generator_test.rb +0 -83
- data/vendor/plugins/has_many_polymorphs/test/integration/app/lib/library_model.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/404.html +0 -30
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/500.html +0 -30
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.cgi +0 -10
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.fcgi +0 -24
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.rb +0 -10
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/favicon.ico +0 -0
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/images/rails.png +0 -0
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/index.html +0 -277
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/application.js +0 -2
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/controls.js +0 -833
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/dragdrop.js +0 -942
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/effects.js +0 -1088
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/javascripts/prototype.js +0 -2515
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/robots.txt +0 -1
- data/vendor/plugins/has_many_polymorphs/test/integration/app/public/stylesheets/scaffold.css +0 -74
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/about +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/breakpointer +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/console +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/destroy +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/generate +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/performance/benchmarker +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/performance/profiler +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/plugin +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/process/inspector +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/process/reaper +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/process/spawner +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/runner +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/script/server +0 -3
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/double_sti_parent_relationships.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/double_sti_parents.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/organic_substances.yml +0 -5
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/single_sti_parent_relationships.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/single_sti_parents.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/sticks.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/fixtures/stones.yml +0 -7
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/addresses_controller_test.rb +0 -57
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/bones_controller_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/sellers_controller_test.rb +0 -57
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/states_controller_test.rb +0 -57
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/users_controller_test.rb +0 -57
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/test_helper.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/bone_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/double_sti_parent_relationship_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/double_sti_parent_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/organic_substance_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_relationship_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stick_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stone_test.rb +0 -8
- data/vendor/plugins/has_many_polymorphs/test/integration/server_test.rb +0 -43
- data/vendor/plugins/has_many_polymorphs/test/models/aquatic/fish.rb +0 -5
- data/vendor/plugins/has_many_polymorphs/test/models/aquatic/pupils_whale.rb +0 -7
- data/vendor/plugins/has_many_polymorphs/test/models/aquatic/whale.rb +0 -15
- data/vendor/plugins/has_many_polymorphs/test/models/beautiful_fight_relationship.rb +0 -26
- data/vendor/plugins/has_many_polymorphs/test/models/canine.rb +0 -9
- data/vendor/plugins/has_many_polymorphs/test/models/cat.rb +0 -5
- data/vendor/plugins/has_many_polymorphs/test/models/dog.rb +0 -18
- data/vendor/plugins/has_many_polymorphs/test/models/eaters_foodstuff.rb +0 -10
- data/vendor/plugins/has_many_polymorphs/test/models/frog.rb +0 -4
- data/vendor/plugins/has_many_polymorphs/test/models/kitten.rb +0 -3
- data/vendor/plugins/has_many_polymorphs/test/models/parentship.rb +0 -4
- data/vendor/plugins/has_many_polymorphs/test/models/person.rb +0 -9
- data/vendor/plugins/has_many_polymorphs/test/models/petfood.rb +0 -39
- data/vendor/plugins/has_many_polymorphs/test/models/tabby.rb +0 -2
- data/vendor/plugins/has_many_polymorphs/test/models/wild_boar.rb +0 -3
- data/vendor/plugins/has_many_polymorphs/test/modules/extension_module.rb +0 -9
- data/vendor/plugins/has_many_polymorphs/test/modules/other_extension_module.rb +0 -9
- data/vendor/plugins/has_many_polymorphs/test/patches/symlinked_plugins_1.2.6.diff +0 -46
- data/vendor/plugins/has_many_polymorphs/test/schema.rb +0 -87
- data/vendor/plugins/has_many_polymorphs/test/setup.rb +0 -14
- data/vendor/plugins/has_many_polymorphs/test/test_helper.rb +0 -51
- data/vendor/plugins/has_many_polymorphs/test/unit/has_many_polymorphs_test.rb +0 -714
@@ -0,0 +1,20 @@
|
|
1
|
+
module Sass
|
2
|
+
module Script
|
3
|
+
class Variable # :nodoc:
|
4
|
+
attr_reader :name
|
5
|
+
|
6
|
+
def initialize(name)
|
7
|
+
@name = name
|
8
|
+
end
|
9
|
+
|
10
|
+
def inspect
|
11
|
+
"!#{name}"
|
12
|
+
end
|
13
|
+
|
14
|
+
def perform(environment)
|
15
|
+
(val = environment.var(name)) && (return val)
|
16
|
+
raise SyntaxError.new("Undefined variable: \"!#{name}\".")
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
@@ -0,0 +1,64 @@
|
|
1
|
+
module Sass::Tree
|
2
|
+
class AttrNode < Node
|
3
|
+
attr_accessor :name, :value
|
4
|
+
|
5
|
+
def initialize(name, value, options)
|
6
|
+
@name = name
|
7
|
+
@value = value
|
8
|
+
super(options)
|
9
|
+
end
|
10
|
+
|
11
|
+
def ==(other)
|
12
|
+
self.class == other.class && name == other.name && value == other.value && super
|
13
|
+
end
|
14
|
+
|
15
|
+
def to_s(tabs, parent_name = nil)
|
16
|
+
if value[-1] == ?;
|
17
|
+
raise Sass::SyntaxError.new("Invalid attribute: #{declaration.dump} (This isn't CSS!).", @line)
|
18
|
+
end
|
19
|
+
real_name = name
|
20
|
+
real_name = "#{parent_name}-#{real_name}" if parent_name
|
21
|
+
|
22
|
+
if value.empty? && children.empty?
|
23
|
+
raise Sass::SyntaxError.new("Invalid attribute: #{declaration.dump}.", @line)
|
24
|
+
end
|
25
|
+
|
26
|
+
join_string = case @style
|
27
|
+
when :compact; ' '
|
28
|
+
when :compressed; ''
|
29
|
+
else "\n"
|
30
|
+
end
|
31
|
+
spaces = ' ' * (tabs - 1)
|
32
|
+
to_return = ''
|
33
|
+
if !value.empty?
|
34
|
+
to_return << "#{spaces}#{real_name}:#{@style == :compressed ? '' : ' '}#{value};#{join_string}"
|
35
|
+
end
|
36
|
+
|
37
|
+
children.each do |kid|
|
38
|
+
to_return << kid.to_s(tabs, real_name) << join_string
|
39
|
+
end
|
40
|
+
|
41
|
+
(@style == :compressed && parent_name) ? to_return : to_return[0...-1]
|
42
|
+
end
|
43
|
+
|
44
|
+
protected
|
45
|
+
|
46
|
+
def perform!(environment)
|
47
|
+
@name = interpolate(@name, environment)
|
48
|
+
@value = @value.is_a?(String) ? interpolate(@value, environment) : @value.perform(environment).to_s
|
49
|
+
super
|
50
|
+
end
|
51
|
+
|
52
|
+
private
|
53
|
+
|
54
|
+
def declaration
|
55
|
+
":#{name} #{value}"
|
56
|
+
end
|
57
|
+
|
58
|
+
def invalid_child?(child)
|
59
|
+
if !child.is_a?(AttrNode) && !child.is_a?(CommentNode)
|
60
|
+
"Illegal nesting: Only attributes may be nested beneath attributes."
|
61
|
+
end
|
62
|
+
end
|
63
|
+
end
|
64
|
+
end
|
@@ -0,0 +1,34 @@
|
|
1
|
+
require 'sass/tree/node'
|
2
|
+
|
3
|
+
module Sass::Tree
|
4
|
+
class CommentNode < Node
|
5
|
+
attr_accessor :value
|
6
|
+
|
7
|
+
def initialize(value, options)
|
8
|
+
@value = value[2..-1].strip
|
9
|
+
super(options)
|
10
|
+
end
|
11
|
+
|
12
|
+
def ==(other)
|
13
|
+
self.value == other.value && super
|
14
|
+
end
|
15
|
+
|
16
|
+
def silent?
|
17
|
+
!!@options[:silent]
|
18
|
+
end
|
19
|
+
|
20
|
+
def to_s(tabs = 0, parent_name = nil)
|
21
|
+
return if (@style == :compressed || silent?)
|
22
|
+
|
23
|
+
spaces = ' ' * (tabs - 1)
|
24
|
+
spaces + "/* " + ([value] + children.map {|c| c.text}).
|
25
|
+
join(@style == :compact ? ' ' : "\n#{spaces} * ") + " */"
|
26
|
+
end
|
27
|
+
|
28
|
+
protected
|
29
|
+
|
30
|
+
def _perform(environment)
|
31
|
+
self
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|
@@ -0,0 +1,22 @@
|
|
1
|
+
module Sass
|
2
|
+
module Tree
|
3
|
+
class DebugNode < Node
|
4
|
+
def initialize(expr, options)
|
5
|
+
@expr = expr
|
6
|
+
super(options)
|
7
|
+
end
|
8
|
+
|
9
|
+
protected
|
10
|
+
|
11
|
+
def _perform(environment)
|
12
|
+
res = @expr.perform(environment)
|
13
|
+
if filename
|
14
|
+
STDERR.puts "#{filename}:#{line} DEBUG: #{res}"
|
15
|
+
else
|
16
|
+
STDERR.puts "Line #{line} DEBUG: #{res}"
|
17
|
+
end
|
18
|
+
[]
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
@@ -0,0 +1,50 @@
|
|
1
|
+
module Sass::Tree
|
2
|
+
class DirectiveNode < Node
|
3
|
+
attr_accessor :value
|
4
|
+
|
5
|
+
def initialize(value, options)
|
6
|
+
@value = value
|
7
|
+
super(options)
|
8
|
+
end
|
9
|
+
|
10
|
+
def to_s(tabs)
|
11
|
+
if children.empty?
|
12
|
+
value + ";"
|
13
|
+
else
|
14
|
+
result = if @style == :compressed
|
15
|
+
"#{value}{"
|
16
|
+
else
|
17
|
+
"#{' ' * (tabs - 1)}#{value} {" + (@style == :compact ? ' ' : "\n")
|
18
|
+
end
|
19
|
+
was_attr = false
|
20
|
+
first = true
|
21
|
+
children.each do |child|
|
22
|
+
if @style == :compact
|
23
|
+
if child.is_a?(AttrNode)
|
24
|
+
result << "#{child.to_s(first || was_attr ? 1 : tabs + 1)} "
|
25
|
+
else
|
26
|
+
if was_attr
|
27
|
+
result[-1] = "\n"
|
28
|
+
end
|
29
|
+
rendered = child.to_s(tabs + 1)
|
30
|
+
rendered.lstrip! if first
|
31
|
+
result << rendered
|
32
|
+
end
|
33
|
+
was_attr = child.is_a?(AttrNode)
|
34
|
+
first = false
|
35
|
+
elsif @style == :compressed
|
36
|
+
result << (was_attr ? ";#{child.to_s(1)}" : child.to_s(1))
|
37
|
+
was_attr = child.is_a?(AttrNode)
|
38
|
+
else
|
39
|
+
result << child.to_s(tabs + 1) + "\n"
|
40
|
+
end
|
41
|
+
end
|
42
|
+
result.rstrip + if @style == :compressed
|
43
|
+
"}"
|
44
|
+
else
|
45
|
+
(@style == :expanded ? "\n" : " ") + "}\n"
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
50
|
+
end
|
@@ -0,0 +1,27 @@
|
|
1
|
+
module Sass
|
2
|
+
module Tree
|
3
|
+
class FileNode < Node
|
4
|
+
def initialize(filename, children, options)
|
5
|
+
@filename = filename
|
6
|
+
super(options)
|
7
|
+
self.children = children
|
8
|
+
end
|
9
|
+
|
10
|
+
def to_s(*args)
|
11
|
+
super()
|
12
|
+
rescue Sass::SyntaxError => e
|
13
|
+
e.add_backtrace_entry(@filename)
|
14
|
+
raise e
|
15
|
+
end
|
16
|
+
|
17
|
+
protected
|
18
|
+
|
19
|
+
def perform!(environment)
|
20
|
+
self.children = perform_children(environment)
|
21
|
+
rescue Sass::SyntaxError => e
|
22
|
+
e.add_backtrace_entry(@filename)
|
23
|
+
raise e
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
@@ -0,0 +1,29 @@
|
|
1
|
+
require 'sass/tree/node'
|
2
|
+
|
3
|
+
module Sass::Tree
|
4
|
+
class ForNode < Node
|
5
|
+
def initialize(var, from, to, exclusive, options)
|
6
|
+
@var = var
|
7
|
+
@from = from
|
8
|
+
@to = to
|
9
|
+
@exclusive = exclusive
|
10
|
+
super(options)
|
11
|
+
end
|
12
|
+
|
13
|
+
protected
|
14
|
+
|
15
|
+
def _perform(environment)
|
16
|
+
from = @from.perform(environment).to_i
|
17
|
+
to = @to.perform(environment).to_i
|
18
|
+
range = Range.new(from, to, @exclusive)
|
19
|
+
|
20
|
+
children = []
|
21
|
+
range.each do |i|
|
22
|
+
environment = Sass::Environment.new(environment)
|
23
|
+
environment.set_local_var(@var, Sass::Script::Number.new(i))
|
24
|
+
children += perform_children(environment)
|
25
|
+
end
|
26
|
+
children
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
@@ -0,0 +1,27 @@
|
|
1
|
+
require 'sass/tree/node'
|
2
|
+
|
3
|
+
module Sass::Tree
|
4
|
+
class IfNode < Node
|
5
|
+
attr_accessor :else
|
6
|
+
|
7
|
+
def initialize(expr, options)
|
8
|
+
@expr = expr
|
9
|
+
@last_else = self
|
10
|
+
super(options)
|
11
|
+
end
|
12
|
+
|
13
|
+
def add_else(node)
|
14
|
+
@last_else.else = node
|
15
|
+
@last_else = node
|
16
|
+
end
|
17
|
+
|
18
|
+
protected
|
19
|
+
|
20
|
+
def _perform(environment)
|
21
|
+
environment = Sass::Environment.new(environment)
|
22
|
+
return perform_children(environment) if @expr.nil? || @expr.perform(environment).to_bool
|
23
|
+
return @else.perform(environment) if @else
|
24
|
+
[]
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
@@ -0,0 +1,18 @@
|
|
1
|
+
module Sass
|
2
|
+
module Tree
|
3
|
+
class MixinDefNode < Node
|
4
|
+
def initialize(name, args, options)
|
5
|
+
@name = name
|
6
|
+
@args = args
|
7
|
+
super(options)
|
8
|
+
end
|
9
|
+
|
10
|
+
private
|
11
|
+
|
12
|
+
def _perform(environment)
|
13
|
+
environment.set_mixin(@name, Sass::Mixin.new(@name, @args, environment, children))
|
14
|
+
[]
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
@@ -0,0 +1,34 @@
|
|
1
|
+
require 'sass/tree/node'
|
2
|
+
|
3
|
+
module Sass::Tree
|
4
|
+
class MixinNode < Node
|
5
|
+
def initialize(name, args, options)
|
6
|
+
@name = name
|
7
|
+
@args = args
|
8
|
+
super(options)
|
9
|
+
end
|
10
|
+
|
11
|
+
protected
|
12
|
+
|
13
|
+
def _perform(environment)
|
14
|
+
raise Sass::SyntaxError.new("Undefined mixin '#{@name}'.", @line) unless mixin = environment.mixin(@name)
|
15
|
+
|
16
|
+
raise Sass::SyntaxError.new(<<END.gsub("\n", "")) if mixin.args.size < @args.size
|
17
|
+
Mixin #{@name} takes #{mixin.args.size} argument#{'s' if mixin.args.size != 1}
|
18
|
+
but #{@args.size} #{@args.size == 1 ? 'was' : 'were'} passed.
|
19
|
+
END
|
20
|
+
|
21
|
+
environment = mixin.args.zip(@args).inject(Sass::Environment.new(mixin.environment)) do |env, (arg, value)|
|
22
|
+
env.set_local_var(arg[:name],
|
23
|
+
if value
|
24
|
+
value.perform(environment)
|
25
|
+
elsif arg[:default_value]
|
26
|
+
arg[:default_value].perform(env)
|
27
|
+
end)
|
28
|
+
raise Sass::SyntaxError.new("Mixin #{@name} is missing parameter !#{arg[:name]}.") unless env.var(arg[:name])
|
29
|
+
env
|
30
|
+
end
|
31
|
+
mixin.tree.map {|c| c.perform(environment)}.flatten
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|
@@ -0,0 +1,99 @@
|
|
1
|
+
module Sass
|
2
|
+
module Tree
|
3
|
+
class Node
|
4
|
+
attr_accessor :children
|
5
|
+
attr_accessor :line
|
6
|
+
attr_accessor :filename
|
7
|
+
|
8
|
+
def initialize(options)
|
9
|
+
@options = options
|
10
|
+
@style = options[:style]
|
11
|
+
@children = []
|
12
|
+
end
|
13
|
+
|
14
|
+
def <<(child)
|
15
|
+
if msg = invalid_child?(child)
|
16
|
+
raise Sass::SyntaxError.new(msg, child.line)
|
17
|
+
end
|
18
|
+
@children << child
|
19
|
+
end
|
20
|
+
|
21
|
+
# We need this because Node duck types as an Array in engine.rb
|
22
|
+
def last
|
23
|
+
children.last
|
24
|
+
end
|
25
|
+
|
26
|
+
def ==(other)
|
27
|
+
self.class == other.class && other.children == children
|
28
|
+
end
|
29
|
+
|
30
|
+
def to_s
|
31
|
+
result = String.new
|
32
|
+
children.each do |child|
|
33
|
+
if child.is_a? AttrNode
|
34
|
+
raise Sass::SyntaxError.new('Attributes aren\'t allowed at the root of a document.', child.line)
|
35
|
+
else
|
36
|
+
child_str = child.to_s(1)
|
37
|
+
next unless child_str && child_str.length > 0
|
38
|
+
result << child_str + (@style == :compressed ? '' : "\n")
|
39
|
+
end
|
40
|
+
end
|
41
|
+
@style == :compressed ? result+"\n" : result[0...-1]
|
42
|
+
end
|
43
|
+
|
44
|
+
def perform(environment)
|
45
|
+
_perform(environment)
|
46
|
+
rescue Sass::SyntaxError => e
|
47
|
+
e.sass_line ||= line
|
48
|
+
raise e
|
49
|
+
end
|
50
|
+
|
51
|
+
protected
|
52
|
+
|
53
|
+
def _perform(environment)
|
54
|
+
node = dup
|
55
|
+
node.perform!(environment)
|
56
|
+
node
|
57
|
+
end
|
58
|
+
|
59
|
+
def perform!(environment)
|
60
|
+
self.children = perform_children(Environment.new(environment))
|
61
|
+
end
|
62
|
+
|
63
|
+
def perform_children(environment)
|
64
|
+
children.map {|c| c.perform(environment)}.flatten
|
65
|
+
end
|
66
|
+
|
67
|
+
def interpolate(text, environment)
|
68
|
+
res = ''
|
69
|
+
rest = Haml::Shared.handle_interpolation text do |scan|
|
70
|
+
escapes = scan[2].size
|
71
|
+
res << scan.matched[0...-2 - escapes]
|
72
|
+
if escapes % 2 == 1
|
73
|
+
res << "\\" * (escapes - 1) << '#{'
|
74
|
+
else
|
75
|
+
res << "\\" * [0, escapes - 1].max
|
76
|
+
res << Script::Parser.new(scan, line, scan.pos - scan.matchedsize, filename).
|
77
|
+
parse_interpolated.perform(environment).to_s
|
78
|
+
end
|
79
|
+
end
|
80
|
+
res + rest
|
81
|
+
end
|
82
|
+
|
83
|
+
def balance(*args)
|
84
|
+
res = Haml::Shared.balance(*args)
|
85
|
+
return res if res
|
86
|
+
raise Sass::SyntaxError.new("Unbalanced brackets.", line)
|
87
|
+
end
|
88
|
+
|
89
|
+
private
|
90
|
+
|
91
|
+
# This method should be overridden by subclasses to return an error message
|
92
|
+
# if the given child node is invalid,
|
93
|
+
# and false or nil otherwise.
|
94
|
+
def invalid_child?(child)
|
95
|
+
false
|
96
|
+
end
|
97
|
+
end
|
98
|
+
end
|
99
|
+
end
|
@@ -0,0 +1,120 @@
|
|
1
|
+
module Sass::Tree
|
2
|
+
class RuleNode < Node
|
3
|
+
# The character used to include the parent selector
|
4
|
+
PARENT = '&'
|
5
|
+
|
6
|
+
attr_accessor :rule
|
7
|
+
|
8
|
+
def initialize(rule, options)
|
9
|
+
@rule = rule
|
10
|
+
super(options)
|
11
|
+
end
|
12
|
+
|
13
|
+
def ==(other)
|
14
|
+
self.class == other.class && rules == other.rules && super
|
15
|
+
end
|
16
|
+
|
17
|
+
def rules
|
18
|
+
Array(rule)
|
19
|
+
end
|
20
|
+
|
21
|
+
def add_rules(node)
|
22
|
+
self.rule = rules
|
23
|
+
self.rule += node.rules
|
24
|
+
end
|
25
|
+
|
26
|
+
def continued?
|
27
|
+
rule[-1] == ?,
|
28
|
+
end
|
29
|
+
|
30
|
+
def to_s(tabs, super_rules = nil)
|
31
|
+
attributes = []
|
32
|
+
sub_rules = []
|
33
|
+
|
34
|
+
rule_split = /\s*,\s*/
|
35
|
+
rule_separator = @style == :compressed ? ',' : ', '
|
36
|
+
line_separator = [:nested, :expanded].include?(@style) ? ",\n" : rule_separator
|
37
|
+
rule_indent = ' ' * (tabs - 1)
|
38
|
+
total_rule = if super_rules
|
39
|
+
super_rules.split(",\n").map do |super_line|
|
40
|
+
super_line.strip.split(rule_split).map do |super_rule|
|
41
|
+
self.rules.map do |line|
|
42
|
+
rule_indent + line.gsub(/,$/, '').split(rule_split).map do |rule|
|
43
|
+
if rule.include?(PARENT)
|
44
|
+
rule.gsub(PARENT, super_rule)
|
45
|
+
else
|
46
|
+
"#{super_rule} #{rule}"
|
47
|
+
end
|
48
|
+
end.join(rule_separator)
|
49
|
+
end.join(line_separator)
|
50
|
+
end.join(rule_separator)
|
51
|
+
end.join(line_separator)
|
52
|
+
elsif self.rules.any? { |r| r.include?(PARENT) }
|
53
|
+
raise Sass::SyntaxError.new("Base-level rules cannot contain the parent-selector-referencing character '#{PARENT}'.", line)
|
54
|
+
else
|
55
|
+
per_rule_indent, total_indent = [:nested, :expanded].include?(@style) ? [rule_indent, ''] : ['', rule_indent]
|
56
|
+
total_indent + self.rules.map do |r|
|
57
|
+
per_rule_indent + r.gsub(/,$/, '').gsub(rule_split, rule_separator).rstrip
|
58
|
+
end.join(line_separator)
|
59
|
+
end
|
60
|
+
|
61
|
+
children.each do |child|
|
62
|
+
if child.is_a? RuleNode
|
63
|
+
sub_rules << child
|
64
|
+
else
|
65
|
+
attributes << child
|
66
|
+
end
|
67
|
+
end
|
68
|
+
|
69
|
+
to_return = ''
|
70
|
+
if !attributes.empty?
|
71
|
+
old_spaces = ' ' * (tabs - 1)
|
72
|
+
spaces = ' ' * tabs
|
73
|
+
if @options[:line_comments] && @style != :compressed
|
74
|
+
to_return << "#{old_spaces}/* line #{line}"
|
75
|
+
|
76
|
+
if filename
|
77
|
+
relative_filename = if @options[:css_filename]
|
78
|
+
begin
|
79
|
+
Pathname.new(filename).relative_path_from(
|
80
|
+
Pathname.new(File.dirname(@options[:css_filename]))).to_s
|
81
|
+
rescue ArgumentError
|
82
|
+
nil
|
83
|
+
end
|
84
|
+
end
|
85
|
+
relative_filename ||= filename
|
86
|
+
to_return << ", #{relative_filename}"
|
87
|
+
end
|
88
|
+
|
89
|
+
to_return << " */\n"
|
90
|
+
end
|
91
|
+
|
92
|
+
if @style == :compact
|
93
|
+
attributes = attributes.map { |a| a.to_s(1) }.select{|a| a && a.length > 0}.join(' ')
|
94
|
+
to_return << "#{total_rule} { #{attributes} }\n"
|
95
|
+
elsif @style == :compressed
|
96
|
+
attributes = attributes.map { |a| a.to_s(1) }.select{|a| a && a.length > 0}.join(';')
|
97
|
+
to_return << "#{total_rule}{#{attributes}}"
|
98
|
+
else
|
99
|
+
attributes = attributes.map { |a| a.to_s(tabs + 1) }.select{|a| a && a.length > 0}.join("\n")
|
100
|
+
end_attrs = (@style == :expanded ? "\n" + old_spaces : ' ')
|
101
|
+
to_return << "#{total_rule} {\n#{attributes}#{end_attrs}}\n"
|
102
|
+
end
|
103
|
+
end
|
104
|
+
|
105
|
+
tabs += 1 unless attributes.empty? || @style != :nested
|
106
|
+
sub_rules.each do |sub|
|
107
|
+
to_return << sub.to_s(tabs, total_rule)
|
108
|
+
end
|
109
|
+
|
110
|
+
to_return
|
111
|
+
end
|
112
|
+
|
113
|
+
protected
|
114
|
+
|
115
|
+
def perform!(environment)
|
116
|
+
self.rule = rules.map {|r| interpolate(r, environment)}
|
117
|
+
super
|
118
|
+
end
|
119
|
+
end
|
120
|
+
end
|