query_string_search 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ac9f7da9d9c53692c3ccb4e3c7fab60ba524d1f
-  data.tar.gz: 865d14548d4ed0aa2129b759f127b8b808d7121d
+  metadata.gz: e26566e03c8bebf8eafc66136d2147f4aa5a84c7
+  data.tar.gz: 202bc4a25b3b21a6518659ed69a9e1482497ced7
 SHA512:
-  metadata.gz: 502464cf14160e106a69ccaa6b671db44650980c6db6e91acba6b5fe39f7e11aa28d70e1b04b0d657829ddf8c90df858aef79703e9f5c0148ea5478034f73407
-  data.tar.gz: fe7f411d65369fb73ec21f2cd15883149a47ae357fdb74d74eaf182f26c9988402f8ba5b453f7cbbe3032fe504842431a8aa12dfd3dbb217367ac41d6134264a
+  metadata.gz: a78fc8441f143d3e9190776df9e7882b8c082a1dc8ecd751b99575e1d0e1ffb96002026e273cd022d449accca4d4dbb7d38d7d9e15eb6f6cbd3833e510f7bb3d
+  data.tar.gz: dc593049a096450f40415d4935db92f27a4c5714ae2dcf4465c2ef15c353db1438d6836bf482188aa384ffa0a5c3ab030fc79e7a2757e8b281105bab5a8d12dc

data/README.md

@@ -24,6 +24,8 @@ Query String Example  | What Data is Returned
 `movies?q=rating=none` | Movies with a nil rating
 `movies?q=year=1994` | Movies with a year of 1994
 `movies?q=year=1994|1995` | Movies with a year of 1994 or 1995
+`movies?q=year!1994` | Movies with a year that is not 1994
+`movies?q=year!1994|1995` | Movies with a year that is not 1994 or 1995
 `movies?q=title=Dunston%20Checks%20In` | Movies with the title Dunston Checks In
 `movies?q=star_rating>1` | Movies with a star rating greater than one
 `movies?q=star_rating<3` | Movies with a star rating less than three
@@ -31,6 +33,8 @@ Query String Example  | What Data is Returned
 `movies?q=star_rating<=4` | Movies with a star rating less than or equal to 4
 `movies?q=home_formats=DVD` | Movies that are available on DVD.
 `movies?q=home_formats=DVD|BD` | Movies that are available on DVD or Blu Ray
+`movies?q=home_formats!DVD` | Movies that are not available on DVD.
+`movies?q=home_formats!=DVD|BD` | Movies that are not available on DVD or Blu Ray
 
 ### Combining Searches
 

data/lib/query_string_search/abstract_comparison.rb

@@ -1,37 +1,35 @@
 require "delegate"
 
 module QueryStringSearch
-  module Comparator
-    class AbstractComparison
-      attr_accessor :other, :subject, :operator
+  class AbstractComparison
+    attr_accessor :other, :subject, :operator
 
-      def self.comparisons
-        descendants.push(self)
-      end
+    def self.comparisons
+      descendants.push(self)
+    end
 
-      def self.descendants
-        ObjectSpace.each_object(Class).select { |klass| klass < AbstractComparison }
-      end
+    def self.descendants
+      ObjectSpace.each_object(Class).select { |klass| klass < AbstractComparison }
+    end
 
-      def self.all_reserved_operators
-        descendants.each_with_object([]) { |d, ret| ret << d.reserved_operators }.flatten
-      end
+    def self.all_reserved_operators
+      descendants.each_with_object([]) { |d, ret| ret << d.reserved_operators }.flatten
+    end
 
-      def self.reserved_operators
-        []
-      end
+    def self.reserved_operators
+      []
+    end
 
-      def normalize(unnormalized)
-        Array(unnormalized).map(&:to_s).map(&:upcase)
-      end
+    def normalize(unnormalized)
+      Array(unnormalized).map(&:to_s).map(&:upcase)
+    end
 
-      def compare
-        false
-      end
+    def compare
+      false
+    end
 
-      def self.build_me?(_)
-        true
-      end
+    def self.build_me?(_)
+      true
     end
   end
 end

data/lib/query_string_search/abstract_matcher.rb

@@ -32,7 +32,7 @@ module QueryStringSearch
     end
 
     def comparison
-      @comparison ||= QueryStringSearch::Comparator::ComparisonFactory.build(self)
+      @comparison ||= QueryStringSearch::ComparisonFactory.build(self)
     end
 
     private

data/lib/query_string_search/comparison_factory.rb

@@ -1,15 +1,13 @@
 module QueryStringSearch
-  module Comparator
-    class ComparisonFactory
-      def self.build(matcher, available_comparisons = AbstractComparison.comparisons)
-        comparison_to_build = available_comparisons.detect { |c| c.build_me?(matcher) }
+  class ComparisonFactory
+    def self.build(matcher, available_comparisons = AbstractComparison.comparisons)
+      comparison_to_build = available_comparisons.detect { |c| c.build_me?(matcher) }
 
-        if comparison_to_build
-          comparison = comparison_to_build.new
-          comparison.subject = matcher.desired_value
-          comparison.operator = matcher.operator
-          comparison
-        end
+      if comparison_to_build
+        comparison = comparison_to_build.new
+        comparison.subject = matcher.desired_value
+        comparison.operator = matcher.operator
+        comparison
       end
     end
   end

data/lib/query_string_search/comparisons/inequality.rb

@@ -1,21 +1,19 @@
 module QueryStringSearch
-  module Comparator
-    class Inequality < AbstractComparison
-      def compare(other)
-        normalize(other).public_send(operator, normalize(subject))
-      end
+  class InequalityComparison < AbstractComparison
+    def compare(other)
+      normalize(other).public_send(operator, normalize(subject))
+    end
 
-      def normalize(unnormalized)
-        unnormalized.to_i
-      end
+    def normalize(unnormalized)
+      unnormalized.to_f
+    end
 
-      def self.reserved_operators
-        [:<, :>, :<=, :>=]
-      end
+    def self.reserved_operators
+      [:<, :>, :<=, :>=]
+    end
 
-      def self.build_me?(matcher)
-        reserved_operators.include?(matcher.operator)
-      end
+    def self.build_me?(matcher)
+      reserved_operators.include?(matcher.operator)
     end
   end
 end

data/lib/query_string_search/comparisons/set.rb

@@ -1,13 +1,19 @@
 module QueryStringSearch
-  module Comparator
-    class Set < AbstractComparison
-      def compare(other)
-        (normalize(subject) & normalize(other)).any?
-      end
+  class SetComparison < AbstractComparison
+    def compare(other)
+      (normalize(subject) & normalize(other)).send(operator)
+    end
 
-      def self.build_me?(matcher)
-        all_reserved_operators.none? { |o| o == matcher.operator }
+    def operator=(x)
+      if x == :!=
+        super(:none?)
+      else
+        super(:any?)
       end
     end
+
+    def self.build_me?(matcher)
+      all_reserved_operators.none? { |o| o == matcher.operator }
+    end
   end
 end

data/lib/query_string_search/matchers/match_multiple_attribute_values.rb

@@ -5,10 +5,6 @@ class MatchMultipleAttributeValues < QueryStringSearch::AbstractMatcher
     end
   end
 
-  def operator
-    :&
-  end
-
   def self.reserved_words
     [
       /^\w+\|\w+/

data/lib/query_string_search/version.rb

@@ -1,3 +1,3 @@
 module QueryStringSearch
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/features/find_records_without_matching_attribute_values_spec.rb

@@ -0,0 +1,30 @@
+require_relative "../../lib/query_string_search"
+require_relative "../fixtures/movie"
+
+RSpec.describe "Finding data that does not have the requested value" do
+  let(:data_set) { Movie.random_collection }
+
+  it "Returns records that do not have a single value " do
+    expected_results = data_set.select { |d| d.year != "1994" }
+    actual_results = QueryStringSearch.new(data_set, "year!=1994").results
+    expect(actual_results).to eq(expected_results)
+  end
+
+  it "Returns records that do not have a value in a collection " do
+    expected_results = data_set.select { |d| !d.home_formats.include?("BD") }
+    actual_results = QueryStringSearch.new(data_set, "home_formats!=BD").results
+    expect(actual_results).to eq(expected_results)
+  end
+
+  it "Returns records that do not have any of the requested values " do
+    expected_results = data_set.select { |d| !%w(1994 1995).include?(d.year) }
+    actual_results = QueryStringSearch.new(data_set, "year!=1994|1995").results
+    expect(actual_results).to eq(expected_results)
+  end
+
+  it "Returns records that do not have any of the requested values in their collection" do
+    expected_results = data_set.select { |d| !d.home_formats.include?("BD") && !d.home_formats.include?("DVD") }
+    actual_results = QueryStringSearch.new(data_set, "home_formats!=BD|DVD").results
+    expect(actual_results).to eq(expected_results)
+  end
+end

data/spec/lib/query_string_search/comparisons/inequality_spec.rb

@@ -0,0 +1,130 @@
+require_relative "../../../../lib/query_string_search/abstract_comparison"
+
+RSpec.describe QueryStringSearch::InequalityComparison do
+  describe "reserved_operators" do
+    it "reserves the equality comparison operators" do
+      expect([:<, :>, :<=, :>=]).to eq(QueryStringSearch::InequalityComparison.reserved_operators)
+    end
+  end
+
+  describe "build_me?" do
+    let(:matcher) { instance_double(QueryStringSearch::AbstractMatcher) }
+    it "is true if the matcher's operator is one of the Inequality reserved_operators" do
+      QueryStringSearch::InequalityComparison.reserved_operators.each do |o|
+        allow(matcher).to receive(:operator).and_return(o)
+        expect(QueryStringSearch::InequalityComparison.build_me?(matcher)).to be_truthy
+      end
+    end
+
+    it "is false if the matcher's operator is not one of the reserved operators" do
+      allow(matcher).to receive(:operator).and_return(:inspect)
+      expect(QueryStringSearch::InequalityComparison.build_me?(matcher)).to be_falsey
+    end
+  end
+
+  describe "compare" do
+    describe "using less than" do
+      let(:comparison) do
+        comparison = QueryStringSearch::InequalityComparison.new
+        comparison.subject = 1.0
+        comparison.operator = :<
+        comparison
+      end
+
+      it "is true if the compared value is less than the subject" do
+        expect(comparison.compare(0.9)).to be_truthy
+      end
+
+      it "is false if the compared value is equal to the subject" do
+        expect(comparison.compare(1)).to be_falsey
+      end
+
+      it "is false if the compared value is greater than the subject" do
+        expect(comparison.compare(1.1)).to be_falsey
+      end
+
+      it "works if the values are strings" do
+        comparison.subject = "1.05"
+        expect(comparison.compare("1")).to be_truthy
+      end
+    end
+  end
+
+  describe "using less-than-or-equal-to" do
+    let(:comparison) do
+      comparison = QueryStringSearch::InequalityComparison.new
+      comparison.subject = 1.0
+      comparison.operator = :<=
+      comparison
+    end
+
+    it "is true if the compared value is less than the subject" do
+      expect(comparison.compare(0.9)).to be_truthy
+    end
+
+    it "is true if the compared value is equal to the subject" do
+      expect(comparison.compare(1)).to be_truthy
+    end
+
+    it "is false if the compared value is greater than the subject" do
+      expect(comparison.compare(1.1)).to be_falsey
+    end
+
+    it "works if the values are strings" do
+      comparison.subject = "1.0"
+      expect(comparison.compare("1")).to be_truthy
+    end
+  end
+
+  describe "greater than" do
+    let(:comparison) do
+      comparison = QueryStringSearch::InequalityComparison.new
+      comparison.subject = 1.0
+      comparison.operator = :>
+      comparison
+    end
+
+    it "is false if the compared value is less than the subject" do
+      expect(comparison.compare(0.9)).to be_falsey
+    end
+
+    it "is false if the compared value is equal to the subject" do
+      expect(comparison.compare(1)).to be_falsey
+    end
+
+    it "is true if the compared value is greater than the subject" do
+      expect(comparison.compare(1.1)).to be_truthy
+    end
+
+    it "works if the values are strings" do
+      comparison.subject = "1.0"
+      expect(comparison.compare("1.1")).to be_truthy
+    end
+  end
+
+  describe "greater-than-or-equal-to" do
+    let(:comparison) do
+      comparison = QueryStringSearch::InequalityComparison.new
+      comparison.subject = 1.0
+      comparison.operator = :>=
+      comparison
+    end
+
+    it "is false if the compared value is less than the subject" do
+      expect(comparison.compare(0.9)).to be_falsey
+    end
+
+    it "is true if the compared value is equal to the subject" do
+      expect(comparison.compare(1)).to be_truthy
+    end
+
+    it "is true if the compared value is greater than the subject" do
+      expect(comparison.compare(1.1)).to be_truthy
+    end
+
+    it "works if the values are strings" do
+      comparison.subject = "1.0"
+      expect(comparison.compare("1")).to be_truthy
+    end
+  end
+end

data/spec/lib/query_string_search/comparisons/set_spec.rb

@@ -0,0 +1,46 @@
+require_relative "../../../../lib/query_string_search/abstract_comparison"
+
+RSpec.describe QueryStringSearch::SetComparison do
+  let(:value) { rand }
+  let(:comparison) do
+    c = QueryStringSearch::SetComparison.new
+    c.subject = value
+    c
+  end
+
+  describe "comparing for existence" do
+    before do
+      comparison.operator = "=".to_sym
+    end
+
+    describe "target has the data" do
+      it "returns true" do
+        expect(comparison.compare(value)).to be_truthy
+      end
+    end
+
+    describe "target does not have the data" do
+      it "returns true" do
+        expect(comparison.compare(value + 1)).to be_falsey
+      end
+    end
+  end
+
+  describe "comparing for absence" do
+    before do
+      comparison.operator = :!=
+    end
+
+    describe "target has the data" do
+      it "returns false" do
+        expect(comparison.compare(value)).to be_falsey
+      end
+    end
+
+    describe "target does not have the data" do
+      it "returns true" do
+        expect(comparison.compare(value + 1)).to be_truthy
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_string_search
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ian Whitney
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,9 +139,12 @@ files:
 - spec/features/find_records_with_matching_attribute_values_spec.rb
 - spec/features/find_records_with_nil_attributes_spec.rb
 - spec/features/find_records_with_nonnil_attributes_spec.rb
+- spec/features/find_records_without_matching_attribute_values_spec.rb
 - spec/features/find_seen_and_unseen_movies_spec.rb
 - spec/fixtures/movie.rb
 - spec/lib/query_string_search/abstract_matcher_spec.rb
+- spec/lib/query_string_search/comparisons/inequality_spec.rb
+- spec/lib/query_string_search/comparisons/set_spec.rb
 - spec/lib/query_string_search/matcher_factory_spec.rb
 - spec/lib/query_string_search/matchers/match_all_spec.rb
 - spec/lib/query_string_search/matchers/match_attribute_spec.rb
@@ -186,9 +189,12 @@ test_files:
 - spec/features/find_records_with_matching_attribute_values_spec.rb
 - spec/features/find_records_with_nil_attributes_spec.rb
 - spec/features/find_records_with_nonnil_attributes_spec.rb
+- spec/features/find_records_without_matching_attribute_values_spec.rb
 - spec/features/find_seen_and_unseen_movies_spec.rb
 - spec/fixtures/movie.rb
 - spec/lib/query_string_search/abstract_matcher_spec.rb
+- spec/lib/query_string_search/comparisons/inequality_spec.rb
+- spec/lib/query_string_search/comparisons/set_spec.rb
 - spec/lib/query_string_search/matcher_factory_spec.rb
 - spec/lib/query_string_search/matchers/match_all_spec.rb
 - spec/lib/query_string_search/matchers/match_attribute_spec.rb