spree_active_sale 1.3.1 → 1.3.2

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 CHANGED
@@ -17,8 +17,9 @@ Spree Active Sale makes it easy to handle flash sale/ daily deals behavior withi
17
17
 
18
18
  * Demo application: [Spree Active Sale Demo](https://github.com/suryart/spree_active_sale_demo)
19
19
  * Dependency status: [![Dependency Status](https://gemnasium.com/suryart/spree_active_sale.png)](https://gemnasium.com/suryart/spree_active_sale)
20
- * Code climate: [![Code Climate](https://codeclimate.com/github/suryart/spree_active_sale.png)](https://codeclimate.com/github/suryart/spree_active_sale)
21
- * Build Status: [![Build Status](https://travis-ci.org/suryart/spree_active_sale.png?branch=master)](https://travis-ci.org/suryart/spree_active_sale)
20
+ * Code Climate: [![Code Climate](https://codeclimate.com/github/suryart/spree_active_sale.png)](https://codeclimate.com/github/suryart/spree_active_sale)
21
+ * Build Status: [![Build Status](https://travis-ci.org/suryart/spree_active_sale.png?branch=1-3-stable)](https://travis-ci.org/suryart/spree_active_sale)
22
+ * Coverage Status: [![Coverage Status](https://coveralls.io/repos/suryart/spree_active_sale/badge.png?branch=1-3-stable)](https://coveralls.io/r/suryart/spree_active_sale?branch=1-3-stable)
22
23
  * Issues: [Project issues](https://github.com/suryart/spree_active_sale/issues)
23
24
  * Fork: [Fork this Project](https://github.com/suryart/spree_active_sale/fork_select)
24
25
 
@@ -15,7 +15,7 @@ module Spree
15
15
 
16
16
  # Get the helper and load from cache when possible
17
17
  def all_active_sale_events
18
- all_sale_events.select{ |e| e.type == "Spree::ActiveSaleEvent" && e.parent != nil }
18
+ all_sale_events.select{ |e| e.type == "Spree::ActiveSaleEvent" && e.parent_id != nil }
19
19
  end
20
20
 
21
21
  # find sale event for the product or a taxon
@@ -32,19 +32,21 @@
32
32
  <%= javascript_tag do -%>
33
33
  var initial = [
34
34
  { "attr" :
35
- { "id" : "<%= @active_sale.root.id %>", "rel" : "root", "parent_id" : "nil" },
36
- "data" : "<%= escape_javascript(raw(@active_sale.root.name)) %>",
35
+ { "id" : "<%= @active_sale.root.try(:id) %>", "rel" : "root", "parent_id" : "nil" },
36
+ "data" : "<%= escape_javascript(raw(@active_sale.root.try(:name))) %>",
37
37
  "state" : "open",
38
38
  "children" : [
39
- <% @active_sale.root.children_sorted_by_position.each_with_index do |event,i| %>
40
- {
41
- "attr" :
42
- { "id" : "<%= event.id %>", "parent_id" : "<%= event.parent_id %>" },
43
- "data" : "<%= escape_javascript(raw(event_js_data(event))) %>"
44
- <% unless event.children.empty? %>
45
- ,"state" : "closed"
46
- <% end %>
47
- }<%= ',' if i < (@active_sale.root.children.size - 1) %>
39
+ <% unless @active_sale.root.nil? %>
40
+ <% @active_sale.root.children_sorted_by_position.each_with_index do |event,i| %>
41
+ {
42
+ "attr" :
43
+ { "id" : "<%= event.id %>", "parent_id" : "<%= event.parent_id %>" },
44
+ "data" : "<%= escape_javascript(raw(event_js_data(event))) %>"
45
+ <% unless event.children.empty? %>
46
+ ,"state" : "closed"
47
+ <% end %>
48
+ }<%= ',' if i < (@active_sale.root.children.size - 1) %>
49
+ <% end %>
48
50
  <% end %>
49
51
  ]
50
52
  }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_active_sale
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.1
4
+ version: 1.3.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-06-20 00:00:00.000000000 Z
12
+ date: 2013-07-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: spree_core
@@ -59,6 +59,22 @@ dependencies:
59
59
  - - ! '>='
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
+ - !ruby/object:Gem::Dependency
63
+ name: database_cleaner
64
+ requirement: !ruby/object:Gem::Requirement
65
+ none: false
66
+ requirements:
67
+ - - ! '>='
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
70
+ type: :development
71
+ prerelease: false
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ! '>='
76
+ - !ruby/object:Gem::Version
77
+ version: '0'
62
78
  - !ruby/object:Gem::Dependency
63
79
  name: factory_girl_rails
64
80
  requirement: !ruby/object:Gem::Requirement
@@ -244,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
244
260
  version: '0'
245
261
  segments:
246
262
  - 0
247
- hash: -430475808815195775
263
+ hash: 3909835489064668345
248
264
  requirements:
249
265
  - none
250
266
  rubyforge_project: