behave_fun 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7a9e0845eb973be63f59ba48dcceaf4e7a98ba28b4c29c1b11db4e5c98cc505
-  data.tar.gz: f4eda02740d8e094cc7191651053e8ba34c289d01381f4cd3c9493679d574e62
+  metadata.gz: 14c08236690427c5751a132759634fb0691b48904592ad070164d2daa9ac9953
+  data.tar.gz: d561e6014713e8bcf4a3f0cbe12eb7b7d7d570a83d30bcaff9ec13808eb03ce2
 SHA512:
-  metadata.gz: 23c14f5aee8434fc001ff9579e64454247ca46b4ae9cf84260bb47575b81a16e662611ba7a57d86ac75769d2d87f0bcee605c9f2ebd8137cf76855dcc8faf7ad
-  data.tar.gz: 8335771314c4fbb5e09c0cef08d77da21a114cbd5d0f1cb6707966ca530ffb2ac80c2517aff056fd4ad6c8e490347f6e672121ae7999398d804c3d7c87c6b376
+  metadata.gz: ed33a719eb2d8f3a92d2cdeb8582ac468ddd63fbad8c434b8844f8c85562f6d8edab26571d15a005a711aca9c92fae7a781620f5b76b8197c69b03251d7d4c8b
+  data.tar.gz: a94237105c6f2c0a29b8a733a8e3e5e0be9088e2f658c96c5be89586984b71dfc3d17272e5ac36c511142526ccb19b65732a6ac2ff25fc11685906139dc221e0

data/Gemfile.lock

@@ -1,22 +1,45 @@
 PATH
   remote: .
   specs:
-    behave_fun (0.2.0)
-      activesupport (~> 6.0.0)
-      zeitwerk (~> 2.3.0)
+    behave_fun (0.3.1)
+      activesupport (~> 6.0)
+      dry-types (~> 1.4)
+      zeitwerk (~> 2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    i18n (1.8.2)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
+    dry-configurable (0.11.6)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.4, >= 0.4.7)
+      dry-equalizer (~> 0.2)
+    dry-container (0.7.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.4.9)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.3.0)
+    dry-inflector (0.2.0)
+    dry-logic (1.0.7)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.2)
+      dry-equalizer (~> 0.2)
+    dry-types (1.4.0)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.4, >= 0.4.4)
+      dry-equalizer (~> 0.3)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.0, >= 1.0.2)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     minitest (5.14.1)
     rake (12.3.3)
@@ -36,7 +59,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

data/behave_fun.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'zeitwerk', '~> 2.3.0'
-  spec.add_dependency 'activesupport', '~> 6.0.0'
+  spec.add_dependency 'zeitwerk', '~> 2.3'
+  spec.add_dependency 'activesupport', '~> 6.0'
+  spec.add_dependency 'dry-types', '~> 1.4'
 end

data/lib/behave_fun/decorators/repeat.rb

@@ -13,6 +13,7 @@ module BehaveFun
       @counter += 1
       if @counter < params[:times]
         @children[0].reset
+        execute
       else
         success
       end
@@ -25,5 +26,13 @@ module BehaveFun
     def serializable_status_fields
       [:counter]
     end
+
+    def params=(params)
+      @params = ParamsSchema[params]
+    end
+
+    ParamsSchema = Types::Hash.schema(
+      times: Types::Coercible::Integer.optional.default(nil)
+    )
   end
 end

data/lib/behave_fun/decorators/until_fail.rb

@@ -1,5 +1,10 @@
 module BehaveFun
   class Decorators::UntilFail < Decorator
+    def child_success
+      reset
+      execute
+    end
+
     def child_fail
       success
     end

data/lib/behave_fun/decorators/until_success.rb

@@ -3,5 +3,10 @@ module BehaveFun
     def child_success
       success
     end
+
+    def child_fail
+      reset
+      execute
+    end
   end
 end

data/lib/behave_fun/leaf_tasks/wait.rb

@@ -19,5 +19,13 @@ module BehaveFun
     def serializable_status_fields
       [:counter]
     end
+
+    def params=(params)
+      @params = ParamsSchema[params]
+    end
+
+    ParamsSchema = Types::Hash.schema(
+      duration: Types::Coercible::Integer
+    )
   end
 end

data/lib/behave_fun/task.rb

@@ -2,11 +2,11 @@ module BehaveFun
   class Task
     include TaskSerializer
 
-    attr_accessor :control, :guard
-    attr_reader :context, :children, :params, :status
+    attr_accessor :control, :guard, :params
+    attr_reader :context, :children, :status
 
     def initialize(params = {})
-      @params = params
+      self.params = params
       @children = []
       @status = :fresh
     end

data/lib/behave_fun/task_builder_factory.rb

@@ -51,6 +51,7 @@ module BehaveFun
     end
 
     def build_task_from_hash(hash)
+      hash = hash.deep_symbolize_keys
       tree = build_tree do
         build_from_hash(hash)
       end
@@ -58,6 +59,7 @@ module BehaveFun
     end
 
     def build_tree_from_hash(hash)
+      hash = hash.deep_symbolize_keys
       build_tree do
         build_from_hash(hash[:root])
       end

data/lib/behave_fun/tree.rb

@@ -56,5 +56,11 @@ module BehaveFun
     def restore_status(data)
       root.restore_status(data)
     end
+
+    def dup
+      cloned = self.class.new(params)
+      cloned.root = root.dup
+      cloned
+    end
   end
 end

data/lib/behave_fun/types.rb

@@ -0,0 +1,7 @@
+require 'dry-types'
+
+module BehaveFun
+  module Types
+    include Dry.Types()
+  end
+end

data/lib/behave_fun/version.rb

@@ -1,3 +1,3 @@
 module BehaveFun
-  VERSION = '0.2.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: behave_fun
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ayaya zhao
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-23 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: dry-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: A behavior tree library for ruby.
 email:
 - ayaya.zhao@gmail.com
@@ -77,6 +91,7 @@ files:
 - lib/behave_fun/task_builder_factory.rb
 - lib/behave_fun/task_serializer.rb
 - lib/behave_fun/tree.rb
+- lib/behave_fun/types.rb
 - lib/behave_fun/version.rb
 homepage: https://github.com/ayamomiji/behave_fun
 licenses:
@@ -85,7 +100,7 @@ metadata:
   homepage_uri: https://github.com/ayamomiji/behave_fun
   source_code_uri: https://github.com/ayamomiji/behave_fun
   changelog_uri: https://github.com/ayamomiji/behave_fun
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A behavior tree library for ruby.
 test_files: []