spree_core 0.70.RC1 → 0.70.0.rc2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/README.md +10 -4
- data/app/assets/javascripts/admin/admin.js.erb +1 -1
- data/app/assets/javascripts/admin/orders/edit_form.js +3 -1
- data/app/assets/stylesheets/admin/admin-form.css.erb +1 -3
- data/app/assets/stylesheets/admin/admin-tables.css.erb +1 -1
- data/app/assets/stylesheets/admin/admin.css.erb +2 -2
- data/app/assets/stylesheets/admin/spree_core.css +0 -1
- data/app/controllers/admin/line_items_controller.rb +3 -1
- data/app/controllers/checkout_controller.rb +6 -0
- data/app/helpers/spree/base_helper.rb +21 -10
- data/app/models/creditcard.rb +15 -1
- data/app/models/inventory_unit.rb +6 -10
- data/app/models/line_item.rb +17 -2
- data/app/models/order.rb +5 -3
- data/app/models/product.rb +33 -21
- data/app/models/taxonomy.rb +1 -1
- data/app/views/admin/mail_methods/_form.html.erb +3 -3
- data/app/views/admin/orders/_line_item.html.erb +3 -1
- data/app/views/admin/orders/index.html.erb +3 -3
- data/app/views/admin/payments/source_views/_gateway.html.erb +1 -1
- data/app/views/admin/products/_form.html.erb +3 -3
- data/app/views/admin/products/new.html.erb +3 -3
- data/app/views/admin/shared/_report_criteria.html.erb +3 -3
- data/app/views/admin/variants/_form.html.erb +3 -3
- data/app/views/admin/variants/index.html.erb +1 -1
- data/app/views/layouts/admin.html.erb +1 -1
- data/app/views/order_mailer/confirm_email.text.erb +1 -1
- data/app/views/orders/_line_item.html.erb +7 -2
- data/config/initializers/rails_3_1.rb +12 -0
- data/config/locales/en.yml +2 -0
- data/lib/generators/spree/dummy/dummy_generator.rb +1 -0
- data/lib/generators/spree/site/site_generator.rb +7 -7
- data/lib/scopes/product.rb +6 -6
- data/lib/spree_base.rb +5 -6
- data/lib/spree_core/railtie.rb +1 -1
- data/lib/spree_core/version.rb +1 -1
- metadata +70 -68
- data/app/assets/stylesheets/admin/grids.css +0 -314
- data/config/initializers/disable_paperclip_log.rb +0 -2
data/app/models/taxonomy.rb
CHANGED
@@ -3,7 +3,7 @@ class Taxonomy < ActiveRecord::Base
|
|
3
3
|
validates :name, :presence => true
|
4
4
|
|
5
5
|
has_many :taxons, :dependent => :destroy
|
6
|
-
has_one :root, :class_name => 'Taxon', :conditions =>
|
6
|
+
has_one :root, :class_name => 'Taxon', :conditions => {:parent_id => nil}
|
7
7
|
|
8
8
|
after_save :set_name
|
9
9
|
|
@@ -1,5 +1,5 @@
|
|
1
|
-
<div class="
|
2
|
-
<div class="
|
1
|
+
<div class="clearfix">
|
2
|
+
<div class="left" data-hook="general">
|
3
3
|
<fieldset>
|
4
4
|
<legend><%= t('general') %></legend>
|
5
5
|
<p>
|
@@ -49,7 +49,7 @@
|
|
49
49
|
|
50
50
|
</div>
|
51
51
|
|
52
|
-
<div class="
|
52
|
+
<div class="right" data-hook="smtp">
|
53
53
|
|
54
54
|
<fieldset>
|
55
55
|
<legend><%= t('smtp') %></legend>
|
@@ -1,5 +1,7 @@
|
|
1
1
|
<tr id="<%= dom_id(f.object) %>" data-hook="admin_order_form_line_item_row">
|
2
|
-
<td width="300"
|
2
|
+
<td width="300">
|
3
|
+
<%=f.object.variant.product.name%> <%= "(#{f.object.variant.options_text}))" unless f.object.variant.option_values.empty? %>
|
4
|
+
</td>
|
3
5
|
<td valign="top" class="price"><%= number_to_currency f.object.price %></td>
|
4
6
|
<td valign="top" class="qty"><%=f.text_field :quantity, :style => "width:30px;", :class => "qty" %></td>
|
5
7
|
<td valign="top" class="total"><%= number_to_currency (f.object.price * f.object.quantity)%></td>
|
@@ -48,12 +48,12 @@
|
|
48
48
|
<h3><%= t(:search) %></h3>
|
49
49
|
<%= form_for [:admin, @search] do |f| %>
|
50
50
|
<label><%= t("date_range") %></label><br />
|
51
|
-
<div class="
|
52
|
-
<div class="
|
51
|
+
<div class="date-range-filter">
|
52
|
+
<div class="left sub-field">
|
53
53
|
<%= f.text_field :created_at_greater_than, :class => 'datepicker' %><br />
|
54
54
|
<label class="sub"><%= t("start") %></label>
|
55
55
|
</div>
|
56
|
-
<div class="
|
56
|
+
<div class="right sub-field">
|
57
57
|
<%= f.text_field :created_at_less_than, :class => 'datepicker' %><br />
|
58
58
|
<label><%= t("stop") %></label>
|
59
59
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
|
-
<div class="
|
2
|
-
<div class="
|
1
|
+
<div class="clearfix">
|
2
|
+
<div class="left" data-hook="admin_product_form_left">
|
3
3
|
<%= f.field_container :name do %>
|
4
4
|
<%= f.label :name, t("name") %> <span class="required">*</span><br />
|
5
5
|
<%= f.text_field :name, :class => 'fullwidth title' %>
|
@@ -18,7 +18,7 @@
|
|
18
18
|
<%= f.error_message_on :description %>
|
19
19
|
<% end %>
|
20
20
|
</div>
|
21
|
-
<div class="
|
21
|
+
<div class="right" data-hook="admin_product_form_right">
|
22
22
|
<%= f.field_container :price do %>
|
23
23
|
<%= f.label :price, t("master_price")%> <span class="required">*</span><br>
|
24
24
|
<%= f.text_field :price, :value => number_with_precision(@product.price, :precision => 2) %>
|
@@ -11,8 +11,8 @@
|
|
11
11
|
<%= f.error_message_on :name %>
|
12
12
|
<% end %>
|
13
13
|
|
14
|
-
<div class="
|
15
|
-
<div class="
|
14
|
+
<div class="clearfix" data-hook="new_product_attrs">
|
15
|
+
<div class="left">
|
16
16
|
|
17
17
|
<% unless @product.has_variants? %>
|
18
18
|
<%= f.field_container :sku do %>
|
@@ -28,7 +28,7 @@
|
|
28
28
|
</p>
|
29
29
|
|
30
30
|
</div>
|
31
|
-
<div class="
|
31
|
+
<div class="right">
|
32
32
|
|
33
33
|
<%= f.field_container :price do %>
|
34
34
|
<%= f.label :price, t("master_price")%> <span class="required">*</span><br />
|
@@ -1,11 +1,11 @@
|
|
1
1
|
<%= form_for @search, :url => sales_total_admin_reports_path do |s| %>
|
2
2
|
<label><%= t("date_range") %></label><br />
|
3
|
-
<div class="
|
4
|
-
<div class="
|
3
|
+
<div class="date-range-filter">
|
4
|
+
<div class="left sub-field">
|
5
5
|
<%= s.text_field :created_at_greater_than, :class => 'datepicker' %><br />
|
6
6
|
<label class="sub"><%= t("start") %></label>
|
7
7
|
</div>
|
8
|
-
<div class="
|
8
|
+
<div class="right sub-field">
|
9
9
|
<%= s.text_field :created_at_less_than, :class => 'datepicker' %><br />
|
10
10
|
<label><%= t("stop") %></label>
|
11
11
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
|
-
<div class="
|
2
|
-
<div class="
|
1
|
+
<div class="clearfix">
|
2
|
+
<div class="left" data-hook="variants">
|
3
3
|
|
4
4
|
<% @product.options.each do |option| %>
|
5
5
|
<p data-hook="presentation">
|
@@ -30,7 +30,7 @@
|
|
30
30
|
<%= f.text_field :on_hand %></p>
|
31
31
|
<% end %>
|
32
32
|
</div>
|
33
|
-
<div class="
|
33
|
+
<div class="right">
|
34
34
|
|
35
35
|
<% Variant.additional_fields.select{|af| af[:only].nil? || af[:only].include?(:variant) }.each do |field| %>
|
36
36
|
<%= render :partial => "admin/shared/additional_field", :locals => {:field => field, :f => f} %>
|
@@ -17,7 +17,7 @@
|
|
17
17
|
<!-- you can skip variant with no options: that's just the default variant that all products have -->
|
18
18
|
<% next if variant.option_values.empty? %>
|
19
19
|
<tr id="<%= dom_id(variant) %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
|
20
|
-
<td><span class="handle"></span> <%=
|
20
|
+
<td><span class="handle"></span> <%= variant.options_text %></td>
|
21
21
|
<td><%= variant.price %></td>
|
22
22
|
<td><%= variant.sku %></td>
|
23
23
|
<% Variant.additional_fields.select{|f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>
|
@@ -6,7 +6,7 @@ Please review and retain the following order information for your records.
|
|
6
6
|
Order Summary
|
7
7
|
============================================================
|
8
8
|
<% for item in @order.line_items %>
|
9
|
-
<%=item.variant.sku %> <%=item.variant.product.name%> <%=
|
9
|
+
<%=item.variant.sku %> <%=item.variant.product.name%> <%= item.variant.options_text -%> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
|
10
10
|
<% end %>
|
11
11
|
============================================================
|
12
12
|
Subtotal: <%= number_to_currency @order.item_total %>
|
@@ -8,7 +8,12 @@
|
|
8
8
|
</td>
|
9
9
|
<td data-hook="cart_item_description">
|
10
10
|
<h4><%= link_to variant.product.name, product_path(variant.product) %></h4>
|
11
|
-
<%=
|
11
|
+
<%= variant.options_text %>
|
12
|
+
<% if @order.insufficient_stock_lines.include? line_item %>
|
13
|
+
<span class="out-of-stock">
|
14
|
+
<%= variant.in_stock? ? t(:insufficient_stock, :on_hand => variant.on_hand) : t(:out_of_stock) %><br>
|
15
|
+
</span>
|
16
|
+
<% end %>
|
12
17
|
<%= truncate(variant.product.description, :length => 100, :omission => "...") %>
|
13
18
|
</td>
|
14
19
|
<td data-hook="cart_item_price">
|
@@ -21,6 +26,6 @@
|
|
21
26
|
<%= format_price(product_price(line_item.variant, :format_as_currency => false) * line_item.quantity) unless line_item.quantity.nil? %>
|
22
27
|
</td>
|
23
28
|
<td data-hook="cart_item_delete">
|
24
|
-
<%= link_to(image_tag('icons/delete.png'), '#', :class => 'delete') %>
|
29
|
+
<%= link_to(image_tag('icons/delete.png'), '#', :class => 'delete', :id => "delete_#{dom_id(line_item)}" ) %>
|
25
30
|
</td>
|
26
31
|
</tr>
|
data/config/locales/en.yml
CHANGED
@@ -465,6 +465,7 @@ en:
|
|
465
465
|
included_in_other_shipment: Included in another Shipment
|
466
466
|
included_in_this_shipment: Included in this Shipment
|
467
467
|
instructions_to_reset_password: "Fill out the form below and instructions to reset your password will be emailed to you:"
|
468
|
+
insufficient_stock: "Insufficient stock available, only %{on_hand} remaining"
|
468
469
|
integration_settings_warning: "If you are changing the billing integration, you must save first before you can edit the integration settings"
|
469
470
|
intercept_email_address: Intercept Email Address
|
470
471
|
intercept_email_instructions: "Override email recipient and replace with this address."
|
@@ -930,6 +931,7 @@ en:
|
|
930
931
|
date: Date
|
931
932
|
time: Time
|
932
933
|
spree_gateway_error_flash_for_checkout: "There was a problem with your payment information. Please check your information and try again."
|
934
|
+
spree_inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
|
933
935
|
ssl_will_be_used_in_development_and_test_modes: "SSL will be used in development and test mode if necessary."
|
934
936
|
ssl_will_be_used_in_production_mode: "SSL will be used in production mode"
|
935
937
|
ssl_will_not_be_used_in_development_and_test_modes: "SSL will not be used in development and test mode if necessary."
|
@@ -50,14 +50,14 @@ Disallow: /users
|
|
50
50
|
|
51
51
|
def configure_application
|
52
52
|
application <<-APP
|
53
|
-
config.middleware.use "SeoAssist"
|
54
|
-
config.middleware.use "RedirectLegacyProductUrl"
|
53
|
+
config.middleware.use "SeoAssist"
|
54
|
+
config.middleware.use "RedirectLegacyProductUrl"
|
55
55
|
|
56
|
-
config.to_prepare do
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
end
|
56
|
+
config.to_prepare do
|
57
|
+
Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
|
58
|
+
Rails.configuration.cache_classes ? require(c) : load(c)
|
59
|
+
end
|
60
|
+
end
|
61
61
|
APP
|
62
62
|
|
63
63
|
append_file "config/environment.rb", "\nActiveRecord::Base.include_root_in_json = true\n"
|
data/lib/scopes/product.rb
CHANGED
@@ -50,9 +50,9 @@ module Scopes::Product
|
|
50
50
|
Product.send(:scope, name.to_s, Product.send(:relation).order(order_text) )
|
51
51
|
end
|
52
52
|
|
53
|
-
::Product.scope :ascend_by_master_price, Product.joins(:variants_with_only_master).order(
|
53
|
+
::Product.scope :ascend_by_master_price, Product.joins(:variants_with_only_master).order("#{Variant.table_name}.price asc")
|
54
54
|
|
55
|
-
::Product.scope :descend_by_master_price, Product.joins(:variants_with_only_master).order(
|
55
|
+
::Product.scope :descend_by_master_price, Product.joins(:variants_with_only_master).order("#{Variant.table_name}.price desc")
|
56
56
|
|
57
57
|
ATTRIBUTE_HELPER_METHODS = {
|
58
58
|
:with_ids => :product_picker_field
|
@@ -74,15 +74,15 @@ module Scopes::Product
|
|
74
74
|
|
75
75
|
|
76
76
|
::Product.scope :price_between, lambda { |low, high|
|
77
|
-
{ :joins => :master, :conditions => ["
|
77
|
+
{ :joins => :master, :conditions => ["#{Variant.table_name}.price BETWEEN ? AND ?", low, high] }
|
78
78
|
}
|
79
79
|
|
80
80
|
::Product.scope :master_price_lte, lambda { |price|
|
81
|
-
{ :joins => :master, :conditions => ["
|
81
|
+
{ :joins => :master, :conditions => ["#{Variant.table_name}.price <= ?", price] }
|
82
82
|
}
|
83
83
|
|
84
84
|
::Product.scope :master_price_gte, lambda { |price|
|
85
|
-
{ :joins => :master, :conditions => ["
|
85
|
+
{ :joins => :master, :conditions => ["#{Variant.table_name}.price >= ?", price] }
|
86
86
|
}
|
87
87
|
|
88
88
|
|
@@ -92,7 +92,7 @@ module Scopes::Product
|
|
92
92
|
# Product.taxons_id_eq(x)
|
93
93
|
#
|
94
94
|
::Product.scope :in_taxon, lambda {|taxon|
|
95
|
-
{ :joins => :taxons, :conditions => ["
|
95
|
+
{ :joins => :taxons, :conditions => ["#{Taxon.table_name}.id IN (?) ", taxon.self_and_descendants.map(&:id)]}
|
96
96
|
}
|
97
97
|
|
98
98
|
# This scope selects products in all taxons AND all its descendants
|
data/lib/spree_base.rb
CHANGED
@@ -9,15 +9,15 @@ module SpreeBase
|
|
9
9
|
attr_writer :title
|
10
10
|
|
11
11
|
def title
|
12
|
-
title_string = @title.
|
13
|
-
if title_string.
|
14
|
-
default_title
|
15
|
-
else
|
12
|
+
title_string = @title.present? ? @title : accurate_title
|
13
|
+
if title_string.present?
|
16
14
|
if Spree::Config[:always_put_site_name_in_title]
|
17
15
|
[default_title, title_string].join(' - ')
|
18
16
|
else
|
19
17
|
title_string
|
20
18
|
end
|
19
|
+
else
|
20
|
+
default_title
|
21
21
|
end
|
22
22
|
end
|
23
23
|
|
@@ -83,8 +83,7 @@ module SpreeBase
|
|
83
83
|
end
|
84
84
|
|
85
85
|
def get_taxonomies
|
86
|
-
@taxonomies ||= Taxonomy.includes(:root => :children)
|
87
|
-
@taxonomies.reject { |t| t.root.nil? }
|
86
|
+
@taxonomies ||= Taxonomy.includes(:root => :children).joins(:root)
|
88
87
|
end
|
89
88
|
|
90
89
|
def current_gateway
|
data/lib/spree_core/railtie.rb
CHANGED
@@ -70,7 +70,7 @@ module SpreeCore
|
|
70
70
|
|
71
71
|
# sets the manifests / assets to be precompiled
|
72
72
|
initializer "spree.assets.precompile" do |app|
|
73
|
-
app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/spree_dash.*', 'admin/orders/edit_form.js', '
|
73
|
+
app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/spree_dash.*', 'admin/orders/edit_form.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js']
|
74
74
|
app.config.assets.debug = false
|
75
75
|
end
|
76
76
|
|
data/lib/spree_core/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,15 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
5
|
-
prerelease:
|
4
|
+
hash: 15425137
|
5
|
+
prerelease: 7
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 70
|
9
|
-
-
|
10
|
-
-
|
11
|
-
|
9
|
+
- 0
|
10
|
+
- rc
|
11
|
+
- 2
|
12
|
+
version: 0.70.0.rc2
|
12
13
|
platform: ruby
|
13
14
|
authors:
|
14
15
|
- Sean Schofield
|
@@ -16,10 +17,12 @@ autorequire:
|
|
16
17
|
bindir: bin
|
17
18
|
cert_chain: []
|
18
19
|
|
19
|
-
date: 2011-09-
|
20
|
+
date: 2011-09-30 00:00:00 Z
|
20
21
|
dependencies:
|
21
22
|
- !ruby/object:Gem::Dependency
|
22
|
-
|
23
|
+
type: :runtime
|
24
|
+
prerelease: false
|
25
|
+
requirement: &id001 !ruby/object:Gem::Requirement
|
23
26
|
none: false
|
24
27
|
requirements:
|
25
28
|
- - "="
|
@@ -30,12 +33,12 @@ dependencies:
|
|
30
33
|
- 1
|
31
34
|
- 4
|
32
35
|
version: 0.1.4
|
36
|
+
version_requirements: *id001
|
33
37
|
name: acts_as_list
|
38
|
+
- !ruby/object:Gem::Dependency
|
34
39
|
type: :runtime
|
35
40
|
prerelease: false
|
36
|
-
requirement:
|
37
|
-
- !ruby/object:Gem::Dependency
|
38
|
-
version_requirements: &id002 !ruby/object:Gem::Requirement
|
41
|
+
requirement: &id002 !ruby/object:Gem::Requirement
|
39
42
|
none: false
|
40
43
|
requirements:
|
41
44
|
- - "="
|
@@ -46,12 +49,12 @@ dependencies:
|
|
46
49
|
- 6
|
47
50
|
- 8
|
48
51
|
version: 1.6.8
|
52
|
+
version_requirements: *id002
|
49
53
|
name: nested_set
|
54
|
+
- !ruby/object:Gem::Dependency
|
50
55
|
type: :runtime
|
51
56
|
prerelease: false
|
52
|
-
requirement:
|
53
|
-
- !ruby/object:Gem::Dependency
|
54
|
-
version_requirements: &id003 !ruby/object:Gem::Requirement
|
57
|
+
requirement: &id003 !ruby/object:Gem::Requirement
|
55
58
|
none: false
|
56
59
|
requirements:
|
57
60
|
- - "="
|
@@ -62,28 +65,28 @@ dependencies:
|
|
62
65
|
- 1
|
63
66
|
- 1
|
64
67
|
version: 0.1.1
|
68
|
+
version_requirements: *id003
|
65
69
|
name: rd_find_by_param
|
70
|
+
- !ruby/object:Gem::Dependency
|
66
71
|
type: :runtime
|
67
72
|
prerelease: false
|
68
|
-
requirement:
|
69
|
-
- !ruby/object:Gem::Dependency
|
70
|
-
version_requirements: &id004 !ruby/object:Gem::Requirement
|
73
|
+
requirement: &id004 !ruby/object:Gem::Requirement
|
71
74
|
none: false
|
72
75
|
requirements:
|
73
76
|
- - ">="
|
74
77
|
- !ruby/object:Gem::Version
|
75
|
-
hash:
|
78
|
+
hash: 11
|
76
79
|
segments:
|
77
80
|
- 1
|
78
81
|
- 0
|
79
|
-
-
|
80
|
-
version: 1.0.
|
82
|
+
- 14
|
83
|
+
version: 1.0.14
|
84
|
+
version_requirements: *id004
|
81
85
|
name: jquery-rails
|
86
|
+
- !ruby/object:Gem::Dependency
|
82
87
|
type: :runtime
|
83
88
|
prerelease: false
|
84
|
-
requirement:
|
85
|
-
- !ruby/object:Gem::Dependency
|
86
|
-
version_requirements: &id005 !ruby/object:Gem::Requirement
|
89
|
+
requirement: &id005 !ruby/object:Gem::Requirement
|
87
90
|
none: false
|
88
91
|
requirements:
|
89
92
|
- - "="
|
@@ -94,12 +97,12 @@ dependencies:
|
|
94
97
|
- 5
|
95
98
|
- 1
|
96
99
|
version: 1.5.1
|
100
|
+
version_requirements: *id005
|
97
101
|
name: highline
|
102
|
+
- !ruby/object:Gem::Dependency
|
98
103
|
type: :runtime
|
99
104
|
prerelease: false
|
100
|
-
requirement:
|
101
|
-
- !ruby/object:Gem::Dependency
|
102
|
-
version_requirements: &id006 !ruby/object:Gem::Requirement
|
105
|
+
requirement: &id006 !ruby/object:Gem::Requirement
|
103
106
|
none: false
|
104
107
|
requirements:
|
105
108
|
- - "="
|
@@ -110,12 +113,12 @@ dependencies:
|
|
110
113
|
- 0
|
111
114
|
- 3
|
112
115
|
version: 1.0.3
|
116
|
+
version_requirements: *id006
|
113
117
|
name: stringex
|
118
|
+
- !ruby/object:Gem::Dependency
|
114
119
|
type: :runtime
|
115
120
|
prerelease: false
|
116
|
-
requirement:
|
117
|
-
- !ruby/object:Gem::Dependency
|
118
|
-
version_requirements: &id007 !ruby/object:Gem::Requirement
|
121
|
+
requirement: &id007 !ruby/object:Gem::Requirement
|
119
122
|
none: false
|
120
123
|
requirements:
|
121
124
|
- - "="
|
@@ -126,44 +129,44 @@ dependencies:
|
|
126
129
|
- 0
|
127
130
|
- 1
|
128
131
|
version: 1.0.1
|
132
|
+
version_requirements: *id007
|
129
133
|
name: state_machine
|
134
|
+
- !ruby/object:Gem::Dependency
|
130
135
|
type: :runtime
|
131
136
|
prerelease: false
|
132
|
-
requirement:
|
133
|
-
- !ruby/object:Gem::Dependency
|
134
|
-
version_requirements: &id008 !ruby/object:Gem::Requirement
|
137
|
+
requirement: &id008 !ruby/object:Gem::Requirement
|
135
138
|
none: false
|
136
139
|
requirements:
|
137
140
|
- - "="
|
138
141
|
- !ruby/object:Gem::Version
|
139
|
-
hash:
|
142
|
+
hash: 23
|
140
143
|
segments:
|
144
|
+
- 1
|
141
145
|
- 0
|
142
|
-
-
|
143
|
-
|
144
|
-
|
146
|
+
- 0
|
147
|
+
version: 1.0.0
|
148
|
+
version_requirements: *id008
|
145
149
|
name: faker
|
150
|
+
- !ruby/object:Gem::Dependency
|
146
151
|
type: :runtime
|
147
152
|
prerelease: false
|
148
|
-
requirement:
|
149
|
-
- !ruby/object:Gem::Dependency
|
150
|
-
version_requirements: &id009 !ruby/object:Gem::Requirement
|
153
|
+
requirement: &id009 !ruby/object:Gem::Requirement
|
151
154
|
none: false
|
152
155
|
requirements:
|
153
156
|
- - "="
|
154
157
|
- !ruby/object:Gem::Version
|
155
|
-
hash:
|
158
|
+
hash: 29
|
156
159
|
segments:
|
157
160
|
- 2
|
158
161
|
- 4
|
159
|
-
-
|
160
|
-
version: 2.4.
|
162
|
+
- 1
|
163
|
+
version: 2.4.1
|
164
|
+
version_requirements: *id009
|
161
165
|
name: paperclip
|
166
|
+
- !ruby/object:Gem::Dependency
|
162
167
|
type: :runtime
|
163
168
|
prerelease: false
|
164
|
-
requirement:
|
165
|
-
- !ruby/object:Gem::Dependency
|
166
|
-
version_requirements: &id010 !ruby/object:Gem::Requirement
|
169
|
+
requirement: &id010 !ruby/object:Gem::Requirement
|
167
170
|
none: false
|
168
171
|
requirements:
|
169
172
|
- - ">="
|
@@ -172,12 +175,12 @@ dependencies:
|
|
172
175
|
segments:
|
173
176
|
- 0
|
174
177
|
version: "0"
|
178
|
+
version_requirements: *id010
|
175
179
|
name: rd_resource_controller
|
180
|
+
- !ruby/object:Gem::Dependency
|
176
181
|
type: :runtime
|
177
182
|
prerelease: false
|
178
|
-
requirement:
|
179
|
-
- !ruby/object:Gem::Dependency
|
180
|
-
version_requirements: &id011 !ruby/object:Gem::Requirement
|
183
|
+
requirement: &id011 !ruby/object:Gem::Requirement
|
181
184
|
none: false
|
182
185
|
requirements:
|
183
186
|
- - "="
|
@@ -188,12 +191,12 @@ dependencies:
|
|
188
191
|
- 1
|
189
192
|
- 1
|
190
193
|
version: 1.1.1
|
194
|
+
version_requirements: *id011
|
191
195
|
name: meta_search
|
196
|
+
- !ruby/object:Gem::Dependency
|
192
197
|
type: :runtime
|
193
198
|
prerelease: false
|
194
|
-
requirement:
|
195
|
-
- !ruby/object:Gem::Dependency
|
196
|
-
version_requirements: &id012 !ruby/object:Gem::Requirement
|
199
|
+
requirement: &id012 !ruby/object:Gem::Requirement
|
197
200
|
none: false
|
198
201
|
requirements:
|
199
202
|
- - "="
|
@@ -204,28 +207,30 @@ dependencies:
|
|
204
207
|
- 17
|
205
208
|
- 0
|
206
209
|
version: 1.17.0
|
210
|
+
version_requirements: *id012
|
207
211
|
name: activemerchant
|
212
|
+
- !ruby/object:Gem::Dependency
|
208
213
|
type: :runtime
|
209
214
|
prerelease: false
|
210
|
-
requirement:
|
211
|
-
- !ruby/object:Gem::Dependency
|
212
|
-
version_requirements: &id013 !ruby/object:Gem::Requirement
|
215
|
+
requirement: &id013 !ruby/object:Gem::Requirement
|
213
216
|
none: false
|
214
217
|
requirements:
|
215
218
|
- - "="
|
216
219
|
- !ruby/object:Gem::Version
|
217
|
-
hash:
|
220
|
+
hash: 15424105
|
218
221
|
segments:
|
219
222
|
- 3
|
220
223
|
- 1
|
221
|
-
-
|
222
|
-
|
224
|
+
- 1
|
225
|
+
- rc
|
226
|
+
- 2
|
227
|
+
version: 3.1.1.rc2
|
228
|
+
version_requirements: *id013
|
223
229
|
name: rails
|
230
|
+
- !ruby/object:Gem::Dependency
|
224
231
|
type: :runtime
|
225
232
|
prerelease: false
|
226
|
-
requirement:
|
227
|
-
- !ruby/object:Gem::Dependency
|
228
|
-
version_requirements: &id014 !ruby/object:Gem::Requirement
|
233
|
+
requirement: &id014 !ruby/object:Gem::Requirement
|
229
234
|
none: false
|
230
235
|
requirements:
|
231
236
|
- - ">="
|
@@ -236,12 +241,12 @@ dependencies:
|
|
236
241
|
- 12
|
237
242
|
- 4
|
238
243
|
version: 0.12.4
|
244
|
+
version_requirements: *id014
|
239
245
|
name: kaminari
|
246
|
+
- !ruby/object:Gem::Dependency
|
240
247
|
type: :runtime
|
241
248
|
prerelease: false
|
242
|
-
requirement:
|
243
|
-
- !ruby/object:Gem::Dependency
|
244
|
-
version_requirements: &id015 !ruby/object:Gem::Requirement
|
249
|
+
requirement: &id015 !ruby/object:Gem::Requirement
|
245
250
|
none: false
|
246
251
|
requirements:
|
247
252
|
- - ">="
|
@@ -252,10 +257,8 @@ dependencies:
|
|
252
257
|
- 6
|
253
258
|
- 1
|
254
259
|
version: 0.6.1
|
260
|
+
version_requirements: *id015
|
255
261
|
name: deface
|
256
|
-
type: :runtime
|
257
|
-
prerelease: false
|
258
|
-
requirement: *id015
|
259
262
|
description: Required dependency for Spree
|
260
263
|
email: sean@railsdog.com
|
261
264
|
executables: []
|
@@ -385,7 +388,6 @@ files:
|
|
385
388
|
- app/assets/stylesheets/admin/admin-typography.css
|
386
389
|
- app/assets/stylesheets/admin/admin.css.erb
|
387
390
|
- app/assets/stylesheets/admin/edit_checkouts.css
|
388
|
-
- app/assets/stylesheets/admin/grids.css
|
389
391
|
- app/assets/stylesheets/admin/spree_core.css
|
390
392
|
- app/assets/stylesheets/admin/token-input.css
|
391
393
|
- app/assets/stylesheets/store/reset.css
|
@@ -750,8 +752,8 @@ files:
|
|
750
752
|
- app/views/test_mailer/test_email.text.erb
|
751
753
|
- config/cucumber.yml
|
752
754
|
- config/initializers/deprecation_checker.rb
|
753
|
-
- config/initializers/disable_paperclip_log.rb
|
754
755
|
- config/initializers/form_builder.rb
|
756
|
+
- config/initializers/rails_3_1.rb
|
755
757
|
- config/initializers/spree.rb
|
756
758
|
- config/initializers/sprockets_precompile_patch.rb
|
757
759
|
- config/initializers/workarounds_for_ruby19.rb
|
@@ -1046,7 +1048,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1046
1048
|
requirements:
|
1047
1049
|
- none
|
1048
1050
|
rubyforge_project: spree_core
|
1049
|
-
rubygems_version: 1.8.
|
1051
|
+
rubygems_version: 1.8.10
|
1050
1052
|
signing_key:
|
1051
1053
|
specification_version: 3
|
1052
1054
|
summary: Core e-commerce functionality for the Spree project.
|