oflow 1.0.2 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 5d34d97bd5ac308c65b62516297d16c06b41fa0e091bcb21a395a9b7564b023b
+  data.tar.gz: bd541cf3747b7d10a82fa297148475b6e52173eef8fc5ed455bb1d124c70f26a
+SHA512:
+  metadata.gz: 795edf243b99e83917dd6382c7874357eef78ab73419f36aa32b0fba943c6416418d5b7afc4641d8e89612dedaa8b8fc1757fbb51e5b07345cf590c3c15e05e6
+  data.tar.gz: 9c0566dec233c2ed6465db6a79196369578636e2d7aacbe48fc61e2a002dc361697cb68f4494fd67d426dbd97a20c0bf539e6152a4739ed86820af69219f46c2

data/README.md

@@ -25,6 +25,10 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 ## Release Notes
 
+### Release 1.1.0
+
+ - Changed the gemchart example to use a new Recorder actor.
+
 ### Release 1.0.2
 
  - Updated GemChart sample to handle poor connections better.

data/lib/oflow/actors.rb

@@ -13,6 +13,7 @@ require 'oflow/actors/balancer'
 require 'oflow/actors/trigger'
 require 'oflow/actors/merger'
 require 'oflow/actors/persister'
+require 'oflow/actors/recorder'
 require 'oflow/actors/timer'
 require 'oflow/actors/httpserver'
 require 'oflow/actors/shellone'

data/lib/oflow/actors/httpserver.rb

@@ -45,9 +45,9 @@ module OFlow
                 continue if :success == key || 'success' == key
                 begin
                   task.ship(key, box)
-                rescue BlockedError => e
+                rescue BlockedError
                   task.warn("Failed to ship timer #{box.contents} to #{key}. Task blocked.")
-                rescue BusyError => e
+                rescue BusyError
                   task.warn("Failed to ship timer #{box.contents} to #{key}. Task busy.")
                 end
               end

data/lib/oflow/actors/recorder.rb

@@ -0,0 +1,184 @@
+require 'oj'
+
+module OFlow
+  module Actors
+
+    # Actor that saves records to the local file system as JSON
+    # representations of the records as lines in a single file associated with
+    # one of the elements of the JSON record. The message that triggers the
+    # store must have a 'table' element, a 'key', and a 'rec' element.
+    class Recorder < Actor
+
+      attr_reader :dir
+
+      # Initializes the recorder with options of:
+      # @param [Hash] options with keys of
+      #  - :dir [String] directory to store the persisted records
+      #  - :results_path [String] path to where the results should be placed in
+      #                           the request (default: nil or ship only results)
+      def initialize(task, options)
+        super
+	@cache = {}
+        @dir = options[:dir]
+        if @dir.nil?
+          @dir = File.join('db', task.full_name.gsub(':', '/'))
+        end
+        @dir = File.expand_path(@dir.strip)
+        @results_path = options[:results_path]
+        @results_path.strip! unless @results_path.nil?
+
+        if Dir.exist?(@dir)
+          Dir.glob(File.join(@dir, '*.json')).each do |path|
+            load(path)
+          end
+        else
+          `mkdir -p #{@dir}`
+        end
+      end
+
+      def perform(op, box)
+        dest = box.contents[:dest]
+        result = nil
+        case op
+        when :insert, :create
+          result = insert(box)
+        when :get, :read
+          result = read(box)
+        when :update
+          result = update(box)
+        when :insert_update
+          result = insert_update(box)
+        when :delete, :remove
+          result = delete(box)
+        when :query
+          result = query(box)
+        when :clear
+          result = clear(box)
+        else
+          raise OpError.new(task.full_name, op)
+        end
+        unless dest.nil?
+          if @results_path.nil?
+            box = Box.new(result, box.tracker)
+          else
+            box = box.set(@results_path, result)
+          end
+          task.ship(dest, box)
+        end
+      end
+
+      def insert(box)
+        table = box.get('table')
+        key = box.get('key')
+        rec = box.get('rec')
+        raise KeyError.new(:insert) if table.nil?
+        raise KeyError.new(:insert) if key.nil?
+
+	tc = @cache[table]
+	if tc.nil?
+	  tc = {}
+	  @cache[table] = tc
+	end
+        tc[key] = rec
+	write(table)
+      end
+
+      alias :update :insert
+      alias :insert_update :insert
+      
+      def read(box)
+        table = box.get('table')
+        key = box.get('key')
+        raise KeyError.new(:read) if table.nil?
+        raise KeyError.new(:read) if key.nil?
+
+	tc = @cache[table]
+	return nil if tc.nil?
+
+	rec = tc[key]
+        rec
+      end
+
+      def delete(box)
+        table = box.get('table')
+        key = box.get('key')
+        raise KeyError.new(:read) if table.nil?
+        raise KeyError.new(:read) if key.nil?
+
+	tc = @cache[table]
+	unless tc.nil?
+	  tc.delete(key)
+	  write(table)
+	end
+        nil
+      end
+
+      def query(box)
+        recs = {}
+        expr = box.get('expr')
+        table = box.get('table')
+        raise KeyError.new(:query) if table.nil?
+
+	tc = @cache[table]
+	tc.each do |key,rec|
+          recs[key] = rec if (expr.nil? || expr.call(rec, key))
+        end
+        recs
+      end
+
+      def clear(box)
+        @cache = {}
+        `rm -rf #{@dir}`
+        # remake the dir in preparation for future inserts
+        `mkdir -p #{@dir}`
+        nil
+      end
+
+      private
+      
+      def write(table)
+        filename = "#{table}.json"
+        path = File.join(@dir, filename)
+        Oj.to_file(path, @cache[table], :mode => :strict)
+      end
+
+      def load(path)
+        return nil unless File.exist?(path)
+        tc = Oj.load_file(path, :mode => :strict, symbol_keys: true)
+	name = File.basename(path)[0..-File.extname(path).size - 1]
+	@cache[name] = tc
+      end
+
+      class TableError < Exception
+        def initialize(table)
+          super("No Table found for #{table}")
+        end
+      end # TableError
+
+      class KeyError < Exception
+        def initialize(key)
+          super("No key found for #{key}")
+        end
+      end # KeyError
+
+      class SeqError < Exception
+        def initialize(op, key)
+          super("No sequence number found for #{op} of #{key}")
+        end
+      end # SeqError
+
+      class ExistsError < Exception
+        def initialize(key, seq)
+          super("#{key}:#{seq} already exists")
+        end
+      end # ExistsError
+
+      class NotFoundError < Exception
+        def initialize(key)
+          super("#{key} not found")
+        end
+      end # NotFoundError
+
+    end # Recorder
+  end # Actors
+end # OFlow

data/lib/oflow/actors/timer.rb

@@ -12,10 +12,11 @@ module OFlow
 
       # When to trigger the first event. nil means start now.
       attr_reader :start
-      # The stop time. If nil then there is not stopping unless the repeat limit
-      # kicks in.
+      # The stop time. If nil then there is no stopping unless the repeat
+      # limit kicks in.
       attr_reader :stop
-      # How long to wait between each trigger. nil indicates as fast as possible,
+      # How long to wait between each trigger. nil indicates as fast as
+      # possible,
       attr_reader :period
       # How many time to repeat before stopping. nil mean go forever.
       attr_reader :repeat
@@ -23,11 +24,13 @@ module OFlow
       attr_reader :label
       # The number of time the timer has fired or shipped.
       attr_reader :count
-      # Boolean flag indicating a tracker should be added to the trigger content
-      # if true.
+      # Boolean flag indicating a tracker should be added to the trigger
+      # content if true.
       attr_reader :with_tracker
       # Time of next or pending trigger.
       attr_reader :pending
+      # Flag indicating a trigger should be fired on start as well.
+      attr_reader :on_start
 
       def initialize(task, options={})
         @count = 0
@@ -35,6 +38,7 @@ module OFlow
         @stop = nil
         @period = nil
         @repeat = nil
+	@on_start = false
         set_options(options)
         @pending = @start
         super
@@ -70,6 +74,9 @@ module OFlow
         when :with_tracker
           set_with_tracker(box.nil? ? nil : box.contents)
         end
+	if @on_start
+	  trigger(Time.now())
+	end
         while true
           now = Time.now()
           # If past stop time then it is done. A future change in options can
@@ -87,22 +94,14 @@ module OFlow
             unless Task::STOPPED == task.state
               @count += 1
               now = Time.now()
-              tracker = @with_tracker ? Tracker.create(@label) : nil
-              box = Box.new([@label, @count, now.utc()], tracker)
-              task.links.each_key do |key|
-                begin
-                  task.ship(key, box)
-                rescue BlockedError => e
-                  task.warn("Failed to ship timer #{box.contents} to #{key}. Task blocked.")
-                rescue BusyError => e
-                  task.warn("Failed to ship timer #{box.contents} to #{key}. Task busy.")
-                end
-              end
+	      trigger(now)
             end
             if @period.nil? || @period == 0
               @pending = now
             else
-              @pending += period
+	      diff = now - @pending
+              @pending += @period * diff.to_i/@period.to_i
+	      @pending += @period if @pending <= now
             end
           end
           # If there is a request waiting then return so it can be handled. It
@@ -122,12 +121,27 @@ module OFlow
         end
       end
 
+      def trigger(now)
+        tracker = @with_tracker ? Tracker.create(@label) : nil
+        box = Box.new([@label, @count, now.utc()], tracker)
+        task.links.each_key do |key|
+          begin
+            task.ship(key, box)
+          rescue BlockedError
+            task.warn("Failed to ship timer #{box.contents} to #{key}. Task blocked.")
+          rescue BusyError
+            task.warn("Failed to ship timer #{box.contents} to #{key}. Task busy.")
+          end
+        end
+      end
+
       def set_options(options)
         set_start(options[:start]) # if nil let start get set to now
         set_stop(options[:stop]) if options.has_key?(:stop)
         set_period(options[:period]) if options.has_key?(:period)
         set_repeat(options[:repeat]) if options.has_key?(:repeat)
         set_with_tracker(options[:with_tracker])
+        set_on_start(options[:on_start])
         @label = options[:label].to_s
       end
 
@@ -135,7 +149,7 @@ module OFlow
         if v.is_a?(String)
           begin
             v = DateTime.parse(v).to_time
-            v = v - v.gmtoff
+            v = v - v.localtime.gmtoff
           rescue Exception
             v = Time.now() + v.to_i
           end
@@ -193,6 +207,18 @@ module OFlow
         @label = v
       end
 
+      def set_on_start(v)
+	if v.is_a?(TrueClass)
+          @on_start = true
+	elsif v.is_a?(FalseClass)
+	  @on_start = false
+	elsif v.nil?
+	  # no change
+	else
+          @on_start = ('true' == v.to_s.strip.downcase)
+	end
+      end
+
       def set_with_tracker(v)
         v = false if v.nil?
         unless true == v || false == v
@@ -200,7 +226,7 @@ module OFlow
         end
         @with_tracker = v
       end
-
+      
     end # Timer
   end # Actors
 end # OFlow

data/lib/oflow/graffle.rb

@@ -20,8 +20,12 @@ module OFlow
       @name = File.basename(filename, '.graffle')
 
       nodes = doc.locate('plist/dict')[0].nodes
-      nodes = Graffle.get_key_value(nodes, 'GraphicsList')
-
+      sheets = Graffle.get_key_value(nodes, 'Sheets')
+      if sheets.nil?
+	nodes = Graffle.get_key_value(nodes, 'GraphicsList')
+      else
+	nodes = Graffle.get_key_value(sheets[0].nodes, 'GraphicsList')
+      end
       raise ConfigError.new("Empty flow.") if nodes.nil?
       
       nodes.each do |node|

data/lib/oflow/version.rb

@@ -1,5 +1,5 @@
 
 module OFlow
   # Current version of the module. 
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oflow
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-26 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies: []
 description: Operations Workflow in Ruby. This implements a workflow/process flow
   using multiple task nodes that each have their own queues and execution thread.
@@ -19,7 +18,11 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- LICENSE
+- README.md
+- lib/oflow.rb
 - lib/oflow/actor.rb
+- lib/oflow/actors.rb
 - lib/oflow/actors/balancer.rb
 - lib/oflow/actors/errorhandler.rb
 - lib/oflow/actors/httpserver.rb
@@ -27,12 +30,12 @@ files:
 - lib/oflow/actors/log.rb
 - lib/oflow/actors/merger.rb
 - lib/oflow/actors/persister.rb
+- lib/oflow/actors/recorder.rb
 - lib/oflow/actors/relay.rb
 - lib/oflow/actors/shellone.rb
 - lib/oflow/actors/shellrepeat.rb
 - lib/oflow/actors/timer.rb
 - lib/oflow/actors/trigger.rb
-- lib/oflow/actors.rb
 - lib/oflow/box.rb
 - lib/oflow/env.rb
 - lib/oflow/errors.rb
@@ -45,12 +48,11 @@ files:
 - lib/oflow/pattern.rb
 - lib/oflow/stamp.rb
 - lib/oflow/task.rb
+- lib/oflow/test.rb
 - lib/oflow/test/action.rb
 - lib/oflow/test/actorwrap.rb
-- lib/oflow/test.rb
 - lib/oflow/tracker.rb
 - lib/oflow/version.rb
-- lib/oflow.rb
 - test/actors/bad.rb
 - test/actors/balancer_test.rb
 - test/actors/doubler.rb
@@ -77,33 +79,30 @@ files:
 - test/stutter.rb
 - test/task_test.rb
 - test/tracker_test.rb
-- LICENSE
-- README.md
 homepage: http://www.ohler.com/oflow
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: oflow
-rubygems_version: 1.8.23.2
+rubygems_version: 2.7.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Operations Workflow in Ruby
 test_files: []