stretchy 0.4.0 → 0.4.1

data/lib/stretchy/types/range.rb

@@ -2,12 +2,17 @@ module Stretchy
   module Types
     class Range < Base
 
-      attr_reader :min, :max, :exclusive_min, :exclusive_max
+      attribute :min
+      attribute :max
+      attribute :exclusive_min
+      attribute :exclusive_max
 
-      contract    min: { type: [Numeric, Date, Time] },
-                  max: { type: [Numeric, Date, Time] },
-        exclusive_min: { in: [true, false] },
-        exclusive_max: { in: [true, false] }
+      validations do
+        rule :min, type: {classes: [Numeric, Date, Time] }
+        rule :max, type: {classes: [Numeric, Date, Time] }
+        rule :exclusive_min, inclusion: {in: [true, false]}
+        rule :exclusive_max, inclusion: {in: [true, false]}
+      end
 
       def initialize(opts_or_range = {}, options = {})
 
@@ -17,20 +22,33 @@ module Stretchy
           @max = opts_or_range.max
           @exclusive_min = !!(options[:exclusive_min] || options[:exclusive])
           @exclusive_max = !!(options[:exclusive_max] || options[:exclusive])
+          @inverse       = !!options[:inverse]
+          @should        = !!options[:should]
         when ::Hash
           opts = options.merge(opts_or_range)
           @min = opts[:min]
           @max = opts[:max]
           @exclusive_min = !!(opts[:exclusive_min] || opts[:exclusive])
           @exclusive_max = !!(opts[:exclusive_max] || opts[:exclusive])
+          @inverse       = !!opts[:inverse]
+          @should        = !!opts[:should]
+        when Range
+          @min = opts_or_range.min
+          @max = opts_or_range.max
+          @exclusive_min = opts_or_range.exclusive_min
+          @exclusive_max = opts_or_range.exclusive_max
         else
           raise Stretchy::Errors::ContractError.new("Ranges must be a range or a hash - found #{options.class.name}")
         end
 
-        require_one min: @min, max: @max
+        require_one! :min, :max
         validate!
       end
 
+      def empty?
+        !(@min || @max)
+      end
+
       def to_search
         json = {}
         if @exclusive_min && @min

data/lib/stretchy/utils/logger.rb

@@ -5,15 +5,19 @@ module Stretchy
   module Utils
     class Logger
 
-      include Stretchy::Utils::Contract
+      include Validation
 
       LEVELS = [:silence, :debug, :info, :warn, :error, :fatal]
 
-      attr_accessor :base, :level, :color
+      attribute :base,  Symbol
+      attribute :level, Symbol
+      attribute :color, String
 
-      contract base: { responds_to: LEVELS.last },
-              level: { in: LEVELS },
-              color: { in: Colorize::COLORS }
+      validations do
+        rule :base,   responds_to:  {method: LEVELS.last}
+        rule :level,  inclusion:    {in: LEVELS}
+        rule :color,  inclusion:    {in: Colorize::COLORS.keys}
+      end
 
       def self.log(msg_or_obj)
         self.new.log(msg_or_obj)
@@ -25,6 +29,7 @@ module Stretchy
         @color = color      || :blue
 
         @color = @color.to_s if @color.is_a?(Symbol)
+
         validate!
       end
 

data/lib/stretchy/utils/validation.rb

@@ -0,0 +1,77 @@
+module Stretchy
+  module Utils
+    module Validation
+
+      def self.included(base)
+        base.send(:include, Virtus.model)
+        base.extend(ClassMethods)
+      end
+
+      def initialize(attributes = nil)
+        self.class.attribute_set.set(self, attributes) if attributes
+        set_default_attributes
+        validate!
+        after_initialize if respond_to?(:after_initialize)
+      end
+
+      def validator
+        @validator ||= self.class.validator.new(self)
+      end
+
+      def validate!
+        raise Errors::ValidationError.new(errors) unless valid?
+      end
+
+      def require_one!(*attrs)
+        rule = ::Validation::Rule::Required.new
+        errors = {}
+        unless attrs.any? {|a| rule.valid_value?( send(a) ) }
+          raise Errors::ValidationError.new(
+            attrs.join(', ') => {
+              rule: :require_one_of
+            }
+          )
+        end
+        true
+      end
+
+      def require_only_one!(*attrs)
+        rule = ::Validation::Rule::Required.new
+        errors = {}
+        if attrs.select {|a| rule.valid_value?( send(a) ) }.count > 1
+          raise Errors::ValidationError.new(
+            attrs.join(', ') => {
+              rule: :require_only_one
+            }
+          )
+        end
+        true
+      end
+
+      def valid?
+        validator.valid?
+      end
+
+      def errors
+        validator.errors
+      end
+
+      module ClassMethods
+
+        def validations(&block)
+          @validator = Class.new(::Validation::Validator) do
+            include ::Validation
+
+            class_exec(&block)
+          end
+        end
+
+        def validator
+          @validator
+        end
+
+      end
+
+    end
+  end
+end

data/lib/stretchy/utils.rb

@@ -1,4 +1,4 @@
-require 'stretchy/utils/contract'
+require 'stretchy/utils/validation'
 require 'stretchy/utils/colorize'
 require 'stretchy/utils/logger'
 require 'stretchy/utils/dot_handler'

data/lib/stretchy/version.rb

@@ -1,3 +1,3 @@
 module Stretchy
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/stretchy.rb

@@ -3,7 +3,10 @@ require 'logger'
 require 'forwardable'
 require 'excon'
 require 'elasticsearch'
+require 'virtus'
+require 'validation'
 
+require 'stretchy_validations'
 require 'stretchy/utils'
 require 'stretchy/errors'
 require 'stretchy/types'

data/lib/stretchy_validations.rb

@@ -0,0 +1,10 @@
+require 'validation/rule/not_empty'
+require 'validation/rule/required'
+require 'validation/rule/responds_to'
+require 'validation/rule/decay'
+require 'validation/rule/distance'
+require 'validation/rule/field'
+require 'validation/rule/inclusion'
+require 'validation/rule/latitude'
+require 'validation/rule/longitude'
+require 'validation/rule/type'

data/lib/validation/rule/decay.rb

@@ -0,0 +1,20 @@
+module Validation
+  module Rule
+    class Decay
+      DECAY_FUNCTIONS = [:gauss, :linear, :exp]
+
+      def error_key
+        :decay_function
+      end
+
+      def valid_value?(value)
+        DECAY_FUNCTIONS.any?{|f| f == value || f.to_s == value }
+      end
+
+      def params
+        {}
+      end
+
+    end
+  end
+end

data/lib/validation/rule/distance.rb

@@ -0,0 +1,20 @@
+module Validation
+  module Rule
+    class Distance
+      DISTANCE_FORMAT = /^(\d+)(km|mi)$/
+
+      def error_key
+        :distance_value
+      end
+
+      def valid_value?(value)
+        !!(value.to_s =~ DISTANCE_FORMAT)
+      end
+
+      def params
+        {}
+      end
+
+    end
+  end
+end

data/lib/validation/rule/field.rb

@@ -0,0 +1,22 @@
+module Validation
+  module Rule
+    class Field
+
+      def error_key
+        :field
+      end
+
+      def valid_value?(value)
+        valid = true
+        valid = false unless value.is_a?(String) || value.is_a?(Symbol) || value.is_a?(Numeric)
+        valid = false if value.to_s.empty?
+        valid
+      end
+
+      def params
+        {}
+      end
+
+    end
+  end
+end

data/lib/validation/rule/inclusion.rb

@@ -0,0 +1,33 @@
+module Validation
+  module Rule
+    class Inclusion
+
+      def initialize(params = {})
+        @params = params
+      end
+
+      def error_key
+        :inclusion
+      end
+
+      def valid_value?(value)
+        return true if value.nil? && !params[:required]
+        within.any? do |allowed_value|
+          if value.respond_to?(:eql?)
+            value.eql?(allowed_value)
+          else
+            value == allowed_value
+          end
+        end
+      end
+
+      def within
+        @params[:in] || @params[:within]
+      end
+
+      def params
+        @params
+      end
+    end
+  end
+end

data/lib/validation/rule/latitude.rb

@@ -0,0 +1,21 @@
+module Validation
+  module Rule
+    class Latitude
+
+      def error_key
+        :latitude
+      end
+
+      def valid_value?(value)
+        valid = true
+        value = Float(value) rescue nil
+        valid = false unless value && value.to_f <= 90 && value.to_f >= -90
+        valid
+      end
+
+      def params
+        {}
+      end
+    end
+  end
+end

data/lib/validation/rule/longitude.rb

@@ -0,0 +1,22 @@
+module Validation
+  module Rule
+    class Longitude
+
+      def error_key
+        :longitude
+      end
+
+      def valid_value?(value)
+        valid = true
+        value = Float(value) rescue nil
+        valid = false unless value && value <= 180 && value >= -180
+        valid
+      end
+
+      def params
+        {}
+      end
+
+    end
+  end
+end

data/lib/validation/rule/one_of.rb

@@ -0,0 +1,22 @@
+module Validation
+  module Rule
+    class OneOf
+
+      def initialize(params)
+        @params = params
+      end
+
+      def error_key
+        :one_of
+      end
+
+      def valid_value?(value)
+        
+      end
+
+      def params
+        @params
+      end
+    end
+  end
+end

data/lib/validation/rule/required.rb

@@ -0,0 +1,26 @@
+module Validation
+  module Rule
+    class Required
+
+      def error_key
+        :required
+      end
+
+      def valid_value?(value)
+        case value
+        when nil
+          false
+        when String, Array, Hash
+          !value.empty?
+        else
+          true
+        end
+      end
+
+      def params
+        {}
+      end
+
+    end
+  end
+end

data/lib/validation/rule/responds_to.rb

@@ -0,0 +1,23 @@
+module Validation
+  module Rule
+    class RespondsTo
+
+      def initialize(params)
+        @params = params
+      end
+
+      def error_key
+        :responds_to
+      end
+
+      def valid_value?(value)
+        value.respond_to?(params[:method])
+      end
+
+      def params
+        @params
+      end
+
+    end
+  end
+end

data/lib/validation/rule/type.rb

@@ -0,0 +1,41 @@
+module Validation
+  module Rule
+    class Type
+
+      def initialize(params = {})
+        @params = params
+      end
+
+      def error_key
+        :type_rule
+      end
+
+      def valid_value?(value)
+        return true if value.nil? && !params[:required]
+        
+        valid = true
+        if params[:array]
+          valid = false unless value.all? {|v| validate_type(v) }
+        else
+          valid = false unless validate_type(value)
+        end
+        valid
+      end
+
+      def validate_type(value)
+        valid = true
+        case params[:classes]
+        when Array
+          valid = false unless params[:classes].any? {|type| value.is_a?(type) }
+        else
+          valid = false unless value.is_a?(params[:classes])
+        end
+        valid
+      end
+
+      def params
+        @params
+      end
+    end
+  end
+end

data/stretchy.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "elasticsearch",  "~> 1.0"
   spec.add_dependency "excon",          "~> 0.45"
+  spec.add_dependency "valid"
+  spec.add_dependency "virtus"
 
   spec.add_development_dependency "bundler",        "~> 1.8"
   spec.add_development_dependency "rake",           "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - agius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.45'
+- !ruby/object:Gem::Dependency
+  name: valid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +172,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
@@ -159,7 +188,10 @@ files:
 - lib/stretchy/boosts/random_boost.rb
 - lib/stretchy/builders.rb
 - lib/stretchy/builders/boost_builder.rb
+- lib/stretchy/builders/filter_builder.rb
 - lib/stretchy/builders/match_builder.rb
+- lib/stretchy/builders/query_builder.rb
+- lib/stretchy/builders/shell_builder.rb
 - lib/stretchy/builders/where_builder.rb
 - lib/stretchy/clauses.rb
 - lib/stretchy/clauses/base.rb
@@ -169,7 +201,7 @@ files:
 - lib/stretchy/clauses/match_clause.rb
 - lib/stretchy/clauses/where_clause.rb
 - lib/stretchy/errors.rb
-- lib/stretchy/errors/contract_error.rb
+- lib/stretchy/errors/validation_error.rb
 - lib/stretchy/filters.rb
 - lib/stretchy/filters/and_filter.rb
 - lib/stretchy/filters/base.rb
@@ -199,10 +231,21 @@ files:
 - lib/stretchy/utils/client_actions.rb
 - lib/stretchy/utils/colorize.rb
 - lib/stretchy/utils/configuration.rb
-- lib/stretchy/utils/contract.rb
 - lib/stretchy/utils/dot_handler.rb
 - lib/stretchy/utils/logger.rb
+- lib/stretchy/utils/validation.rb
 - lib/stretchy/version.rb
+- lib/stretchy_validations.rb
+- lib/validation/rule/decay.rb
+- lib/validation/rule/distance.rb
+- lib/validation/rule/field.rb
+- lib/validation/rule/inclusion.rb
+- lib/validation/rule/latitude.rb
+- lib/validation/rule/longitude.rb
+- lib/validation/rule/one_of.rb
+- lib/validation/rule/required.rb
+- lib/validation/rule/responds_to.rb
+- lib/validation/rule/type.rb
 - stretchy.gemspec
 homepage: https://github.com/hired/stretchy
 licenses:
@@ -224,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Query builder for Elasticsearch

data/lib/stretchy/errors/contract_error.rb

@@ -1,5 +0,0 @@
-module Stretchy
-  module Errors
-    class ContractError < StandardError ; end
-  end
-end