rffdb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc4467ccd374f36f1a5793286254b9e0f5e0d7ca
-  data.tar.gz: ecd7ed58e3635b2f9ca2494b6dfb69f32f772db8
+  metadata.gz: 37838db2bfccfd088505b989e6ad5e7e23d9d7d2
+  data.tar.gz: a41f4ce7ddf7175fedd855951af01361d03514ce
 SHA512:
-  metadata.gz: d35ee19ff25eefb271ff21df71882056e8a989be0024ab261f63b094cc0943c9e68f0671e09bb6410fb668e0ceecb38f1b2a73492a097ad770b1821a3a72dc83
-  data.tar.gz: f8dc378ee8c4e67a9ae4bfb80c4a30db378d65af261e00a96cfdb20006cdfebc1c865dd291a3a15bef2bf87d5a4d253011321d972fd3759c6534de193f1fee42
+  metadata.gz: 9f5a755761ebf31cc18fb208edcd607162a67b052bcbcd97a6e12ebd958fd57e016c5df9806c8b0b303fe9a3e1d6c40063583f4f8fd0dd025114e533ad886c8a
+  data.tar.gz: 6642ec484386203f3c1f7fad6aaef202b33bd1448a1be603ea4f340a830a09be5fb0808cd8db7ce97b0f947aa49eac123bf22b5e048a926a89747643d5288516

data/lib/rffdb/document_collection.rb

@@ -86,7 +86,7 @@ module RubyFFDB
         new_keys += other.collect(&:id)
 
         new_keys.sort.uniq.each do |doc_id|
-          new_list << self.class.get(doc_id)
+          new_list << @type.get(doc_id)
         end
 
         self.class.new(new_list, @type)
@@ -123,11 +123,11 @@ module RubyFFDB
     # @param attribute [Symbol] the attribute to query
     # @param value [Object] the value to compare against
     # @param comparison_method [String,Symbol] the method to use for comparison
-    #   - allowed options are "'==', '>', '>=', '<', '<=', and 'match'"
+    #   - allowed options are "'==', '!=', '>', '>=', '<', '<=', and 'match'"
     # @raise [Exceptions::InvalidWhereQuery] if not the right kind of comparison
     # @return [DocumentCollection]
     def where(attribute, value, comparison_method = '==')
-      valid_comparison_methods = [:'==', :'>', :'>=', :'<', :'<=', :match]
+      valid_comparison_methods = [:'==', :'!=', :'>', :'>=', :'<', :'<=', :match]
       unless valid_comparison_methods.include?(comparison_method.to_sym)
         fail Exceptions::InvalidWhereQuery
       end
@@ -142,5 +142,20 @@ module RubyFFDB
         @type
       )
     end
+
+    alias_method :and, :where
+
+    # Hacked together #or() method in the same spirit as #where().
+    # This method can be chained for multiple / more specific queries.
+    #
+    # @param attribute [Symbol] the attribute to query
+    # @param value [Object] the value to compare against
+    # @param comparison_method [String,Symbol] the method to use for comparison
+    #   - allowed options are "'==', '!=', '>', '>=', '<', '<=', and 'match'"
+    # @raise [Exceptions::InvalidWhereQuery] if not the right kind of comparison
+    # @return [DocumentCollection]
+    def or(attribute, value, comparison_method = '==')
+      merge @type.where(attribute, value, comparison_method)
+    end
   end
 end

data/lib/rffdb/version.rb

@@ -1,3 +1,3 @@
 module RubyFFDB
-  VERSION = [0, 1, 2].join('.')
+  VERSION = [0, 1, 3].join('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rffdb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -67,9 +67,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby FlatFile DB
 test_files: []
-has_rdoc: