breacan 0.9.0 → 0.10.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 114f3618a6e60278a633ce4d583fff573e4064abf8fabdf1179a8662bc8e986f
4
- data.tar.gz: b56af77f0a6089ba2803667d36c895f61174acca76fa6bafd3d2932c1f8c1841
3
+ metadata.gz: a4037673a8b19c16b7ef76e018f1128692f2ba3be9a588228ac7f01678c9e111
4
+ data.tar.gz: 42922282e412029ed30c8eb55ebfb4d299055b1d91d04d26150e3af2ad57f100
5
5
  SHA512:
6
- metadata.gz: b7b14d22955ba9e12ed37eae9c21555df800201c79229d4a2a7b6630ff89a5f8855ba63bf0c8fc8f8fd774c22bf159dad5f282fd5f8ec2e9ef7f3c15135a72bc
7
- data.tar.gz: f0ed5cad10a8c7e128d9c5424cff5665ec12aea67ce7067c66e21ee4fcd0d477ddccb91ca34fb564522cf56748db978cac9dc637c2d4cc86f4d05b3f0ce60ecc
6
+ metadata.gz: c43ed2a1c456b1cca7a2eee1137d54fa33d0aecf36aa1e8bbf48dbe7b37331dc225a86ee703501c24a79d25b3cd9c3175174bb93064f8e011325e635e597e43e
7
+ data.tar.gz: 2cc0683d08f53b9b0e6fce4d9fa5e906c6fdd5d11f9a6c10d6e9f28bfa7f09a75cabd68020fa8641d1a8dbfe52e66697f46d89aa3e1793a721dedef59706ccbd
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
19
19
  spec.require_paths = ["lib"]
20
20
 
21
21
  spec.add_dependency "sawyer", "~> 0.6"
22
- spec.add_dependency "activesupport", "~>4.2"
22
+ spec.add_dependency "activesupport"
23
23
  spec.add_development_dependency "bundler", "~> 1.7"
24
24
  spec.add_development_dependency "rake", "~> 10.0"
25
25
 
@@ -62,7 +62,13 @@ module Breacan
62
62
  r = request :get, url, parse_query_and_convenience_headers(options.merge({cursor: nextc}))
63
63
  if r.is_a?(Sawyer::Resource)
64
64
  res ||= {}
65
- res.to_hash.deep_merge!(r.to_hash)
65
+ res = res.deep_merge(r) do |key, this_val, other_val|
66
+ if this_val.is_a?(Array) && other_val.is_a?(Array)
67
+ this_val + other_val
68
+ else
69
+ other_val
70
+ end
71
+ end
66
72
  elsif r.is_a?(Array)
67
73
  res ||= []
68
74
  res.concat(r)
@@ -1,3 +1,3 @@
1
1
  module Breacan
2
- VERSION = '0.9.0'
2
+ VERSION = '0.10.0'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: breacan
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.0
4
+ version: 0.10.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - linyows
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-01-22 00:00:00.000000000 Z
11
+ date: 2020-01-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sawyer
@@ -28,16 +28,16 @@ dependencies:
28
28
  name: activesupport
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '4.2'
33
+ version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '4.2'
40
+ version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bundler
43
43
  requirement: !ruby/object:Gem::Requirement