set_builder 2.0.0.beta3 → 2.0.0.beta4

data/lib/assets/javascripts/set_builder.js

@@ -30,12 +30,14 @@ var SetBuilder = (function() {
       return _modifiers;
     },
     getValueMap: function(key) {
-      return _value_maps[key];
+      var valueMap = _value_maps[key];
+      return typeof valueMap == 'function' ? valueMap() : valueMap;
     },
-    getValue: function(key, value) {
+    getValue: function(key, value, valueMap) {
+      var map = valueMap || SetBuilder.getValueMap(key);
       if(Object.prototype.toString.call(value) == '[object Array]') {
         var getValue = arguments.callee;
-        var values = value.__collect(function(value) { return getValue(key, value) });
+        var values = value.__collect(function(value) { return getValue(key, value, map) });
         switch(values.length) {
           case 0: return '';
           case 1: return values[0];
@@ -43,9 +45,7 @@ var SetBuilder = (function() {
           default: return values.slice(0, -1).join(', ') + ', or ' + values[values.length - 1];
         }
       }
-
-      var match = value.toString(),
-          map = SetBuilder.getValueMap(key);
+      var match = value.toString();
       if(map) {
         var pair = map.__find(function(i) { return (i[0] == match) });
         return pair ? pair[1] : '(unknown)';
@@ -174,11 +174,16 @@ SetBuilder.Modifier = function(_name, _operator, _values, _params) {
   }
 
   this.toString = function() {
-    var words = [_operator.replace(/_/, ' ')];
-    for(var i=0; i<_values.length; i++) {
-      words.push(SetBuilder.getValue(_params[i], _values[i]));
+    var words = [_operator.replace(/_/, ' '), ' '];
+    var __values = _values.dup();
+    for(var i=0; i<_params.length; i++) {
+      if(_params[i][0] == 'arg') {
+        words.push(SetBuilder.getValue(_params[i][1], __values.shift()));
+      } else {
+        words.push(_params[i][1])
+      }
     }
-    return words.join(' ');
+    return words.join('');
   }
 
 };
@@ -247,13 +252,14 @@ SetBuilder.Modifiers = function(_modifiers) {
     var operator = args.operator;
     if(!operator) throw 'An operator name was not supplied.'
 
-    var params = this.params_for_operator(modifier_type, operator);
+    var params = this.params_for_operator(modifier_type, operator)
+    var paramsLength = params.__select(function(token) { return token[0] == 'arg' }).length;
     var values = args.values;
 
     if(!values) values = [];
     if(!(values instanceof Array)) values = [values];
-    if(values.length != params.length) {
-      throw ('The operator "' + operator.toString() + '" expects ' + params.length + ' arguments but received ' + values.length + '.');
+    if(values.length != paramsLength) {
+      throw ('The operator "' + operator.toString() + '" expects ' + paramsLength + ' arguments but received ' + values.length + '.');
     }
 
     return new SetBuilder.Modifier(name, operator, values, params);

data/lib/set_builder/constraint.rb

@@ -23,7 +23,17 @@ module SetBuilder
       @params = params
 
       @direct_object = params[direct_object_type] if trait.requires_direct_object?
-      @enums = params[:enums] || []
+
+      # Map supplied enum values to what the Trait has defined.
+      # If there are any discrepancies or missing values, fill them
+      # in with values that will work.
+      enum_values = params[:enums] || []
+      @enums = trait.enums.each_with_index.map do |expected_values, i|
+        value = enum_values[i]
+        value = expected_values[0] unless expected_values.include?(value)
+        value
+      end
+
       modifiers = params.fetch(:modifiers, [])
       @modifiers = trait.modifiers.each_with_index.map { |modifier, i|
         modifier.new(modifiers[i] || {}) }
@@ -38,13 +48,6 @@ module SetBuilder
     def errors
       [].tap do |errors|
         errors.push "#{direct_object_type} is blank" if direct_object_required? && direct_object.nil?
-        if enums.length != trait.enums.length
-          errors.push "should have values for #{trait.enums.length} enums"
-        else
-          trait.enums.each_with_index do |expected_values, i|
-            errors.push "enum ##{i + 1} should be #{expected_values.map { |value| "'#{value}'" }.to_sentence(two_words_connector: " or ", last_word_connector: ", or ")}" unless expected_values.member?(enums[i])
-          end
-        end
         errors.concat modifiers.flat_map(&:errors)
       end
     end

data/lib/set_builder/modifier/arguments.rb

@@ -0,0 +1,50 @@
+require "set_builder/parser"
+
+module SetBuilder
+  module Modifier
+    class Arguments
+      attr_reader :arguments, :expression, :tokens
+
+      include Parser
+
+      def initialize(expression)
+        @expression = expression.respond_to?(:each) ? map_legacy_arguments(expression) : expression
+        @tokens = parse(@expression)
+      end
+
+      def arity
+        types.count
+      end
+
+      def types
+        @types ||= @tokens
+          .select { |token, _| token == :arg }
+          .map { |_, type| type }
+      end
+
+      def as_json(*)
+        tokens.map { |(token, value)| [token.to_s, value] }
+      end
+
+      def to_s(values)
+        _values = values.dup
+        tokens.map do |token, token_value|
+          if token == :arg
+            ValueMap.to_s(token_value, _values.shift)
+          else
+            token_value
+          end
+        end.join
+      end
+
+    private
+
+      def map_legacy_arguments(arguments)
+        _expression = arguments.map { |arg| "{#{arg}}" }.join(" ")
+        puts "DEPRECATED: SetBuilder::Modifier should use expression style argumenents now e.g.-> \"#{_expression}\""
+        _expression
+      end
+
+    end
+  end
+end

data/lib/set_builder/modifier/base.rb

@@ -1,3 +1,5 @@
+require "set_builder/modifier/arguments"
+
 module SetBuilder
   module Modifier
     class Base
@@ -43,11 +45,11 @@ module SetBuilder
 
       def errors_with_values
         [].tap do |errors|
-          types = self.class.operators[operator] || []
-          if values.length != types.length
-            errors.push "wrong number of arguments; expected #{types.length} (#{types.join(", ")})"
+          arguments = self.class.parsed_operators[operator] || Arguments.new("")
+          if values.length != arguments.arity
+            errors.push "wrong number of arguments; expected #{arguments.arity} (#{arguments.types.join(", ")})"
           else
-            errors.concat values.each_with_index.flat_map { |value, i| errors_with_value_type(value, types[i]) }
+            errors.concat values.each_with_index.flat_map { |value, i| errors_with_value_type(value, arguments.types[i]) }
           end
         end
       end
@@ -78,13 +80,16 @@ module SetBuilder
 
 
 
-      def to_s(negative=false)
-        words = negative ? [self.class.negate(operator).to_s.gsub(/_/, " ")] : [operator.to_s.gsub(/_/, " ")]
-        arguments = self.class.operators[operator] || []
-        (0...arguments.length).each do |i|
-          words << ValueMap.to_s(arguments[i], values[i])
-        end
-        words.join(" ")
+      def to_s
+        arguments = self.class.parsed_operators[operator] || Arguments.new("")
+        operator.to_s.gsub(/_/, " ") + " " + arguments.to_s(values)
+      end
+
+
+
+      def self.parsed_operators
+        @parsed_operators ||= Hash[operators.map { |operator, arguments|
+          [operator, Arguments.new(arguments)] }]
       end
 
 
@@ -96,11 +101,8 @@ module SetBuilder
 
 
       def self.to_hash
-        hash = {}
-        operators.each do |operator, array|
-          hash[operator.to_s] = array.map {|type| type.to_s }
-        end
-        hash
+        Hash[parsed_operators.map { |operator, arguments|
+            [operator.to_s, arguments.as_json] }]
       end
 
 

data/lib/set_builder/modifiers/date_preposition.rb

@@ -7,14 +7,14 @@ module SetBuilder
 
       def self.operators
         {
-          :ever => [],
-          :before => [:date],
-          :after => [:date],
-          :on => [:date],
-          :during_month => [:month],
-          :during_year => [:year],
-          :in_the_last => [:number, :period],
-          :between => [:date, :date]
+          :ever => "",
+          :before => "{date}",
+          :after => "{date}",
+          :on => "{date}",
+          :during_month => "{month}",
+          :during_year => "{year}",
+          :in_the_last => "{number} {period}",
+          :between => "{date} and {date}"
         }
       end
 

data/lib/set_builder/modifiers/number_preposition.rb

@@ -7,10 +7,10 @@ module SetBuilder
 
       def self.operators
         {
-          :is => [:number],
-          :is_less_than => [:number],
-          :is_greater_than => [:number],
-          :is_between => [:number, :number]
+          :is => "{number}",
+          :is_less_than => "{number}",
+          :is_greater_than => "{number}",
+          :is_between => "{number} and {number}"
         }
       end
 

data/lib/set_builder/modifiers/string_preposition.rb

@@ -7,14 +7,14 @@ module SetBuilder
 
       def self.operators
         {
-          :contains => [:string],
-          :does_not_contain => [:string],
-          :begins_with => [:string],
-          :does_not_begin_with => [:string],
-          :ends_with => [:string],
-          :does_not_end_with => [:string],
-          :is => [:string],
-          :is_not => [:string]
+          :contains => "{string}",
+          :does_not_contain => "{string}",
+          :begins_with => "{string}",
+          :does_not_begin_with => "{string}",
+          :ends_with => "{string}",
+          :does_not_end_with => "{string}",
+          :is => "{string}",
+          :is_not => "{string}"
         }
       end
 

data/lib/set_builder/parser.rb

@@ -0,0 +1,36 @@
+module SetBuilder
+  module Parser
+
+    def parse(expression)
+      tokenizer = Regexp.union(LEXER.values)
+      expression.split(tokenizer).each_with_object([]) do |lexeme, output|
+        next if lexeme.empty?
+        token = token_for(lexeme)
+        output.push [token, value_for(token, lexeme)]
+      end
+    end
+
+    def token_for(lexeme)
+      LEXER.each { |token, pattern| return token if pattern.match(lexeme) }
+      :string
+    end
+
+    def value_for(token, lexeme)
+      case token
+      when :name, :modifier, :arg then lexeme[1...-1]
+      when :enum then lexeme[1...-1].split("|")
+      when :direct_object_type then lexeme[1..-1]
+      else lexeme
+      end
+    end
+
+    LEXER = {
+      name: /("[^"]+")/,
+      direct_object_type: /(:[\w\-\.]+)/,
+      enum: /(\[[^\]]+\])/,
+      modifier: /(<\w+>)/,
+      arg:  /(\{[^\}]+\})/
+    }.freeze
+
+  end
+end

data/lib/set_builder/trait.rb

@@ -1,11 +1,13 @@
 require "set_builder/constraint"
 require "set_builder/modifier"
+require "set_builder/parser"
 
 
 module SetBuilder
   class Trait
     attr_reader :expression, :tokens, :name, :modifiers, :direct_object_type, :enums
 
+    include Parser
 
 
     def initialize(expression, &block)
@@ -65,38 +67,5 @@ module SetBuilder
 
 
 
-    def parse(expression)
-      tokenizer = Regexp.union(LEXER.values)
-      expression.split(tokenizer).each_with_object([]) do |lexeme, output|
-        next if lexeme.empty?
-        token = token_for(lexeme)
-        output.push [token, value_for(token, lexeme)]
-      end
-    end
-
-    def token_for(lexeme)
-      LEXER.each { |token, pattern| return token if pattern.match(lexeme) }
-      :string
-    end
-
-    def value_for(token, lexeme)
-      case token
-      when :name then lexeme[1...-1]
-      when :enum then lexeme[1...-1].split("|")
-      when :modifier then lexeme[1...-1]
-      when :direct_object_type then lexeme[1..-1]
-      else lexeme
-      end
-    end
-
-    LEXER = {
-      name: /("[^"]+")/,
-      direct_object_type: /(:[\w\-\.]+)/,
-      enum: /(\[[^\]]+\])/,
-      modifier: /(<\w+>)/
-    }.freeze
-
-
-
   end
 end

data/lib/set_builder/version.rb

@@ -1,3 +1,3 @@
 module SetBuilder
-  VERSION = "2.0.0.beta3"
+  VERSION = "2.0.0.beta4"
 end

data/spec/unit/set_builder.spec.js

@@ -32,10 +32,13 @@ describe 'SetBuilder'
 
     SetBuilder.registerModifiers({
       string: {
-        contains: ['string'],
-        begins_with: ['string'],
-        ends_with: ['string'],
-        is: ['string']
+        contains: [['arg', 'string']],
+        begins_with: [['arg', 'string']],
+        ends_with: [['arg', 'string']],
+        is: [['arg', 'string']]
+      },
+      date: {
+        between: [['arg', 'date'], ['string', ' and '], ['arg', 'date']]
       }
     });
 
@@ -60,6 +63,20 @@ describe 'SetBuilder'
 
 
 
+  describe '.registerValueMap'
+    it 'should accept an array of arrays as a valueMap'
+      SetBuilder.registerValueMap('name', [['1', 'John'], ['2', 'Susan']]);
+      expect(SetBuilder.getValueMap('name')).to(eql, [['1', 'John'], ['2', 'Susan']]);
+    end
+
+    it 'should accept and call a function as a valueMap'
+      var events = [['1', 'Band Rehearsal']];
+      SetBuilder.registerValueMap('event', function () { return events });
+      expect(SetBuilder.getValueMap('event')).to(eql, events);
+      events.push(['2', 'Basketball Practice']);
+      expect(SetBuilder.getValueMap('event')).to(eql, events);
+    end
+  end
 
   describe '.getValueMap'
     it 'should return an array of arrays'
@@ -80,7 +97,7 @@ describe 'SetBuilder'
 
   describe '.getValueMaps'
     it 'should return the names of the value maps registered'
-      expect(SetBuilder.getValueMaps()).to(eql, ['school']);
+      expect(SetBuilder.getValueMaps()).to(eql, ['school', 'name', 'event']);
     end
   end
 
@@ -139,7 +156,7 @@ describe 'SetBuilder'
 
     describe '.length'
       it 'should have parsed the data structure correctly'
-        expect(modifiers.length()).to(be, 1);
+      expect(modifiers.length()).to(be, 2);
       end
     end
 
@@ -195,6 +212,14 @@ describe 'SetBuilder'
         var expected_string = 'who are not awesome, who have not attended Concordia, who have not died, and whose name is Jerome'
         expect(set.toString()).to(eql, expected_string);
       end
+
+      it 'should generate the natural language description of a set with extra text in modifier arguments'
+        var set = new SetBuilder.Set([
+          { trait: 'born', modifiers: [{ operator: 'between', values: ['Jan 1, 2016', 'Jan 2, 2016'] }]}
+        ])
+        var expected_string = 'who were born between Jan 1, 2016 and Jan 2, 2016';
+        expect(set.toString()).to(eql, expected_string);
+      end
     end
 
   end

data/test/constraint_test.rb

@@ -3,6 +3,8 @@ require "test_helper"
 class ConstraintTest < ActiveSupport::TestCase
   include SetBuilder
 
+  attr_reader :trait, :constraint
+
 
   test "constraints find correct modifiers" do
     trait = $friend_traits[:name]
@@ -29,6 +31,40 @@ class ConstraintTest < ActiveSupport::TestCase
 
 
 
+  context "When a Constraint has fewer enum values than the Trait expects, it" do
+    setup do
+      @trait = Trait.new('who [is|is not] "awesome" at [basketball|golf|hockey]')
+      @constraint = trait.apply({enums: ["is not"]})
+    end
+
+    should "be valid" do
+      assert constraint.valid?, "The constraint was not valid: #{constraint.errors.join(";")}"
+    end
+
+    should "fill in the missing values with the first option the Trait defines" do
+      assert_equal "who is not awesome at basketball", constraint.to_s
+    end
+  end
+
+
+
+  context "When a Constraint is given an enum value that the Trait doesn't expect, it" do
+    setup do
+      @trait = Trait.new('who [is|is not] "awesome" at [basketball|golf|hockey]')
+      @constraint = trait.apply({enums: ["are not", "soccer"]})
+    end
+
+    should "be valid" do
+      assert constraint.valid?, "The constraint was not valid: #{constraint.errors.join(";")}"
+    end
+
+    should "replace the value with the first option the Trait defines" do
+      assert_equal "who is awesome at basketball", constraint.to_s
+    end
+  end
+
+
+
   context "A constraint" do
     should "be invalid if it is missing a direct object" do
       trait = Trait.new('who "attended" :school')
@@ -36,18 +72,6 @@ class ConstraintTest < ActiveSupport::TestCase
       assert_match /school is blank/, constraint.errors.join
     end
 
-    should "be invalid if it is missing an enumeration" do
-      trait = Trait.new('who [is|is not] "awesome"')
-      constraint = trait.apply({})
-      assert_match /should have values for 1 enums/, constraint.errors.join
-    end
-
-    should "be invalid if it supplies an unexpected value for an enumeration" do
-      trait = Trait.new('who [is|is not] "awesome"')
-      constraint = trait.apply(enums: ["is totally"])
-      assert_match /should be 'is' or 'is not'/, constraint.errors.join
-    end
-
     should "be invalid if it supplies an unexpected value for a modifier's operator" do
       trait = Trait.new('whose "name" <string>')
       constraint = trait.apply(modifiers: [{ operator: "starts_with", values: ["Jer"] }])

data/test/modifier_test.rb

@@ -55,14 +55,14 @@ class ModifierTest < ActiveSupport::TestCase
 
   test "converting modifier to json" do
     expected_results = {
-      "contains"            => ["string"],
-      "does_not_contain"    => ["string"],
-      "begins_with"         => ["string"],
-      "does_not_begin_with" => ["string"],
-      "ends_with"           => ["string"],
-      "does_not_end_with"   => ["string"],
-      "is"                  => ["string"],
-      "is_not"              => ["string"]
+      "contains"            => [["arg", "string"]],
+      "does_not_contain"    => [["arg", "string"]],
+      "begins_with"         => [["arg", "string"]],
+      "does_not_begin_with" => [["arg", "string"]],
+      "ends_with"           => [["arg", "string"]],
+      "does_not_end_with"   => [["arg", "string"]],
+      "is"                  => [["arg", "string"]],
+      "is_not"              => [["arg", "string"]]
     }.to_json
     assert_equal expected_results, SetBuilder::Modifier.for(:string).to_json
   end
@@ -71,29 +71,29 @@ class ModifierTest < ActiveSupport::TestCase
     expected_results = {
       "date" => {
         "ever"        => [],
-        "after"       => ["date"],
-        "before"      => ["date"],
-        "on"          => ["date"],
-        "in_the_last" => ["number", "period"],
-        "during_month"=> ["month"],
-        "during_year" => ["year"],
-        "between"     => ["date", "date"]
+        "before"      => [["arg", "date"]],
+        "after"       => [["arg", "date"]],
+        "on"          => [["arg", "date"]],
+        "during_month"=> [["arg", "month"]],
+        "during_year" => [["arg", "year"]],
+        "in_the_last" => [["arg", "number"], ["string", " "], ["arg", "period"]],
+        "between"     => [["arg", "date"], ["string", " and "], ["arg", "date"]]
       },
-      "number"=> {
-        "is"=>["number"],
-        "is_less_than"=>["number"],
-        "is_greater_than"=>["number"],
-        "is_between"=>["number", "number"]
+      "number" => {
+        "is"=>[["arg", "number"]],
+        "is_less_than"=>[["arg", "number"]],
+        "is_greater_than"=>[["arg", "number"]],
+        "is_between"=>[["arg", "number"], ["string", " and "], ["arg", "number"]]
       },
       "string" => {
-        "contains"            => ["string"],
-        "does_not_contain"    => ["string"],
-        "begins_with"         => ["string"],
-        "does_not_begin_with" => ["string"],
-        "ends_with"           => ["string"],
-        "does_not_end_with"   => ["string"],
-        "is"                  => ["string"],
-        "is_not"              => ["string"]
+        "contains"            => [["arg", "string"]],
+        "does_not_contain"    => [["arg", "string"]],
+        "begins_with"         => [["arg", "string"]],
+        "does_not_begin_with" => [["arg", "string"]],
+        "ends_with"           => [["arg", "string"]],
+        "does_not_end_with"   => [["arg", "string"]],
+        "is"                  => [["arg", "string"]],
+        "is_not"              => [["arg", "string"]]
       }
     }
     assert_equal expected_results, $friend_traits.modifiers.to_hash

metadata

@@ -1,139 +1,158 @@
 --- !ruby/object:Gem::Specification
 name: set_builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta3
+  version: 2.0.0.beta4
+  prerelease: 6
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A gem for describing constraints on data sets
@@ -143,8 +162,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -158,6 +177,7 @@ files:
 - lib/set_builder/errors/trait_not_found.rb
 - lib/set_builder/modifier.rb
 - lib/set_builder/modifier/adverb.rb
+- lib/set_builder/modifier/arguments.rb
 - lib/set_builder/modifier/base.rb
 - lib/set_builder/modifier/verb.rb
 - lib/set_builder/modifier_collection.rb
@@ -165,6 +185,7 @@ files:
 - lib/set_builder/modifiers/date_preposition.rb
 - lib/set_builder/modifiers/number_preposition.rb
 - lib/set_builder/modifiers/string_preposition.rb
+- lib/set_builder/parser.rb
 - lib/set_builder/set.rb
 - lib/set_builder/trait.rb
 - lib/set_builder/trait_builder.rb
@@ -209,26 +230,30 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2909033226206724461
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">"
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Define traits on a model, create sets that constrain those traits, and generate
   both natural-language descriptions of the sets and queries to select them
 test_files:

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: acd34d467c6aca8cc3c42db795261de035c72c58
-  data.tar.gz: 2c08cc3a703c5cc84230cbaa0e047004d4e7f430
-SHA512:
-  metadata.gz: d79aec9ff59f398bc844de87cbc9a7946fb43166017d1231c36fc8a1ff267a296a98e88e524d3b01b2c726bd91ed75d4e63833246e32cc6fa25114e038809cb1
-  data.tar.gz: d4ba5f0e2dfff5ad5245abd758adcac891c93fe2e0bba30c830e52b7dd63e7749962ed6843dc4f3c4b33b1e7b3a3b33dcb58ceef97312a417cce6abbf8be8962