civil 3.0.0 → 3.1.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
  SHA1:
3
- metadata.gz: 7466208c6933e1c80abafd6ca50f919a479b65a8
4
- data.tar.gz: 998b31b58587c0b45c59fe069a646ce3b5d53926
3
+ metadata.gz: 89dbdb4fca3b3d46e9c9ed0836f5521db3f3a386
4
+ data.tar.gz: 388f7197da85282b823a4b7aefd0eb4d9ed27f9c
5
5
  SHA512:
6
- metadata.gz: 9cdfee13f4671d49cf5c5d23336b095915ab90b0b8a29c216cd2e530953a44f5fb774308130400ca187fbea67964b25c0240d006736aed7145d7c8aee3bc04ea
7
- data.tar.gz: 7796162ca2fd5625955ae0755565eedb6f308e3f1de31dee46403ab5790b2be4ebcd8fa56aa78b01104e11f0c9bdc212c03ba277932409391214ea7a55d5aa1f
6
+ metadata.gz: 637edfe7906749aa616c7e2a6adf86f5f02707876e392753d96e306b0655db51001ad35be960103fdbc3f37063379e91d7766df78bf2b011dcc4bce9cac6f926
7
+ data.tar.gz: 88ad845c8730d3dab66ab14ca9ecef5b1ba04c892532c957d233070aa83fc328e3518fe98c2bdb318c5a0da4145dffa2dc66a9bae95cdd45b0e71b5702a0238b
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
6
6
 
7
7
  ## [Unreleased]
8
8
 
9
+ ## [3.1.0] - 2016-12-15
10
+ ### Added
11
+ - `Civil::Service#merge_result(result)` merges conditions and meta from a
12
+ nested service call's result into the current service context.
13
+
9
14
  ## [3.0.0] - 2016-12-14
10
15
  ### Changed
11
16
  - `Civil::Set` now renamed to `Civil::Array` and inherit from the `::Array`
@@ -63,7 +68,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
63
68
  - Documentation and examples in README.md
64
69
  - This changelog :-)
65
70
 
66
- [Unreleased]: https://github.com/earksiinni/civil/compare/v3.0.0...HEAD
71
+ [Unreleased]: https://github.com/earksiinni/civil/compare/v3.1.0...HEAD
72
+ [3.1.0]: https://github.com/earksiinni/civil/compare/v3.0.0...v3.1.0
67
73
  [3.0.0]: https://github.com/earksiinni/civil/compare/v2.1.0...v3.0.0
68
74
  [2.1.0]: https://github.com/earksiinni/civil/compare/v2.0.0...v2.1.0
69
75
  [2.0.0]: https://github.com/earksiinni/civil/compare/v1.1.0...v2.0.0
@@ -58,5 +58,11 @@ module Civil
58
58
  def _meta
59
59
  @_meta ||= Civil::Hash.new
60
60
  end
61
+
62
+ def merge_result(result)
63
+ _conditions.merge! result.conditions
64
+ _meta.merge! result.meta
65
+ result.data
66
+ end
61
67
  end
62
68
  end
@@ -1,3 +1,3 @@
1
1
  module Civil
2
- VERSION = "3.0.0"
2
+ VERSION = "3.1.0"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: civil
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0
4
+ version: 3.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ersin Akinci