spree 0.8.5 → 0.9.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 +97 -4
- data/CONTRIBUTORS +62 -29
- data/LICENSE +1 -1
- data/README.markdown +1 -1
- data/app/controllers/admin/base_controller.rb +10 -1
- data/app/controllers/admin/configurations_controller.rb +19 -8
- data/app/controllers/admin/coupons_controller.rb +17 -0
- data/app/controllers/admin/creditcard_payments_controller.rb +4 -8
- data/app/controllers/admin/images_controller.rb +42 -3
- data/app/controllers/admin/orders_controller.rb +12 -12
- data/app/controllers/admin/products_controller.rb +12 -32
- data/app/controllers/admin/prototypes_controller.rb +3 -1
- data/app/controllers/admin/reports_controller.rb +6 -6
- data/app/controllers/admin/shipments_controller.rb +12 -1
- data/app/controllers/admin/shipping_methods_controller.rb +17 -17
- data/app/controllers/admin/shipping_rates_controller.rb +20 -0
- data/app/controllers/admin/tax_rates_controller.rb +28 -0
- data/{vendor/extensions/tax_calculator/app → app}/controllers/admin/tax_settings_controller.rb +1 -1
- data/app/controllers/admin/taxons_controller.rb +18 -72
- data/app/controllers/admin/users_controller.rb +6 -6
- data/app/controllers/admin/zones_controller.rb +4 -4
- data/app/controllers/application.rb +3 -3
- data/app/controllers/checkouts_controller.rb +158 -0
- data/app/controllers/content_controller.rb +1 -8
- data/app/controllers/orders_controller.rb +11 -23
- data/app/controllers/products_controller.rb +24 -23
- data/app/controllers/spree/base_controller.rb +47 -3
- data/app/controllers/states_controller.rb +4 -5
- data/app/controllers/taxons_controller.rb +13 -9
- data/app/controllers/user_sessions_controller.rb +3 -1
- data/app/controllers/users_controller.rb +3 -7
- data/app/helpers/admin/base_helper.rb +74 -6
- data/app/helpers/admin/calculators_helper.rb +2 -0
- data/app/helpers/admin/orders_helper.rb +1 -1
- data/{vendor/extensions/tax_calculator/app → app}/helpers/admin/tax_rates_helper.rb +0 -0
- data/app/helpers/admin/taxonomies_helper.rb +0 -59
- data/app/helpers/application_helper.rb +1 -2
- data/app/helpers/checkouts_helper.rb +7 -0
- data/app/helpers/products_helper.rb +15 -15
- data/app/helpers/spree/base_helper.rb +27 -5
- data/app/helpers/taxons_helper.rb +9 -9
- data/app/metal/create_admin_user.rb +21 -0
- data/app/models/address.rb +42 -2
- data/app/models/adjustment.rb +37 -0
- data/app/models/app_configuration.rb +10 -1
- data/app/models/calculator.rb +41 -0
- data/app/models/calculator/flat_percent_item_total.rb +19 -0
- data/app/models/calculator/flat_rate.rb +18 -0
- data/app/models/calculator/flexi_rate.rb +33 -0
- data/app/models/calculator/per_item.rb +18 -0
- data/app/models/calculator/price_bucket.rb +31 -0
- data/app/models/calculator/sales_tax.rb +48 -0
- data/app/models/calculator/vat.rb +63 -0
- data/app/models/charge.rb +37 -0
- data/app/models/checkout.rb +48 -0
- data/app/models/country.rb +11 -1
- data/app/models/coupon.rb +27 -0
- data/app/models/credit.rb +27 -0
- data/app/models/creditcard.rb +5 -5
- data/app/models/creditcard_payment.rb +13 -5
- data/app/models/image.rb +23 -1
- data/app/models/inventory_unit.rb +4 -3
- data/app/models/line_item.rb +10 -4
- data/app/models/order.rb +125 -65
- data/app/models/order_mailer.rb +1 -1
- data/app/models/order_observer.rb +15 -0
- data/app/models/product.rb +101 -87
- data/app/models/shipment.rb +20 -14
- data/app/models/shipping_category.rb +2 -0
- data/app/models/shipping_method.rb +19 -6
- data/app/models/shipping_rate.rb +6 -0
- data/app/models/state.rb +8 -2
- data/app/models/state_event.rb +7 -0
- data/app/models/tax_category.rb +2 -0
- data/{vendor/extensions/tax_calculator/app → app}/models/tax_rate.rb +9 -3
- data/app/models/taxon.rb +21 -15
- data/app/models/user.rb +17 -18
- data/app/models/user_mailer.rb +1 -1
- data/app/models/variant.rb +51 -60
- data/app/models/zone.rb +38 -23
- data/app/views/admin/configurations/index.html.erb +12 -0
- data/app/views/admin/coupons/_form.html.erb +24 -0
- data/app/views/admin/coupons/edit.html.erb +8 -0
- data/app/views/admin/coupons/index.html.erb +38 -0
- data/app/views/admin/coupons/new.html.erb +9 -0
- data/app/views/admin/creditcard_payments/new.html.erb +1 -1
- data/app/views/admin/general_settings/edit.html.erb +1 -1
- data/app/views/admin/general_settings/show.html.erb +2 -4
- data/app/views/admin/images/_form.html.erb +12 -0
- data/app/views/admin/images/edit.html.erb +19 -0
- data/app/views/admin/images/index.html.erb +63 -0
- data/app/views/admin/images/new.html.erb +20 -8
- data/app/views/admin/inventory_settings/show.html.erb +2 -2
- data/app/views/admin/mail_settings/edit.html.erb +13 -4
- data/app/views/admin/mail_settings/show.html.erb +7 -0
- data/app/views/admin/option_types/index.html.erb +1 -1
- data/app/views/admin/orders/index.html.erb +41 -54
- data/app/views/admin/orders/show.html.erb +19 -2
- data/app/views/admin/products/_form.html.erb +29 -16
- data/app/views/admin/products/index.html.erb +12 -17
- data/app/views/admin/products/new.html.erb +5 -5
- data/app/views/admin/properties/index.html.erb +1 -1
- data/app/views/admin/prototypes/index.html.erb +1 -1
- data/app/views/admin/reports/sales_total.html.erb +4 -4
- data/app/views/admin/shared/_address.html.erb +3 -1
- data/app/views/admin/shared/_calculator_fields.html.erb +15 -0
- data/app/views/admin/shared/_edit_resource_links.html.erb +1 -1
- data/app/views/admin/shared/_form_address.html.erb +8 -2
- data/app/views/admin/shared/_new_resource_links.html.erb +1 -1
- data/app/views/admin/shared/_order_details.html.erb +3 -36
- data/app/views/admin/shared/_order_tabs.html.erb +2 -2
- data/app/views/admin/shared/_product_tabs.html.erb +25 -12
- data/app/views/admin/shared/_report_criteria.html.erb +3 -7
- data/app/views/admin/shipments/_form.html.erb +11 -1
- data/app/views/admin/shipping_categories/index.html.erb +1 -1
- data/app/views/admin/shipping_methods/_form.html.erb +3 -5
- data/app/views/admin/shipping_methods/edit.html.erb +2 -2
- data/app/views/admin/shipping_methods/index.html.erb +3 -3
- data/app/views/admin/shipping_rates/_form.html.erb +12 -0
- data/app/views/admin/shipping_rates/edit.html.erb +8 -0
- data/app/views/admin/shipping_rates/index.html.erb +30 -0
- data/app/views/admin/shipping_rates/new.html.erb +10 -0
- data/app/views/admin/tax_categories/index.html.erb +1 -1
- data/app/views/admin/tax_rates/_form.html.erb +16 -0
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_rates/edit.html.erb +2 -2
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_rates/index.html.erb +4 -4
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_rates/new.html.erb +0 -0
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_settings/edit.html.erb +3 -3
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_settings/show.html.erb +1 -1
- data/app/views/admin/taxonomies/_js_head.html.erb +13 -0
- data/app/views/admin/taxonomies/_list.html.erb +3 -3
- data/app/views/admin/taxonomies/_taxon.html.erb +12 -0
- data/app/views/admin/taxonomies/edit.html.erb +17 -7
- data/app/views/admin/users/index.html.erb +7 -9
- data/app/views/admin/variants/_form.html.erb +1 -1
- data/app/views/admin/variants/index.html.erb +2 -2
- data/app/views/admin/zones/index.html.erb +4 -4
- data/app/views/checkouts/_billing.html.erb +66 -0
- data/app/views/checkouts/_confirmation.html.erb +11 -0
- data/app/views/checkouts/_form.html.erb +20 -0
- data/app/views/checkouts/_payment.html.erb +45 -0
- data/app/views/{orders → checkouts}/_registration.html.erb +4 -4
- data/app/views/checkouts/_shipping.html.erb +68 -0
- data/app/views/checkouts/_shipping_method.html.erb +19 -0
- data/app/views/checkouts/_summary.html.erb +36 -0
- data/app/views/checkouts/edit.html.erb +13 -0
- data/app/views/checkouts/new.html.erb +13 -0
- data/app/views/layouts/admin.html.erb +15 -5
- data/app/views/layouts/application.html.erb +3 -11
- data/{vendor/plugins/resource_controller/test/app/views/layouts/application.rhtml → app/views/layouts/checkouts.html.erb} +2 -2
- data/app/views/order_mailer/cancel.html.erb +4 -3
- data/app/views/order_mailer/confirm.html.erb +5 -4
- data/app/views/orders/_form.html.erb +4 -1
- data/app/views/orders/_google_order.html.erb +2 -2
- data/app/views/orders/_line_item.html.erb +6 -3
- data/app/views/orders/edit.html.erb +3 -3
- data/app/views/orders/new.html.erb +2 -2
- data/app/views/products/_cart_form.html.erb +45 -14
- data/app/views/products/_thumbnails.html.erb +34 -6
- data/app/views/products/index.html.erb +6 -2
- data/app/views/products/show.html.erb +1 -1
- data/app/views/shared/_edit_resource_links.html.erb +1 -1
- data/app/views/shared/_filters.html.erb +52 -0
- data/app/views/shared/_footer.html.erb +1 -1
- data/app/views/shared/_head.html.erb +6 -0
- data/app/views/shared/_login.html.erb +2 -2
- data/app/views/shared/_new_resource_links.html.erb +1 -1
- data/app/views/shared/_order_details.html.erb +46 -36
- data/app/views/shared/_taxonomies.html.erb +5 -6
- data/app/views/states/index.js.erb +1 -1
- data/app/views/taxons/show.html.erb +1 -1
- data/bin/spree +43 -2
- data/config/boot.rb +2 -2
- data/config/environment.rb +13 -5
- data/config/environments/test.rb +6 -2
- data/config/initializers/locales.rb +20 -8
- data/config/initializers/paperclip.rb +20 -0
- data/config/initializers/spree.rb +12 -2
- data/config/locales/da.yml +614 -0
- data/config/locales/da_rails.yml +197 -0
- data/config/locales/de-CH.yml +614 -0
- data/config/locales/de-CH_rails.yml +142 -0
- data/config/locales/de.yml +95 -4
- data/config/locales/en-GB.yml +112 -21
- data/config/locales/en-GB_rails.yml +84 -42
- data/config/locales/en-US.yml +103 -12
- data/config/locales/es.yml +95 -4
- data/config/locales/fi.yml +614 -0
- data/config/locales/fi_rails.yml +143 -0
- data/config/locales/fr-FR.yml +95 -4
- data/config/locales/fr-FR_rails.yml +1 -1
- data/config/locales/il.yml +614 -0
- data/config/locales/il_rails.yml +103 -0
- data/config/locales/it.yml +102 -11
- data/config/locales/jp.yml +614 -0
- data/config/locales/jp_rails.yml +135 -0
- data/config/locales/mx.yml +614 -0
- data/config/locales/mx_rails.yml +181 -0
- data/config/locales/nb-NO.yml +95 -4
- data/config/locales/nl-BE.yml +95 -4
- data/config/locales/nl-NL.yml +614 -0
- data/config/locales/nl-NL_rails.yml +172 -0
- data/config/locales/pl.yml +102 -11
- data/config/locales/pt-BR.yml +101 -10
- data/config/locales/pt-PT.yml +95 -4
- data/config/locales/ru-RU.yml +414 -323
- data/config/locales/ru-RU_rails.yml +1 -1
- data/config/locales/th.yml +614 -0
- data/config/locales/th_rails.yml +195 -0
- data/config/routes.rb +10 -6
- data/config/schedule.rb +27 -0
- data/config/spree_permissions.yml +8 -7
- data/db/default/zone_members.yml +2 -14
- data/{vendor/extensions/tax_calculator/db → db}/migrate/20080620100001_create_tax_rates.rb +0 -0
- data/{vendor/extensions/tax_calculator/db → db}/migrate/20080704192456_update_tax_rates_add_zones_etc.rb +0 -0
- data/db/migrate/20090401223217_create_eu_vat_zone_again.rb +1 -1
- data/db/migrate/20090404192723_add_maestro_fields.rb +12 -0
- data/db/migrate/20090406091357_add_alternative_phone.rb +9 -0
- data/db/migrate/20090525000325_remove_address_orphans.rb +15 -0
- data/db/migrate/20090603153927_create_checkouts.rb +71 -0
- data/db/migrate/20090617181106_change_txn_type_to_int.rb +18 -0
- data/db/migrate/20090618203233_create_charges.rb +61 -0
- data/db/migrate/20090626235303_create_credits.rb +22 -0
- data/db/migrate/20090705101511_add_image_dimensions.rb +12 -0
- data/db/migrate/20090708175306_create_coupons.rb +16 -0
- data/db/migrate/20090708175317_create_discounts.rb +14 -0
- data/db/migrate/20090714094201_add_default_addresses_to_user.rb +11 -0
- data/db/migrate/20090715172345_create_calculators.rb +22 -0
- data/db/migrate/20090731085008_add_charge_source_to_charge.rb +11 -0
- data/db/migrate/20090803072025_create_shipping_rates.rb +12 -0
- data/db/migrate/20090804090559_create_calculators_for_tax_rates.rb +16 -0
- data/db/migrate/20090805131937_drop_credits_and_discounts.rb +9 -0
- data/db/migrate/20090805185015_remove_tax_type.rb +13 -0
- data/db/migrate/20090806063212_rename_charges_to_adjustments.rb +24 -0
- data/db/migrate/20090806160214_rename_base_to_source.rb +11 -0
- data/db/migrate/20090809170304_remove_checkout_shipping_address_and_method.rb +15 -0
- data/db/migrate/20090809193131_add_is_master_to_variants.rb +43 -0
- data/db/migrate/20090809201209_drop_master_price_from_products.rb +13 -0
- data/db/migrate/20090809231957_update_legacy_calculators.rb +9 -0
- data/db/migrate/20090823005402_coupon_starts_at.rb +13 -0
- data/db/migrate/20090828114732_add_queued_mail.rb +12 -0
- data/db/migrate/20090908141056_adjust_percent_calc_settings.rb +9 -0
- data/db/migrate/migrate/20080620100001_create_tax_rates.rb +13 -0
- data/db/migrate/migrate/20080704192456_update_tax_rates_add_zones_etc.rb +17 -0
- data/db/sample/adjustments.yml +20 -0
- data/db/sample/assets.yml +219 -11
- data/db/sample/calculators.yml +16 -0
- data/db/sample/checkouts.yml +8 -0
- data/db/sample/coupons.yml +4 -0
- data/db/sample/creditcards.yml +0 -1
- data/db/sample/orders.yml +0 -7
- data/db/sample/preferences.yml +20 -0
- data/db/sample/products.yml +0 -9
- data/db/sample/shipping_methods.yml +3 -10
- data/db/sample/variants.yml +13 -0
- data/db/schema.rb +73 -23
- data/db/seeds.rb +8 -3
- data/generate +4 -0
- data/lib/generators/extension/extension_generator.rb +1 -1
- data/lib/generators/extension/templates/Rakefile +1 -1
- data/lib/generators/extension/templates/extension.rb +22 -2
- data/lib/generators/extension_migration/extension_migration_generator.rb +3 -3
- data/lib/generators/instance/instance_generator.rb +4 -2
- data/lib/plugins/extension_patches/lib/asset_copy.rb +1 -50
- data/lib/plugins/monkey_patches/lib/monkey_patches.rb +2 -2
- data/lib/product_filters.rb +174 -0
- data/lib/product_scopes.rb +76 -0
- data/lib/spree.rb +2 -2
- data/lib/spree/config.rb +1 -1
- data/lib/spree/extension_loader.rb +10 -1
- data/lib/spree/file_utilz.rb +71 -0
- data/lib/spree/initializer.rb +13 -1
- data/lib/spree/setup.rb +7 -1
- data/lib/tasks/consistency.rake +30 -0
- data/lib/tasks/database.rake +1 -7
- data/lib/tasks/extensions.rake +24 -8
- data/lib/tasks/framework.rake +0 -1
- data/lib/tasks/release.rake +22 -11
- data/lib/tasks/sample/products/1009/large/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1009/mini/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1009/original/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1009/product/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1009/small/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1010/large/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1010/mini/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1010/original/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1010/product/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1010/small/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1011/large/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1011/mini/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1011/original/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1011/product/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1011/small/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1012/large/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1012/mini/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1012/original/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1012/product/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1012/small/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1013/large/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1013/mini/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1013/original/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1013/product/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1013/small/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1014/large/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1014/mini/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1014/original/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1014/product/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1014/small/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1015/large/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1015/mini/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1015/original/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1015/product/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1015/small/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1016/large/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1016/mini/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1016/original/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1016/product/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1016/small/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1017/large/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1017/mini/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1017/original/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1017/product/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1017/small/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1018/large/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1018/mini/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1018/original/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1018/product/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1018/small/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1019/large/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1019/mini/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1019/original/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1019/product/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1019/small/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1020/large/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1020/mini/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1020/original/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1020/product/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1020/small/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1021/large/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1021/mini/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1021/original/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1021/product/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1021/small/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1022/large/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1022/mini/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1022/original/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1022/product/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1022/small/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1023/large/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1023/mini/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1023/original/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1023/product/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1023/small/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1024/large/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1024/mini/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1024/original/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1024/product/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1024/small/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1025/large/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1025/mini/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1025/original/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1025/product/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1025/small/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1026/large/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1026/mini/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1026/original/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1026/product/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1026/small/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/translation.rake +1 -1
- data/lib/tasks/upgrade.rake +2 -9
- data/public/images/menu-current.png +0 -0
- data/public/images/progress.gif +0 -0
- data/public/javascripts/calculator.js +13 -0
- data/public/javascripts/checkout.js +163 -34
- data/public/javascripts/jquery.alerts/images/help.gif +0 -0
- data/public/javascripts/jquery.alerts/images/important.gif +0 -0
- data/public/javascripts/jquery.alerts/images/info.gif +0 -0
- data/public/javascripts/jquery.alerts/images/title.gif +0 -0
- data/public/javascripts/jquery.alerts/jquery.alerts.css +57 -0
- data/public/javascripts/jquery.alerts/jquery.alerts.js +235 -0
- data/public/javascripts/jquery.alerts/jquery.alerts.spree.css +30 -0
- data/public/javascripts/jquery.validate.min.js +16 -0
- data/public/javascripts/jsTree/source/_lib.js +126 -0
- data/public/javascripts/jsTree/source/themes/default/context.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/create.png +0 -0
- data/public/javascripts/jsTree/source/themes/default/dot.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/f.png +0 -0
- data/public/javascripts/jsTree/source/themes/default/fminus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/fminus_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/fplus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/fplus_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/lastli.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/lastli_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/li.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/remove.png +0 -0
- data/public/javascripts/jsTree/source/themes/default/rename.png +0 -0
- data/public/javascripts/jsTree/source/themes/default/style.css +44 -0
- data/public/javascripts/jsTree/source/themes/default/throbber.gif +0 -0
- data/public/javascripts/jsTree/source/themes/marker.gif +0 -0
- data/public/javascripts/jsTree/source/themes/marker_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/plus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/remove.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/context.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/create.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/dot.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/f.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/fminus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/fminus_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/fplus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/fplus_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/lastli.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/li.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/remove.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/rename.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/style.css +39 -0
- data/public/javascripts/jsTree/source/themes/spree/throbber.gif +0 -0
- data/public/javascripts/jsTree/source/tree_component.css +62 -0
- data/public/javascripts/jsTree/source/tree_component.js +2315 -0
- data/public/javascripts/jsTree/source/tree_component.min.js +14 -0
- data/public/javascripts/spree.js +9 -0
- data/public/javascripts/taxonomy.js +202 -0
- data/public/stylesheets/admin/admin.css +36 -3
- data/public/stylesheets/compiled/screen.css +393 -306
- data/public/stylesheets/sass/_buttons.sass +59 -0
- data/public/stylesheets/sass/_cart.sass +21 -0
- data/public/stylesheets/sass/_checkout.sass +173 -0
- data/public/stylesheets/sass/_colors.sass +11 -0
- data/public/stylesheets/sass/_layout.sass +63 -0
- data/public/stylesheets/sass/_messages.sass +28 -0
- data/public/stylesheets/sass/_mixins.sass +17 -0
- data/public/stylesheets/sass/_navigation.sass +97 -0
- data/public/stylesheets/sass/_prices.sass +13 -0
- data/public/stylesheets/sass/_product_detail.sass +27 -0
- data/public/stylesheets/sass/_product_thumbnail.sass +58 -0
- data/public/stylesheets/sass/_registration.sass +9 -0
- data/public/stylesheets/sass/screen.sass +12 -555
- data/public/stylesheets/scaffold.css +54 -0
- data/spec/controllers/orders_controller_spec.rb +3 -2
- data/spec/models/address_spec.rb +2 -1
- data/spec/models/shipping_order_spec.rb +8 -6
- data/spec/models/zone_spec.rb +1 -1
- data/spec/preference_factory.rb +1 -1
- data/test/factories/address_factory.rb +20 -0
- data/test/factories/adjustments_factory.rb +53 -0
- data/test/factories/checkout_factory.rb +15 -0
- data/test/factories/country_factory.rb +5 -0
- data/test/factories/coupon_factory.rb +5 -0
- data/test/factories/creditcard_factory.rb +12 -0
- data/test/factories/creditcard_payment_factory.rb +11 -0
- data/test/factories/inventory_unit_factory.rb +2 -0
- data/test/factories/line_item_factory.rb +8 -0
- data/test/factories/options_factory.rb +10 -0
- data/test/factories/order_factory.rb +6 -0
- data/test/factories/preference_factory.rb +5 -0
- data/test/factories/product_factory.rb +13 -0
- data/test/factories/role_factory.rb +5 -0
- data/test/factories/shipment_factory.rb +6 -0
- data/test/factories/shipping_category_factory.rb +5 -0
- data/test/factories/shipping_method_factory.rb +13 -0
- data/test/factories/tax_category_factory.rb +8 -0
- data/test/factories/tax_rate_factory.rb +4 -0
- data/test/factories/taxon_factory.rb +16 -0
- data/test/factories/taxonomy_factory.rb +5 -0
- data/test/factories/user_factory.rb +11 -0
- data/test/factories/variant_factory.rb +13 -0
- data/test/factories/zone_factory.rb +10 -0
- data/test/fixtures/countries.yml +4 -0
- data/test/fixtures/gateway_configurations.yml +2 -0
- data/test/fixtures/gateways.yml +4 -0
- data/test/fixtures/states.yml +204 -0
- data/test/functional/calculators_controller_test.rb +8 -0
- data/test/functional/checkouts_controller_test.rb +77 -0
- data/test/functional/products_controller_test.rb +12 -0
- data/test/functional/users_controller_test.rb +25 -0
- data/test/test_helper.rb +66 -0
- data/test/unit/address_test.rb +39 -0
- data/test/unit/charge_test.rb +90 -0
- data/test/unit/checkout_test.rb +10 -0
- data/test/unit/country_test.rb +6 -0
- data/test/unit/coupon_test.rb +56 -0
- data/test/unit/credit_test.rb +61 -0
- data/test/unit/creditcard_payment_test.rb +28 -0
- data/test/unit/creditcard_test.rb +44 -0
- data/test/unit/factories_test.rb +29 -0
- data/test/unit/flat_percent_item_total_test.rb +28 -0
- data/test/unit/flat_rate_calculators_test.rb +13 -0
- data/test/unit/has_calculator_test.rb +22 -0
- data/test/unit/helpers/calculators_helper_test.rb +4 -0
- data/test/unit/helpers/checkouts_helper_test.rb +26 -0
- data/test/unit/helpers/products_helper_test.rb +32 -0
- data/test/unit/helpers/spree/base_helper_test.rb +43 -0
- data/test/unit/incomplete_checkout_test.rb +68 -0
- data/test/unit/inventory_unit_test.rb +20 -0
- data/test/unit/line_item_test.rb +73 -0
- data/test/unit/order_test.rb +80 -0
- data/test/unit/per_item_calculator_test.rb +14 -0
- data/test/unit/preference_test.rb +148 -0
- data/test/unit/product_test.rb +279 -0
- data/test/unit/sales_tax_calculator_test.rb +46 -0
- data/test/unit/shipping_method_test.rb +21 -0
- data/test/unit/state_event_test.rb +40 -0
- data/test/unit/state_test.rb +7 -0
- data/test/unit/tax_rate_test.rb +9 -0
- data/test/unit/variant_test.rb +128 -0
- data/test/unit/vat_calculator_test.rb +60 -0
- data/vendor/extensions/calculators/README.markdown +4 -0
- data/vendor/extensions/calculators/calculators_extension.rb +31 -0
- data/vendor/extensions/localization/public/images/flags/{dk.png → da.png} +0 -0
- data/vendor/extensions/localization/public/images/flags/de_CH.png +0 -0
- data/vendor/extensions/payment_gateway/README_PAYPAL.markdown +1 -1
- data/vendor/extensions/payment_gateway/db/migrate/20090517173727_add_currency_code_option_to_paypal_gateway.rb +13 -0
- data/vendor/extensions/payment_gateway/lib/spree/payment_gateway.rb +22 -12
- data/vendor/plugins/acts_as_adjacency_list/lib/active_record/acts/adjacency_list.rb +13 -20
- data/vendor/plugins/delegate_belongs_to/README +1 -0
- data/vendor/plugins/delegate_belongs_to/Rakefile +21 -0
- data/vendor/plugins/delegate_belongs_to/init.rb +2 -0
- data/vendor/plugins/delegate_belongs_to/lib/delegate_belongs_to.rb +95 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/controllers/application.rb +2 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/models/contact.rb +5 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/models/user_default.rb +2 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/models/user_mixed.rb +2 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/models/user_no_default.rb +2 -0
- data/vendor/plugins/{resource_controller/test → delegate_belongs_to/spec/app_root}/config/boot.rb +14 -9
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/database.yml +21 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/environment.rb +13 -0
- data/{public/favicon.ico → vendor/plugins/delegate_belongs_to/spec/app_root/config/environments/in_memory.rb} +0 -0
- data/vendor/plugins/{resource_controller/test/app/views/tags/index.rjs → delegate_belongs_to/spec/app_root/config/environments/mysql.rb} +0 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/environments/postgresql.rb +0 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/environments/sqlite.rb +0 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/environments/sqlite3.rb +0 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/routes.rb +4 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/db/migrate/01_create_users.rb +22 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/db/migrate/02_create_contacts.rb +12 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/lib/console_with_fixtures.rb +4 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/script/console +7 -0
- data/vendor/plugins/delegate_belongs_to/spec/model/with_defaults_spec.rb +30 -0
- data/vendor/plugins/delegate_belongs_to/spec/model/with_mixed_spec.rb +29 -0
- data/vendor/plugins/delegate_belongs_to/spec/model/with_no_defaults_spec.rb +30 -0
- data/vendor/plugins/delegate_belongs_to/spec/spec_helper.rb +68 -0
- data/vendor/plugins/has_calculator/README +7 -0
- data/vendor/plugins/has_calculator/init.rb +2 -0
- data/vendor/plugins/has_calculator/lib/has_calculator.rb +52 -0
- data/vendor/plugins/mail_queue/README +40 -0
- data/vendor/plugins/mail_queue/Rakefile +22 -0
- data/vendor/plugins/mail_queue/init.rb +1 -0
- data/vendor/plugins/mail_queue/install.rb +1 -0
- data/vendor/plugins/mail_queue/lib/mail_queue.rb +48 -0
- data/vendor/plugins/mail_queue/lib/queued_mail.rb +5 -0
- data/vendor/plugins/mail_queue/lib/test_mail_queue_mailer.rb +19 -0
- data/vendor/plugins/mail_queue/lib/test_mail_queue_mailer/notify.rhtml +1 -0
- data/vendor/plugins/mail_queue/tasks/mailer_queue_tasks.rake +4 -0
- data/vendor/plugins/mail_queue/test/mailer_queue_test.rb +29 -0
- data/vendor/plugins/paperclip/README.rdoc +126 -11
- data/vendor/plugins/paperclip/Rakefile +35 -24
- data/vendor/plugins/paperclip/lib/paperclip.rb +141 -67
- data/vendor/plugins/paperclip/lib/paperclip/attachment.rb +233 -117
- data/vendor/plugins/paperclip/lib/paperclip/callback_compatability.rb +33 -0
- data/vendor/plugins/paperclip/lib/paperclip/geometry.rb +4 -3
- data/vendor/plugins/paperclip/lib/paperclip/interpolations.rb +105 -0
- data/vendor/plugins/paperclip/lib/paperclip/iostream.rb +16 -1
- data/vendor/plugins/paperclip/lib/paperclip/matchers.rb +4 -0
- data/vendor/plugins/paperclip/lib/paperclip/matchers/have_attached_file_matcher.rb +49 -0
- data/vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb +66 -0
- data/vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_presence_matcher.rb +48 -0
- data/vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_size_matcher.rb +83 -0
- data/vendor/plugins/paperclip/lib/paperclip/processor.rb +49 -0
- data/vendor/plugins/paperclip/lib/paperclip/storage.rb +54 -25
- data/vendor/plugins/paperclip/lib/paperclip/thumbnail.rb +13 -31
- data/vendor/plugins/paperclip/lib/paperclip/upfile.rb +11 -0
- data/vendor/plugins/paperclip/paperclip.gemspec +37 -0
- data/vendor/plugins/paperclip/shoulda_macros/paperclip.rb +58 -22
- data/vendor/plugins/paperclip/tasks/paperclip_tasks.rake +1 -1
- data/vendor/plugins/paperclip/test/attachment_test.rb +460 -54
- data/vendor/plugins/paperclip/test/database.yml +0 -1
- data/vendor/plugins/paperclip/test/fixtures/s3.yml +4 -0
- data/vendor/plugins/paperclip/test/fixtures/twopage.pdf +0 -0
- data/vendor/plugins/paperclip/test/geometry_test.rb +22 -13
- data/vendor/plugins/paperclip/test/helper.rb +46 -3
- data/vendor/plugins/paperclip/test/integration_test.rb +140 -52
- data/vendor/plugins/paperclip/test/interpolations_test.rb +120 -0
- data/vendor/plugins/paperclip/test/iostream_test.rb +32 -21
- data/vendor/plugins/paperclip/test/matchers/have_attached_file_matcher_test.rb +21 -0
- data/vendor/plugins/paperclip/test/matchers/validate_attachment_content_type_matcher_test.rb +30 -0
- data/vendor/plugins/paperclip/test/matchers/validate_attachment_presence_matcher_test.rb +21 -0
- data/vendor/plugins/paperclip/test/matchers/validate_attachment_size_matcher_test.rb +50 -0
- data/vendor/plugins/paperclip/test/paperclip_test.rb +148 -36
- data/vendor/plugins/paperclip/test/processor_test.rb +10 -0
- data/vendor/plugins/paperclip/test/storage_test.rb +126 -16
- data/vendor/plugins/paperclip/test/thumbnail_test.rb +51 -19
- metadata +586 -622
- data/app/views/admin/products/_images.html.erb +0 -42
- data/app/views/admin/taxonomies/_yui_head.html.erb +0 -17
- data/app/views/orders/_billing.html.erb +0 -53
- data/app/views/orders/_checkout_form.html.erb +0 -14
- data/app/views/orders/_confirmation.html.erb +0 -11
- data/app/views/orders/_payment.html.erb +0 -30
- data/app/views/orders/_shipping.html.erb +0 -54
- data/app/views/orders/_shipping_method.html.erb +0 -10
- data/app/views/orders/checkout.html.erb +0 -15
- data/config/initializers/searchlogic.rb +0 -6
- data/db/sample/images/ror_bag.jpg +0 -0
- data/db/sample/images/ror_baseball_jersey.jpg +0 -0
- data/db/sample/images/ror_jr_spaghetti.jpg +0 -0
- data/db/sample/images/ror_mug.jpg +0 -0
- data/db/sample/images/ror_ringer_tshirt.jpg +0 -0
- data/db/sample/images/ror_stein.jpg +0 -0
- data/db/sample/images/ror_tote.jpg +0 -0
- data/db/sample/zone_members.yml +0 -16
- data/db/sample/zones.yml +0 -6
- data/lib/flat_rate.rb +0 -10
- data/lib/spree/checkout.rb +0 -74
- data/public/assets/products/1/mini/ror_tote.jpeg +0 -0
- data/public/assets/products/1/original/ror_tote.jpeg +0 -0
- data/public/assets/products/1/product/ror_tote.jpeg +0 -0
- data/public/assets/products/1/small/ror_tote.jpeg +0 -0
- data/public/assets/products/10/mini/ror_ringer_back.jpeg +0 -0
- data/public/assets/products/10/original/ror_ringer_back.jpeg +0 -0
- data/public/assets/products/10/product/ror_ringer_back.jpeg +0 -0
- data/public/assets/products/10/small/ror_ringer_back.jpeg +0 -0
- data/public/assets/products/1004/mini/apache_baseball.png +0 -0
- data/public/assets/products/1004/original/apache_baseball.png +0 -0
- data/public/assets/products/1004/product/apache_baseball.png +0 -0
- data/public/assets/products/1004/small/apache_baseball.png +0 -0
- data/public/assets/products/1008/mini/ruby_baseball.png +0 -0
- data/public/assets/products/1008/original/ruby_baseball.png +0 -0
- data/public/assets/products/1008/product/ruby_baseball.png +0 -0
- data/public/assets/products/1008/small/ruby_baseball.png +0 -0
- data/public/assets/products/11/mini/ror_stein.jpeg +0 -0
- data/public/assets/products/11/original/ror_stein.jpeg +0 -0
- data/public/assets/products/11/product/ror_stein.jpeg +0 -0
- data/public/assets/products/11/small/ror_stein.jpeg +0 -0
- data/public/assets/products/12/mini/ror_stein_back.jpeg +0 -0
- data/public/assets/products/12/original/ror_stein_back.jpeg +0 -0
- data/public/assets/products/12/product/ror_stein_back.jpeg +0 -0
- data/public/assets/products/12/small/ror_stein_back.jpeg +0 -0
- data/public/assets/products/2/mini/ror_tote_back.jpeg +0 -0
- data/public/assets/products/2/original/ror_tote_back.jpeg +0 -0
- data/public/assets/products/2/product/ror_tote_back.jpeg +0 -0
- data/public/assets/products/2/small/ror_tote_back.jpeg +0 -0
- data/public/assets/products/3/mini/ror_bag.jpeg +0 -0
- data/public/assets/products/3/original/ror_bag.jpeg +0 -0
- data/public/assets/products/3/product/ror_bag.jpeg +0 -0
- data/public/assets/products/3/small/ror_bag.jpeg +0 -0
- data/public/assets/products/4/mini/ror_baseball.jpeg +0 -0
- data/public/assets/products/4/original/ror_baseball.jpeg +0 -0
- data/public/assets/products/4/product/ror_baseball.jpeg +0 -0
- data/public/assets/products/4/small/ror_baseball.jpeg +0 -0
- data/public/assets/products/5/mini/ror_baseball_back.jpeg +0 -0
- data/public/assets/products/5/original/ror_baseball_back.jpeg +0 -0
- data/public/assets/products/5/product/ror_baseball_back.jpeg +0 -0
- data/public/assets/products/5/small/ror_baseball_back.jpeg +0 -0
- data/public/assets/products/6/mini/ror_jr_spaghetti.jpeg +0 -0
- data/public/assets/products/6/original/ror_jr_spaghetti.jpeg +0 -0
- data/public/assets/products/6/product/ror_jr_spaghetti.jpeg +0 -0
- data/public/assets/products/6/small/ror_jr_spaghetti.jpeg +0 -0
- data/public/assets/products/7/mini/ror_mug.jpeg +0 -0
- data/public/assets/products/7/original/ror_mug.jpeg +0 -0
- data/public/assets/products/7/product/ror_mug.jpeg +0 -0
- data/public/assets/products/7/small/ror_mug.jpeg +0 -0
- data/public/assets/products/8/mini/ror_mug_back.jpeg +0 -0
- data/public/assets/products/8/original/ror_mug_back.jpeg +0 -0
- data/public/assets/products/8/product/ror_mug_back.jpeg +0 -0
- data/public/assets/products/8/small/ror_mug_back.jpeg +0 -0
- data/public/assets/products/9/mini/ror_ringer.jpeg +0 -0
- data/public/assets/products/9/original/ror_ringer.jpeg +0 -0
- data/public/assets/products/9/product/ror_ringer.jpeg +0 -0
- data/public/assets/products/9/small/ror_ringer.jpeg +0 -0
- data/public/javascripts/jquery.validate.pack.js +0 -15
- data/public/javascripts/spree-yui.js +0 -693
- data/public/javascripts/yui-includes.js +0 -57
- data/public/stylesheets/admin/david-admin.css +0 -210
- data/spec/controllers/admin/shipments_controller_spec.rb +0 -30
- data/spec/helpers/admin/configurations_helper_spec.rb +0 -11
- data/spec/helpers/admin/mail_settings_helper_spec.rb +0 -11
- data/spec/helpers/products_helper_spec.rb +0 -12
- data/spec/helpers/spree/base_helper_spec.rb +0 -30
- data/spec/models/country_spec.rb +0 -29
- data/spec/models/line_item_spec.rb +0 -78
- data/spec/models/preference_spec.rb +0 -185
- data/spec/models/product_spec.rb +0 -207
- data/spec/models/shipping_method_spec.rb +0 -59
- data/spec/models/state_event_spec.rb +0 -12
- data/spec/models/state_spec.rb +0 -28
- data/spec/models/variant_spec.rb +0 -98
- data/vendor/extensions/flat_rate_shipping/README.markdown +0 -3
- data/vendor/extensions/flat_rate_shipping/Rakefile +0 -120
- data/vendor/extensions/flat_rate_shipping/flat_rate_shipping_extension.rb +0 -11
- data/vendor/extensions/flat_rate_shipping/lib/flat_rate_shipping_configuration.rb +0 -7
- data/vendor/extensions/flat_rate_shipping/lib/spree/flat_rate_shipping/calculator.rb +0 -9
- data/vendor/extensions/flat_rate_shipping/lib/spree/flat_rate_shipping/config.rb +0 -22
- data/vendor/extensions/flat_rate_shipping/lib/tasks/flat_rate_shipping_extension_tasks.rake +0 -29
- data/vendor/extensions/flat_rate_shipping/spec/spec.opts +0 -6
- data/vendor/extensions/flat_rate_shipping/spec/spec_helper.rb +0 -37
- data/vendor/extensions/tax_calculator/README.markdown +0 -8
- data/vendor/extensions/tax_calculator/Rakefile +0 -120
- data/vendor/extensions/tax_calculator/app/controllers/admin/tax_rates_controller.rb +0 -27
- data/vendor/extensions/tax_calculator/app/views/admin/tax_rates/_form.html.erb +0 -20
- data/vendor/extensions/tax_calculator/config/locales/de.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/en-GB.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/en-US.yml +0 -32
- data/vendor/extensions/tax_calculator/config/locales/es.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/it.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/nb-NO.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/pl.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/pt-BR.yml +0 -30
- data/vendor/extensions/tax_calculator/config/routes.rb +0 -4
- data/vendor/extensions/tax_calculator/lib/spree/sales_tax_calculator.rb +0 -31
- data/vendor/extensions/tax_calculator/lib/spree/tax/config.rb +0 -22
- data/vendor/extensions/tax_calculator/lib/spree/tax_calculator.rb +0 -18
- data/vendor/extensions/tax_calculator/lib/spree/vat_calculator.rb +0 -42
- data/vendor/extensions/tax_calculator/lib/tasks/tax_calculator_extension_tasks.rake +0 -18
- data/vendor/extensions/tax_calculator/lib/tax_configuration.rb +0 -7
- data/vendor/extensions/tax_calculator/spec/controllers/tax_calculator_spec.rb +0 -12
- data/vendor/extensions/tax_calculator/spec/helpers/admin/tax_rates_helper_spec.rb +0 -6
- data/vendor/extensions/tax_calculator/spec/helpers/products_helper_spec.rb +0 -88
- data/vendor/extensions/tax_calculator/spec/models/sales_tax_calculator_spec.rb +0 -53
- data/vendor/extensions/tax_calculator/spec/models/tax_calculator_spec.rb +0 -58
- data/vendor/extensions/tax_calculator/spec/models/tax_rate_spec.rb +0 -17
- data/vendor/extensions/tax_calculator/spec/models/vat_calculator_spec.rb +0 -56
- data/vendor/extensions/tax_calculator/spec/spec.opts +0 -6
- data/vendor/extensions/tax_calculator/spec/spec_helper.rb +0 -42
- data/vendor/extensions/tax_calculator/tax_calculator_extension.rb +0 -41
- data/vendor/plugins/resource_controller/test/Rakefile +0 -10
- data/vendor/plugins/resource_controller/test/app/controllers/accounts_controller.rb +0 -6
- data/vendor/plugins/resource_controller/test/app/controllers/application.rb +0 -7
- data/vendor/plugins/resource_controller/test/app/controllers/cms/options_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/cms/personnel_controller.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/controllers/cms/photos_controller.rb +0 -6
- data/vendor/plugins/resource_controller/test/app/controllers/cms/products_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/comments_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/images_controller.rb +0 -4
- data/vendor/plugins/resource_controller/test/app/controllers/options_controller.rb +0 -8
- data/vendor/plugins/resource_controller/test/app/controllers/people_controller.rb +0 -9
- data/vendor/plugins/resource_controller/test/app/controllers/photos_controller.rb +0 -11
- data/vendor/plugins/resource_controller/test/app/controllers/posts_controller.rb +0 -10
- data/vendor/plugins/resource_controller/test/app/controllers/projects_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/somethings_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/tags_controller.rb +0 -13
- data/vendor/plugins/resource_controller/test/app/controllers/users_controller.rb +0 -12
- data/vendor/plugins/resource_controller/test/app/helpers/accounts_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/application_helper.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/helpers/cms/products_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/comments_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/images_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/options_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/people_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/photos_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/posts_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/projects_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/somethings_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/tags_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/users_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/models/account.rb +0 -4
- data/vendor/plugins/resource_controller/test/app/models/comment.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/image.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/option.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/personnel.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/photo.rb +0 -5
- data/vendor/plugins/resource_controller/test/app/models/post.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/product.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/project.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/models/something.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/models/tag.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/user.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/views/accounts/_form.html.erb +0 -4
- data/vendor/plugins/resource_controller/test/app/views/accounts/edit.html.erb +0 -14
- data/vendor/plugins/resource_controller/test/app/views/accounts/new.html.erb +0 -12
- data/vendor/plugins/resource_controller/test/app/views/accounts/show.html.erb +0 -5
- data/vendor/plugins/resource_controller/test/app/views/cms/options/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/cms/options/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/cms/options/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/cms/options/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/cms/photos/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/cms/photos/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/cms/photos/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/cms/photos/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/cms/products/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/cms/products/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/cms/products/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/cms/products/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/comments/edit.rhtml +0 -27
- data/vendor/plugins/resource_controller/test/app/views/comments/index.rhtml +0 -24
- data/vendor/plugins/resource_controller/test/app/views/comments/new.rhtml +0 -26
- data/vendor/plugins/resource_controller/test/app/views/comments/show.rhtml +0 -18
- data/vendor/plugins/resource_controller/test/app/views/images/_form.html.erb +0 -4
- data/vendor/plugins/resource_controller/test/app/views/images/edit.html.erb +0 -14
- data/vendor/plugins/resource_controller/test/app/views/images/new.html.erb +0 -12
- data/vendor/plugins/resource_controller/test/app/views/layouts/comments.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/options.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/people.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/photos.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/projects.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/somethings.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/tags.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/options/_form.html.erb +0 -8
- data/vendor/plugins/resource_controller/test/app/views/options/edit.html.erb +0 -16
- data/vendor/plugins/resource_controller/test/app/views/options/index.html.erb +0 -21
- data/vendor/plugins/resource_controller/test/app/views/options/new.html.erb +0 -12
- data/vendor/plugins/resource_controller/test/app/views/options/show.html.erb +0 -10
- data/vendor/plugins/resource_controller/test/app/views/people/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/people/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/people/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/people/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/photos/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/photos/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/photos/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/photos/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/posts/edit.rhtml +0 -22
- data/vendor/plugins/resource_controller/test/app/views/posts/index.rhtml +0 -22
- data/vendor/plugins/resource_controller/test/app/views/posts/new.rhtml +0 -21
- data/vendor/plugins/resource_controller/test/app/views/posts/show.rhtml +0 -13
- data/vendor/plugins/resource_controller/test/app/views/projects/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/projects/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/projects/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/projects/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/somethings/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/somethings/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/somethings/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/somethings/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/tags/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/tags/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/tags/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/tags/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/users/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/users/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/users/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/users/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/config/database.yml +0 -9
- data/vendor/plugins/resource_controller/test/config/environment.rb +0 -47
- data/vendor/plugins/resource_controller/test/config/environments/development.rb +0 -21
- data/vendor/plugins/resource_controller/test/config/environments/test.rb +0 -19
- data/vendor/plugins/resource_controller/test/config/initializers/inflections.rb +0 -14
- data/vendor/plugins/resource_controller/test/config/routes.rb +0 -61
- data/vendor/plugins/resource_controller/test/db/migrate/001_create_posts.rb +0 -12
- data/vendor/plugins/resource_controller/test/db/migrate/002_create_products.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/003_create_comments.rb +0 -13
- data/vendor/plugins/resource_controller/test/db/migrate/004_create_options.rb +0 -13
- data/vendor/plugins/resource_controller/test/db/migrate/005_create_photos.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/006_create_tags.rb +0 -17
- data/vendor/plugins/resource_controller/test/db/migrate/007_create_somethings.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/008_create_accounts.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/009_add_account_id_to_photos.rb +0 -9
- data/vendor/plugins/resource_controller/test/db/migrate/010_create_projects.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/011_create_images.rb +0 -12
- data/vendor/plugins/resource_controller/test/db/migrate/012_create_users.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/013_create_personnel.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/014_add_personnel_id_to_photos.rb +0 -9
- data/vendor/plugins/resource_controller/test/db/schema.rb +0 -78
- data/vendor/plugins/resource_controller/test/script/console +0 -3
- data/vendor/plugins/resource_controller/test/script/destroy +0 -3
- data/vendor/plugins/resource_controller/test/script/generate +0 -3
- data/vendor/plugins/resource_controller/test/script/server +0 -3
- data/vendor/plugins/resource_controller/test/test/fixtures/accounts.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/comments.yml +0 -11
- data/vendor/plugins/resource_controller/test/test/fixtures/images.yml +0 -6
- data/vendor/plugins/resource_controller/test/test/fixtures/options.yml +0 -9
- data/vendor/plugins/resource_controller/test/test/fixtures/personnel.yml +0 -5
- data/vendor/plugins/resource_controller/test/test/fixtures/photos.yml +0 -9
- data/vendor/plugins/resource_controller/test/test/fixtures/photos_tags.yml +0 -3
- data/vendor/plugins/resource_controller/test/test/fixtures/posts.yml +0 -9
- data/vendor/plugins/resource_controller/test/test/fixtures/products.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/projects.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/somethings.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/tags.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/users.yml +0 -5
- data/vendor/plugins/resource_controller/test/test/functional/cms/options_controller_test.rb +0 -23
- data/vendor/plugins/resource_controller/test/test/functional/cms/photos_controller_test.rb +0 -43
- data/vendor/plugins/resource_controller/test/test/functional/cms/products_controller_test.rb +0 -23
- data/vendor/plugins/resource_controller/test/test/functional/comments_controller_test.rb +0 -26
- data/vendor/plugins/resource_controller/test/test/functional/images_controller_test.rb +0 -37
- data/vendor/plugins/resource_controller/test/test/functional/people_controller_test.rb +0 -34
- data/vendor/plugins/resource_controller/test/test/functional/photos_controller_test.rb +0 -130
- data/vendor/plugins/resource_controller/test/test/functional/posts_controller_test.rb +0 -34
- data/vendor/plugins/resource_controller/test/test/functional/projects_controller_test.rb +0 -18
- data/vendor/plugins/resource_controller/test/test/functional/somethings_controller_test.rb +0 -28
- data/vendor/plugins/resource_controller/test/test/functional/tags_controller_test.rb +0 -64
- data/vendor/plugins/resource_controller/test/test/functional/users_controller_test.rb +0 -24
- data/vendor/plugins/resource_controller/test/test/test_helper.rb +0 -12
- data/vendor/plugins/resource_controller/test/test/unit/accessors_test.rb +0 -110
- data/vendor/plugins/resource_controller/test/test/unit/account_test.rb +0 -7
- data/vendor/plugins/resource_controller/test/test/unit/action_options_test.rb +0 -109
- data/vendor/plugins/resource_controller/test/test/unit/base_test.rb +0 -11
- data/vendor/plugins/resource_controller/test/test/unit/comment_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/failable_action_options_test.rb +0 -77
- data/vendor/plugins/resource_controller/test/test/unit/helpers/current_objects_test.rb +0 -133
- data/vendor/plugins/resource_controller/test/test/unit/helpers/internal_test.rb +0 -106
- data/vendor/plugins/resource_controller/test/test/unit/helpers/nested_test.rb +0 -86
- data/vendor/plugins/resource_controller/test/test/unit/helpers/singleton_current_objects_test.rb +0 -68
- data/vendor/plugins/resource_controller/test/test/unit/helpers/singleton_nested_test.rb +0 -77
- data/vendor/plugins/resource_controller/test/test/unit/helpers/singleton_urls_test.rb +0 -67
- data/vendor/plugins/resource_controller/test/test/unit/helpers/urls_test.rb +0 -75
- data/vendor/plugins/resource_controller/test/test/unit/helpers_test.rb +0 -25
- data/vendor/plugins/resource_controller/test/test/unit/image_test.rb +0 -7
- data/vendor/plugins/resource_controller/test/test/unit/option_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/photo_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/post_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/project_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/response_collector_test.rb +0 -49
- data/vendor/plugins/resource_controller/test/test/unit/something_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/tag_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/urligence_test.rb +0 -203
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/Rakefile +0 -32
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/bin/convert_to_should_syntax +0 -40
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/init.rb +0 -3
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda.rb +0 -43
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/active_record_helpers.rb +0 -580
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/color.rb +0 -77
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/controller_tests/controller_tests.rb +0 -467
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/controller_tests/formats/html.rb +0 -201
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/controller_tests/formats/xml.rb +0 -170
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/gem/proc_extensions.rb +0 -14
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/gem/shoulda.rb +0 -239
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/general.rb +0 -118
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/private_helpers.rb +0 -22
@@ -0,0 +1,120 @@
|
|
1
|
+
require 'test/helper'
|
2
|
+
|
3
|
+
class InterpolationsTest < Test::Unit::TestCase
|
4
|
+
should "return all methods but the infrastructure when sent #all" do
|
5
|
+
methods = Paperclip::Interpolations.all
|
6
|
+
assert ! methods.include?(:[])
|
7
|
+
assert ! methods.include?(:[]=)
|
8
|
+
assert ! methods.include?(:all)
|
9
|
+
methods.each do |m|
|
10
|
+
assert Paperclip::Interpolations.respond_to? m
|
11
|
+
end
|
12
|
+
end
|
13
|
+
|
14
|
+
should "return the RAILS_ROOT" do
|
15
|
+
assert_equal RAILS_ROOT, Paperclip::Interpolations.rails_root(:attachment, :style)
|
16
|
+
end
|
17
|
+
|
18
|
+
should "return the RAILS_ENV" do
|
19
|
+
assert_equal RAILS_ENV, Paperclip::Interpolations.rails_env(:attachment, :style)
|
20
|
+
end
|
21
|
+
|
22
|
+
should "return the class of the instance" do
|
23
|
+
attachment = mock
|
24
|
+
attachment.expects(:instance).returns(attachment)
|
25
|
+
attachment.expects(:class).returns("Thing")
|
26
|
+
assert_equal "things", Paperclip::Interpolations.class(attachment, :style)
|
27
|
+
end
|
28
|
+
|
29
|
+
should "return the basename of the file" do
|
30
|
+
attachment = mock
|
31
|
+
attachment.expects(:original_filename).returns("one.jpg").times(2)
|
32
|
+
assert_equal "one", Paperclip::Interpolations.basename(attachment, :style)
|
33
|
+
end
|
34
|
+
|
35
|
+
should "return the extension of the file" do
|
36
|
+
attachment = mock
|
37
|
+
attachment.expects(:original_filename).returns("one.jpg")
|
38
|
+
attachment.expects(:styles).returns({})
|
39
|
+
assert_equal "jpg", Paperclip::Interpolations.extension(attachment, :style)
|
40
|
+
end
|
41
|
+
|
42
|
+
should "return the extension of the file as the format if defined in the style" do
|
43
|
+
attachment = mock
|
44
|
+
attachment.expects(:original_filename).never
|
45
|
+
attachment.expects(:styles).returns({:style => {:format => "png"}})
|
46
|
+
assert_equal "png", Paperclip::Interpolations.extension(attachment, :style)
|
47
|
+
end
|
48
|
+
|
49
|
+
should "return the id of the attachment" do
|
50
|
+
attachment = mock
|
51
|
+
attachment.expects(:id).returns(23)
|
52
|
+
attachment.expects(:instance).returns(attachment)
|
53
|
+
assert_equal 23, Paperclip::Interpolations.id(attachment, :style)
|
54
|
+
end
|
55
|
+
|
56
|
+
should "return the partitioned id of the attachment" do
|
57
|
+
attachment = mock
|
58
|
+
attachment.expects(:id).returns(23)
|
59
|
+
attachment.expects(:instance).returns(attachment)
|
60
|
+
assert_equal "000/000/023", Paperclip::Interpolations.id_partition(attachment, :style)
|
61
|
+
end
|
62
|
+
|
63
|
+
should "return the name of the attachment" do
|
64
|
+
attachment = mock
|
65
|
+
attachment.expects(:name).returns("file")
|
66
|
+
assert_equal "files", Paperclip::Interpolations.attachment(attachment, :style)
|
67
|
+
end
|
68
|
+
|
69
|
+
should "return the style" do
|
70
|
+
assert_equal :style, Paperclip::Interpolations.style(:attachment, :style)
|
71
|
+
end
|
72
|
+
|
73
|
+
should "return the default style" do
|
74
|
+
attachment = mock
|
75
|
+
attachment.expects(:default_style).returns(:default_style)
|
76
|
+
assert_equal :default_style, Paperclip::Interpolations.style(attachment, nil)
|
77
|
+
end
|
78
|
+
|
79
|
+
should "reinterpolate :url" do
|
80
|
+
attachment = mock
|
81
|
+
attachment.expects(:options).returns({:url => ":id"})
|
82
|
+
attachment.expects(:url).with(:style, false).returns("1234")
|
83
|
+
assert_equal "1234", Paperclip::Interpolations.url(attachment, :style)
|
84
|
+
end
|
85
|
+
|
86
|
+
should "raise if infinite loop detcted reinterpolating :url" do
|
87
|
+
attachment = mock
|
88
|
+
attachment.expects(:options).returns({:url => ":url"})
|
89
|
+
assert_raises(Paperclip::InfiniteInterpolationError){ Paperclip::Interpolations.url(attachment, :style) }
|
90
|
+
end
|
91
|
+
|
92
|
+
should "return the filename as basename.extension" do
|
93
|
+
attachment = mock
|
94
|
+
attachment.expects(:styles).returns({})
|
95
|
+
attachment.expects(:original_filename).returns("one.jpg").times(3)
|
96
|
+
assert_equal "one.jpg", Paperclip::Interpolations.filename(attachment, :style)
|
97
|
+
end
|
98
|
+
|
99
|
+
should "return the filename as basename.extension when format supplied" do
|
100
|
+
attachment = mock
|
101
|
+
attachment.expects(:styles).returns({:style => {:format => :png}})
|
102
|
+
attachment.expects(:original_filename).returns("one.jpg").times(2)
|
103
|
+
assert_equal "one.png", Paperclip::Interpolations.filename(attachment, :style)
|
104
|
+
end
|
105
|
+
|
106
|
+
should "return the timestamp" do
|
107
|
+
now = Time.now
|
108
|
+
attachment = mock
|
109
|
+
attachment.expects(:instance_read).with(:updated_at).returns(now)
|
110
|
+
assert_equal now.to_s, Paperclip::Interpolations.timestamp(attachment, :style)
|
111
|
+
end
|
112
|
+
|
113
|
+
should "call all expected interpolations with the given arguments" do
|
114
|
+
Paperclip::Interpolations.expects(:id).with(:attachment, :style).returns(1234)
|
115
|
+
Paperclip::Interpolations.expects(:attachment).with(:attachment, :style).returns("attachments")
|
116
|
+
Paperclip::Interpolations.expects(:notreal).never
|
117
|
+
value = Paperclip::Interpolations.interpolate(":notreal/:id/:attachment", :attachment, :style)
|
118
|
+
assert_equal ":notreal/1234/attachments", value
|
119
|
+
end
|
120
|
+
end
|
@@ -1,10 +1,4 @@
|
|
1
|
-
require '
|
2
|
-
require 'test/unit'
|
3
|
-
require 'stringio'
|
4
|
-
require 'tempfile'
|
5
|
-
require 'shoulda'
|
6
|
-
|
7
|
-
require File.join(File.dirname(__FILE__), '..', 'lib', 'paperclip', 'iostream.rb')
|
1
|
+
require 'test/helper'
|
8
2
|
|
9
3
|
class IOStreamTest < Test::Unit::TestCase
|
10
4
|
context "IOStream" do
|
@@ -17,29 +11,46 @@ class IOStreamTest < Test::Unit::TestCase
|
|
17
11
|
|
18
12
|
context "A file" do
|
19
13
|
setup do
|
20
|
-
@file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"))
|
14
|
+
@file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
|
21
15
|
end
|
22
16
|
|
17
|
+
teardown { @file.close }
|
18
|
+
|
23
19
|
context "that is sent #stream_to" do
|
24
20
|
|
25
|
-
|
26
|
-
|
21
|
+
context "and given a String" do
|
22
|
+
setup do
|
23
|
+
FileUtils.mkdir_p(File.join(ROOT, 'tmp'))
|
24
|
+
assert @result = @file.stream_to(File.join(ROOT, 'tmp', 'iostream.string.test'))
|
25
|
+
end
|
27
26
|
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
end
|
27
|
+
should "return a File" do
|
28
|
+
assert @result.is_a?(File)
|
29
|
+
end
|
32
30
|
|
33
|
-
|
34
|
-
|
35
|
-
|
31
|
+
should "contain the same data as the original file" do
|
32
|
+
@file.rewind; @result.rewind
|
33
|
+
assert_equal @file.read, @result.read
|
34
|
+
end
|
35
|
+
end
|
36
36
|
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
37
|
+
context "and given a Tempfile" do
|
38
|
+
setup do
|
39
|
+
tempfile = Tempfile.new('iostream.test')
|
40
|
+
tempfile.binmode
|
41
|
+
assert @result = @file.stream_to(tempfile)
|
42
|
+
end
|
43
|
+
|
44
|
+
should "return a Tempfile" do
|
45
|
+
assert @result.is_a?(Tempfile)
|
46
|
+
end
|
47
|
+
|
48
|
+
should "contain the same data as the original file" do
|
49
|
+
@file.rewind; @result.rewind
|
50
|
+
assert_equal @file.read, @result.read
|
41
51
|
end
|
42
52
|
end
|
53
|
+
|
43
54
|
end
|
44
55
|
|
45
56
|
context "that is sent #to_tempfile" do
|
@@ -0,0 +1,21 @@
|
|
1
|
+
require 'test/helper'
|
2
|
+
|
3
|
+
class HaveAttachedFileMatcherTest < Test::Unit::TestCase
|
4
|
+
context "have_attached_file" do
|
5
|
+
setup do
|
6
|
+
@dummy_class = reset_class "Dummy"
|
7
|
+
reset_table "dummies"
|
8
|
+
@matcher = self.class.have_attached_file(:avatar)
|
9
|
+
end
|
10
|
+
|
11
|
+
should "reject a class with no attachment" do
|
12
|
+
assert_rejects @matcher, @dummy_class
|
13
|
+
end
|
14
|
+
|
15
|
+
should "accept a class with an attachment" do
|
16
|
+
modify_table("dummies"){|d| d.string :avatar_file_name }
|
17
|
+
@dummy_class.has_attached_file :avatar
|
18
|
+
assert_accepts @matcher, @dummy_class
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
@@ -0,0 +1,30 @@
|
|
1
|
+
require 'test/helper'
|
2
|
+
|
3
|
+
class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
|
4
|
+
context "validate_attachment_content_type" do
|
5
|
+
setup do
|
6
|
+
reset_table("dummies") do |d|
|
7
|
+
d.string :avatar_file_name
|
8
|
+
end
|
9
|
+
@dummy_class = reset_class "Dummy"
|
10
|
+
@dummy_class.has_attached_file :avatar
|
11
|
+
@matcher = self.class.validate_attachment_content_type(:avatar).
|
12
|
+
allowing(%w(image/png image/jpeg)).
|
13
|
+
rejecting(%w(audio/mp3 application/octet-stream))
|
14
|
+
end
|
15
|
+
|
16
|
+
should "reject a class with no validation" do
|
17
|
+
assert_rejects @matcher, @dummy_class
|
18
|
+
end
|
19
|
+
|
20
|
+
should "reject a class with a validation that doesn't match" do
|
21
|
+
@dummy_class.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
|
22
|
+
assert_rejects @matcher, @dummy_class
|
23
|
+
end
|
24
|
+
|
25
|
+
should "accept a class with a validation" do
|
26
|
+
@dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
|
27
|
+
assert_accepts @matcher, @dummy_class
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
@@ -0,0 +1,21 @@
|
|
1
|
+
require 'test/helper'
|
2
|
+
|
3
|
+
class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
|
4
|
+
context "validate_attachment_presence" do
|
5
|
+
setup do
|
6
|
+
reset_table("dummies"){|d| d.string :avatar_file_name }
|
7
|
+
@dummy_class = reset_class "Dummy"
|
8
|
+
@dummy_class.has_attached_file :avatar
|
9
|
+
@matcher = self.class.validate_attachment_presence(:avatar)
|
10
|
+
end
|
11
|
+
|
12
|
+
should "reject a class with no validation" do
|
13
|
+
assert_rejects @matcher, @dummy_class
|
14
|
+
end
|
15
|
+
|
16
|
+
should "accept a class with a validation" do
|
17
|
+
@dummy_class.validates_attachment_presence :avatar
|
18
|
+
assert_accepts @matcher, @dummy_class
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
@@ -0,0 +1,50 @@
|
|
1
|
+
require 'test/helper'
|
2
|
+
|
3
|
+
class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
|
4
|
+
context "validate_attachment_size" do
|
5
|
+
setup do
|
6
|
+
reset_table("dummies") do |d|
|
7
|
+
d.string :avatar_file_name
|
8
|
+
end
|
9
|
+
@dummy_class = reset_class "Dummy"
|
10
|
+
@dummy_class.has_attached_file :avatar
|
11
|
+
end
|
12
|
+
|
13
|
+
context "of limited size" do
|
14
|
+
setup{ @matcher = self.class.validate_attachment_size(:avatar).in(256..1024) }
|
15
|
+
|
16
|
+
should "reject a class with no validation" do
|
17
|
+
assert_rejects @matcher, @dummy_class
|
18
|
+
end
|
19
|
+
|
20
|
+
should "reject a class with a validation that's too high" do
|
21
|
+
@dummy_class.validates_attachment_size :avatar, :in => 256..2048
|
22
|
+
assert_rejects @matcher, @dummy_class
|
23
|
+
end
|
24
|
+
|
25
|
+
should "reject a class with a validation that's too low" do
|
26
|
+
@dummy_class.validates_attachment_size :avatar, :in => 0..1024
|
27
|
+
assert_rejects @matcher, @dummy_class
|
28
|
+
end
|
29
|
+
|
30
|
+
should "accept a class with a validation that matches" do
|
31
|
+
@dummy_class.validates_attachment_size :avatar, :in => 256..1024
|
32
|
+
assert_accepts @matcher, @dummy_class
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
context "validates_attachment_size with infinite range" do
|
37
|
+
setup{ @matcher = self.class.validate_attachment_size(:avatar) }
|
38
|
+
|
39
|
+
should "accept a class with an upper limit" do
|
40
|
+
@dummy_class.validates_attachment_size :avatar, :less_than => 1
|
41
|
+
assert_accepts @matcher, @dummy_class
|
42
|
+
end
|
43
|
+
|
44
|
+
should "accept a class with no upper limit" do
|
45
|
+
@dummy_class.validates_attachment_size :avatar, :greater_than => 1
|
46
|
+
assert_accepts @matcher, @dummy_class
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
50
|
+
end
|
@@ -1,13 +1,67 @@
|
|
1
|
-
require 'test/helper
|
1
|
+
require 'test/helper'
|
2
2
|
|
3
3
|
class PaperclipTest < Test::Unit::TestCase
|
4
|
-
|
4
|
+
[:image_magick_path, :convert_path].each do |path|
|
5
|
+
context "Calling Paperclip.run with an #{path} specified" do
|
6
|
+
setup do
|
7
|
+
Paperclip.options[:image_magick_path] = nil
|
8
|
+
Paperclip.options[:convert_path] = nil
|
9
|
+
Paperclip.options[path] = "/usr/bin"
|
10
|
+
end
|
11
|
+
|
12
|
+
should "execute the right command" do
|
13
|
+
Paperclip.expects(:path_for_command).with("convert").returns("/usr/bin/convert")
|
14
|
+
Paperclip.expects(:bit_bucket).returns("/dev/null")
|
15
|
+
Paperclip.expects(:"`").with("/usr/bin/convert one.jpg two.jpg 2>/dev/null")
|
16
|
+
Paperclip.run("convert", "one.jpg two.jpg")
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
|
21
|
+
context "Calling Paperclip.run with no path specified" do
|
22
|
+
setup do
|
23
|
+
Paperclip.options[:image_magick_path] = nil
|
24
|
+
Paperclip.options[:convert_path] = nil
|
25
|
+
end
|
26
|
+
|
5
27
|
should "execute the right command" do
|
6
|
-
Paperclip.expects(:path_for_command).with("convert").returns("
|
28
|
+
Paperclip.expects(:path_for_command).with("convert").returns("convert")
|
7
29
|
Paperclip.expects(:bit_bucket).returns("/dev/null")
|
8
|
-
Paperclip.expects(:"`").with("
|
30
|
+
Paperclip.expects(:"`").with("convert one.jpg two.jpg 2>/dev/null")
|
9
31
|
Paperclip.run("convert", "one.jpg two.jpg")
|
10
32
|
end
|
33
|
+
|
34
|
+
should "log the command when :log_command is set" do
|
35
|
+
Paperclip.options[:log_command] = true
|
36
|
+
Paperclip.expects(:bit_bucket).returns("/dev/null")
|
37
|
+
Paperclip.expects(:log).with("this is the command 2>/dev/null")
|
38
|
+
Paperclip.expects(:"`").with("this is the command 2>/dev/null")
|
39
|
+
Paperclip.run("this","is the command")
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
should "raise when sent #processor and the name of a class that exists but isn't a subclass of Processor" do
|
44
|
+
assert_raises(Paperclip::PaperclipError){ Paperclip.processor(:attachment) }
|
45
|
+
end
|
46
|
+
|
47
|
+
should "raise when sent #processor and the name of a class that doesn't exist" do
|
48
|
+
assert_raises(NameError){ Paperclip.processor(:boogey_man) }
|
49
|
+
end
|
50
|
+
|
51
|
+
should "return a class when sent #processor and the name of a class under Paperclip" do
|
52
|
+
assert_equal ::Paperclip::Thumbnail, Paperclip.processor(:thumbnail)
|
53
|
+
end
|
54
|
+
|
55
|
+
should "call a proc sent to check_guard" do
|
56
|
+
@dummy = Dummy.new
|
57
|
+
@dummy.expects(:one).returns(:one)
|
58
|
+
assert_equal :one, @dummy.avatar.send(:check_guard, lambda{|x| x.one })
|
59
|
+
end
|
60
|
+
|
61
|
+
should "call a method name sent to check_guard" do
|
62
|
+
@dummy = Dummy.new
|
63
|
+
@dummy.expects(:one).returns(:one)
|
64
|
+
assert_equal :one, @dummy.avatar.send(:check_guard, :one)
|
11
65
|
end
|
12
66
|
|
13
67
|
context "Paperclip.bit_bucket" do
|
@@ -35,9 +89,11 @@ class PaperclipTest < Test::Unit::TestCase
|
|
35
89
|
context "An ActiveRecord model with an 'avatar' attachment" do
|
36
90
|
setup do
|
37
91
|
rebuild_model :path => "tmp/:class/omg/:style.:extension"
|
38
|
-
@file = File.new(File.join(FIXTURES_DIR, "5k.png"))
|
92
|
+
@file = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
|
39
93
|
end
|
40
94
|
|
95
|
+
teardown { @file.close }
|
96
|
+
|
41
97
|
should "not error when trying to also create a 'blah' attachment" do
|
42
98
|
assert_nothing_raised do
|
43
99
|
Dummy.class_eval do
|
@@ -55,8 +111,6 @@ class PaperclipTest < Test::Unit::TestCase
|
|
55
111
|
end
|
56
112
|
|
57
113
|
should "not assign the avatar on mass-set" do
|
58
|
-
@dummy.logger.expects(:debug)
|
59
|
-
|
60
114
|
@dummy.attributes = { :other => "I'm set!",
|
61
115
|
:avatar => @file }
|
62
116
|
|
@@ -65,8 +119,6 @@ class PaperclipTest < Test::Unit::TestCase
|
|
65
119
|
end
|
66
120
|
|
67
121
|
should "still allow assigment on normal set" do
|
68
|
-
@dummy.logger.expects(:debug).times(0)
|
69
|
-
|
70
122
|
@dummy.other = "I'm set!"
|
71
123
|
@dummy.avatar = @file
|
72
124
|
|
@@ -135,45 +187,105 @@ class PaperclipTest < Test::Unit::TestCase
|
|
135
187
|
end
|
136
188
|
end
|
137
189
|
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
190
|
+
context "a validation with an if guard clause" do
|
191
|
+
setup do
|
192
|
+
Dummy.send(:"validates_attachment_presence", :avatar, :if => lambda{|i| i.foo })
|
193
|
+
@dummy = Dummy.new
|
194
|
+
end
|
195
|
+
|
196
|
+
should "attempt validation if the guard returns true" do
|
197
|
+
@dummy.expects(:foo).returns(true)
|
198
|
+
@dummy.avatar.expects(:validate_presence).returns(nil)
|
199
|
+
@dummy.valid?
|
200
|
+
end
|
201
|
+
|
202
|
+
should "not attempt validation if the guard returns false" do
|
203
|
+
@dummy.expects(:foo).returns(false)
|
204
|
+
@dummy.avatar.expects(:validate_presence).never
|
205
|
+
@dummy.valid?
|
206
|
+
end
|
207
|
+
end
|
208
|
+
|
209
|
+
context "a validation with an unless guard clause" do
|
210
|
+
setup do
|
211
|
+
Dummy.send(:"validates_attachment_presence", :avatar, :unless => lambda{|i| i.foo })
|
212
|
+
@dummy = Dummy.new
|
213
|
+
end
|
214
|
+
|
215
|
+
should "attempt validation if the guard returns true" do
|
216
|
+
@dummy.expects(:foo).returns(false)
|
217
|
+
@dummy.avatar.expects(:validate_presence).returns(nil)
|
218
|
+
@dummy.valid?
|
219
|
+
end
|
220
|
+
|
221
|
+
should "not attempt validation if the guard returns false" do
|
222
|
+
@dummy.expects(:foo).returns(true)
|
223
|
+
@dummy.avatar.expects(:validate_presence).never
|
224
|
+
@dummy.valid?
|
225
|
+
end
|
226
|
+
end
|
227
|
+
|
228
|
+
def self.should_validate validation, options, valid_file, invalid_file
|
229
|
+
context "with #{validation} validation and #{options.inspect} options" do
|
146
230
|
setup do
|
147
|
-
Dummy.
|
148
|
-
send(*[:"validates_attachment_#{args[0].to_s[/[a-z_]*/]}", :avatar, args[1]].compact)
|
149
|
-
end
|
231
|
+
Dummy.send(:"validates_attachment_#{validation}", :avatar, options)
|
150
232
|
@dummy = Dummy.new
|
151
233
|
end
|
152
|
-
|
153
|
-
context "and a valid file" do
|
234
|
+
context "and assigning nil" do
|
154
235
|
setup do
|
155
|
-
@
|
236
|
+
@dummy.avatar = nil
|
237
|
+
@dummy.valid?
|
156
238
|
end
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
239
|
+
if validation == :presence
|
240
|
+
should "have an error on the attachment" do
|
241
|
+
assert @dummy.errors.on(:avatar)
|
242
|
+
end
|
243
|
+
else
|
244
|
+
should "not have an error on the attachment" do
|
245
|
+
assert_nil @dummy.errors.on(:avatar)
|
246
|
+
end
|
162
247
|
end
|
163
248
|
end
|
164
|
-
|
165
|
-
context "and an invalid file" do
|
249
|
+
context "and assigned a valid file" do
|
166
250
|
setup do
|
167
|
-
@
|
251
|
+
@dummy.avatar = valid_file
|
252
|
+
@dummy.valid?
|
168
253
|
end
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
254
|
+
should "not have an error when assigned a valid file" do
|
255
|
+
assert ! @dummy.avatar.errors.key?(validation)
|
256
|
+
end
|
257
|
+
should "not have an error on the attachment" do
|
258
|
+
assert_nil @dummy.errors.on(:avatar)
|
259
|
+
end
|
260
|
+
end
|
261
|
+
context "and assigned an invalid file" do
|
262
|
+
setup do
|
263
|
+
@dummy.avatar = invalid_file
|
264
|
+
@dummy.valid?
|
265
|
+
end
|
266
|
+
should "have an error when assigned a valid file" do
|
267
|
+
assert_not_nil @dummy.avatar.errors[validation]
|
268
|
+
end
|
269
|
+
should "have an error on the attachment" do
|
270
|
+
assert @dummy.errors.on(:avatar)
|
174
271
|
end
|
175
272
|
end
|
176
273
|
end
|
177
274
|
end
|
275
|
+
|
276
|
+
[[:presence, {}, "5k.png", nil],
|
277
|
+
[:size, {:in => 1..10240}, nil, "12k.png"],
|
278
|
+
[:size, {:less_than => 10240}, "5k.png", "12k.png"],
|
279
|
+
[:size, {:greater_than => 8096}, "12k.png", "5k.png"],
|
280
|
+
[:content_type, {:content_type => "image/png"}, "5k.png", "text.txt"],
|
281
|
+
[:content_type, {:content_type => "text/plain"}, "text.txt", "5k.png"],
|
282
|
+
[:content_type, {:content_type => %r{image/.*}}, "5k.png", "text.txt"]].each do |args|
|
283
|
+
validation, options, valid_file, invalid_file = args
|
284
|
+
valid_file &&= File.open(File.join(FIXTURES_DIR, valid_file), "rb")
|
285
|
+
invalid_file &&= File.open(File.join(FIXTURES_DIR, invalid_file), "rb")
|
286
|
+
|
287
|
+
should_validate validation, options, valid_file, invalid_file
|
288
|
+
end
|
289
|
+
|
178
290
|
end
|
179
291
|
end
|