sunflower 0.5.7 → 0.5.8

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 (3) hide show
  1. data/README +1 -1
  2. data/lib/sunflower/core.rb +2 -2
  3. metadata +2 -2
data/README CHANGED
@@ -1,4 +1,4 @@
1
- Version: 0.5.7 alpha
1
+ Version: 0.5.8 alpha
2
2
 
3
3
  >>> English:
4
4
 
@@ -17,7 +17,7 @@ class Hash
17
17
  if self[k].is_a?(Array) && other[k].is_a?(Array)
18
18
  self[k].concat(other[k])
19
19
  elsif self[k].is_a?(Hash) && other[k].is_a?(Hash)
20
- self[k].recursive_merge!(other[k])
20
+ self[k].sunflower_recursive_merge!(other[k])
21
21
  else
22
22
  self[k] = other[k]
23
23
  end
@@ -40,7 +40,7 @@ end
40
40
  #
41
41
  # You can use multiple Sunflowers at once, to work on multiple wikis.
42
42
  class Sunflower
43
- VERSION = '0.5.7'
43
+ VERSION = '0.5.8'
44
44
 
45
45
  INVALID_CHARS = %w(# < > [ ] | { })
46
46
  INVALID_CHARS_REGEX = Regexp.union *INVALID_CHARS
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sunflower
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.7
4
+ version: 0.5.8
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-01-16 00:00:00.000000000 Z
12
+ date: 2013-02-18 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: json