spree_slider 1.0.1 → 1.1.0

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.
Files changed (6) hide show
  1. data/Gemfile.lock +89 -124
  2. data/Versionfile +2 -1
  3. data/app/models/spree/slide.rb +1 -0
  4. data/app/views/spree/admin/slides/show.html.erb +1 -1
  5. data/spree_slider.gemspec +5 -5
  6. metadata +16 -34
data/Gemfile.lock CHANGED
@@ -1,109 +1,98 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- spree_slider (1.0.0)
5
- spree_core (~> 1.0.0)
4
+ spree_slider (1.0.1)
5
+ spree_core (~> 1.1.0.rc1)
6
6
 
7
7
  GEM
8
8
  remote: http://rubygems.org/
9
9
  specs:
10
- actionmailer (3.1.3)
11
- actionpack (= 3.1.3)
12
- mail (~> 2.3.0)
13
- actionpack (3.1.3)
14
- activemodel (= 3.1.3)
15
- activesupport (= 3.1.3)
10
+ actionmailer (3.2.3)
11
+ actionpack (= 3.2.3)
12
+ mail (~> 2.4.4)
13
+ actionpack (3.2.3)
14
+ activemodel (= 3.2.3)
15
+ activesupport (= 3.2.3)
16
16
  builder (~> 3.0.0)
17
17
  erubis (~> 2.7.0)
18
- i18n (~> 0.6)
19
- rack (~> 1.3.5)
20
- rack-cache (~> 1.1)
21
- rack-mount (~> 0.8.2)
18
+ journey (~> 1.0.1)
19
+ rack (~> 1.4.0)
20
+ rack-cache (~> 1.2)
22
21
  rack-test (~> 0.6.1)
23
- sprockets (~> 2.0.3)
22
+ sprockets (~> 2.1.2)
24
23
  active_utils (1.0.3)
25
24
  activesupport (>= 2.3.11)
26
25
  i18n
27
- activemerchant (1.20.1)
28
- active_utils (>= 1.0.1)
26
+ activemerchant (1.20.4)
27
+ active_utils (>= 1.0.2)
29
28
  activesupport (>= 2.3.11)
30
29
  braintree (>= 2.0.0)
31
30
  builder (>= 2.0.0)
32
31
  i18n
33
32
  json (>= 1.5.1)
34
33
  money (<= 3.7.1)
35
- activemodel (3.1.3)
36
- activesupport (= 3.1.3)
34
+ activemodel (3.2.3)
35
+ activesupport (= 3.2.3)
37
36
  builder (~> 3.0.0)
38
- i18n (~> 0.6)
39
- activerecord (3.1.3)
40
- activemodel (= 3.1.3)
41
- activesupport (= 3.1.3)
42
- arel (~> 2.2.1)
37
+ activerecord (3.2.3)
38
+ activemodel (= 3.2.3)
39
+ activesupport (= 3.2.3)
40
+ arel (~> 3.0.2)
43
41
  tzinfo (~> 0.3.29)
44
- activeresource (3.1.3)
45
- activemodel (= 3.1.3)
46
- activesupport (= 3.1.3)
47
- activesupport (3.1.3)
42
+ activeresource (3.2.3)
43
+ activemodel (= 3.2.3)
44
+ activesupport (= 3.2.3)
45
+ activesupport (3.2.3)
46
+ i18n (~> 0.6)
48
47
  multi_json (~> 1.0)
49
48
  acts_as_list (0.1.4)
50
- archive-tar-minitar (0.5.2)
51
- arel (2.2.3)
52
- braintree (2.13.4)
49
+ arel (3.0.2)
50
+ aws-sdk (1.3.9)
51
+ httparty (~> 0.7)
52
+ json (~> 1.4)
53
+ nokogiri (>= 1.4.4)
54
+ uuidtools (~> 2.1)
55
+ braintree (2.16.0)
53
56
  builder (>= 2.0.0)
54
57
  builder (3.0.0)
55
- capybara (1.0.1)
56
- mime-types (>= 1.16)
57
- nokogiri (>= 1.3.3)
58
- rack (>= 1.0.0)
59
- rack-test (>= 0.5.4)
60
- selenium-webdriver (~> 2.0)
61
- xpath (~> 0.1.4)
62
- childprocess (0.3.1)
63
- ffi (~> 1.0.6)
64
58
  cocaine (0.2.1)
65
59
  columnize (0.3.6)
66
- deface (0.7.2)
60
+ deface (0.8.0)
67
61
  nokogiri (~> 1.5.0)
68
62
  rails (>= 3.0.9)
69
- diff-lcs (1.1.3)
70
63
  erubis (2.7.0)
71
- factory_girl (2.6.0)
72
- activesupport (>= 2.3.9)
73
64
  ffaker (1.12.1)
74
- ffi (1.0.11)
75
- highline (1.6.8)
65
+ highline (1.6.11)
76
66
  hike (1.2.1)
67
+ httparty (0.8.2)
68
+ multi_json
69
+ multi_xml
77
70
  i18n (0.6.0)
78
- jquery-rails (1.0.19)
79
- railties (~> 3.0)
71
+ journey (1.0.3)
72
+ jquery-rails (2.0.2)
73
+ railties (>= 3.2.0, < 5.0)
80
74
  thor (~> 0.14)
81
- json (1.6.5)
82
- json_pure (1.6.5)
75
+ json (1.6.6)
83
76
  kaminari (0.13.0)
84
77
  actionpack (>= 3.0.0)
85
78
  activesupport (>= 3.0.0)
86
79
  railties (>= 3.0.0)
87
- linecache19 (0.5.12)
88
- ruby_core_source (>= 0.1.4)
89
- mail (2.3.0)
80
+ linecache (0.46)
81
+ rbx-require-relative (> 0.0.4)
82
+ mail (2.4.4)
90
83
  i18n (>= 0.4.0)
91
84
  mime-types (~> 1.16)
92
85
  treetop (~> 1.4.8)
93
- meta_search (1.1.1)
94
- actionpack (~> 3.1.0)
95
- activerecord (~> 3.1.0)
96
- activesupport (~> 3.1.0)
97
- polyamorous (~> 0.5.0)
98
- mime-types (1.17.2)
86
+ mime-types (1.18)
99
87
  money (3.7.1)
100
88
  i18n (~> 0.4)
101
- multi_json (1.1.0)
102
- nested_set (1.6.8)
89
+ multi_json (1.3.2)
90
+ multi_xml (0.4.4)
91
+ nested_set (1.7.0)
103
92
  activerecord (>= 3.0.0)
104
93
  railties (>= 3.0.0)
105
- nokogiri (1.5.0)
106
- paperclip (2.5.0)
94
+ nokogiri (1.5.2)
95
+ paperclip (2.7.0)
107
96
  activerecord (>= 2.3.0)
108
97
  activesupport (>= 2.3.2)
109
98
  cocaine (>= 0.0.2)
@@ -111,100 +100,76 @@ GEM
111
100
  polyamorous (0.5.0)
112
101
  activerecord (~> 3.0)
113
102
  polyglot (0.3.3)
114
- rack (1.3.6)
115
- rack-cache (1.1)
103
+ rack (1.4.1)
104
+ rack-cache (1.2)
116
105
  rack (>= 0.4)
117
- rack-mount (0.8.3)
118
- rack (>= 1.0.0)
119
106
  rack-ssl (1.3.2)
120
107
  rack
121
108
  rack-test (0.6.1)
122
109
  rack (>= 1.0)
123
- rails (3.1.3)
124
- actionmailer (= 3.1.3)
125
- actionpack (= 3.1.3)
126
- activerecord (= 3.1.3)
127
- activeresource (= 3.1.3)
128
- activesupport (= 3.1.3)
110
+ rails (3.2.3)
111
+ actionmailer (= 3.2.3)
112
+ actionpack (= 3.2.3)
113
+ activerecord (= 3.2.3)
114
+ activeresource (= 3.2.3)
115
+ activesupport (= 3.2.3)
129
116
  bundler (~> 1.0)
130
- railties (= 3.1.3)
131
- railties (3.1.3)
132
- actionpack (= 3.1.3)
133
- activesupport (= 3.1.3)
117
+ railties (= 3.2.3)
118
+ railties (3.2.3)
119
+ actionpack (= 3.2.3)
120
+ activesupport (= 3.2.3)
134
121
  rack-ssl (~> 1.3.2)
135
122
  rake (>= 0.8.7)
136
123
  rdoc (~> 3.4)
137
124
  thor (~> 0.14.6)
138
125
  rake (0.9.2.2)
126
+ ransack (0.6.0)
127
+ actionpack (~> 3.0)
128
+ activerecord (~> 3.0)
129
+ polyamorous (~> 0.5.0)
130
+ rbx-require-relative (0.0.9)
139
131
  rdoc (3.12)
140
132
  json (~> 1.4)
141
- rspec (2.8.0)
142
- rspec-core (~> 2.8.0)
143
- rspec-expectations (~> 2.8.0)
144
- rspec-mocks (~> 2.8.0)
145
- rspec-core (2.8.0)
146
- rspec-expectations (2.8.0)
147
- diff-lcs (~> 1.1.2)
148
- rspec-mocks (2.8.0)
149
- rspec-rails (2.8.1)
150
- actionpack (>= 3.0)
151
- activesupport (>= 3.0)
152
- railties (>= 3.0)
153
- rspec (~> 2.8.0)
154
- ruby-debug-base19 (0.11.25)
155
- columnize (>= 0.3.1)
156
- linecache19 (>= 0.5.11)
157
- ruby_core_source (>= 0.1.4)
158
- ruby-debug19 (0.11.6)
159
- columnize (>= 0.3.1)
160
- linecache19 (>= 0.5.11)
161
- ruby-debug-base19 (>= 0.11.19)
162
- ruby_core_source (0.1.5)
163
- archive-tar-minitar (>= 0.5.2)
164
- rubyzip (0.9.6.1)
165
- selenium-webdriver (2.13.0)
166
- childprocess (>= 0.2.1)
167
- ffi (~> 1.0.9)
168
- json_pure
169
- rubyzip
170
- spree_core (1.0.0)
171
- activemerchant (= 1.20.1)
133
+ ruby-debug (0.10.4)
134
+ columnize (>= 0.1)
135
+ ruby-debug-base (~> 0.10.4.0)
136
+ ruby-debug-base (0.10.4)
137
+ linecache (>= 0.3)
138
+ spree_core (1.1.0.rc2)
139
+ activemerchant (= 1.20.4)
172
140
  acts_as_list (= 0.1.4)
173
- deface (>= 0.7.2)
141
+ aws-sdk (~> 1.3.4)
142
+ deface (>= 0.8.0)
174
143
  ffaker (~> 1.12.0)
175
- highline (= 1.6.8)
176
- jquery-rails (>= 1.0.18, <= 1.0.19)
144
+ highline (= 1.6.11)
145
+ jquery-rails (~> 2.0.0)
177
146
  kaminari (>= 0.13.0)
178
- meta_search (= 1.1.1)
179
- nested_set (= 1.6.8)
180
- paperclip (= 2.5.0)
181
- rails (>= 3.1.1, <= 3.1.3)
182
- state_machine (= 1.1.1)
183
- stringex (~> 1.3.0)
184
- sprockets (2.0.3)
147
+ nested_set (= 1.7.0)
148
+ paperclip (~> 2.7)
149
+ rails (>= 3.2.2, <= 3.2.3)
150
+ ransack (~> 0.6.0)
151
+ state_machine (= 1.1.2)
152
+ stringex (~> 1.3.2)
153
+ sprockets (2.1.2)
185
154
  hike (~> 1.2)
186
155
  rack (~> 1.0)
187
156
  tilt (~> 1.1, != 1.3.0)
188
157
  sqlite3 (1.3.5)
189
- state_machine (1.1.1)
158
+ state_machine (1.1.2)
190
159
  stringex (1.3.2)
191
160
  thor (0.14.6)
192
161
  tilt (1.3.3)
193
162
  treetop (1.4.10)
194
163
  polyglot
195
164
  polyglot (>= 0.3.1)
196
- tzinfo (0.3.31)
197
- xpath (0.1.4)
198
- nokogiri (~> 1.3)
165
+ tzinfo (0.3.33)
166
+ uuidtools (2.1.2)
199
167
 
200
168
  PLATFORMS
201
169
  ruby
202
170
 
203
171
  DEPENDENCIES
204
- capybara (= 1.0.1)
205
- factory_girl
206
172
  ffaker
207
- rspec-rails (~> 2.7)
208
- ruby-debug19
173
+ ruby-debug
209
174
  spree_slider!
210
175
  sqlite3
data/Versionfile CHANGED
@@ -7,4 +7,5 @@
7
7
  # "0.60.x" => { :branch => "0-60-stable" }
8
8
  # "0.40.x" => { :tag => "v1.0.0", :version => "1.0.0" }
9
9
 
10
- "1.0.x" => { :branch => "master"}
10
+ "1.0.x" => { :ref => '2c31ead09bf6a62e7a0700a5d831c7933d63edd5' }
11
+ "1.1.x" => { :branch => "master"}
data/app/models/spree/slide.rb CHANGED
@@ -1,4 +1,5 @@
1
1
  class Spree::Slide < ActiveRecord::Base
2
2
  has_attached_file :image
3
3
  scope :published, where(:published => true)
4
+ attr_accessible :name, :body, :link_url, :published, :image
4
5
  end
data/app/views/spree/admin/slides/show.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <%= render :partial => 'admin/shared/configuration_menu' %>
1
+ <%= render :partial => 'spree/admin/shared/configuration_menu' %>
2
2
 
3
3
  <h1><%= t(:slide) %></h1>
4
4
 
data/spree_slider.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_slider'
5
- s.version = '1.0.1'
5
+ s.version = '1.1.0'
6
6
  s.summary = 'Spree Slider extension'
7
7
  s.description = 'Adds a slider to the homepage'
8
8
  s.required_ruby_version = '>= 1.8.7'
@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
16
16
  s.require_path = 'lib'
17
17
  s.requirements << 'none'
18
18
 
19
- s.add_dependency 'spree_core', '~> 1.0.0'
19
+ s.add_dependency 'spree_core', '~> 1.1.0'
20
20
 
21
- s.add_development_dependency 'capybara', '1.0.1'
22
- s.add_development_dependency 'factory_girl'
21
+ # s.add_development_dependency 'capybara', '1.0.1'
22
+ # s.add_development_dependency 'factory_girl'
23
23
  s.add_development_dependency 'ffaker'
24
- s.add_development_dependency 'rspec-rails', '~> 2.7'
24
+ # s.add_development_dependency 'rspec-rails', '~> 2.7'
25
25
  s.add_development_dependency 'sqlite3'
26
26
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_slider
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.1.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,33 +9,27 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-02-23 00:00:00.000000000 Z
12
+ date: 2012-05-14 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: spree_core
16
- requirement: &86219780 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
20
20
  - !ruby/object:Gem::Version
21
- version: 1.0.0
21
+ version: 1.1.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *86219780
25
- - !ruby/object:Gem::Dependency
26
- name: capybara
27
- requirement: &86219420 !ruby/object:Gem::Requirement
24
+ version_requirements: !ruby/object:Gem::Requirement
28
25
  none: false
29
26
  requirements:
30
- - - =
27
+ - - ~>
31
28
  - !ruby/object:Gem::Version
32
- version: 1.0.1
33
- type: :development
34
- prerelease: false
35
- version_requirements: *86219420
29
+ version: 1.1.0
36
30
  - !ruby/object:Gem::Dependency
37
- name: factory_girl
38
- requirement: &86219220 !ruby/object:Gem::Requirement
31
+ name: ffaker
32
+ requirement: !ruby/object:Gem::Requirement
39
33
  none: false
40
34
  requirements:
41
35
  - - ! '>='
@@ -43,40 +37,28 @@ dependencies:
43
37
  version: '0'
44
38
  type: :development
45
39
  prerelease: false
46
- version_requirements: *86219220
47
- - !ruby/object:Gem::Dependency
48
- name: ffaker
49
- requirement: &86218960 !ruby/object:Gem::Requirement
40
+ version_requirements: !ruby/object:Gem::Requirement
50
41
  none: false
51
42
  requirements:
52
43
  - - ! '>='
53
44
  - !ruby/object:Gem::Version
54
45
  version: '0'
55
- type: :development
56
- prerelease: false
57
- version_requirements: *86218960
58
46
  - !ruby/object:Gem::Dependency
59
- name: rspec-rails
60
- requirement: &86218570 !ruby/object:Gem::Requirement
47
+ name: sqlite3
48
+ requirement: !ruby/object:Gem::Requirement
61
49
  none: false
62
50
  requirements:
63
- - - ~>
51
+ - - ! '>='
64
52
  - !ruby/object:Gem::Version
65
- version: '2.7'
53
+ version: '0'
66
54
  type: :development
67
55
  prerelease: false
68
- version_requirements: *86218570
69
- - !ruby/object:Gem::Dependency
70
- name: sqlite3
71
- requirement: &86218280 !ruby/object:Gem::Requirement
56
+ version_requirements: !ruby/object:Gem::Requirement
72
57
  none: false
73
58
  requirements:
74
59
  - - ! '>='
75
60
  - !ruby/object:Gem::Version
76
61
  version: '0'
77
- type: :development
78
- prerelease: false
79
- version_requirements: *86218280
80
62
  description: Adds a slider to the homepage
81
63
  email: priviterag@gmail.com
82
64
  executables: []
@@ -229,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
229
211
  requirements:
230
212
  - none
231
213
  rubyforge_project:
232
- rubygems_version: 1.8.10
214
+ rubygems_version: 1.8.21
233
215
  signing_key:
234
216
  specification_version: 3
235
217
  summary: Spree Slider extension