spree_core 1.1.6 → 1.2.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (264) hide show
  1. data/app/assets/images/{creditcards → credit_cards}/amex_cid.gif +0 -0
  2. data/app/assets/images/{creditcards/creditcard.gif → credit_cards/credit_card.gif} +0 -0
  3. data/app/assets/images/{creditcards → credit_cards}/discover_cid.gif +0 -0
  4. data/app/assets/images/{creditcards → credit_cards}/icons/american_express.png +0 -0
  5. data/app/assets/images/{creditcards → credit_cards}/icons/cirrus.png +0 -0
  6. data/app/assets/images/{creditcards → credit_cards}/icons/delta.png +0 -0
  7. data/app/assets/images/{creditcards → credit_cards}/icons/dinersclub.png +0 -0
  8. data/app/assets/images/{creditcards → credit_cards}/icons/directdebit.png +0 -0
  9. data/app/assets/images/{creditcards → credit_cards}/icons/discover.png +0 -0
  10. data/app/assets/images/{creditcards → credit_cards}/icons/egold.png +0 -0
  11. data/app/assets/images/{creditcards → credit_cards}/icons/maestro.png +0 -0
  12. data/app/assets/images/{creditcards → credit_cards}/icons/master.png +0 -0
  13. data/app/assets/images/{creditcards → credit_cards}/icons/paypal.png +0 -0
  14. data/app/assets/images/{creditcards → credit_cards}/icons/solo.png +0 -0
  15. data/app/assets/images/{creditcards → credit_cards}/icons/switch.png +0 -0
  16. data/app/assets/images/{creditcards → credit_cards}/icons/visa.png +0 -0
  17. data/app/assets/images/{creditcards → credit_cards}/icons/visaelectron.png +0 -0
  18. data/app/assets/images/{creditcards → credit_cards}/icons/westernunion.png +0 -0
  19. data/app/assets/images/{creditcards → credit_cards}/icons/wirecard.png +0 -0
  20. data/app/assets/images/{creditcards → credit_cards}/icons/worldpay.png +0 -0
  21. data/app/assets/images/{creditcards → credit_cards}/master_cid.jpg +0 -0
  22. data/app/assets/images/{creditcards → credit_cards}/visa_cid.gif +0 -0
  23. data/app/assets/javascripts/admin/admin.js.erb +12 -136
  24. data/app/assets/javascripts/admin/checkouts/edit.js +18 -35
  25. data/app/assets/javascripts/admin/gateway.js +2 -2
  26. data/app/assets/javascripts/admin/images/index.js.coffee +12 -0
  27. data/app/assets/javascripts/admin/images/new.js.coffee +4 -0
  28. data/app/assets/javascripts/admin/orders/edit.js +1 -1
  29. data/app/assets/javascripts/admin/orders/edit_form.js +0 -2
  30. data/app/assets/javascripts/admin/product_autocomplete.js.erb +116 -0
  31. data/app/assets/javascripts/store/cart.js.coffee +7 -0
  32. data/app/assets/javascripts/store/checkout.js.coffee +57 -0
  33. data/app/assets/javascripts/store/product.js.coffee +36 -0
  34. data/app/assets/stylesheets/admin/admin.css.erb +5 -0
  35. data/app/assets/stylesheets/admin/spree_core.css +1 -0
  36. data/app/assets/stylesheets/store/screen.css.scss +15 -1
  37. data/app/assets/stylesheets/store/variables.css.scss +29 -29
  38. data/app/controllers/spree/admin/banners_controller.rb +14 -0
  39. data/app/controllers/spree/admin/base_controller.rb +11 -0
  40. data/app/controllers/spree/admin/images_controller.rb +13 -5
  41. data/app/controllers/spree/admin/line_items_controller.rb +16 -25
  42. data/app/controllers/spree/admin/mail_methods_controller.rb +1 -8
  43. data/app/controllers/spree/admin/option_types_controller.rb +0 -25
  44. data/app/controllers/spree/admin/orders/customer_details_controller.rb +3 -3
  45. data/app/controllers/spree/admin/orders_controller.rb +23 -14
  46. data/app/controllers/spree/admin/payment_methods_controller.rb +1 -7
  47. data/app/controllers/spree/admin/payments_controller.rb +5 -5
  48. data/app/controllers/spree/admin/products_controller.rb +15 -5
  49. data/app/controllers/spree/admin/prototypes_controller.rb +2 -2
  50. data/app/controllers/spree/admin/reports_controller.rb +1 -7
  51. data/app/controllers/spree/admin/resource_controller.rb +130 -130
  52. data/app/controllers/spree/admin/search_controller.rb +47 -0
  53. data/app/controllers/spree/admin/taxons_controller.rb +0 -43
  54. data/app/controllers/spree/base_controller.rb +2 -1
  55. data/app/controllers/spree/checkout_controller.rb +29 -10
  56. data/app/controllers/spree/orders_controller.rb +7 -11
  57. data/app/controllers/spree/products_controller.rb +5 -1
  58. data/app/helpers/spree/account_helper.rb +4 -0
  59. data/app/helpers/spree/admin/base_helper.rb +2 -44
  60. data/app/helpers/spree/admin/navigation_helper.rb +1 -3
  61. data/app/helpers/spree/admin/orders_helper.rb +3 -2
  62. data/app/helpers/spree/admin/products_helper.rb +21 -0
  63. data/app/helpers/spree/base_helper.rb +14 -11
  64. data/app/helpers/spree/checkout_helper.rb +5 -1
  65. data/app/helpers/spree/orders_helper.rb +5 -0
  66. data/app/helpers/spree/products_helper.rb +4 -0
  67. data/app/helpers/spree/trackers_helper.rb +4 -0
  68. data/app/models/spree/ability.rb +70 -0
  69. data/app/models/spree/address.rb +4 -12
  70. data/app/models/spree/adjustment.rb +30 -8
  71. data/app/models/spree/app_configuration.rb +1 -1
  72. data/app/models/spree/calculator/price_sack.rb +3 -5
  73. data/app/models/spree/country.rb +1 -4
  74. data/app/models/spree/{creditcard.rb → credit_card.rb} +4 -4
  75. data/app/models/spree/gateway.rb +2 -2
  76. data/app/models/spree/gateway/bogus.rb +10 -10
  77. data/app/models/spree/gateway/bogus_simple.rb +4 -4
  78. data/app/models/spree/image.rb +3 -12
  79. data/app/models/spree/inventory_unit.rb +4 -6
  80. data/app/models/spree/{user.rb → legacy_user.rb} +7 -6
  81. data/app/models/spree/line_item.rb +4 -5
  82. data/app/models/spree/option_type.rb +4 -6
  83. data/app/models/spree/option_value.rb +1 -1
  84. data/app/models/spree/order.rb +90 -132
  85. data/app/models/spree/order/checkout.rb +124 -0
  86. data/app/models/spree/payment.rb +6 -6
  87. data/app/models/spree/payment/processing.rb +34 -38
  88. data/app/models/spree/payment_method.rb +2 -2
  89. data/app/models/spree/preference.rb +2 -0
  90. data/app/models/spree/preferences/preferable_class_methods.rb +0 -2
  91. data/app/models/spree/preferences/store.rb +3 -21
  92. data/app/models/spree/product.rb +41 -43
  93. data/app/models/spree/product/scopes.rb +9 -25
  94. data/app/models/spree/product_option_type.rb +2 -2
  95. data/app/models/spree/product_property.rb +9 -4
  96. data/app/models/spree/property.rb +1 -1
  97. data/app/models/spree/prototype.rb +2 -2
  98. data/app/models/spree/return_authorization.rb +2 -2
  99. data/app/models/spree/role.rb +1 -1
  100. data/app/models/spree/shipment.rb +6 -5
  101. data/app/models/spree/shipping_method.rb +19 -13
  102. data/app/models/spree/state.rb +2 -5
  103. data/app/models/spree/state_change.rb +1 -1
  104. data/app/models/spree/tax_rate.rb +8 -1
  105. data/app/models/spree/taxon.rb +5 -1
  106. data/app/models/spree/taxonomy.rb +1 -1
  107. data/app/models/spree/tokenized_permission.rb +6 -0
  108. data/app/models/spree/tracker.rb +1 -1
  109. data/app/models/spree/variant.rb +13 -40
  110. data/app/models/spree/zone.rb +15 -14
  111. data/app/models/spree/zone_member.rb +1 -1
  112. data/app/views/spree/admin/image_settings/edit.html.erb +2 -2
  113. data/app/views/spree/admin/images/_form.html.erb +8 -4
  114. data/app/views/spree/admin/images/index.html.erb +1 -1
  115. data/app/views/spree/admin/line_items/create.js.erb +1 -1
  116. data/app/views/spree/admin/option_types/_option_value_fields.html.erb +1 -1
  117. data/app/views/spree/admin/option_types/index.html.erb +1 -1
  118. data/app/views/spree/admin/orders/_add_product.html.erb +1 -1
  119. data/app/views/spree/admin/orders/customer_details/edit.html.erb +1 -1
  120. data/app/views/spree/admin/orders/index.html.erb +4 -4
  121. data/app/views/spree/admin/orders/show.html.erb +1 -1
  122. data/app/views/spree/admin/payments/_form.html.erb +1 -1
  123. data/app/views/spree/admin/payments/new.html.erb +0 -4
  124. data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +1 -1
  125. data/app/views/spree/admin/payments/source_views/_gateway.html.erb +2 -2
  126. data/app/views/spree/admin/products/_form.html.erb +21 -5
  127. data/app/views/spree/admin/products/index.html.erb +2 -2
  128. data/app/views/spree/admin/properties/_form.html.erb +1 -1
  129. data/app/views/spree/admin/properties/index.html.erb +1 -1
  130. data/app/views/spree/admin/return_authorizations/_form.html.erb +33 -17
  131. data/app/views/spree/admin/return_authorizations/edit.html.erb +2 -2
  132. data/app/views/spree/admin/shared/_address_form.html.erb +1 -1
  133. data/app/views/spree/admin/shared/_head.html.erb +12 -2
  134. data/app/views/spree/admin/shared/_order_tabs.html.erb +1 -4
  135. data/app/views/spree/admin/shared/_product_tabs.html.erb +0 -6
  136. data/app/views/spree/admin/shared/_show_resource_links.html.erb +3 -3
  137. data/app/views/spree/admin/shared/_tabs.html.erb +1 -2
  138. data/app/views/spree/admin/shipments/edit.html.erb +2 -2
  139. data/app/views/spree/admin/shipping_methods/_form.html.erb +1 -1
  140. data/app/views/spree/admin/states/_state_list.html.erb +1 -1
  141. data/app/views/spree/admin/tax_rates/index.html.erb +1 -1
  142. data/app/views/spree/admin/taxonomies/_form.html.erb +1 -1
  143. data/app/views/spree/admin/taxons/_form.html.erb +1 -1
  144. data/app/views/spree/admin/taxons/_taxon_table.html.erb +2 -2
  145. data/app/views/spree/admin/variants/_form.html.erb +13 -13
  146. data/app/views/spree/admin/variants/index.html.erb +1 -7
  147. data/app/views/spree/checkout/_address.html.erb +10 -4
  148. data/app/views/spree/checkout/edit.html.erb +0 -1
  149. data/app/views/spree/checkout/payment/_gateway.html.erb +5 -5
  150. data/app/views/spree/checkout/registration.html.erb +2 -2
  151. data/app/views/spree/content/cvv.html.erb +6 -6
  152. data/app/views/spree/layouts/spree_application.html.erb +4 -48
  153. data/app/views/spree/order_mailer/cancel_email.text.erb +5 -5
  154. data/app/views/spree/order_mailer/confirm_email.text.erb +6 -7
  155. data/app/views/spree/orders/_adjustments.html.erb +14 -0
  156. data/app/views/spree/orders/_form.html.erb +1 -0
  157. data/app/views/spree/orders/show.html.erb +3 -3
  158. data/app/views/spree/products/_thumbnails.html.erb +1 -1
  159. data/app/views/spree/products/index.html.erb +1 -1
  160. data/app/views/spree/shared/_footer.html.erb +6 -0
  161. data/app/views/spree/shared/_google_analytics.html.erb +15 -16
  162. data/app/views/spree/shared/_head.html.erb +3 -9
  163. data/app/views/spree/shared/_header.html.erb +5 -0
  164. data/app/views/spree/shared/_main_nav_bar.html.erb +6 -0
  165. data/app/views/spree/shared/_nav_bar.html.erb +7 -3
  166. data/app/views/spree/shared/_order_details.html.erb +14 -11
  167. data/app/views/spree/shared/_sidebar.html.erb +3 -0
  168. data/app/views/spree/shared/unauthorized.html.erb +0 -0
  169. data/app/views/spree/shipment_mailer/shipped_email.text.erb +7 -7
  170. data/app/views/spree/taxons/show.html.erb +1 -1
  171. data/config/initializers/check_for_orphaned_preferences.rb +1 -1
  172. data/config/initializers/spree.rb +0 -12
  173. data/config/initializers/user_class_extensions.rb +25 -0
  174. data/config/initializers/workarounds_for_ruby19.rb +72 -0
  175. data/config/locales/en.yml +11 -24
  176. data/config/routes.rb +7 -37
  177. data/db/migrate/20090823005402_spree_zero_nine_zero.rb +14 -12
  178. data/db/migrate/20091015153048_add_openid_field_to_users.rb +9 -7
  179. data/db/migrate/20100209144531_polymorphic_payments.rb +5 -5
  180. data/db/migrate/20100214212536_assign_creditcard_txns_to_payment.rb +4 -4
  181. data/db/migrate/20100528185820_add_index_on_users_persistence_token.rb +3 -1
  182. data/db/migrate/20100811163637_add_guest_flag.rb +3 -1
  183. data/db/migrate/20100901171814_change_guest_flag_to_anonymous.rb +3 -1
  184. data/db/migrate/20101026184959_generate_anonymous_users.rb +3 -3
  185. data/db/migrate/20101103212716_drop_anonymous_field_for_user.rb +3 -1
  186. data/db/migrate/20111007143030_namespace_top_level_models.rb +18 -1
  187. data/db/migrate/20120315064358_migrate_images_from_products_to_variants.rb +6 -4
  188. data/db/migrate/20120509055454_create_tokenized_permissions_table.rb +16 -0
  189. data/db/migrate/20120530012000_rename_creditcards_to_credit_cards.rb +11 -0
  190. data/db/migrate/20120604203654_remove_credit_total_from_orders.rb +5 -0
  191. data/lib/generators/spree/custom_user/custom_user_generator.rb +53 -0
  192. data/lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt +28 -0
  193. data/lib/generators/spree/custom_user/templates/initializer.rb.tt +1 -0
  194. data/lib/generators/spree/custom_user/templates/migration.rb.tt +7 -0
  195. data/lib/generators/spree/dummy/dummy_generator.rb +3 -0
  196. data/lib/generators/spree/dummy/templates/initializers/custom_user.rb +1 -0
  197. data/lib/generators/spree/install/templates/app/assets/javascripts/admin/all.js +0 -1
  198. data/lib/generators/spree/install/templates/app/assets/javascripts/store/all.js +0 -1
  199. data/lib/generators/spree/install/templates/app/assets/stylesheets/admin/all.css +0 -1
  200. data/lib/generators/spree/install/templates/app/assets/stylesheets/store/all.css +0 -1
  201. data/lib/generators/spree/install/templates/config/initializers/spree.rb +2 -0
  202. data/lib/spree/core.rb +15 -2
  203. data/lib/spree/core/controller_helpers.rb +123 -62
  204. data/lib/spree/core/current_order.rb +5 -0
  205. data/lib/spree/core/engine.rb +1 -1
  206. data/lib/spree/core/mail_settings.rb +1 -2
  207. data/lib/spree/core/permalinks.rb +1 -5
  208. data/lib/spree/core/preference_rescue.rb +8 -4
  209. data/lib/spree/core/relation_serialization.rb +9 -0
  210. data/lib/spree/core/respond_with.rb +1 -1
  211. data/lib/spree/core/s3_support.rb +25 -0
  212. data/lib/spree/core/search/base.rb +2 -5
  213. data/lib/spree/core/ssl_requirement.rb +2 -2
  214. data/lib/spree/core/store_helpers.rb +1 -2
  215. data/lib/spree/core/testing_support/controller_requests.rb +1 -0
  216. data/lib/spree/core/testing_support/env.rb +2 -0
  217. data/lib/spree/core/testing_support/factories/{creditcard_factory.rb → credit_card_factory.rb} +3 -3
  218. data/lib/spree/core/testing_support/factories/payment_factory.rb +1 -1
  219. data/lib/spree/core/testing_support/factories/product_factory.rb +4 -4
  220. data/lib/spree/core/testing_support/factories/user_factory.rb +3 -3
  221. data/lib/spree/core/testing_support/factories/zone_factory.rb +2 -3
  222. data/lib/spree/core/token_resource.rb +27 -0
  223. data/lib/spree/core/version.rb +1 -1
  224. data/lib/spree/product_filters.rb +12 -13
  225. data/lib/tasks/core.rake +1 -1
  226. metadata +146 -154
  227. data/app/assets/images/noimage/large.png +0 -0
  228. data/app/assets/javascripts/admin/images/index.js +0 -10
  229. data/app/assets/javascripts/admin/images/new.js +0 -5
  230. data/app/assets/javascripts/admin/products.js +0 -2
  231. data/app/assets/javascripts/store/cart.js +0 -11
  232. data/app/assets/javascripts/store/checkout.js +0 -78
  233. data/app/assets/javascripts/store/product.js +0 -49
  234. data/app/controllers/spree/admin/users_controller.rb +0 -68
  235. data/app/views/spree/admin/option_types/_available.html.erb +0 -28
  236. data/app/views/spree/admin/option_types/_selected.html.erb +0 -26
  237. data/app/views/spree/admin/option_types/available.js.erb +0 -2
  238. data/app/views/spree/admin/option_types/select.js.erb +0 -3
  239. data/app/views/spree/admin/option_types/selected.html.erb +0 -6
  240. data/app/views/spree/admin/orders/history.html.erb +0 -29
  241. data/app/views/spree/admin/products/_option_types.html.erb +0 -40
  242. data/app/views/spree/admin/shared/_additional_field.html.erb +0 -5
  243. data/app/views/spree/admin/shared/_routes.html.erb +0 -8
  244. data/app/views/spree/admin/shared/_translations.html.erb +0 -17
  245. data/app/views/spree/admin/taxons/available.js.erb +0 -26
  246. data/app/views/spree/admin/taxons/remove.html.erb +0 -1
  247. data/app/views/spree/admin/taxons/select.js.erb +0 -2
  248. data/app/views/spree/admin/taxons/selected.html.erb +0 -42
  249. data/app/views/spree/admin/users/_form.html.erb +0 -19
  250. data/app/views/spree/admin/users/edit.html.erb +0 -14
  251. data/app/views/spree/admin/users/index.html.erb +0 -48
  252. data/app/views/spree/admin/users/new.html.erb +0 -14
  253. data/app/views/spree/admin/users/show.html.erb +0 -21
  254. data/app/views/spree/shared/_store_menu.html.erb +0 -2
  255. data/config/initializers/rails_5868.rb +0 -8
  256. data/db/migrate/20120605211305_make_users_email_index_unique.rb +0 -10
  257. data/db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb +0 -11
  258. data/db/sample/users.rb +0 -61
  259. data/lib/generators/spree/sandbox/sandbox_generator.rb +0 -36
  260. data/lib/generators/spree/sandbox/templates/rails/routes.rb +0 -7
  261. data/lib/spree/core/ext/array.rb +0 -14
  262. data/lib/spree/core/ext/hash.rb +0 -75
  263. data/lib/spree/core/ext/string.rb +0 -10
  264. data/lib/tasks/install.rake +0 -18
@@ -102,10 +102,10 @@ module SslRequirement
102
102
  def ensure_proper_protocol
103
103
  return true if ssl_allowed?
104
104
  if ssl_required? && !request.ssl? && ssl_supported?
105
- redirect_to "https://" + request.host + request.fullpath.sub("//", "/")
105
+ redirect_to "https://" + request.host + request.fullpath
106
106
  flash.keep
107
107
  elsif request.ssl? && !ssl_required?
108
- redirect_to "http://" + request.host + request.fullpath.sub("//", "/")
108
+ redirect_to "http://" + request.host + request.fullpath
109
109
  flash.keep
110
110
  end
111
111
 
@@ -5,8 +5,7 @@ module Spree
5
5
 
6
6
  # helper to determine if its appropriate to show the store menu
7
7
  def store_menu?
8
- return true unless %w{thank_you}.include? @current_action
9
- false
8
+ %w{thank_you}.exclude? params[:action]
10
9
  end
11
10
 
12
11
  end
@@ -48,6 +48,7 @@ module Spree
48
48
 
49
49
  def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
50
50
  parameters ||= {}
51
+ parameters.reverse_merge!(:format => :json)
51
52
  parameters.merge!(:use_route => :spree)
52
53
  xml_http_request(:get, action, parameters, session, flash)
53
54
  end
@@ -0,0 +1,2 @@
1
+ Capybara.default_selector = :css
2
+ Capybara.server_boot_timeout = 50
@@ -1,10 +1,10 @@
1
- # allows creditcard info to be saved to the datbase which is needed for factories to work properly
2
- class TestCard < Spree::Creditcard
1
+ # allows credit card info to be saved to the database which is needed for factories to work properly
2
+ class TestCard < Spree::CreditCard
3
3
  def remove_readonly_attributes(attributes) attributes; end
4
4
  end
5
5
 
6
6
  FactoryGirl.define do
7
- factory :creditcard, :class => TestCard do
7
+ factory :credit_card, :class => TestCard do
8
8
  verification_value 123
9
9
  month 12
10
10
  year 2013
@@ -2,7 +2,7 @@ FactoryGirl.define do
2
2
  factory :payment, :class => Spree::Payment do
3
3
  amount 45.75
4
4
  payment_method { FactoryGirl.create(:bogus_payment_method) }
5
- source { FactoryGirl.build(:creditcard) }
5
+ source { FactoryGirl.build(:credit_card) }
6
6
  order { FactoryGirl.create(:order) }
7
7
  state 'pending'
8
8
  response_code '12345'
@@ -10,8 +10,8 @@ FactoryGirl.define do
10
10
  end
11
11
 
12
12
  factory :product, :parent => :simple_product do
13
- tax_category { |r| Spree::TaxCategory.find(:first) || r.association(:tax_category) }
14
- shipping_category { |r| Spree::ShippingCategory.find(:first) || r.association(:shipping_category) }
13
+ tax_category { |r| Spree::TaxCategory.first || r.association(:tax_category) }
14
+ shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) }
15
15
  end
16
16
 
17
17
  factory :product_with_option_types, :parent => :product do
@@ -24,8 +24,8 @@ FactoryGirl.define do
24
24
  description { Faker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
25
25
 
26
26
  # associations:
27
- tax_category { |r| Spree::TaxCategory.find(:first) || r.association(:tax_category) }
28
- shipping_category { |r| Spree::ShippingCategory.find(:first) || r.association(:shipping_category) }
27
+ tax_category { |r| Spree::TaxCategory.first || r.association(:tax_category) }
28
+ shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) }
29
29
 
30
30
  sku 'ABC'
31
31
  available_on 1.year.ago
@@ -3,15 +3,15 @@ FactoryGirl.define do
3
3
  "xxxx#{Time.now.to_i}#{rand(1000)}#{n}xxxxxxxxxxxxx"
4
4
  end
5
5
 
6
- factory :user, :class => Spree::User do
6
+ factory :user, :class => Spree::LegacyUser do
7
7
  email { Faker::Internet.email }
8
8
  login { email }
9
9
  password 'secret'
10
10
  password_confirmation 'secret'
11
- authentication_token { FactoryGirl.generate(:user_authentication_token) } if Spree::User.attribute_method? :authentication_token
11
+ authentication_token { FactoryGirl.generate(:user_authentication_token) } if Spree::LegacyUser.attribute_method? :authentication_token
12
12
  end
13
13
 
14
14
  factory :admin_user, :parent => :user do
15
- roles { [Spree::Role.find_by_name('admin') || FactoryGirl.create(:role, :name => 'admin')]}
15
+ spree_roles { [Spree::Role.find_by_name('admin') || FactoryGirl.create(:role, :name => 'admin')] }
16
16
  end
17
17
  end
@@ -3,8 +3,8 @@ FactoryGirl.define do
3
3
  name 'GlobalZone'
4
4
  description { Faker::Lorem.sentence }
5
5
  zone_members do |proxy|
6
- zone = proxy.instance_eval{@instance}
7
- Spree::Country.find(:all).map do |c|
6
+ zone = proxy.instance_eval { @instance }
7
+ Spree::Country.all.map do |c|
8
8
  zone_member = Spree::ZoneMember.create(:zoneable => c, :zone => zone)
9
9
  end
10
10
  end
@@ -13,6 +13,5 @@ FactoryGirl.define do
13
13
  factory :zone, :class => Spree::Zone do
14
14
  name { Faker::Lorem.words }
15
15
  description { Faker::Lorem.sentence }
16
- zone_members { [Spree::ZoneMember.create(:zoneable => Factory(:country))] }
17
16
  end
18
17
  end
@@ -0,0 +1,27 @@
1
+ module Spree
2
+ module Core
3
+ module TokenResource
4
+ module ClassMethods
5
+ def token_resource
6
+ has_one :tokenized_permission, :as => :permissable
7
+ delegate :token, :to => :tokenized_permission, :allow_nil => true
8
+ after_create :create_token
9
+ end
10
+ end
11
+
12
+ def create_token
13
+ permission = build_tokenized_permission
14
+ permission.token = token = ::SecureRandom::hex(8)
15
+ permission.save!
16
+ token
17
+ end
18
+
19
+ def self.included(receiver)
20
+ receiver.extend ClassMethods
21
+ end
22
+ end
23
+ end
24
+ end
25
+
26
+ ActiveRecord::Base.class_eval { include Spree::Core::TokenResource }
27
+
@@ -1,5 +1,5 @@
1
1
  module Spree
2
2
  def self.version
3
- "1.1.6"
3
+ "1.2.0.rc1"
4
4
  end
5
5
  end
@@ -106,13 +106,13 @@ module Spree
106
106
 
107
107
  def ProductFilters.brand_filter
108
108
  brand_property = Spree::Property.find_by_name("brand")
109
- brands = Spree::ProductProperty.where(:property_id => brand_property).map(&:value).compact.uniq
109
+ brands = Spree::ProductProperty.where(:property_id => brand_property).pluck(:value).uniq
110
110
  pp = Spree::ProductProperty.arel_table
111
- conds = Hash[*brands.map {|b| [b, pp[:value].eq(b)]}.flatten]
111
+ conds = Hash[*brands.map { |b| [b, pp[:value].eq(b)] }.flatten]
112
112
  { :name => "Brands",
113
113
  :scope => :brand_any,
114
114
  :conds => conds,
115
- :labels => (brands.sort).map {|k| [k,k]}
115
+ :labels => (brands.sort).map { |k| [k, k] }
116
116
  }
117
117
  end
118
118
  end
@@ -142,18 +142,17 @@ module Spree
142
142
  end
143
143
 
144
144
  def ProductFilters.selective_brand_filter(taxon = nil)
145
- if taxon.nil?
146
- taxon = Spree::Taxonomy.first.root
147
- end
145
+ taxon ||= Spree::Taxonomy.first.root
148
146
  brand_property = Spree::Property.find_by_name("brand")
149
- scope = Spree::ProductProperty.scoped(:conditions => ["property_id = ?", brand_property]).
150
- scoped(:joins => {:product => :taxons},
151
- :conditions => ["#{Spree::Taxon.table_name}.id in (?)", [taxon] + taxon.descendants])
152
- brands = scope.map {|p| p.value}.uniq
153
-
154
- { :name => "Applicable Brands",
147
+ scope = Spree::ProductProperty.where(:property_id => brand_property).
148
+ joins(:product => :taxons).
149
+ where("#{Spree::Taxon.table_name}.id" => [taxon] + taxon.descendants).
150
+ scoped
151
+ brands = scope.pluck(:value).uniq
152
+ {
153
+ :name => "Applicable Brands",
155
154
  :scope => :selective_brand_any,
156
- :labels => brands.sort.map {|k| [k,k]}
155
+ :labels => brands.sort.map { |k| [k,k] }
157
156
  }
158
157
  end
159
158
  end
data/lib/tasks/core.rake CHANGED
@@ -63,7 +63,7 @@ For .rb use rake db:load_file[/absolute/path/to/sample/filename.rb]}
63
63
  end
64
64
  end
65
65
 
66
- desc "Bootstrap is: migrating, loading defaults, sample data and seeding (for all extensions) invoking create_admin and load_products tasks"
66
+ desc "Bootstrap is: migrating, loading defaults, sample data and seeding (for all extensions) and load_products tasks"
67
67
  task :bootstrap do
68
68
  require 'highline/import'
69
69
 
metadata CHANGED
@@ -1,272 +1,272 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_core
3
3
  version: !ruby/object:Gem::Version
4
- prerelease:
5
- version: 1.1.6
4
+ version: 1.2.0.rc1
5
+ prerelease: 6
6
6
  platform: ruby
7
7
  authors:
8
8
  - Sean Schofield
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-02-25 00:00:00.000000000 Z
12
+ date: 2012-08-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
- type: :runtime
16
- version_requirements: !ruby/object:Gem::Requirement
15
+ name: acts_as_list
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
21
  version: 0.1.4
22
- name: acts_as_list
22
+ type: :runtime
23
23
  prerelease: false
24
- requirement: !ruby/object:Gem::Requirement
24
+ version_requirements: !ruby/object:Gem::Requirement
25
25
  none: false
26
26
  requirements:
27
27
  - - '='
28
28
  - !ruby/object:Gem::Version
29
29
  version: 0.1.4
30
30
  - !ruby/object:Gem::Dependency
31
- type: :runtime
32
- version_requirements: !ruby/object:Gem::Requirement
31
+ name: nested_set
32
+ requirement: !ruby/object:Gem::Requirement
33
33
  none: false
34
34
  requirements:
35
35
  - - '='
36
36
  - !ruby/object:Gem::Version
37
37
  version: 1.7.0
38
- name: nested_set
38
+ type: :runtime
39
39
  prerelease: false
40
- requirement: !ruby/object:Gem::Requirement
40
+ version_requirements: !ruby/object:Gem::Requirement
41
41
  none: false
42
42
  requirements:
43
43
  - - '='
44
44
  - !ruby/object:Gem::Version
45
45
  version: 1.7.0
46
46
  - !ruby/object:Gem::Dependency
47
- type: :runtime
48
- version_requirements: !ruby/object:Gem::Requirement
47
+ name: jquery-rails
48
+ requirement: !ruby/object:Gem::Requirement
49
49
  none: false
50
50
  requirements:
51
51
  - - ~>
52
52
  - !ruby/object:Gem::Version
53
- version: '2.0'
54
- name: jquery-rails
53
+ version: 2.0.0
54
+ type: :runtime
55
55
  prerelease: false
56
- requirement: !ruby/object:Gem::Requirement
56
+ version_requirements: !ruby/object:Gem::Requirement
57
57
  none: false
58
58
  requirements:
59
59
  - - ~>
60
60
  - !ruby/object:Gem::Version
61
- version: '2.0'
61
+ version: 2.0.0
62
62
  - !ruby/object:Gem::Dependency
63
+ name: select2-rails
64
+ requirement: !ruby/object:Gem::Requirement
65
+ none: false
66
+ requirements:
67
+ - - '='
68
+ - !ruby/object:Gem::Version
69
+ version: 0.0.9
63
70
  type: :runtime
71
+ prerelease: false
64
72
  version_requirements: !ruby/object:Gem::Requirement
65
73
  none: false
66
74
  requirements:
67
75
  - - '='
68
76
  - !ruby/object:Gem::Version
69
- version: 1.6.11
77
+ version: 0.0.9
78
+ - !ruby/object:Gem::Dependency
70
79
  name: highline
71
- prerelease: false
72
80
  requirement: !ruby/object:Gem::Requirement
73
81
  none: false
74
82
  requirements:
75
83
  - - '='
76
84
  - !ruby/object:Gem::Version
77
85
  version: 1.6.11
78
- - !ruby/object:Gem::Dependency
79
86
  type: :runtime
87
+ prerelease: false
80
88
  version_requirements: !ruby/object:Gem::Requirement
81
89
  none: false
82
90
  requirements:
83
91
  - - '='
84
92
  - !ruby/object:Gem::Version
85
- version: 1.1.2
93
+ version: 1.6.11
94
+ - !ruby/object:Gem::Dependency
86
95
  name: state_machine
87
- prerelease: false
88
96
  requirement: !ruby/object:Gem::Requirement
89
97
  none: false
90
98
  requirements:
91
99
  - - '='
92
100
  - !ruby/object:Gem::Version
93
101
  version: 1.1.2
94
- - !ruby/object:Gem::Dependency
95
102
  type: :runtime
103
+ prerelease: false
96
104
  version_requirements: !ruby/object:Gem::Requirement
97
105
  none: false
98
106
  requirements:
99
- - - ~>
107
+ - - '='
100
108
  - !ruby/object:Gem::Version
101
- version: 1.12.0
109
+ version: 1.1.2
110
+ - !ruby/object:Gem::Dependency
102
111
  name: ffaker
103
- prerelease: false
104
112
  requirement: !ruby/object:Gem::Requirement
105
113
  none: false
106
114
  requirements:
107
115
  - - ~>
108
116
  - !ruby/object:Gem::Version
109
117
  version: 1.12.0
110
- - !ruby/object:Gem::Dependency
111
118
  type: :runtime
119
+ prerelease: false
112
120
  version_requirements: !ruby/object:Gem::Requirement
113
121
  none: false
114
122
  requirements:
115
123
  - - ~>
116
124
  - !ruby/object:Gem::Version
117
- version: '2.8'
125
+ version: 1.12.0
126
+ - !ruby/object:Gem::Dependency
118
127
  name: paperclip
119
- prerelease: false
120
128
  requirement: !ruby/object:Gem::Requirement
121
129
  none: false
122
130
  requirements:
123
131
  - - ~>
124
132
  - !ruby/object:Gem::Version
125
- version: '2.8'
126
- - !ruby/object:Gem::Dependency
133
+ version: '2.7'
127
134
  type: :runtime
135
+ prerelease: false
128
136
  version_requirements: !ruby/object:Gem::Requirement
129
137
  none: false
130
138
  requirements:
131
139
  - - ~>
132
140
  - !ruby/object:Gem::Version
133
- version: 1.3.4
141
+ version: '2.7'
142
+ - !ruby/object:Gem::Dependency
134
143
  name: aws-sdk
135
- prerelease: false
136
144
  requirement: !ruby/object:Gem::Requirement
137
145
  none: false
138
146
  requirements:
139
147
  - - ~>
140
148
  - !ruby/object:Gem::Version
141
149
  version: 1.3.4
142
- - !ruby/object:Gem::Dependency
143
150
  type: :runtime
151
+ prerelease: false
144
152
  version_requirements: !ruby/object:Gem::Requirement
145
153
  none: false
146
154
  requirements:
147
155
  - - ~>
148
156
  - !ruby/object:Gem::Version
149
- version: 0.6.0
157
+ version: 1.3.4
158
+ - !ruby/object:Gem::Dependency
150
159
  name: ransack
151
- prerelease: false
152
160
  requirement: !ruby/object:Gem::Requirement
153
161
  none: false
154
162
  requirements:
155
163
  - - ~>
156
164
  - !ruby/object:Gem::Version
157
165
  version: 0.6.0
158
- - !ruby/object:Gem::Dependency
159
166
  type: :runtime
167
+ prerelease: false
160
168
  version_requirements: !ruby/object:Gem::Requirement
161
169
  none: false
162
170
  requirements:
163
- - - '='
171
+ - - ~>
164
172
  - !ruby/object:Gem::Version
165
- version: 1.28.0
173
+ version: 0.6.0
174
+ - !ruby/object:Gem::Dependency
166
175
  name: activemerchant
167
- prerelease: false
168
176
  requirement: !ruby/object:Gem::Requirement
169
177
  none: false
170
178
  requirements:
171
179
  - - '='
172
180
  - !ruby/object:Gem::Version
173
- version: 1.28.0
174
- - !ruby/object:Gem::Dependency
181
+ version: 1.20.4
175
182
  type: :runtime
176
- version_requirements: !ruby/object:Gem::Requirement
177
- none: false
178
- requirements:
179
- - - ! '>='
180
- - !ruby/object:Gem::Version
181
- version: 1.5.5
182
- name: json
183
183
  prerelease: false
184
- requirement: !ruby/object:Gem::Requirement
185
- none: false
186
- requirements:
187
- - - ! '>='
188
- - !ruby/object:Gem::Version
189
- version: 1.5.5
190
- - !ruby/object:Gem::Dependency
191
- type: :runtime
192
184
  version_requirements: !ruby/object:Gem::Requirement
193
185
  none: false
194
186
  requirements:
195
187
  - - '='
196
188
  - !ruby/object:Gem::Version
197
- version: 5.0.0
198
- name: money
199
- prerelease: false
189
+ version: 1.20.4
190
+ - !ruby/object:Gem::Dependency
191
+ name: rails
200
192
  requirement: !ruby/object:Gem::Requirement
201
193
  none: false
202
194
  requirements:
203
- - - '='
195
+ - - ~>
204
196
  - !ruby/object:Gem::Version
205
- version: 5.0.0
206
- - !ruby/object:Gem::Dependency
197
+ version: 3.2.7
207
198
  type: :runtime
199
+ prerelease: false
208
200
  version_requirements: !ruby/object:Gem::Requirement
209
201
  none: false
210
202
  requirements:
211
203
  - - ~>
212
204
  - !ruby/object:Gem::Version
213
- version: 3.2.12
214
- name: rails
215
- prerelease: false
205
+ version: 3.2.7
206
+ - !ruby/object:Gem::Dependency
207
+ name: kaminari
216
208
  requirement: !ruby/object:Gem::Requirement
217
209
  none: false
218
210
  requirements:
219
- - - ~>
211
+ - - ! '>='
220
212
  - !ruby/object:Gem::Version
221
- version: 3.2.12
222
- - !ruby/object:Gem::Dependency
213
+ version: 0.13.0
223
214
  type: :runtime
215
+ prerelease: false
224
216
  version_requirements: !ruby/object:Gem::Requirement
225
217
  none: false
226
218
  requirements:
227
- - - '='
219
+ - - ! '>='
228
220
  - !ruby/object:Gem::Version
229
221
  version: 0.13.0
230
- name: kaminari
231
- prerelease: false
222
+ - !ruby/object:Gem::Dependency
223
+ name: deface
232
224
  requirement: !ruby/object:Gem::Requirement
233
225
  none: false
234
226
  requirements:
235
- - - '='
227
+ - - ! '>='
236
228
  - !ruby/object:Gem::Version
237
- version: 0.13.0
238
- - !ruby/object:Gem::Dependency
229
+ version: 0.9.0
239
230
  type: :runtime
231
+ prerelease: false
240
232
  version_requirements: !ruby/object:Gem::Requirement
241
233
  none: false
242
234
  requirements:
243
235
  - - ! '>='
244
236
  - !ruby/object:Gem::Version
245
237
  version: 0.9.0
246
- name: deface
247
- prerelease: false
238
+ - !ruby/object:Gem::Dependency
239
+ name: stringex
248
240
  requirement: !ruby/object:Gem::Requirement
249
241
  none: false
250
242
  requirements:
251
- - - ! '>='
243
+ - - ~>
252
244
  - !ruby/object:Gem::Version
253
- version: 0.9.0
254
- - !ruby/object:Gem::Dependency
245
+ version: 1.3.2
255
246
  type: :runtime
247
+ prerelease: false
256
248
  version_requirements: !ruby/object:Gem::Requirement
257
249
  none: false
258
250
  requirements:
259
251
  - - ~>
260
252
  - !ruby/object:Gem::Version
261
253
  version: 1.3.2
262
- name: stringex
263
- prerelease: false
254
+ - !ruby/object:Gem::Dependency
255
+ name: cancan
264
256
  requirement: !ruby/object:Gem::Requirement
265
257
  none: false
266
258
  requirements:
267
- - - ~>
259
+ - - '='
268
260
  - !ruby/object:Gem::Version
269
- version: 1.3.2
261
+ version: 1.6.7
262
+ type: :runtime
263
+ prerelease: false
264
+ version_requirements: !ruby/object:Gem::Requirement
265
+ none: false
266
+ requirements:
267
+ - - '='
268
+ - !ruby/object:Gem::Version
269
+ version: 1.6.7
270
270
  description: Required dependency for Spree
271
271
  email: sean@spreecommerce.com
272
272
  executables: []
@@ -354,34 +354,33 @@ files:
354
354
  - app/assets/images/admin/icons/xls.png
355
355
  - app/assets/images/admin/payment_banner.png
356
356
  - app/assets/images/admin/progress.gif
357
- - app/assets/images/creditcards/amex_cid.gif
358
- - app/assets/images/creditcards/creditcard.gif
359
- - app/assets/images/creditcards/discover_cid.gif
360
- - app/assets/images/creditcards/icons/american_express.png
361
- - app/assets/images/creditcards/icons/cirrus.png
362
- - app/assets/images/creditcards/icons/delta.png
363
- - app/assets/images/creditcards/icons/dinersclub.png
364
- - app/assets/images/creditcards/icons/directdebit.png
365
- - app/assets/images/creditcards/icons/discover.png
366
- - app/assets/images/creditcards/icons/egold.png
367
- - app/assets/images/creditcards/icons/maestro.png
368
- - app/assets/images/creditcards/icons/master.png
369
- - app/assets/images/creditcards/icons/paypal.png
370
- - app/assets/images/creditcards/icons/solo.png
371
- - app/assets/images/creditcards/icons/switch.png
372
- - app/assets/images/creditcards/icons/visa.png
373
- - app/assets/images/creditcards/icons/visaelectron.png
374
- - app/assets/images/creditcards/icons/westernunion.png
375
- - app/assets/images/creditcards/icons/wirecard.png
376
- - app/assets/images/creditcards/icons/worldpay.png
377
- - app/assets/images/creditcards/master_cid.jpg
378
- - app/assets/images/creditcards/visa_cid.gif
357
+ - app/assets/images/credit_cards/amex_cid.gif
358
+ - app/assets/images/credit_cards/credit_card.gif
359
+ - app/assets/images/credit_cards/discover_cid.gif
360
+ - app/assets/images/credit_cards/icons/american_express.png
361
+ - app/assets/images/credit_cards/icons/cirrus.png
362
+ - app/assets/images/credit_cards/icons/delta.png
363
+ - app/assets/images/credit_cards/icons/dinersclub.png
364
+ - app/assets/images/credit_cards/icons/directdebit.png
365
+ - app/assets/images/credit_cards/icons/discover.png
366
+ - app/assets/images/credit_cards/icons/egold.png
367
+ - app/assets/images/credit_cards/icons/maestro.png
368
+ - app/assets/images/credit_cards/icons/master.png
369
+ - app/assets/images/credit_cards/icons/paypal.png
370
+ - app/assets/images/credit_cards/icons/solo.png
371
+ - app/assets/images/credit_cards/icons/switch.png
372
+ - app/assets/images/credit_cards/icons/visa.png
373
+ - app/assets/images/credit_cards/icons/visaelectron.png
374
+ - app/assets/images/credit_cards/icons/westernunion.png
375
+ - app/assets/images/credit_cards/icons/wirecard.png
376
+ - app/assets/images/credit_cards/icons/worldpay.png
377
+ - app/assets/images/credit_cards/master_cid.jpg
378
+ - app/assets/images/credit_cards/visa_cid.gif
379
379
  - app/assets/images/favicon.ico
380
380
  - app/assets/images/icons/add-to-cart.png
381
381
  - app/assets/images/icons/checkout.png
382
382
  - app/assets/images/icons/delete.png
383
383
  - app/assets/images/icons/update.png
384
- - app/assets/images/noimage/large.png
385
384
  - app/assets/images/noimage/mini.png
386
385
  - app/assets/images/noimage/product.png
387
386
  - app/assets/images/noimage/small.png
@@ -394,21 +393,21 @@ files:
394
393
  - app/assets/javascripts/admin/checkouts/edit.js
395
394
  - app/assets/javascripts/admin/gateway.js
396
395
  - app/assets/javascripts/admin/image_settings.js
397
- - app/assets/javascripts/admin/images/index.js
398
- - app/assets/javascripts/admin/images/new.js
396
+ - app/assets/javascripts/admin/images/index.js.coffee
397
+ - app/assets/javascripts/admin/images/new.js.coffee
399
398
  - app/assets/javascripts/admin/nested-attribute.js
400
399
  - app/assets/javascripts/admin/orders/edit.js
401
400
  - app/assets/javascripts/admin/orders/edit_form.js
402
401
  - app/assets/javascripts/admin/payments/new.js
403
- - app/assets/javascripts/admin/products.js
402
+ - app/assets/javascripts/admin/product_autocomplete.js.erb
404
403
  - app/assets/javascripts/admin/shipping_methods.js
405
404
  - app/assets/javascripts/admin/spree_core.js
406
405
  - app/assets/javascripts/admin/taxonomy.js
407
406
  - app/assets/javascripts/admin/underscore-min.js
408
407
  - app/assets/javascripts/admin/zone.js
409
- - app/assets/javascripts/store/cart.js
410
- - app/assets/javascripts/store/checkout.js
411
- - app/assets/javascripts/store/product.js
408
+ - app/assets/javascripts/store/cart.js.coffee
409
+ - app/assets/javascripts/store/checkout.js.coffee
410
+ - app/assets/javascripts/store/product.js.coffee
412
411
  - app/assets/javascripts/store/spree_core.js
413
412
  - app/assets/stylesheets/admin/admin-form.css.erb
414
413
  - app/assets/stylesheets/admin/admin-reset.css
@@ -422,6 +421,7 @@ files:
422
421
  - app/assets/stylesheets/store/spree_core.css
423
422
  - app/assets/stylesheets/store/variables.css.scss
424
423
  - app/controllers/spree/admin/adjustments_controller.rb
424
+ - app/controllers/spree/admin/banners_controller.rb
425
425
  - app/controllers/spree/admin/base_controller.rb
426
426
  - app/controllers/spree/admin/configurations_controller.rb
427
427
  - app/controllers/spree/admin/general_settings_controller.rb
@@ -445,6 +445,7 @@ files:
445
445
  - app/controllers/spree/admin/reports_controller.rb
446
446
  - app/controllers/spree/admin/resource_controller.rb
447
447
  - app/controllers/spree/admin/return_authorizations_controller.rb
448
+ - app/controllers/spree/admin/search_controller.rb
448
449
  - app/controllers/spree/admin/shipments_controller.rb
449
450
  - app/controllers/spree/admin/shipping_categories_controller.rb
450
451
  - app/controllers/spree/admin/shipping_methods_controller.rb
@@ -455,7 +456,6 @@ files:
455
456
  - app/controllers/spree/admin/taxonomies_controller.rb
456
457
  - app/controllers/spree/admin/taxons_controller.rb
457
458
  - app/controllers/spree/admin/trackers_controller.rb
458
- - app/controllers/spree/admin/users_controller.rb
459
459
  - app/controllers/spree/admin/variants_controller.rb
460
460
  - app/controllers/spree/admin/zones_controller.rb
461
461
  - app/controllers/spree/base_controller.rb
@@ -467,6 +467,7 @@ files:
467
467
  - app/controllers/spree/products_controller.rb
468
468
  - app/controllers/spree/states_controller.rb
469
469
  - app/controllers/spree/taxons_controller.rb
470
+ - app/helpers/spree/account_helper.rb
470
471
  - app/helpers/spree/admin/base_helper.rb
471
472
  - app/helpers/spree/admin/inventory_settings_helper.rb
472
473
  - app/helpers/spree/admin/navigation_helper.rb
@@ -479,12 +480,15 @@ files:
479
480
  - app/helpers/spree/admin/zones_helper.rb
480
481
  - app/helpers/spree/base_helper.rb
481
482
  - app/helpers/spree/checkout_helper.rb
483
+ - app/helpers/spree/orders_helper.rb
482
484
  - app/helpers/spree/products_helper.rb
483
485
  - app/helpers/spree/search_helper.rb
484
486
  - app/helpers/spree/taxons_helper.rb
487
+ - app/helpers/spree/trackers_helper.rb
485
488
  - app/mailers/spree/order_mailer.rb
486
489
  - app/mailers/spree/shipment_mailer.rb
487
490
  - app/mailers/spree/test_mailer.rb
491
+ - app/models/spree/ability.rb
488
492
  - app/models/spree/activator.rb
489
493
  - app/models/spree/address.rb
490
494
  - app/models/spree/adjustment.rb
@@ -501,17 +505,19 @@ files:
501
505
  - app/models/spree/calculator.rb
502
506
  - app/models/spree/configuration.rb
503
507
  - app/models/spree/country.rb
504
- - app/models/spree/creditcard.rb
508
+ - app/models/spree/credit_card.rb
505
509
  - app/models/spree/gateway/bogus.rb
506
510
  - app/models/spree/gateway/bogus_simple.rb
507
511
  - app/models/spree/gateway.rb
508
512
  - app/models/spree/image.rb
509
513
  - app/models/spree/inventory_unit.rb
514
+ - app/models/spree/legacy_user.rb
510
515
  - app/models/spree/line_item.rb
511
516
  - app/models/spree/log_entry.rb
512
517
  - app/models/spree/mail_method.rb
513
518
  - app/models/spree/option_type.rb
514
519
  - app/models/spree/option_value.rb
520
+ - app/models/spree/order/checkout.rb
515
521
  - app/models/spree/order.rb
516
522
  - app/models/spree/payment/processing.rb
517
523
  - app/models/spree/payment.rb
@@ -541,8 +547,8 @@ files:
541
547
  - app/models/spree/tax_rate.rb
542
548
  - app/models/spree/taxon.rb
543
549
  - app/models/spree/taxonomy.rb
550
+ - app/models/spree/tokenized_permission.rb
544
551
  - app/models/spree/tracker.rb
545
- - app/models/spree/user.rb
546
552
  - app/models/spree/variant/scopes.rb
547
553
  - app/models/spree/variant.rb
548
554
  - app/models/spree/zone.rb
@@ -571,24 +577,18 @@ files:
571
577
  - app/views/spree/admin/mail_methods/edit.html.erb
572
578
  - app/views/spree/admin/mail_methods/index.html.erb
573
579
  - app/views/spree/admin/mail_methods/new.html.erb
574
- - app/views/spree/admin/option_types/_available.html.erb
575
580
  - app/views/spree/admin/option_types/_form.html.erb
576
581
  - app/views/spree/admin/option_types/_option_value_fields.html.erb
577
- - app/views/spree/admin/option_types/_selected.html.erb
578
- - app/views/spree/admin/option_types/available.js.erb
579
582
  - app/views/spree/admin/option_types/edit.html.erb
580
583
  - app/views/spree/admin/option_types/index.html.erb
581
584
  - app/views/spree/admin/option_types/new.html.erb
582
585
  - app/views/spree/admin/option_types/new.js.erb
583
- - app/views/spree/admin/option_types/select.js.erb
584
- - app/views/spree/admin/option_types/selected.html.erb
585
586
  - app/views/spree/admin/orders/_add_product.html.erb
586
587
  - app/views/spree/admin/orders/_form.html.erb
587
588
  - app/views/spree/admin/orders/_line_item.html.erb
588
589
  - app/views/spree/admin/orders/customer_details/_form.html.erb
589
590
  - app/views/spree/admin/orders/customer_details/edit.html.erb
590
591
  - app/views/spree/admin/orders/edit.html.erb
591
- - app/views/spree/admin/orders/history.html.erb
592
592
  - app/views/spree/admin/orders/index.html.erb
593
593
  - app/views/spree/admin/orders/new.html.erb
594
594
  - app/views/spree/admin/orders/show.html.erb
@@ -611,7 +611,6 @@ files:
611
611
  - app/views/spree/admin/product_properties/_product_property_fields.html.erb
612
612
  - app/views/spree/admin/product_properties/index.html.erb
613
613
  - app/views/spree/admin/products/_form.html.erb
614
- - app/views/spree/admin/products/_option_types.html.erb
615
614
  - app/views/spree/admin/products/_properties_form.erb
616
615
  - app/views/spree/admin/products/edit.html.erb
617
616
  - app/views/spree/admin/products/index.html.erb
@@ -638,7 +637,6 @@ files:
638
637
  - app/views/spree/admin/return_authorizations/edit.html.erb
639
638
  - app/views/spree/admin/return_authorizations/index.html.erb
640
639
  - app/views/spree/admin/return_authorizations/new.html.erb
641
- - app/views/spree/admin/shared/_additional_field.html.erb
642
640
  - app/views/spree/admin/shared/_address.html.erb
643
641
  - app/views/spree/admin/shared/_address_form.html.erb
644
642
  - app/views/spree/admin/shared/_alert.html.erb
@@ -655,10 +653,8 @@ files:
655
653
  - app/views/spree/admin/shared/_product_sub_menu.html.erb
656
654
  - app/views/spree/admin/shared/_product_tabs.html.erb
657
655
  - app/views/spree/admin/shared/_report_criteria.html.erb
658
- - app/views/spree/admin/shared/_routes.html.erb
659
656
  - app/views/spree/admin/shared/_show_resource_links.html.erb
660
657
  - app/views/spree/admin/shared/_tabs.html.erb
661
- - app/views/spree/admin/shared/_translations.html.erb
662
658
  - app/views/spree/admin/shared/_update_order_state.js
663
659
  - app/views/spree/admin/shipments/_form.html.erb
664
660
  - app/views/spree/admin/shipments/edit.html.erb
@@ -699,20 +695,11 @@ files:
699
695
  - app/views/spree/admin/taxonomies/new.html.erb
700
696
  - app/views/spree/admin/taxons/_form.html.erb
701
697
  - app/views/spree/admin/taxons/_taxon_table.html.erb
702
- - app/views/spree/admin/taxons/available.js.erb
703
698
  - app/views/spree/admin/taxons/edit.html.erb
704
- - app/views/spree/admin/taxons/remove.html.erb
705
- - app/views/spree/admin/taxons/select.js.erb
706
- - app/views/spree/admin/taxons/selected.html.erb
707
699
  - app/views/spree/admin/trackers/_form.html.erb
708
700
  - app/views/spree/admin/trackers/edit.html.erb
709
701
  - app/views/spree/admin/trackers/index.html.erb
710
702
  - app/views/spree/admin/trackers/new.html.erb
711
- - app/views/spree/admin/users/_form.html.erb
712
- - app/views/spree/admin/users/edit.html.erb
713
- - app/views/spree/admin/users/index.html.erb
714
- - app/views/spree/admin/users/new.html.erb
715
- - app/views/spree/admin/users/show.html.erb
716
703
  - app/views/spree/admin/variants/_form.html.erb
717
704
  - app/views/spree/admin/variants/edit.html.erb
718
705
  - app/views/spree/admin/variants/index.html.erb
@@ -740,6 +727,7 @@ files:
740
727
  - app/views/spree/layouts/spree_application.html.erb
741
728
  - app/views/spree/order_mailer/cancel_email.text.erb
742
729
  - app/views/spree/order_mailer/confirm_email.text.erb
730
+ - app/views/spree/orders/_adjustments.html.erb
743
731
  - app/views/spree/orders/_form.html.erb
744
732
  - app/views/spree/orders/_line_item.html.erb
745
733
  - app/views/spree/orders/edit.html.erb
@@ -754,14 +742,18 @@ files:
754
742
  - app/views/spree/products/show.html.erb
755
743
  - app/views/spree/shared/_error_messages.html.erb
756
744
  - app/views/spree/shared/_filters.html.erb
745
+ - app/views/spree/shared/_footer.html.erb
757
746
  - app/views/spree/shared/_google_analytics.html.erb
758
747
  - app/views/spree/shared/_head.html.erb
748
+ - app/views/spree/shared/_header.html.erb
749
+ - app/views/spree/shared/_main_nav_bar.html.erb
759
750
  - app/views/spree/shared/_nav_bar.html.erb
760
751
  - app/views/spree/shared/_order_details.html.erb
761
752
  - app/views/spree/shared/_products.html.erb
762
753
  - app/views/spree/shared/_search.html.erb
763
- - app/views/spree/shared/_store_menu.html.erb
754
+ - app/views/spree/shared/_sidebar.html.erb
764
755
  - app/views/spree/shared/_taxonomies.html.erb
756
+ - app/views/spree/shared/unauthorized.html.erb
765
757
  - app/views/spree/shipment_mailer/shipped_email.text.erb
766
758
  - app/views/spree/states/index.js.erb
767
759
  - app/views/spree/taxons/_taxon.html.erb
@@ -771,11 +763,17 @@ files:
771
763
  - config/initializers/deprecation_checker.rb
772
764
  - config/initializers/form_builder.rb
773
765
  - config/initializers/rails_3_1.rb
774
- - config/initializers/rails_5868.rb
775
766
  - config/initializers/spree.rb
767
+ - config/initializers/user_class_extensions.rb
768
+ - config/initializers/workarounds_for_ruby19.rb
776
769
  - config/locales/en.yml
777
770
  - config/routes.rb
771
+ - lib/generators/spree/custom_user/custom_user_generator.rb
772
+ - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
773
+ - lib/generators/spree/custom_user/templates/initializer.rb.tt
774
+ - lib/generators/spree/custom_user/templates/migration.rb.tt
778
775
  - lib/generators/spree/dummy/dummy_generator.rb
776
+ - lib/generators/spree/dummy/templates/initializers/custom_user.rb
779
777
  - lib/generators/spree/dummy/templates/rails/application.rb
780
778
  - lib/generators/spree/dummy/templates/rails/boot.rb
781
779
  - lib/generators/spree/dummy/templates/rails/database.yml
@@ -787,8 +785,6 @@ files:
787
785
  - lib/generators/spree/install/templates/app/assets/stylesheets/admin/all.css
788
786
  - lib/generators/spree/install/templates/app/assets/stylesheets/store/all.css
789
787
  - lib/generators/spree/install/templates/config/initializers/spree.rb
790
- - lib/generators/spree/sandbox/sandbox_generator.rb
791
- - lib/generators/spree/sandbox/templates/rails/routes.rb
792
788
  - lib/spree/core/action_callbacks.rb
793
789
  - lib/spree/core/authorize_net_cim_hack.rb
794
790
  - lib/spree/core/calculated_adjustments.rb
@@ -801,9 +797,6 @@ files:
801
797
  - lib/spree/core/environment.rb
802
798
  - lib/spree/core/environment_extension.rb
803
799
  - lib/spree/core/ext/active_record.rb
804
- - lib/spree/core/ext/array.rb
805
- - lib/spree/core/ext/hash.rb
806
- - lib/spree/core/ext/string.rb
807
800
  - lib/spree/core/file_utilz.rb
808
801
  - lib/spree/core/gateway_error.rb
809
802
  - lib/spree/core/mail_interceptor.rb
@@ -812,21 +805,24 @@ files:
812
805
  - lib/spree/core/middleware/seo_assist.rb
813
806
  - lib/spree/core/permalinks.rb
814
807
  - lib/spree/core/preference_rescue.rb
808
+ - lib/spree/core/relation_serialization.rb
815
809
  - lib/spree/core/respond_with.rb
816
810
  - lib/spree/core/responder.rb
811
+ - lib/spree/core/s3_support.rb
817
812
  - lib/spree/core/scopes.rb
818
813
  - lib/spree/core/search/base.rb
819
814
  - lib/spree/core/ssl_requirement.rb
820
815
  - lib/spree/core/store_helpers.rb
821
816
  - lib/spree/core/testing_support/common_rake.rb
822
817
  - lib/spree/core/testing_support/controller_requests.rb
818
+ - lib/spree/core/testing_support/env.rb
823
819
  - lib/spree/core/testing_support/factories/activator_factory.rb
824
820
  - lib/spree/core/testing_support/factories/address_factory.rb
825
821
  - lib/spree/core/testing_support/factories/adjustment_factory.rb
826
822
  - lib/spree/core/testing_support/factories/calculator_factory.rb
827
823
  - lib/spree/core/testing_support/factories/configuration_factory.rb
828
824
  - lib/spree/core/testing_support/factories/country_factory.rb
829
- - lib/spree/core/testing_support/factories/creditcard_factory.rb
825
+ - lib/spree/core/testing_support/factories/credit_card_factory.rb
830
826
  - lib/spree/core/testing_support/factories/inventory_unit_factory.rb
831
827
  - lib/spree/core/testing_support/factories/line_item_factory.rb
832
828
  - lib/spree/core/testing_support/factories/mail_method_factory.rb
@@ -855,6 +851,7 @@ files:
855
851
  - lib/spree/core/testing_support/factories/zone_factory.rb
856
852
  - lib/spree/core/testing_support/factories.rb
857
853
  - lib/spree/core/testing_support/fixtures.rb
854
+ - lib/spree/core/token_resource.rb
858
855
  - lib/spree/core/url_helpers.rb
859
856
  - lib/spree/core/user_banners.rb
860
857
  - lib/spree/core/validators/email.rb
@@ -865,7 +862,6 @@ files:
865
862
  - lib/spree_core.rb
866
863
  - lib/tasks/assets.rake
867
864
  - lib/tasks/core.rake
868
- - lib/tasks/install.rake
869
865
  - lib/tasks/rake_util.rb
870
866
  - lib/tasks/taxon.rake
871
867
  - db/default/spree/countries.yml
@@ -969,12 +965,12 @@ files:
969
965
  - db/migrate/20120315064358_migrate_images_from_products_to_variants.rb
970
966
  - db/migrate/20120416233427_rename_attachment_size_to_attachment_file_size.rb
971
967
  - db/migrate/20120507232704_increase_scale_of_tax_rate_amount.rb
968
+ - db/migrate/20120509055454_create_tokenized_permissions_table.rb
972
969
  - db/migrate/20120523061241_convert_sales_tax_to_default_tax.rb
970
+ - db/migrate/20120530012000_rename_creditcards_to_credit_cards.rb
973
971
  - db/migrate/20120604030249_add_deleted_at_to_spree_shipping_methods.rb
974
- - db/migrate/20120605211305_make_users_email_index_unique.rb
972
+ - db/migrate/20120604203654_remove_credit_total_from_orders.rb
975
973
  - db/migrate/20120712172620_add_counter_cache_to_zone_members.rb
976
- - db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb
977
- - db/sample/users.rb
978
974
  - db/seeds.rb
979
975
  - vendor/assets/images/datepicker/cal.gif
980
976
  - vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
@@ -1055,8 +1051,7 @@ files:
1055
1051
  - vendor/assets/stylesheets/jquery.formalize.css.erb
1056
1052
  - vendor/assets/stylesheets/skeleton.css
1057
1053
  homepage: http://spreecommerce.com
1058
- licenses:
1059
- - BSD-3
1054
+ licenses: []
1060
1055
  post_install_message:
1061
1056
  rdoc_options: []
1062
1057
  require_paths:
@@ -1070,12 +1065,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
1070
1065
  required_rubygems_version: !ruby/object:Gem::Requirement
1071
1066
  none: false
1072
1067
  requirements:
1073
- - - ! '>='
1068
+ - - ! '>'
1074
1069
  - !ruby/object:Gem::Version
1075
- segments:
1076
- - 0
1077
- hash: 2803062377320575420
1078
- version: '0'
1070
+ version: 1.3.1
1079
1071
  requirements:
1080
1072
  - none
1081
1073
  rubyforge_project: spree_core