origin 2.2.0 → 2.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +5 -47
  3. data/lib/origin/selector.rb +1 -1
  4. data/lib/origin/version.rb +1 -1
  5. metadata +3 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0b18444ac7a70fe5f8b4ffb6cfc3561007018adb
4
- data.tar.gz: df43b397e418dbe94ae4435252f73490d4ba8d2a
3
+ metadata.gz: 9b3dd0d1ffa7364b1d22d3ecab9755acad55db19
4
+ data.tar.gz: 59d946d465824d927f0e21b234c5bca4ce14b5e5
5
5
  SHA512:
6
- metadata.gz: 29d9b33aba3b290a0112d0d8b02d446d881da38de59c612f0da08aede046ed695bffd6b03ff1bf1a6db01c6dd7b146078c538e05f3caedd6118314333816f6e5
7
- data.tar.gz: 6e917ba1a28baf310037fac320b9db36ba54aa6ba69868183db13eb30e02db042775ed33ef36a317e209ab7089c3cd31e5dea9abce09f2885755b3fafa85b8b3
6
+ metadata.gz: 303578ea5526fef18a4a6bd01012de29816c62c21e55875ddd1766f92d2fc4906641ccf512fcc9aaef168763fbdfd3f1d6a754bfa83670a7464a3a95573455bc
7
+ data.tar.gz: 55882c68fe07dec11b74d82eb13b48eaf2c2f92857197763365f5a7bd033d6535ef8155dea91a80562aaa9d9190d25622fae0c865c00b2f355fb824cc8b0276b
data/README.md CHANGED
@@ -1,50 +1,8 @@
1
- Origin [![Build Status](https://secure.travis-ci.org/mongoid/origin.png?branch=master&.png)](http://travis-ci.org/mongoid/origin) [![Code Climate](https://codeclimate.com/github/mongoid/origin.png)](https://codeclimate.com/github/mongoid/origin) [![Coverage Status](https://coveralls.io/repos/mongoid/origin/badge.png?branch=master)](https://coveralls.io/r/mongoid/origin?branch=master)
2
- ========
3
-
4
- Origin is a DSL for building MongoDB queries.
5
-
6
- Project Tracking
7
- ----------------
8
-
9
- * [Mongoid Google Group](http://groups.google.com/group/mongoid)
10
- * [Origin Website and Documentation](http://mongoid.org/en/origin/)
11
-
12
- Compatibility
13
- -------------
14
-
15
- Origin is tested against MRI 1.9.2, 1.9.3, 2.0.0, and JRuby (1.9).
16
-
17
- Documentation
18
- -------------
19
-
20
- Please see the new Mongoid website for up-to-date documentation in
21
- the Origin section: [mongoid.org](http://mongoid.org/en/origin/)
22
-
23
- License
1
+ Origin
24
2
  -------
25
3
 
26
- Copyright (c) 2011-2013 Durran Jordan
27
-
28
- Permission is hereby granted, free of charge, to any person obtaining
29
- a copy of this software and associated documentation files (the
30
- "Software"), to deal in the Software without restriction, including
31
- without limitation the rights to use, copy, modify, merge, publish,
32
- distribute, sublicense, and/or sell copies of the Software, and to
33
- permit persons to whom the Software is furnished to do so, subject to
34
- the following conditions:
35
-
36
- The above copyright notice and this permission notice shall be
37
- included in all copies or substantial portions of the Software.
38
-
39
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
40
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
41
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
42
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
43
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
44
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
45
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
46
-
47
- Credits
48
- -------
4
+ This is the legacy repository of the Origin gem, which has been merged into the official Mongoid codebase
5
+ after version 2.2.0.
6
+ You can find the code in the MongoDB Mongoid repository [here](https://github.com/mongodb/mongoid).
49
7
 
50
- Durran Jordan: durran at gmail dot com
8
+ The legacy README for Origin can be found [here](README_LEGACY.md).
data/lib/origin/selector.rb CHANGED
@@ -19,7 +19,7 @@ module Origin
19
19
  other.each_pair do |key, value|
20
20
  if value.is_a?(Hash) && self[key.to_s].is_a?(Hash)
21
21
  value = self[key.to_s].merge(value) do |_key, old_val, new_val|
22
- multi_value?(_key) ? (old_val + new_val).uniq : new_val
22
+ _key == '$in' ? new_val & old_val : old_val | new_val
23
23
  end
24
24
  end
25
25
  if multi_selection?(key)
data/lib/origin/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # encoding: utf-8
2
2
  module Origin
3
- VERSION = "2.2.0"
3
+ VERSION = "2.2.1"
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: origin
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.0
4
+ version: 2.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Durran Jordan
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-01-26 00:00:00.000000000 Z
11
+ date: 2016-10-19 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Origin is a simple DSL for generating MongoDB selectors and options
14
14
  email:
@@ -71,9 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
71
71
  version: 1.3.6
72
72
  requirements: []
73
73
  rubyforge_project: origin
74
- rubygems_version: 2.4.6
74
+ rubygems_version: 2.4.5.1
75
75
  signing_key:
76
76
  specification_version: 4
77
77
  summary: Simple DSL for MongoDB query generation
78
78
  test_files: []
79
- has_rdoc: