ruy 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb7f94655e005150da3e73788e1f3a9fd468a736
-  data.tar.gz: 69ef1d941e8316dddcf67559502c091abe7df1af
+  metadata.gz: cd5ceb75eb7454f4c8b8477a9f57428c9d4c5a2a
+  data.tar.gz: 84566c136caaa90dc3b9b237d27edc6c60af8adc
 SHA512:
-  metadata.gz: 21f385fc78e17bbb78dc68b26194574c08ed494f16f75b4fa37f570131c8d55aeec4bbc654bcef7b873c5651f5328b274def2f032edfe338c6acbf3edd6e1810
-  data.tar.gz: dd62cdfa7593eb95b43ded250262358f057fa277d583cb7750d04811cbcf116504121fba08d9b93f111c4634371efeb3004cb64c6d7916442802a23d1b6a1748
+  metadata.gz: 1d732cd15c2acf298a872ce6a51de97740e6edfa1a1fdad9cfa4372423e0a78cf51578e8057eaeef38afcc0f250db3acd6f4ada9bb02778e8c829815cb4fc894
+  data.tar.gz: 7e38818c44bb7529e2c9283aaa975560acb6363f56fa221a8075013dd7a0731424659653a307dc9bb6edd844e4ad2e52bd214a3744cb53a7d84d7f9b8c1d3d20

data/lib/ruy.rb

@@ -2,6 +2,7 @@ require_relative 'ruy/rule'
 require_relative 'ruy/adapters'
 require_relative 'ruy/conditions'
 require_relative 'ruy/rule_storage'
+require_relative 'ruy/time_pattern'
 
 module Ruy
   class RuleSet < Rule
@@ -62,9 +63,7 @@ module Ruy
 
     def outcome(value, &block)
       outcome = Outcome.new(value)
-
       outcome.instance_exec(&block) if block_given?
-
       @outcomes << outcome
     end
 
@@ -93,9 +92,7 @@ module Ruy
     end
 
     def call(ctx)
-      if super(ctx)
-        @value
-      end
+      @value if super(ctx)
     end
 
     def ==(o)
@@ -107,10 +104,9 @@ module Ruy
 
   # Context that can resolve variable access
   class VariableContext
-    def initialize(ctx, vars)
+    def initialize(ctx, vars = {})
       @ctx = ctx
       @vars = vars
-
       @resolved_vars = {}
     end
 

data/lib/ruy/conditions.rb

@@ -10,6 +10,7 @@ require_relative 'conditions/include'
 require_relative 'conditions/included'
 require_relative 'conditions/less_than'
 require_relative 'conditions/less_than_or_equal'
+require_relative 'conditions/tz'
 
 module Ruy
   module Conditions; end

data/lib/ruy/conditions/assert.rb

@@ -7,6 +7,7 @@ module Ruy
 
       # @param attr Context attribute's name
       def initialize(attr)
+        super()
         @attr = attr
         @params = [@attr]
       end

data/lib/ruy/conditions/except.rb

@@ -17,12 +17,9 @@ module Ruy
 
         @attr = attr
         @value = value
-
         @params = [@attr, @value]
 
-        if block_given?
-          instance_exec(&block)
-        end
+        instance_exec(&block) if block_given?
       end
 
       def call(var_ctx)

data/lib/ruy/conditions/less_than.rb

@@ -8,6 +8,7 @@ module Ruy
       # @param attr Context attribute's name
       # @param value
       def initialize(attr, value)
+        super()
         @attr = attr
         @value = value
 

data/lib/ruy/conditions/less_than_or_equal.rb

@@ -8,6 +8,7 @@ module Ruy
       # @param attr Context attribute's name
       # @param value
       def initialize(attr, value)
+        super()
         @attr = attr
         @value = value
 

data/lib/ruy/conditions/tz.rb

@@ -0,0 +1,62 @@
+module Ruy
+  module Conditions
+
+    # Evaluates a block using comparison matchers that receive time-related objects with time zone awareness.
+    #   Does not support time zone-aware matchers inside sub-blocks.
+    #   A workaround for this is always surrounding your time zone-aware matchers by a 'tz' block even in sub-blocks
+    #   already surrounded by one.
+    class TZ < Ruy::Rule
+      # @param [String] tz_identifier String representing IANA's time zone identifier.
+      def initialize(tz_identifier)
+        super()
+        @tz_identifier = tz_identifier
+        @params = [@tz_identifier]
+      end
+
+      # @param [Ruy::VariableContext] var_ctx
+      def call(var_ctx)
+        @conditions.all? do |condition|
+          condition.call(var_ctx)
+        end
+      end
+
+      # Intercepts an 'eq' call to the superclass and enhances its arguments
+      #
+      # @param (see Ruy::Conditions::Eq#initialize)
+      def eq(attr, pattern, &block)
+        super(attr, TimePattern.new(pattern, @tz_identifier), &block)
+      end
+
+      # TODO Add Greater condition call here
+
+      # Intercepts a 'greater_than_or_equal' call to the superclass and enhances its arguments
+      #
+      # @param (see Ruy::Conditions::GreaterThanOrEqual#initialize)
+      def greater_than_or_equal(attr, pattern, &block)
+        super(attr, TimePattern.new(pattern, @tz_identifier), &block)
+      end
+
+      # Intercepts a 'less_than' call to the superclass and enhances its arguments
+      #
+      # @param (see Ruy::Conditions::LessThan#initialize)
+      def less_than(attr, pattern, &block)
+        super(attr, TimePattern.new(pattern, @tz_identifier), &block)
+      end
+
+      # Intercepts a 'less_than_or_equal' call to the superclass and enhances its arguments
+      #
+      # @param (see Ruy::Conditions::LessThanOrEqual#initialize)
+      def less_than_or_equal(attr, pattern, &block)
+        super(attr, TimePattern.new(pattern, @tz_identifier), &block)
+      end
+
+      # Intercepts a 'between' call to the superclass and enhances its arguments
+      #
+      # @param (see Ruy::Conditions::Between#initialize)
+      def between(attr, from, to, &block)
+        super(attr, TimePattern.new(from, @tz_identifier), TimePattern.new(to, @tz_identifier), &block)
+      end
+
+    end
+  end
+end

data/lib/ruy/rule.rb

@@ -153,6 +153,17 @@ module Ruy
       @conditions << Conditions::LessThan.new(attr, value)
     end
 
+    # Adds a TZ condition block
+    #
+    # @param [String] tz_identifier String representing IANA's time zone identifier. Defaults to UTC if none passed.
+    # @yield Evaluates the given block in the context of the TZ rule
+    def tz(tz_identifier = 'UTC', &block)
+      cond = Conditions::TZ.new(tz_identifier)
+      cond.instance_exec(&block)
+
+      @conditions << cond
+    end
+
     # Gets attribute's value from the given name.
     #
     # @param name

data/lib/ruy/time_pattern.rb

@@ -0,0 +1,57 @@
+require 'tzinfo'
+
+module Ruy
+  class TimePattern
+    include Comparable
+
+    EXP = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(z(\S+))?$/
+
+    attr_reader :tz, :local_time, :utc_time
+
+    # @param [String] pattern String representing a Ruy's well-formed timestamp pattern
+    # @param [String] tz_identifier String representing IANA's time zone identifier. Defaults to UTC if none passed.
+    def initialize(pattern, tz_identifier = 'UTC')
+      raise ArgumentError, 'Pattern is malformed' unless match_data = pattern.match(EXP)
+
+      year = match_data[1].to_i
+      month = match_data[2].to_i
+      day = match_data[3].to_i
+      hours = match_data[4].to_i
+      min = match_data[5].to_i
+      sec = match_data[6].to_i
+      tz_identifier = match_data[8] || tz_identifier
+
+      # Store the TZInfo::Timezone object corresponding to the specified time zone
+      @tz = TZInfo::Timezone.get(tz_identifier)
+
+      # Store a Time object with values based on the specified time zone
+      @local_time = Time.new(year, month, day, hours, min, sec, '+00:00')
+
+      # Store a Time object with values based on UTC
+      @utc_time = @tz.local_to_utc(@local_time)
+    end
+
+    # Implements Ruby's spaceship operator to work with TimePattern objects.
+    #
+    # @param [TimePattern|Time]
+    # @return [Fixnum]
+    def <=>(time)
+      @utc_time <=> (time.is_a?(self.class) ? time.utc_time : time)
+    end
+
+    # Returns a well-formed Ruy timestamp with IANA time zone identifier representing the current TimePattern object.
+    #
+    # @return [String]
+    def to_s
+      @local_time.strftime("%Y-%m-%dT%H:%M:%Sz#{@tz.identifier}")
+    end
+
+    # Overrides Ruby's method missing call to redirect calls to the stored Time object in case it responds to the
+    #   missing method. Will call to super in case it doesn't.
+    #
+    # @param (see BasicObject#method_missing)
+    def method_missing(method, *args)
+      @utc_time.respond_to?(method) ? @utc_time.send(method, *args) : super
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Moove-IT
@@ -10,43 +10,59 @@ bindir: bin
 cert_chain: []
 date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: '4.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: '4.12'
 description: 
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/ruy.rb
+- lib/ruy/adapters.rb
 - lib/ruy/adapters/file_adapter.rb
 - lib/ruy/adapters/sequel_adapter.rb
-- lib/ruy/adapters.rb
+- lib/ruy/conditions.rb
 - lib/ruy/conditions/all.rb
 - lib/ruy/conditions/any.rb
 - lib/ruy/conditions/assert.rb
@@ -59,10 +75,10 @@ files:
 - lib/ruy/conditions/included.rb
 - lib/ruy/conditions/less_than.rb
 - lib/ruy/conditions/less_than_or_equal.rb
-- lib/ruy/conditions.rb
+- lib/ruy/conditions/tz.rb
 - lib/ruy/rule.rb
 - lib/ruy/rule_storage.rb
-- lib/ruy.rb
+- lib/ruy/time_pattern.rb
 homepage: https://github.com/Moove-it/ruy
 licenses:
 - MIT
@@ -73,18 +89,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rules Engine for Ruby
 test_files: []
+has_rdoc: