set_builder 1.2.0.beta3 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b72932fe9a27cb708e417d352685eb5a2737c702
-  data.tar.gz: 56c5cd7d3731616a8647e927a43d81e0a076b94c
+  metadata.gz: 33054edba058a15627aaf11cbdd32f2a3bdb5c7e
+  data.tar.gz: 2ab79d3204faa01c6acd43515f453d8c3a883990
 SHA512:
-  metadata.gz: 7d2fdb5e59c579e37246537c3313cc60deb1344b3eed5793d741a769388c3529f6ac2e9fbeb8a49e03e6695c816375b24489f0f0debac7c1b86866129b30ff9e
-  data.tar.gz: 226cb56332e3daab5df7ce0f5c4089f1bd3608bccdaa9c2dde55c69e90d2c1ab35983355f0381d081305db741b70b04d967034c2016fe9e77059b8944b414cc7
+  metadata.gz: f5af7ed922c28414483e4cf8c14704a94d527733a27ce8d07b95a3c687df7533594661c0d1099085d6326308602dd619dae2a143c09960aa69bdebdc41417b7e
+  data.tar.gz: 47f857f3f679dec0cb5f0c701bd45a890a8cdd968d9eb8a544d76c8e866bc8ddfb9c2747c7437b7dba845dd17c32ebed93f9f0ff759b8e0324564f00d16e4b45

data/README.md

@@ -27,5 +27,11 @@ SetBuilder can render this Set in plain English:
 It can also generate a NamedScope on an ActiveRecord model to fetch the people who fit in this set.
 
 
+### Running the tests
 
-Copyright (c) 2010 Bob Lail, released under the MIT license
+*Ruby* `bundle exec rake test`
+
+*Javascript* `jspec run --browsers ff`
+
+
+Copyright (c) 2010, 2015 Bob Lail, released under the MIT license

data/lib/assets/javascripts/set_builder.js

@@ -77,7 +77,7 @@ SetBuilder.Constraint = function(_trait, args) {
   }
 
   args = args.dup();
-  if(_trait.requires_direct_object()) _direct_object = args.shift();
+  if(_trait.requiresDirectObject()) _direct_object = args.shift();
   var _modifiers = _trait.modifiers().collect(function(modifier_type) {
     return SetBuilder.modifiers().apply(modifier_type, args.shift());
   });
@@ -109,7 +109,7 @@ SetBuilder.Constraint = function(_trait, args) {
   
   this.negate = function(value) {
     _negative = value;
-    if(_trait.noun()) _negative = false;
+    if(!_trait.hasNegative()) _negative = false;
     return this;
   }
   
@@ -121,19 +121,26 @@ SetBuilder.Constraint = function(_trait, args) {
     return _trait.requires_direct_object();
   }
   
-  this.prefix = function() {
-    return _trait.prefix(_negative);
-  }
-  
-  this.toString = function(include_prefix) {
-    var _description = _trait.toString(include_prefix, _negative);
-    if(_direct_object) {
-      _description += ' ' + SetBuilder.getValue(_trait.direct_object_type(), _direct_object);
-    }
-    _modifiers.__each(function(modifier) {
-      _description += ' ' + modifier.toString(_negative);
-    });
-    return _description;
+  this.toString = function() {
+    var type, text, i = 0;
+    return _trait.tokens().collect(function(token) {
+      type = token[0], text = token[1];
+      switch(type) {
+        case 'string':
+          return text;
+        case 'name':
+          return _trait.name();
+        case 'negative':
+          return _negative && text;
+        case 'direct_object_type':
+          return SetBuilder.getValue(text, _direct_object);
+        case 'modifier':
+          return _modifiers[i++].toString();
+        default:
+          if(console && console.log) console.log('[SetBuilder.Constraint] unknown type: "' + type + '" (text: "' + text + '")');
+          return false;
+      }
+    }).compact().join(' ');
   }
 
 };
@@ -165,7 +172,7 @@ SetBuilder.Modifier = function(_name, _operator, _values, _params) {
     return _values;
   }
   
-  this.toString = function(negative) {
+  this.toString = function() {
     var words = [_operator.replace(/_/, ' ')];
     for(var i=0; i<_values.length; i++) {
       words.push(SetBuilder.getValue(_params[i], _values[i]));
@@ -265,7 +272,6 @@ SetBuilder.Modifiers = function(_modifiers) {
 */
 
 SetBuilder.Set = function(_raw_data) {
-  
   if(!_raw_data) _raw_data = [];
   
   var _constraints = [];
@@ -314,27 +320,32 @@ SetBuilder.Set = function(_raw_data) {
       an individual trait that can be constrained
 */
 
-SetBuilder.Trait = function(_raw_data) {
-
-  // window.console.log('new SetBuilder.Trait()');
-  // window.console.log(_raw_data);
-  var _name = _raw_data[0];
-  var _part_of_speech = _raw_data[1].toString().toLowerCase();
-  var _modifiers = _raw_data[2] || []; //.collect(function(modifier_name) {
-  //     return SetBuilder.Modifiers.__find(modifier_name);
-  //   });
-  var _direct_object_type;
-  
-  if(typeof(_name) != 'string') {
-    _direct_object_type = _name[1];
-    _name = _name[0];
-  }
-  
+SetBuilder.Trait = function(_tokens) {
+  
+  var type, text;
+  var _name, _modifiers = [], _direct_object_type, _negative;
+  _tokens.each(function(token) {
+    type = token[0], text = token[1];
+    switch(type) {
+      case 'name':
+        _name = text;
+        break;
+      case 'modifier':
+        _modifiers.push(text);
+        break;
+      case 'direct_object_type':
+        _direct_object_type = text;
+        break;
+      case 'negative':
+        _negative = text;
+        break;
+    }
+  });
   
   
   // Public methods
   
-  this.requires_direct_object = function() {
+  this.requiresDirectObject = function() {
     return !!_direct_object_type;
   }
   
@@ -346,39 +357,16 @@ SetBuilder.Trait = function(_raw_data) {
     return _name;
   }
   
-  this.noun = function() {
-    return (_part_of_speech == 'noun');
+  this.hasNegative = function() {
+    return !!_negative;
   }
   
   this.modifiers = function() {
     return _modifiers;
   }
   
-  this.prefix = function(negative) {
-    if(negative === undefined) negative = false;
-    switch(_part_of_speech) {
-      case 'active':
-        return negative ? 'who have not' : 'who';
-      case 'perfect':
-        return negative ? 'who have not' : 'who have';
-      case 'passive':
-        return negative ? 'who were not' : 'who were';
-      case 'reflexive':
-        return negative ? 'who are not' : 'who are';
-      case 'noun':
-        return 'whose';
-      default:
-        return undefined;
-    }
-  }
-   
-  this.toString = function(include_prefix, negative) {
-    var prefix = this.prefix(negative);
-    if(prefix) { // return an empty string if the prefix is invalid
-      return (include_prefix==false) ? this.name() : (prefix + ' ' + this.name());
-    } else {
-      return '';
-    }
+  this.tokens = function() {
+    return _tokens;
   }
 
   this.apply = function(args) {
@@ -397,7 +385,7 @@ SetBuilder.Trait = function(_raw_data) {
 */
 
 SetBuilder.Traits = function(_raw_data) {
-
+  
   var _traits = _raw_data.collect(function(line) {
     return new SetBuilder.Trait(line);
   });
@@ -515,6 +503,22 @@ if(!Array.prototype.inject) Array.prototype.inject = Array.prototype.__inject;
 
 
 
+//
+// .compact
+//
+Array.prototype.__compact = function() {
+  var new_array = [];
+  for(var i=0; i<this.length; i++) {
+    if(this[i]) {
+      new_array.push(this[i]);
+    }
+  }
+  return new_array;
+}
+if(!Array.prototype.compact) Array.prototype.compact = Array.prototype.__compact;
+
+
+
 //
 // .find
 //
@@ -527,3 +531,17 @@ Array.prototype.__find = function(fn) {
   return null;
 }
 if(!Array.prototype.find) Array.prototype.find = Array.prototype.__find;
+
+//
+// .select
+//
+Array.prototype.__select = function(fn) {
+  var results = [];
+  for(var i=0; i<this.length; i++) {
+    if(fn(this[i])) {
+      results.push(this[i]);
+    }
+  }
+  return results;
+}
+if(!Array.prototype.select) Array.prototype.select = Array.prototype.__select;

data/lib/set_builder/constraint.rb

@@ -52,7 +52,7 @@ module SetBuilder
     
     def negate(value)
       @negative = value
-      @negative = false if trait.noun?
+      @negative = false unless trait.negative?
       self
     end
     
@@ -65,4 +65,4 @@ module SetBuilder
     
     
   end
-end
+end

data/lib/set_builder/modifier.rb

@@ -33,8 +33,14 @@ module SetBuilder
     
     
     
-    def self.[](klass_or_symbol)
-      klass_or_symbol.is_a?(Class) ? SetBuilder::Modifier.valid_modifier!(klass_or_symbol) : SetBuilder::Modifier.for(klass_or_symbol)
+    def self.[](klassname_or_symbol)
+      is_classname = /^[A-Z]/.match(klassname_or_symbol)
+      if is_classname
+        klass = SetBuilder::Modifiers.const_get("#{klassname_or_symbol}")
+        SetBuilder::Modifier.valid_modifier!(klass)
+      else
+        SetBuilder::Modifier.for(klassname_or_symbol.to_sym)
+      end
     end
     
     
@@ -98,9 +104,9 @@ module SetBuilder
   # Force predefined modifiers to pass `valid_modifier?`
   #
   Modifier.register(
-    [:date,     Modifiers::DateModifier],
-    [:number,   Modifiers::NumberModifier],
-    [:string,   Modifiers::StringModifier]
+    [:date,     Modifiers::DatePreposition],
+    [:number,   Modifiers::NumberPreposition],
+    [:string,   Modifiers::StringPreposition]
   )
   
   
@@ -131,4 +137,4 @@ end
 #   
 #   
 #   
-# end
+# end

data/lib/set_builder/modifiers/{date_modifier.rb → date_preposition.rb}

@@ -3,7 +3,7 @@ require 'set_builder/modifier/adverb'
 
 module SetBuilder
   module Modifiers
-    class DateModifier < Modifier::Adverb
+    class DatePreposition < Modifier::Adverb
       
       
       

data/lib/set_builder/modifiers/{number_modifier.rb → number_preposition.rb}

@@ -3,7 +3,7 @@ require 'set_builder/modifier/verb'
 
 module SetBuilder
   module Modifiers
-    class NumberModifier < Modifier::Verb
+    class NumberPreposition < Modifier::Verb
       
       
       
@@ -42,7 +42,7 @@ module SetBuilder
         when :is_greater_than
           selector.gt(value)
         when :is_between
-          selector.gteq(value).and(selector.lteq(value))
+          selector.gteq(values[0]).and(selector.lteq(values[1]))
         end
       end
       

data/lib/set_builder/modifiers/{string_modifier.rb → string_preposition.rb}

@@ -3,7 +3,7 @@ require 'set_builder/modifier/verb'
 
 module SetBuilder
   module Modifiers
-    class StringModifier < Modifier::Verb
+    class StringPreposition < Modifier::Verb
       
       
       

data/lib/set_builder/modifiers.rb

@@ -1,3 +1,3 @@
-require 'set_builder/modifiers/string_modifier'
-require 'set_builder/modifiers/date_modifier'
-require 'set_builder/modifiers/number_modifier'
+require 'set_builder/modifiers/string_preposition'
+require 'set_builder/modifiers/date_preposition'
+require 'set_builder/modifiers/number_preposition'

data/lib/set_builder/trait.rb

@@ -5,70 +5,72 @@ require 'set_builder/modifier'
 module SetBuilder
   class Trait
     
-    
-    
-    def initialize(name, part_of_speech, *args, &block)
-      case name
-      when Hash
-        @name, @direct_object_type = name.first[0].to_s, name.first[1]
-      else
-        @name = name.to_s
-      end
-      @part_of_speech, @block = part_of_speech, block
-      @modifiers = (args||[]).collect {|modifier| Modifier[modifier]}
+    attr_reader :name, :parsed_expression, :part_of_speech, :modifiers, :direct_object_type
+        
+    LEXER = { 
+      name: /("[^"]+")/,
+      direct_object_type: /(:\w+)/,
+      negative: /(\[[^\]]+\])/,
+      modifier: /(<\w+>)/
+    }.freeze
+    
+    def initialize(trait_expression, &block)
+      @parsed_expression = parse(trait_expression)
+      @name, @direct_object_type = find(:name), find(:direct_object_type)
+      @block = block
+      @modifiers = find_all(:modifier).map { |modifier| Modifier[modifier]  }
     end
     
-    
-    
-    attr_reader :name, :part_of_speech, :modifiers, :direct_object_type
-    
-    
-    
     def requires_direct_object?
       !@direct_object_type.nil?
     end
     alias :direct_object_required? :requires_direct_object?
     
-    
-    
-    def noun?
-      (self.part_of_speech == :noun)
+    def negative?
+      find(:negative)
     end
-    
-    
-    
+
     def to_s(negative=false)
-      case part_of_speech
-      when :active
-        negative ? "who have not #{name}" : "who #{name}"
-      when :perfect
-        negative ? "who have not #{name}" : "who have #{name}"
-      when :passive
-        negative ? "who were not #{name}" : "who were #{name}"
-      when :reflexive
-        negative ? "who are not #{name}" : "who are #{name}"
-      when :noun
-        "whose #{name}"
-      end
+      parsed_expression.reject do |token, _|
+        [:modifier, :direct_object_type].include?(token) || (!negative && token == :negative)
+      end.map do |token, value|
+        token == :name ? name : value
+      end.join(" ")
     end
     
-    
-    
-    def to_json
-      array = []
-      array << (requires_direct_object? ? [name, @direct_object_type] : name)
-      array << part_of_speech
-      array << modifiers.collect{|klass| Modifier.name(klass)} unless modifiers.empty?
-      array.to_json
+    def find_all(token)
+      parsed_expression.select { |(_token, _)| _token == token }.map { |(_, value)| value }
     end
     
+    def find(token)
+      find_all(token).first
+    end
     
-    
+    def as_json(*)
+      parsed_expression.map { |(token, value)| [token.to_s, value] }
+    end
+
     def apply(*args)
       SetBuilder::Constraint.new(self, *args, &@block)
     end
+  
+  private
+    
+    def parse(trait_definition)
+      regex = Regexp.union(LEXER.values)
+      trait_definition.split(regex).map do |lexeme|
+        [token_for(lexeme), value_for(lexeme)] unless lexeme.strip.empty?
+      end.compact
+    end
     
+    def token_for(lexeme)
+      LEXER.each { |token, pattern| return token if pattern.match(lexeme) }
+      return :string
+    end
     
-    
+    def value_for(lexeme)
+      lexeme.to_s.strip.gsub(/[<>"\[\]:]/, "")
+    end
+
   end
-end
+end

data/lib/set_builder/value_map.rb

@@ -16,14 +16,15 @@ module SetBuilder
     
     def self.to_s(name, value)
       if value.is_a?(Array)
-        values = value.map { |value| self.send(__method__, name, value) }
-        return case value.length
-        when 0; ""
-        when 1; values.first
-        when 2; "#{values.first} or #{values.last}"
-        else; "#{values[0..-2].join(', ')}, or #{values.last}"
+        values = value.map { |value| to_s(name, value) }
+        case value.length
+        when 0 then return ""
+        when 1 then return values.first
+        when 2 then return "#{values.first} or #{values.last}"
+        else return "#{values[0..-2].join(', ')}, or #{values.last}"
         end
       end 
+      
       name = name.to_sym
       map = @registered_value_maps[name]     
       if map
@@ -44,7 +45,7 @@ module SetBuilder
     
     
     def self.register_collection(name, collection, name_method = :name, id_method = :id)
-      map = collection.map {|i| [i.send(id_method).to_s, i.send(name_method)]}
+      map = collection.map { |i| [i.send(id_method).to_s, i.send(name_method)] }
       register(name, map)
     end
     

data/lib/set_builder/version.rb

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

data/lib/set_builder.rb

@@ -8,8 +8,7 @@ require 'set_builder/engine'
 
 
 module SetBuilder
-  
-  
+    
   def self.extended(base)
     base.instance_variable_set("@traits", SetBuilder::Traits.new)
     base.send(:include, SetBuilder::Modifiers)
@@ -18,47 +17,22 @@ module SetBuilder
   
   attr_reader :traits
   
-  
   def modifiers
     traits.modifiers
   end
   
-  
   def that_belong_to(set)
     SetBuilder::Set.new(self, to_scope, set)
   end
   
-  
   def to_scope
     scoped
   end
-  
-  
+
 protected
-  
-  
-  
-  def trait(*args, &block)
-    part_of_speech = get_part_of_speech(args.shift)
-    name = args.shift
-    traits << Trait.new(name, part_of_speech, *args, &block)
-  end
-  
-  
-  def get_part_of_speech(arg)
-    case arg
-    when :is, :are, :reflexive
-      :reflexive
-    when nil, :active
-      :active
-    when :was, :were, :passive
-      :passive
-    when :has, :have, :perfect
-      :perfect
-    when :whose, :noun
-      :noun
-    end
+
+  def trait(trait_expression, &block)
+    traits << Trait.new(trait_expression, &block)
   end
   
-  
-end
+end

data/set_builder.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails", ">= 3.1", "< 5.0"
-  spec.add_dependency "arel", "~> 5.0"
+  spec.add_dependency "rails", ">= 3.1", "< 4.2"
+  spec.add_dependency "arel"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "jspec"
   spec.add_development_dependency "pry"
 end

data/spec/dom.html

@@ -3,8 +3,7 @@
 		<link type="text/css" rel="stylesheet" href="./lib/jspec.css" />
 		<script src="./lib/jspec.js"></script>
 		<script src="./lib/jspec.xhr.js"></script>
-		<script src="../assets/array.js"></script>
-		<script src="../assets/set_builder.js"></script>
+		<script src="../lib/assets/javascripts/set_builder.js"></script>
 		<script src="unit/spec.helper.js"></script>
 		<script>
 			function runSuites() {
@@ -21,4 +20,4 @@
 		<div id="jspec"></div>
 		<div id="jspec-bottom"></div>
 	</body>
-</html>
+</html>

data/spec/unit/array.spec.js

@@ -66,6 +66,14 @@ describe 'Array'
       })).to(be, "what?")
     end
   end
+      
+  describe '.select'
+      it 'should return all members of the array where fn(member) is true'
+        expect(["this", "nope", "that", "this"].select(function(word){
+          return word == "this";
+        })).to(eql, ["this", "this"]);
+      end
+  end
   
 end
 
@@ -79,4 +87,4 @@ describe 'Object'
     end
   end
 
-end
+end

data/spec/unit/set_builder.spec.js

@@ -2,11 +2,25 @@ describe 'SetBuilder'
   before_each
 
     SetBuilder.registerTraits([
-      ['awesome', 'reflexive'],
-      ['died', 'active'],
-      ['born', 'passive', ['date']],
-      [['attended', 'school'], 'perfect'],
-      ['name', 'noun', ['string']]
+      [['string','who are'],
+        ['negative','not'],
+        ['name','awesome']],
+       [['string','who'],
+        ['negative','have not'],
+        ['name','died']],
+       [['string','who were'],
+        ['name','born'],
+        ['modifier','date']],
+       [['string','whose'],
+        ['name','age'],
+        ['modifier','number']],
+       [['string','who have'],
+        ['negative','not'],
+        ['name','attended'],
+        ['direct_object_type','school']],
+       [['string','whose'],
+        ['name','name'],
+        ['modifier','string']]
     ]);
 
     SetBuilder.registerModifiers({
@@ -59,23 +73,19 @@ describe 'SetBuilder'
   describe '.Trait'
   
     describe '.constructor'
-      it 'should correctly parse simple parameters'
-        var trait = new SetBuilder.Trait(['awesome', 'reflexive']);
+      it 'should correctly parse the name of the trait'
+        var trait = new SetBuilder.Trait([['string', 'who are'], ['name', 'awesome']]);
         expect(trait.name()).to(be, 'awesome');
-        expect(trait.toString()).to(eql, 'who are awesome');
       end
     
-      it 'should correctly identify direct objects'
-        var trait = new SetBuilder.Trait([['attended', 'string'], 'perfect']);
-        expect(trait.name()).to(be, 'attended');
-        expect(trait.requires_direct_object()).to(be, true);
-        expect(trait.toString()).to(eql, 'who have attended');
+      it 'should correctly identify when it expects a direct objects'
+        var trait = new SetBuilder.Trait([['string', 'who have'], ['name', 'attended'], ['direct_object_type', 'string']]);
+        expect(trait.requiresDirectObject()).to(be, true);
       end
     
       it 'should correctly parse paramters with modifiers'
-        var trait = new SetBuilder.Trait(['born', 'passive', ['date']]);
+        var trait = new SetBuilder.Trait([['string', 'who were'], ['name', 'born'], ['modifier', 'date']]);
         expect(trait.modifiers().length).to(be, 1);
-        expect(trait.toString()).to(eql, 'who were born');
       end
     end
     
@@ -90,17 +100,17 @@ describe 'SetBuilder'
   
     describe '.length'
       it 'should have parsed the data structure correctly'
-        expect(traits.length()).to(be, 5);
+        expect(traits.length()).to(be, 6);
       end
     end
   
     describe '.find'
       it 'should get a SetBuilder.Trait object by name'
-        expect(traits.__find('awesome').toString()).to(eql, 'who are awesome');
-        expect(traits.__find('died').toString()).to(eql,    'who died');
-        expect(traits.__find('born').toString()).to(eql,    'who were born');
-        expect(traits.__find('attended').toString()).to(eql,'who have attended');
-        expect(traits.__find('name').toString()).to(eql,    'whose name');
+        expect(traits.__find('awesome').name()).to(eql, 'awesome');
+        expect(traits.__find('died').name()).to(eql,    'died');
+        expect(traits.__find('born').name()).to(eql,    'born');
+        expect(traits.__find('attended').name()).to(eql,'attended');
+        expect(traits.__find('name').name()).to(eql,    'name');
       end
     end
     

data/test/{date_modifier_test.rb → date_preposition_test.rb}

@@ -1,13 +1,13 @@
 require 'test_helper'
 
-class DateModifierTest < ActiveSupport::TestCase
+class DatePrepositionTest < ActiveSupport::TestCase
   include SetBuilder::Modifiers
   
   
   test "should constrain our date queries to A.D." do
-    modifier = DateModifier.new({:in_the_last => [Date.today.year, "years"]})
+    modifier = DatePreposition.new({:in_the_last => [Date.today.year, "years"]})
     assert_equal "x>='0001-01-01'", modifier.build_conditions_for("x")
   end
   
   
-end
+end

data/test/inflector_test.rb

@@ -4,24 +4,24 @@ class InflectorTest < ActiveSupport::TestCase
 
 
   test "active" do
-    assert_equal "who died", SetBuilder::Trait.new("died", :active).to_s
+    assert_equal "who died", SetBuilder::Trait.new('who "died"').to_s
   end
     
   test "perfect" do
-    assert_equal "who have attended", SetBuilder::Trait.new("attended", :perfect).to_s
+    assert_equal "who have attended", SetBuilder::Trait.new('who have "attended"').to_s
   end
     
   test "passive" do
-    assert_equal "who were born", SetBuilder::Trait.new("born", :passive).to_s
+    assert_equal "who were born", SetBuilder::Trait.new('who were "born"').to_s
   end
     
   test "reflexive" do
-    assert_equal "who are awesome", SetBuilder::Trait.new("awesome", :reflexive).to_s
+    assert_equal "who are awesome", SetBuilder::Trait.new('who are "awesome"').to_s
   end
     
   test "noun" do
-    assert_equal "whose name", SetBuilder::Trait.new("name", :noun).to_s
+    assert_equal "whose name", SetBuilder::Trait.new('whose "name"').to_s
   end
     
 
-end
+end

data/test/modifier_test.rb

@@ -5,11 +5,11 @@ class ModifierTest < ActiveSupport::TestCase
 
 
   test "get type with string" do
-    assert_equal StringModifier, SetBuilder::Modifier["String"]
+    assert_equal StringPreposition, SetBuilder::Modifier["StringPreposition"]
   end
   
   test "get type with symbol" do
-    assert_equal StringModifier, SetBuilder::Modifier[:string]
+    assert_equal StringPreposition, SetBuilder::Modifier[:string]
   end
 
   test "registering a modifier" do
@@ -87,4 +87,4 @@ class HashModifier < SetBuilder::Modifier::Verb
     [:has_key]
   end
   
-end
+end

data/test/{string_modifier_test.rb → string_preposition_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class StringModifierTest < ActiveSupport::TestCase
+class StringPrepositionTest < ActiveSupport::TestCase
   include SetBuilder::Modifiers
   
   attr_reader :table
@@ -11,7 +11,7 @@ class StringModifierTest < ActiveSupport::TestCase
   
   
   test "#build_arel_for should generate the correct SQL" do
-    modifier = StringModifier.new({:does_not_contain => ["banana"]})
+    modifier = StringPreposition.new({:does_not_contain => ["banana"]})
     assert_equal "\"fruits\".\"name\" NOT LIKE '%banana%'", modifier.build_arel_for(table[:name]).to_sql
   end
   

data/test/test_helper.rb

@@ -15,40 +15,33 @@ SetBuilder::ValueMap.register(:school, [[1, "Concordia"], [2, "McKendree"]])
 class Friend
   extend SetBuilder
 
-
-  trait(:is, "awesome") do |query, scope|
+  trait('who are [not] "awesome"') do |query, scope|
     scope << {:conditions => {:awesome => true}}
   end
 
-  trait(nil, "died") do |query, scope|
+  trait('who [have not] "died"') do |query, scope|
     scope << {:conditions => {:alive => false}}
   end
 
-  # this trait accepts modifiers --- an adverbial clause
-  trait(:was, "born", :date) do |query, scope|
+  trait('who were "born" <date>') do |query, scope|
     scope << {:conditions => query.modifiers[0].build_conditions_for("friends.birthday")}
   end
 
-  trait(:whose, "age", :number) do |query, scope|
+  trait('whose "age" <number>') do |query, scope|
     scope << {:conditions => query.modifiers[0].build_conditions_for("friends.age")}
   end
 
-  # this trait has a direct object
-  trait(:has, {"attended" => :school}) do |query, scope|
+  trait('who have [not] "attended" :school') do |query, scope|
     scope << {
       :joins => "INNER JOIN schools ON friends.school_id=schools.id",
       :conditions => {"schools.id" => query.direct_object}
     }
   end
 
-  # this trait is a noun
-  # also modifiers can be classes
-  trait(:whose, "name", StringModifier) do |query, scope|
+  trait('whose "name" <string>') do |query, scope|
     scope << {:conditions => query.modifiers[0].build_conditions_for("friends.name")}
   end
   
-  
-  
   # by stubbing out scoped, we can unit test the `performed` features
   def self.to_scope
     []

data/test/trait_test.rb

@@ -10,7 +10,7 @@ class TraitTest < ActiveSupport::TestCase
 
     constraint = trait.apply({:is => "Jerome"})
     assert_equal 1, constraint.modifiers.length
-    assert_kind_of StringModifier, constraint.modifiers.first
+    assert_kind_of StringPreposition, constraint.modifiers.first
   end
   
   test "modifiers should find correct values" do

data/test/traits_test.rb

@@ -23,17 +23,30 @@ class TraitsTest < ActiveSupport::TestCase
   end
   
   test "collection of modifiers" do
-    expected_modifiers = %w{DateModifier NumberModifier StringModifier}.collect {|name| "SetBuilder::Modifiers::#{name}"}
+    expected_modifiers = %w{DatePreposition NumberPreposition StringPreposition}.collect {|name| "SetBuilder::Modifiers::#{name}"}
     assert_equal expected_modifiers, Friend.traits.modifiers.collect(&:name).sort
   end
   
   test "to_json" do
-    expected_json = [['awesome', 'reflexive'],
-                     ['died', 'active'],
-                     ['born', 'passive', ['date']],
-                     ['age', 'noun', ['number']],
-                     [['attended', 'school'], 'perfect'],
-                     ['name', 'noun', ['string']]].to_json
+    expected_json = [[["string","who are"],
+      ["negative","not"],
+      ["name","awesome"]],
+     [["string","who"],
+      ["negative","have not"],
+      ["name","died"]],
+     [["string","who were"],
+      ["name","born"],
+      ["modifier","date"]],
+     [["string","whose"],
+      ["name","age"],
+      ["modifier","number"]],
+     [["string","who have"],
+      ["negative","not"],
+      ["name","attended"],
+      ["direct_object_type","school"]],
+     [["string","whose"],
+      ["name","name"],
+      ["modifier","string"]]].to_json
     assert_equal expected_json, Friend.traits.to_json
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: set_builder
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta3
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -111,9 +125,9 @@ files:
 - lib/set_builder/modifier/verb.rb
 - lib/set_builder/modifier_collection.rb
 - lib/set_builder/modifiers.rb
-- lib/set_builder/modifiers/date_modifier.rb
-- lib/set_builder/modifiers/number_modifier.rb
-- lib/set_builder/modifiers/string_modifier.rb
+- lib/set_builder/modifiers/date_preposition.rb
+- lib/set_builder/modifiers/number_preposition.rb
+- lib/set_builder/modifiers/string_preposition.rb
 - lib/set_builder/query_builders/string.rb
 - lib/set_builder/set.rb
 - lib/set_builder/trait.rb
@@ -144,11 +158,11 @@ files:
 - spec/unit/array.spec.js
 - spec/unit/set_builder.spec.js
 - spec/unit/spec.helper.js
-- test/date_modifier_test.rb
+- test/date_preposition_test.rb
 - test/inflector_test.rb
 - test/modifier_test.rb
 - test/set_test.rb
-- test/string_modifier_test.rb
+- test/string_preposition_test.rb
 - test/support/fake_connection.rb
 - test/test_helper.rb
 - test/trait_test.rb
@@ -204,11 +218,11 @@ test_files:
 - spec/unit/array.spec.js
 - spec/unit/set_builder.spec.js
 - spec/unit/spec.helper.js
-- test/date_modifier_test.rb
+- test/date_preposition_test.rb
 - test/inflector_test.rb
 - test/modifier_test.rb
 - test/set_test.rb
-- test/string_modifier_test.rb
+- test/string_preposition_test.rb
 - test/support/fake_connection.rb
 - test/test_helper.rb
 - test/trait_test.rb