ruby-dagger 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4815548df0f3403101f979e8ac7be3af0cca871d6d800cd01186c958d2c112f
-  data.tar.gz: aeb7536387b287e3e7ea9be20c982d90efb022dc5d7487c435a814a8ed3f124f
+  metadata.gz: 0e0b2aac30db4d1b00f0c2142f9f67f3cbc7bf2c48c21c6769f488428e605f1e
+  data.tar.gz: 6a03b80f550cc179fff40d582ba960011f57dda457fc728e130678e0697a00eb
 SHA512:
-  metadata.gz: 59d586af2dd28e3a94412b7d160e95eb4de34bbac6864f58231fe82560b5201bbc73b38c57c4596685316f5b1ae66645edddb7a78e8cfea8323d88d3ea9ce047
-  data.tar.gz: c8c5e006cd4002ea99edd40e81767418333ec0681c9aea39510e41f8cc06a4a070e30d21ffb54e23d069f991fc7c1bcd3d9c493d17de4e45a25a876596e2d61b
+  metadata.gz: 363469d20a35b20b81087b5c197f99a9175e02a2ea6b4ebae9d4f2fc3ce348710cd1f1e15bc5ff4c07579d5f6b3e8e5aa98ea5a2a8c7c38c2924decb8af55314
+  data.tar.gz: 7745518212caef8a211a8d2750f177a1cfd092a4bf5161fa75826180ae478da90816e5c0afc748f2ad6a5294887e557a966551784e9cf393a1abeebae5f968ec

data/CHANGELOG.md

@@ -0,0 +1,37 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.3.0] - 2019-07-05
+
+### Added
+- Numeric default values
+  - integer: for rounded integer values
+  - float: for floating point values
+  - both types also support summarizing functions
+  	- sum: arithmetic sum of the values
+  	- product: arithmetic product of the values
+  	- arithmetic_mean: the [arithmetic mean] of the values
+  	- geometric_mean: the [geometric mean] of the values
+  	- harmonic_mean: the [harmonic mean] of the values
+
+[arithmethic mean]: https://en.wikipedia.org/wiki/Mean#Arithmetic_mean_(AM)
+[geometric mean]: https://en.wikipedia.org/wiki/Mean#Geometric_mean_(GM)
+[harmonic mean]: https://en.wikipedia.org/wiki/Mean#Harmonic_mean_(HM)
+
+### Changed
+- Default value arguments used to be wrapped in arrays based on responding
+  to `#enum`, but are now based on `#to_ary`, to ensure that hashes are also
+  wrapped.
+
+## [Older]
+These releases have no change logs.
+
+
+[Unreleased]: https://github.com/notCalle/ruby-dagger/compare/v0.3.0..HEAD
+[0.3.0]: https://github.com/notCalle/ruby-dagger/compare/v0.2.1..v0.3.0
+[Older]: https://github.com/notCalle/ruby-dagger/releases/tag/v0.2.1

data/lib/dagger/generate/float.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative '../numeric_generator'
+
+module Dagger
+  module Generate
+    # Generate a floating point value from a format string
+    #
+    # _default.key:
+    #   - float: "#{key}"
+    #   - float:
+    #     - "#{key}"
+    #     - ...
+    class Float < NumericGenerator
+      private
+
+      def from_s(string)
+        string.to_f
+      end
+    end
+  end
+end

data/lib/dagger/generate/integer.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative '../numeric_generator'
+
+module Dagger
+  module Generate
+    # Generate an integer value from a format string
+    #
+    # _default.key:
+    #   - integer: "#{key}"
+    #   - integer:
+    #     - "#{key}"
+    #     - ...
+    #   - integer:
+    #       accumulate:
+    class Integer < NumericGenerator
+      private
+
+      def from_s(string)
+        string.to_f.round
+      end
+    end
+  end
+end

data/lib/dagger/{generator → generate}/regexp.rb

@@ -35,7 +35,7 @@ module Dagger
       def match_regexps(key, regexps)
         string = dictionary[key]
 
-        enumerable(regexps).each_with_object({}) do |regexp, matches|
+        array(regexps).each_with_object({}) do |regexp, matches|
           matchdata = ::Regexp.new(regexp).match(string)
           next if matchdata.nil?
 

data/lib/dagger/{generator → generate}/require.rb

@@ -14,7 +14,7 @@ module Dagger
       def process(keys)
         stop unless keys.any? do |key, regexps|
           string = dictionary[key]
-          enumerable(regexps).any? do |regexp|
+          array(regexps).any? do |regexp|
             ::Regexp.new(regexp).match?(string)
           end
         end

data/lib/dagger/{generator → generate}/require_name.rb

@@ -11,7 +11,7 @@ module Dagger
     #   - ...
     class RequireName < Dagger::Generator
       def process(regexps)
-        stop unless enumerable(regexps).any? do |regexp|
+        stop unless array(regexps).any? do |regexp|
           ::Regexp.new(regexp).match?(vertex.name)
         end
       end

data/lib/dagger/{generator → generate}/string.rb

@@ -13,7 +13,7 @@ module Dagger
     #       - ...
     class String < Dagger::Generator
       def process(strings)
-        enumerable(strings).each do |fmtstr|
+        array(strings).each do |fmtstr|
           result = format_string(fmtstr)
           yield result unless result.nil?
         end

data/lib/dagger/generator.rb

@@ -60,12 +60,12 @@ module Dagger
       kwargs.each { |key, value| @context[key] = value }
     end
 
-    # Make an array of a value unless it is already enumerable
+    # Make an array of a value unless it is already an array
     #
     # :call-seq:
-    #   enumerable(value) => value || [value]
-    def enumerable(value)
-      value.respond_to?(:each) ? value : [value]
+    #   array(value) => value || [value]
+    def array(value)
+      value.respond_to?(:to_ary) ? value : [value]
     end
 
     # Format a +string+ with values from a +dictionary+
@@ -85,4 +85,4 @@ module Dagger
   end
 end
 
-Dir[__dir__ + '/generator/*.rb'].each { |file| load(file) }
+Dir[__dir__ + '/generate/*.rb'].each { |file| load(file) }

data/lib/dagger/numeric_generator.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require_relative 'generator'
+
+module Dagger
+  module Generate
+    # Abstract base for generating numeric values
+    class NumericGenerator < Dagger::Generator
+      def process(args)
+        array(args).each do |arg|
+          result = process_recurse(arg)
+          yield result unless result.nil?
+        end
+      end
+
+      private
+
+      def process_recurse(arg)
+        case arg
+        when Hash
+          process_hash(arg)
+        when ::String
+          str = format_string(arg)
+          from_s(str) unless str.nil?
+        else
+          from_s(arg)
+        end
+      end
+
+      def process_hash(hash)
+        print(hash)
+        hash.each do |key, args|
+          result = process_hash_item(key, args)
+          return result unless result.nil?
+        end
+      end
+
+      def process_hash_item(key, args)
+        case args
+        when ::String
+          send("numeric_#{key}", dictionary[args])
+        else
+          send("numeric_#{key}", process_args(args))
+        end
+      end
+
+      def process_args(args)
+        args = array(args).flat_map { |arg| process_recurse(arg) }
+        args.delete(nil)
+        args
+      end
+
+      def numeric_values(args)
+        args.map { |value| from_s(value) }
+      end
+
+      def numeric_sum(args)
+        args.sum
+      end
+
+      def numeric_product(args)
+        args.reduce(:*)
+      end
+
+      def numeric_arithmetic_mean(args)
+        return if args.empty?
+
+        numeric_sum(args) / args.length
+      end
+
+      def numeric_geometric_mean(args)
+        return if args.empty?
+
+        numeric_product(args)**(1.0 / args.length)
+      end
+
+      def numeric_harmonic_mean(args)
+        return if args.empty?
+
+        args.length / args.map { |n| 1.0 / n }.sum
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dagger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Calle Englund
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2019-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: key_tree
@@ -175,6 +175,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -186,12 +187,15 @@ files:
 - lib/dagger.rb
 - lib/dagger/context.rb
 - lib/dagger/default.rb
+- lib/dagger/generate/float.rb
+- lib/dagger/generate/integer.rb
+- lib/dagger/generate/regexp.rb
+- lib/dagger/generate/require.rb
+- lib/dagger/generate/require_name.rb
+- lib/dagger/generate/string.rb
 - lib/dagger/generator.rb
-- lib/dagger/generator/regexp.rb
-- lib/dagger/generator/require.rb
-- lib/dagger/generator/require_name.rb
-- lib/dagger/generator/string.rb
 - lib/dagger/graph.rb
+- lib/dagger/numeric_generator.rb
 - lib/dagger/version.rb
 - lib/dagger/vertex.rb
 - ruby-dagger.gemspec