spree_carousels 1.2.2 → 1.2.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/Gemfile.lock +23 -18
  2. data/app/views/spree/spree_carousels/_taxon_carousels.erb +1 -1
  3. data/spree_carousels.gemspec +1 -1
  4. metadata +14 -14
data/Gemfile.lock CHANGED
@@ -1,8 +1,8 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- spree_carousels (1.1.3)
5
- spree_core (~> 1.1.3)
4
+ spree_carousels (1.2.2)
5
+ spree_core (~> 1.2)
6
6
 
7
7
  GEM
8
8
  remote: http://rubygems.org/
@@ -20,17 +20,17 @@ GEM
20
20
  rack-cache (~> 1.2)
21
21
  rack-test (~> 0.6.1)
22
22
  sprockets (~> 2.1.3)
23
- active_utils (1.0.4)
23
+ active_utils (1.0.5)
24
24
  activesupport (>= 2.3.11)
25
25
  i18n
26
- activemerchant (1.20.4)
26
+ activemerchant (1.28.0)
27
27
  active_utils (>= 1.0.2)
28
28
  activesupport (>= 2.3.11)
29
- braintree (>= 2.0.0)
30
29
  builder (>= 2.0.0)
31
30
  i18n
32
31
  json (>= 1.5.1)
33
- money (<= 3.7.1)
32
+ money
33
+ nokogiri
34
34
  activemodel (3.2.8)
35
35
  activesupport (= 3.2.8)
36
36
  builder (~> 3.0.0)
@@ -53,9 +53,8 @@ GEM
53
53
  json (~> 1.4)
54
54
  nokogiri (>= 1.4.4)
55
55
  uuidtools (~> 2.1)
56
- braintree (2.16.0)
57
- builder (>= 2.0.0)
58
56
  builder (3.0.0)
57
+ cancan (1.6.7)
59
58
  capybara (1.0.1)
60
59
  mime-types (>= 1.16)
61
60
  nokogiri (>= 1.3.3)
@@ -77,16 +76,16 @@ GEM
77
76
  ffi (1.1.5)
78
77
  highline (1.6.11)
79
78
  hike (1.2.1)
80
- httparty (0.8.3)
79
+ httparty (0.9.0)
81
80
  multi_json (~> 1.0)
82
81
  multi_xml
83
82
  i18n (0.6.1)
84
83
  journey (1.0.4)
85
- jquery-rails (2.0.3)
84
+ jquery-rails (2.1.2)
86
85
  railties (>= 3.1.0, < 5.0)
87
86
  thor (~> 0.14)
88
87
  json (1.7.5)
89
- kaminari (0.14.0)
88
+ kaminari (0.14.1)
90
89
  actionpack (>= 3.0.0)
91
90
  activesupport (>= 3.0.0)
92
91
  libwebsocket (0.1.5)
@@ -96,8 +95,9 @@ GEM
96
95
  mime-types (~> 1.16)
97
96
  treetop (~> 1.4.8)
98
97
  mime-types (1.19)
99
- money (3.7.1)
98
+ money (5.0.0)
100
99
  i18n (~> 0.4)
100
+ json
101
101
  multi_json (1.3.6)
102
102
  multi_xml (0.5.1)
103
103
  nested_set (1.7.0)
@@ -135,7 +135,7 @@ GEM
135
135
  rdoc (~> 3.4)
136
136
  thor (>= 0.14.6, < 2.0)
137
137
  rake (0.9.2.2)
138
- ransack (0.6.0)
138
+ ransack (0.7.0)
139
139
  actionpack (~> 3.0)
140
140
  activerecord (~> 3.0)
141
141
  polyamorous (~> 0.5.0)
@@ -155,24 +155,29 @@ GEM
155
155
  railties (>= 3.0)
156
156
  rspec (~> 2.11.0)
157
157
  rubyzip (0.9.9)
158
+ select2-rails (0.0.9)
159
+ thor (~> 0.14)
158
160
  selenium-webdriver (2.25.0)
159
161
  childprocess (>= 0.2.5)
160
162
  libwebsocket (~> 0.1.3)
161
163
  multi_json (~> 1.0)
162
164
  rubyzip
163
- spree_core (1.1.3)
164
- activemerchant (= 1.20.4)
165
+ spree_core (1.2.0)
166
+ activemerchant (= 1.28.0)
165
167
  acts_as_list (= 0.1.4)
166
168
  aws-sdk (~> 1.3.4)
169
+ cancan (= 1.6.7)
167
170
  deface (>= 0.9.0)
168
171
  ffaker (~> 1.12.0)
169
172
  highline (= 1.6.11)
170
- jquery-rails (~> 2.0.0)
173
+ jquery-rails (~> 2.0)
171
174
  kaminari (>= 0.13.0)
175
+ money (= 5.0.0)
172
176
  nested_set (= 1.7.0)
173
177
  paperclip (~> 2.7)
174
- rails (~> 3.2.6)
175
- ransack (~> 0.6.0)
178
+ rails (~> 3.2.8)
179
+ ransack (~> 0.7.0)
180
+ select2-rails (= 0.0.9)
176
181
  state_machine (= 1.1.2)
177
182
  stringex (~> 1.3.2)
178
183
  sprockets (2.1.3)
data/app/views/spree/spree_carousels/_taxon_carousels.erb CHANGED
@@ -8,7 +8,7 @@
8
8
  <span class="view-all"><%= link_to t(:view_all), seo_url(carousel.root) %></span>
9
9
  </div>
10
10
  <div class="carousel-products">
11
- <%= render partial: 'spree/products/products', locals: { products: carousel.products } %>
11
+ <%= render partial: 'spree/products/products', locals: { products: carousel.products.active } %>
12
12
  </div>
13
13
  <div class="clearfix"></div>
14
14
  <a class="prev" href="#"><span>prev</span></a>
data/spree_carousels.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
  Gem::Specification.new do |s|
3
3
  s.platform = Gem::Platform::RUBY
4
4
  s.name = 'spree_carousels'
5
- s.version = '1.2.2'
5
+ s.version = '1.2.3'
6
6
  s.summary = 'Adds carousels to spree'
7
7
  s.description = 'Adds carousel functionality to spree homepage, based on taxons'
8
8
  s.required_ruby_version = '>= 1.9.2'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_carousels
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.2
4
+ version: 1.2.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-09-13 00:00:00.000000000Z
12
+ date: 2012-09-18 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: spree_core
16
- requirement: &70113244916460 !ruby/object:Gem::Requirement
16
+ requirement: &70163347304280 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '1.2'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70113244916460
24
+ version_requirements: *70163347304280
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: capybara
27
- requirement: &70113244915560 !ruby/object:Gem::Requirement
27
+ requirement: &70163347302940 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - =
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.0.1
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70113244915560
35
+ version_requirements: *70163347302940
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: factory_girl
38
- requirement: &70113244914660 !ruby/object:Gem::Requirement
38
+ requirement: &70163347302000 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 2.6.4
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70113244914660
46
+ version_requirements: *70163347302000
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: ffaker
49
- requirement: &70113244913940 !ruby/object:Gem::Requirement
49
+ requirement: &70163347301520 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70113244913940
57
+ version_requirements: *70163347301520
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rspec-rails
60
- requirement: &70113244910200 !ruby/object:Gem::Requirement
60
+ requirement: &70163347290620 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '2.9'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70113244910200
68
+ version_requirements: *70163347290620
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: sqlite3
71
- requirement: &70113244909200 !ruby/object:Gem::Requirement
71
+ requirement: &70163347287380 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70113244909200
79
+ version_requirements: *70163347287380
80
80
  description: Adds carousel functionality to spree homepage, based on taxons
81
81
  email: robertoles@me.com
82
82
  executables: []