set_builder 2.0.0.beta2 → 2.0.0.beta3

data/lib/set_builder/set.rb

@@ -4,9 +4,11 @@ module SetBuilder
 
 
     def initialize(traits, scope, raw_data)
+      traits = Traits.new(traits) if traits.is_a?(Array)
+      raise ArgumentError, "Expected traits to be an instance of SetBuilder::Traits" unless traits.is_a?(Traits)
       @traits = traits
       @scope = scope
-      @set = raw_data
+      @set = self.class.normalize(raw_data)
     end
 
 
@@ -25,7 +27,14 @@ module SetBuilder
     # Returns true if all of the constraints in this set are valid
     #
     def valid?
-      constraints.all?(&:valid?)
+      errors.none?
+    end
+
+    def errors
+      @errors ||= constraints.each_with_object({}) do |constraint, hash|
+        errors = constraint.errors
+        hash[constraint.trait.name] = errors if errors.any?
+      end
     end
 
 
@@ -37,6 +46,13 @@ module SetBuilder
       constraints.to_sentence
     end
 
+    #
+    # Exports this set in raw data
+    #
+    def to_a
+      set
+    end
+
 
 
     #
@@ -49,19 +65,43 @@ module SetBuilder
 
 
 
-  private
+    def self.normalize(constraints)
+      hash_to_array(constraints).map do |constraint|
+        constraint = constraint.symbolize_keys
+        if constraint[:modifiers]
+          constraint[:modifiers] = hash_to_array(constraint[:modifiers]).map do |modifier|
+            modifier = modifier.symbolize_keys
+            modifier[:values] = hash_to_array(modifier[:values]) if modifier[:values]
+            modifier
+          end
+        end
+        constraint[:enums] = hash_to_array(constraint[:enums]) if constraint[:enums]
+        constraint
+      end
+    end
 
 
 
+  private
     attr_reader :set
 
+
+
+    def self.hash_to_array(hash)
+      return hash.values if hash.is_a?(Hash)
+      Array(hash)
+    end
+
+
+
     def get_constraints
-      set.inject([]) do |constraints, line|
-        negate, trait_name, args = false, line.first.to_s, line[1..-1]
-        trait_name, negate = trait_name[1..-1], true if (trait_name[0..0] == "!")
+      set.map do |constraint|
+        trait_name = constraint.fetch(:trait) do
+          raise ArgumentError, ":trait is missing from the given constraint`"
+        end
         trait = traits[trait_name]
-        raise("\"#{trait_name}\" is not a trait in `traits`") unless trait
-        constraints << trait.apply(*args).negate(negate)
+        raise SetBuilder::TraitNotFound, "\"#{trait_name}\" is not a trait in `traits`" unless trait
+        trait.apply(constraint)
       end
     end
 

data/lib/set_builder/trait.rb

@@ -1,76 +1,102 @@
-require 'set_builder/constraint'
-require 'set_builder/modifier'
+require "set_builder/constraint"
+require "set_builder/modifier"
 
 
 module SetBuilder
   class Trait
-    
-    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)
+    attr_reader :expression, :tokens, :name, :modifiers, :direct_object_type, :enums
+
+
+
+    def initialize(expression, &block)
+      @expression = expression.to_s.strip
+      @tokens = parse(expression)
       @block = block
-      @modifiers = find_all(:modifier).map { |modifier| Modifier[modifier]  }
+
+      names = find_all(:name)
+      raise ArgumentError, "A trait must be defined with a name" if names.none?
+      raise ArgumentError, "A trait must be defined with only one name" if names.length > 1
+      @name = names[0]
+
+      direct_object_types = find_all(:direct_object_type)
+      raise ArgumentError, "A trait may define only one direct object" if direct_object_types.length > 1
+      @direct_object_type = direct_object_types[0].to_sym if direct_object_types[0]
+
+      @enums = find_all(:enum)
+      raise ArgumentError, "An enum must define more than one option" if enums.any? { |options| options.length < 2 }
+
+      @modifiers = find_all(:modifier).map { |modifier_type| Modifier[modifier_type] }
     end
-    
+
+
+
     def requires_direct_object?
       !@direct_object_type.nil?
     end
     alias :direct_object_required? :requires_direct_object?
-    
-    def negative?
-      find(:negative)
+
+
+
+    def to_s
+      expression
     end
 
-    def to_s(negative=false)
-      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(" ")
+    def as_json(*)
+      tokens.map { |(token, value)| [token.to_s, value] }
+    end
+
+    def apply(constraint)
+      SetBuilder::Constraint.new(self, constraint, &@block)
     end
-    
+
+
+
+  private
+
+
+
     def find_all(token)
-      parsed_expression.select { |(_token, _)| _token == token }.map { |(_, value)| value }
+      tokens.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
+
+
+    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) }
-      return :string
+      :string
     end
-    
-    def value_for(lexeme)
-      lexeme.to_s.strip.gsub(/[<>"\[\]:]/, "")
+
+    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/traits.rb

@@ -1,7 +1,7 @@
-require 'set_builder/trait'
-require 'set_builder/trait_builder'
-require 'set_builder/modifier_collection'
-require 'delegate'
+require "set_builder/trait"
+require "set_builder/trait_builder"
+require "set_builder/modifier_collection"
+require "delegate"
 
 
 module SetBuilder
@@ -51,6 +51,15 @@ module SetBuilder
       self.class.new(self.__getobj__.concat other_traits.__getobj__)
     end
 
+    def sort_by(&block)
+      self.class.new(self.__getobj__.sort_by(&block))
+    end
+
+    def <<(trait)
+      super
+      self
+    end
+
 
 
     def modifiers

data/lib/set_builder/value_map.rb

@@ -1,19 +1,19 @@
 module SetBuilder
   module ValueMap
-    
-    
-    
+
+
+
     @registered_value_maps = {}
-    
-    
-    
+
+
+
     def self.registered?(name)
       name = name.to_sym
       @registered_value_maps.key?(name)
     end
-    
-    
-    
+
+
+
     def self.to_s(name, value)
       if value.is_a?(Array)
         values = value.map { |value| to_s(name, value) }
@@ -23,8 +23,8 @@ module SetBuilder
         when 2 then return "#{values.first} or #{values.last}"
         else return "#{values[0..-2].join(', ')}, or #{values.last}"
         end
-      end 
-      
+      end
+
       name = name.to_sym
       map = @registered_value_maps[name]
       if map
@@ -34,43 +34,43 @@ module SetBuilder
         value.to_s
       end
     end
-    
-    
-    
+
+
+
     def self.for(name)
       name = name.to_sym
       @registered_value_maps[name] || raise(ArgumentError, "A value map has not been registered for #{value}")
     end
-    
-    
-    
+
+
+
     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)] }
       register(name, map)
     end
-    
-    
-    
+
+
+
     def self.register(name, map)
       raise "map is expected to be an array of pairs" unless map.is_a?(Array)
       name = name.to_sym
       @registered_value_maps[name] = map
     end
-    
-    
-    
+
+
+
     def self.as_json(options={})
       @registered_value_maps.dup
     end
-    
+
     def self.to_json
       @registered_value_maps.to_json
     end
-    
-    
-    
+
+
+
   end
-  
-  
-  
+
+
+
 end

data/lib/set_builder/version.rb

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

data/lib/set_builder.rb

@@ -1,10 +1,11 @@
-require 'active_record'
-require 'active_support/core_ext'
-require 'set_builder/traits'
-require 'set_builder/modifiers'
-require 'set_builder/value_map'
-require 'set_builder/set'
-require 'set_builder/engine'
+require "active_record"
+require "active_support/core_ext"
+require "set_builder/traits"
+require "set_builder/errors/trait_not_found"
+require "set_builder/modifiers"
+require "set_builder/value_map"
+require "set_builder/set"
+require "set_builder/engine"
 
 
 module SetBuilder

data/set_builder.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'set_builder/version'
+require "set_builder/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "set_builder"
@@ -18,11 +18,13 @@ 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", "< 4.2"
+  spec.add_dependency "rails", "~> 4.2.0"
   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"
+  spec.add_development_dependency "shoulda-context"
   spec.add_development_dependency "minitest-reporters"
+  spec.add_development_dependency "timecop"
 end

data/spec/commands/example_command.rb

@@ -15,5 +15,5 @@
 #     # options.bar
 #     # options.__hash__[:foo]
 #     # options.__hash__[:bar]
-#   end 
-# end
+#   end
+# end

data/spec/lib/jspec.css

@@ -90,7 +90,7 @@ body.jspec {
   margin: 0;
   padding: 0 0 5px 25px;
 }
-#jspec-report tr.even:hover + tr.body, 
+#jspec-report tr.even:hover + tr.body,
 #jspec-report tr.odd:hover + tr.body {
   display: block;
 }
@@ -101,7 +101,7 @@ body.jspec {
   font-weight: normal;
   color: #7B8D9B;
 }
-#jspec-report tr.even:hover, 
+#jspec-report tr.even:hover,
 #jspec-report tr.odd:hover {
   text-shadow: 1px 1px 1px #fff;
   background: #F2F5F7;
@@ -130,7 +130,7 @@ body.jspec {
   color: #1a1a1a;
 }
 #jspec-report tr.description:first-child td {
-  border-top: none;  
+  border-top: none;
 }
 #jspec-report .assertion {
   display: block;
@@ -146,4 +146,4 @@ body.jspec {
 }
 .jspec-sandbox {
   display: none;
-}
+}

data/spec/lib/jspec.growl.js

@@ -2,13 +2,13 @@
 // JSpec - Growl - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
 
 ;(function(){
-  
+
   Growl = {
-    
+
     // --- Version
-    
+
     version: '1.0.0',
-    
+
     /**
      * Execute the given _cmd_, returning an array of lines from stdout.
      *
@@ -28,11 +28,11 @@
         var stream = new DataInputStream(proccess.getInputStream())
         while (line = stream.readLine())
           lines.push(line + '')
-        stream.close()    
+        stream.close()
       }
       return lines
     },
-    
+
     /**
      * Return the extension of the given _path_ or null.
      *
@@ -40,9 +40,9 @@
      * @return {string}
      * @api private
      */
-    
+
     extname: function(path) {
-      return path.lastIndexOf('.') != -1 ? 
+      return path.lastIndexOf('.') != -1 ?
         path.slice(path.lastIndexOf('.') + 1, path.length) :
           null
     },
@@ -102,7 +102,7 @@
       this.exec.apply(this, args)
     }
   }
-  
+
   JSpec.include({
     name: 'Growl',
     reporting: function(options){
@@ -111,5 +111,5 @@
       else Growl.notify('passed ' + stats.passes + ' assertions', { title: 'JSpec' })
     }
   })
-  
-})()
+
+})()

data/spec/lib/jspec.jquery.js

@@ -5,15 +5,15 @@ JSpec
 .requires('jQuery', 'when using jspec.jquery.js')
 .include({
   name: 'jQuery',
-  
+
   // --- Initialize
-  
+
   init : function() {
     jQuery.ajaxSetup({ async: false })
   },
-  
+
   // --- Utilities
-  
+
   utilities : {
     element:  jQuery,
     elements: jQuery,
@@ -21,10 +21,10 @@ JSpec
       return jQuery('<div class="sandbox"></div>')
     }
   },
-  
+
   // --- Matchers
-  
-  matchers : {    
+
+  matchers : {
     have_tag      : "jQuery(expected, actual).length === 1",
     have_one      : "alias have_tag",
     have_tags     : "jQuery(expected, actual).length > 1",
@@ -36,18 +36,18 @@ JSpec
     have_value    : "jQuery(actual).val() === expected",
     be_enabled    : "!jQuery(actual).attr('disabled')",
     have_class    : "jQuery(actual).hasClass(expected)",
-    be_animated   : "jQuery(actual).queue().length > 0",        
-        
+    be_animated   : "jQuery(actual).queue().length > 0",
+
     be_visible : function(actual) {
       return jQuery(actual).css('display') != 'none' &&
              jQuery(actual).css('visibility') != 'hidden' &&
              jQuery(actual).attr('type') != 'hidden'
     },
-    
+
     be_hidden : function(actual) {
       return !JSpec.does(actual, 'be_visible')
     },
-    
+
     have_classes : function(actual) {
       return !JSpec.any(JSpec.toArray(arguments, 1), function(arg){
         return !JSpec.does(actual, 'have_class', arg)
@@ -58,7 +58,7 @@ JSpec
       return value ? jQuery(actual).attr(attr) == value:
                      jQuery(actual).attr(attr)
     },
-    
+
     have_event_handlers : function(actual, expected) {
       if (jQuery(actual).data('events') && jQuery(actual).data('events').hasOwnProperty(expected)) {
         return true;
@@ -73,11 +73,11 @@ JSpec
       }
       return false;
     },
-    
+
     'be disabled selected checked' : function(attr) {
       return 'jQuery(actual).attr("' + attr + '")'
     },
-    
+
     'have type id title alt href src sel rev name target' : function(attr) {
       return function(actual, value) {
         return JSpec.does(actual, 'have_attr', attr, value)