activefacts-api 1.9.0 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21a02e9269652ab77d07c778444ba5c502c94c98
-  data.tar.gz: 6df79ce9c7f637ba80471e3661fc64145b2d3686
+  metadata.gz: d49215e86ffa0e5ff4c3c4245834dbe57bca2b69
+  data.tar.gz: ffe190be92cd81ceef91f4204ef27d5f7fd0f414
 SHA512:
-  metadata.gz: 7039e5fe1a242951fc967ee84e098b1eae9bea18bd2cfdf16d9f914ded12977cf1f72f0bbb75f1a31d4a51aeb268e92e1e9ba2b8e61dae77919605206aaa9724
-  data.tar.gz: 22f0cf6fa9189e7908fbd81b4a433e8206bee09abfe25f6dd9dc58d669a49daf88ca4a257eb3a31897a98e5182802d75964d587b55c84c4172edb686b6449b36
+  metadata.gz: 9be5b953f3e71c05c1f7211ce09fb0c5e21f69b3c519ea58aeaa76323b29ddd82bbb5e3269328b55f41f1d1c75dfd74738a93e01ec4b21b55f1fe00303d992d0
+  data.tar.gz: 769cc83b2198f25f2867a8104e8feaa4fa1b88e51df38a4766c5ba6fd802e1826d4fad47da3cfefec05cddd679417f4e51b885fc728a114d3be9f43d9b8a0241

data/activefacts-api.gemspec

@@ -31,15 +31,11 @@ over the fact population.
   ]
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
-  spec.add_runtime_dependency(%q<rbtree-pure>, [">= 0.1.1", "~> 0"])
+  spec.add_runtime_dependency 'rbtree-pure', [">= 0.1.1", "~> 0"]
+  spec.add_runtime_dependency 'tracing', ["~> 2"]
 
   spec.add_development_dependency "bundler", ">= 1.10", "~> 1.10.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
-
-  spec.add_runtime_dependency(%q<ruby-debug>, ["~> 0"]) if RUBY_VERSION < "1.9"
-  spec.add_runtime_dependency(%q<debugger>, ["~> 1"]) if RUBY_VERSION =~ /^1\.9/ or RUBY_VERSION =~ /^2\.0/
-  spec.add_runtime_dependency(%q<byebug>, ["~> 1"]) if RUBY_VERSION =~ /^2\.1/
-  # spec.add_development_dependency(%q<pry>, ["~> 0"]) # rbx, jruby
 end
 

data/lib/activefacts/api.rb

@@ -43,4 +43,4 @@ require 'activefacts/api/value'                 # A Value is an Instance of a va
 require 'activefacts/api/entity'                # An Entity class is an Instance not of a value class
 require 'activefacts/api/standard_types'        # Value classes are augmented so their subclasses may become Value Types
 require 'activefacts/api/exceptions'            # Relevant exceptions
-require 'activefacts/tracer'
+require 'tracing'

data/lib/activefacts/api/constellation.rb

@@ -246,10 +246,17 @@ module ActiveFacts
 	  object_type.all_role_transitive.inject({}) do |hash, (role_name, role)|
 	    next hash if !role.unique
 	    next hash if role.fact_type.class == ActiveFacts::API::TypeInheritanceFactType
-	    if role.counterpart && role.counterpart.unique && !attrs.include?(role.name) && instance.send(role.getter) != nil
-	      raise "#{object_type.basename} cannot be forked unless a replacement value for #{role.name} is provided"
+	    old_value = instance.send(role.getter)
+	    if role.counterpart && role.counterpart.unique && old_value != nil
+	      # It's a one-to-one which is populated. We must not change the counterpart
+	      if role.mandatory && !attrs.include?(role.name)
+		# and cannot just nullify the value
+		raise "#{object_type.basename} cannot be forked unless a replacement value for #{role.name} is provided"
+	      end
+	      value = attrs[role_name]
+	    else
+	      value = attrs[role_name] || instance.send(role.getter)
 	    end
-	    value = attrs[role_name] || instance.send(role.getter)
 	    hash[role_name] = value if value != nil
 	    hash
 	  end

data/lib/activefacts/api/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module API
-    VERSION = "1.9.0"
+    VERSION = "1.9.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-api
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.2
 platform: ruby
 authors:
 - Clifford Heath
@@ -30,6 +30,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tracing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -78,20 +92,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 description: |2
 
   The ActiveFacts API is a Ruby DSL for managing constellations of elementary facts.
@@ -135,7 +135,6 @@ files:
 - lib/activefacts/api/value.rb
 - lib/activefacts/api/version.rb
 - lib/activefacts/api/vocabulary.rb
-- lib/activefacts/tracer.rb
 homepage: https://github.com/cjheath/activefacts-api
 licenses:
 - MIT

data/lib/activefacts/tracer.rb

@@ -1,281 +0,0 @@
-#
-# ActiveFacts Tracer.
-#
-# The trace() method supports indented tracing.
-#
-# Trace keys:
-# The first argument is normally a symbol which is the key for related trace calls.
-# Set the TRACE environment variable to enable it, or add trace.enable(:key) to a CLI.
-# A call to trace without a first symbol argument is always enabled (as if by :all)
-#
-# Message arguments:
-# Each subsequent argument is either
-#  - a String (or anything that can be join()ed), or
-#  - a Proc (or anything that can be called) that returns such a string.
-# Proc arguments will be called only if the trace key is enabled.
-# If the key is enabled (or not present) the Trace strings will be joined and emitted.
-#
-# Trace blocks:
-# A block passed to the trace method will always be called, and trace will always return its value.
-# Any trace emitted from within such a block will be indented if the current trace key is enabled.
-#
-# Special trace key options for nesting blocks:
-# - A trace key ending in _ is enabled if the base key is enabled, but enables all
-#   nested trace calls whether or not their key is enabled.
-# - A trace key ending in ? is enabled if the base key is enabled, but is emitted
-#   only if (and just before) the nested block emits a trace message
-# 
-# Testing whether a trace key is enabled:
-# A call to trace with a key but without a block will return true if the key is enabled
-#
-# A call to trace with no arguments returns the Tracer object itself.
-#
-# Built-in trace keys and behaviour:
-#   help - list (at exit) all trace keys that became available during the run
-#   all - enable all trace keys
-#   keys - display the trace key for every trace message (automatically enabled by :all)
-#   debug - prepare a Ruby debugger at the start of the run, so it has the full context available
-#   firstaid - enter the debugger inside the Exception constructor so you can inspect the local context
-#   trap - trap SIGINT (^C) in a block that allows inspecting or continuing execution (not all debuggers support this)
-#   flame - use ruby-prof-flamegraph to display the performance profile as a flame graph using SVG
-#
-# The debugger is chosen from ENV['DEBUG_PREFERENCE'] or the first to load of: byebug, pry. debugger, ruby-trace
-#
-# Copyright (c) 2009-2015 Clifford Heath. Read the LICENSE file.
-#
-module ActiveFacts
-  (class << self; self; end).class_eval do
-    attr_accessor :tracer
-  end
-
-  class Tracer
-    def initialize
-      reinitialize
-    end
-
-    def reinitialize
-      @indent = 0	# Current nesting level of enabled trace blocks
-      @nested = false   # Set when a block enables all enclosed tracing
-      @available = {}	# Hash of available trace keys, accumulated during the run
-      @delayed = nil	# A delayed message, emitted only if the enclosed block emits tracing
-
-      @keys = {}
-      if (e = ENV["TRACE"])
-	e.split(/[^_a-zA-Z0-9]/).each{|k| enable(k) }
-      end
-    end
-
-    def trace(*args, &block)
-      begin
-	old_indent, old_nested, old_delayed, enabled = @indent, @nested, @delayed, show(*args)
-	# This monstrosity reduces the steps when single-stepping:
-	block ? yield : (args.size == 0 ? self : enabled)
-      ensure
-	@indent, @nested, @delayed = old_indent, old_nested, old_delayed
-      end
-    end
-
-    def available_keys
-      @available.keys
-    end
-
-    def enabled? key
-      !key.empty? && @keys[key.to_sym]
-    end
-
-    def enabled
-      @keys.keys
-    end
-
-    def enable key
-      if !key.empty? && !@keys[s = key.to_sym]
-	@keys[s] = true
-	setup_help if s == :help
-	setup_flame if s == :flame
-      else
-	true
-      end
-    end
-
-    def disable key
-      !key.empty? and @keys.delete(key.to_sym)
-    end
-
-    def toggle key
-      if !key.empty?
-	if enabled?(key)
-	  disable(key)
-	  false
-	else
-	  enable(key)
-	  true
-	end
-      end
-    end
-
-    def setup_help
-      at_exit {
-	$stderr.puts "---\nTracing keys available: #{@available.keys.map{|s| s.to_s}.sort*", "}"
-      }
-    end
-
-    def setup_flame
-      require 'ruby-prof'
-      require 'ruby-prof-flamegraph'
-      profile_result = RubyProf.start
-      at_exit {
-	profile_result2 = RubyProf.stop
-	printer = RubyProf::FlameGraphPrinter.new(profile_result2)
-	data_file = "/tmp/flamedata_#{Process.pid}.txt"
-	svg_file = "/tmp/flamedata_#{Process.pid}.svg"
-	flamegraph = File.dirname(__FILE__)+"/flamegraph.pl"
-	File.popen("tee #{data_file} | perl #{flamegraph} --countname=ms --width=4800 > #{svg_file}", "w") { |f|
-	  printer.print(f, {})
-	}
-	STDERR.puts("Flame graph dumped to file:///#{svg_file}")
-      }
-    end
-
-    def setup_debugger
-      begin
-	require 'ruby-trace '
-	Debugger.start # (:post_mortem => true)  # Some Ruby versions crash on post-mortem debugging
-      rescue LoadError
-	# Ok, no debugger, tough luck.
-      end
-
-      if trace :trap
-	trap('SIGINT') do
-	  puts "Stopped at:\n\t"+caller*"\n\t"
-	  debugger
-	  true	# Stopped on SIGINT
-	end
-      end
-
-      errors = []
-      (
-	[ENV["DEBUG_PREFERENCE"]].compact +
-	[
-	  'byebug',
-	  'pry',
-	  'debugger',
-	  'ruby-trace '
-	]
-      ).each do |debugger|
-	begin
-	  require debugger
-	  if debugger == 'byebug'
-	    Kernel.class_eval do
-	      alias_method :debugger, :byebug
-	    end
-	  end
-	  ::Debugger.start if (const_get(::Debugger) rescue nil)
-	  return
-	rescue LoadError => e
-	  errors << e
-	end
-      end
-
-      # Report when we couldn't load any debugger
-      $stderr.p errors
-    end
-
-    def setup_firstaid
-      if trace :firstaid
-	puts "Preparing first aid kit"
-	::Exception.class_eval do
-	  alias_method :firstaid_initialize, :initialize
-
-	  def initialize *args, &b
-	    send(:firstaid_initialize, *args, &b)
-	    return if NoMethodError === self && message =~ /^undefined method `to_ary' for \#<Gem::Specification/
-	    return if LoadError == self
-	    puts "Stopped due to #{self.class}: #{message} at "+caller*"\n\t"
-	    debugger
-	    true # Stopped in Exception constructor
-	  end
-	end
-      end
-    end
-
-    def display key, msg
-      puts msg
-    end
-
-  private
-    def show(*args)
-      key, enabled_prefix = *selected?(args)
-
-      # Emit the message if enabled or a parent is:
-      if enabled_prefix && args.size > 0
-	message =
-	  "\##{enabled_prefix} " +
-	  '  '*@indent +
-	  args.
-	    map{|a| a.respond_to?(:call) ? a.call : a}.
-	    join(' ')
-
-	if @delayed == true
-	  @delayed = message	# Arrange to display this message later, if necessary
-	elsif @delayed
-	  display key, @delayed		# Display a delayed message, then the current one
-	  @delayed = nil
-	  display key, message
-	else
-	  display key, message
-	end
-      end
-      @indent += (enabled_prefix ? 1 : 0)
-      !!enabled_prefix
-    end
-
-    def selected?(args)
-      # Figure out whether this trace is enabled (itself or by :all), if it nests, and if we should print the key:
-      key =
-	if Symbol === args[0]
-	  control = args.shift
-	  case s = control.to_s
-	  when /_\Z/		# Enable all nested trace calls
-	    nested = true
-	    s.sub(/_\Z/, '').to_sym
-	  when /\?\Z/		# Delay this message until a nested active trace
-	    @delayed = true
-	    s.sub(/\?\Z/, '').to_sym
-	  else
-	    control
-	  end
-	else
-	  :all
-	end
-
-      @available[key] ||= key		# Remember that this trace was requested, for help
-      if @nested ||			# This trace is enabled because it's in a nested block
-	  @keys[key] ||			# This trace is enabled in its own right
-	  @keys[:all]			# This trace is enabled because all are
-	if @keys[:keys] || @keys[:all]	# Use a formatting prefix?
-	  enabled_prefix = " %-15s"%key
-	  @keys[key] = enabled_prefix if @keys[key] == true # Save the formatting prefix
-	else
-	  enabled_prefix = ''
-	end
-	@nested ||= nested		# Activate nesting, if requested
-      end
-
-      [key, enabled_prefix]
-    end
-
-  end
-end
-
-# Make the trace method globally available:
-class Object
-  def trace *args, &block
-    (ActiveFacts.tracer ||= ActiveFacts::Tracer.new).trace(*args, &block)
-  end
-end
-
-# Load the ruby debugger before everything else, if requested
-if trace(:debug) or trace(:firstaid) or trace(:trap)
-  trace.setup_debugger
-  trace.setup_firstaid
-end