with_ease 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1acaa86f823eeec13d846b6af27f39e94ec5bffa9d19fa81ce78994680efbfa5
-  data.tar.gz: 2c23c88589ed075d3289e27528e9d8ceb1acda6eeee0a45e6c21cae6a95240ef
+  metadata.gz: 5e01a06e7d3664b42c554856f9f14a424c739e15fa7463cb3afb59b975d71095
+  data.tar.gz: 9375604296c49a99b23e7b504ed0c98cff36a9c0269519294ab5bf815726ac21
 SHA512:
-  metadata.gz: a6cb7b523b7481b4696242a2addd533cd08c158f6652e8e8ab11b2aa6cbeb262abfbde383a14ad51e3dda8013ff45ba431901fdcd075636aaf48d73c10aac6f8
-  data.tar.gz: 2f5c8b59bf12285100c0cabf7a592a55117a8b6c0e0e9d946141d14c76290c24c2770a8bc519210ac4b58cf3bf7c5b45a73292d570aec7e6f79d97a87f46937e
+  metadata.gz: 52a5632e7e4de8255098a3b82dfe158b6bc518b7e3a64ecc69b39d186a7a15bca82b18ba6aea8b4d3afb80ee57e9470e49f4f4f8658a714e8152fcf8f0ba66a8
+  data.tar.gz: c9009ed9fd714345ffac18bf42a97a574ec5753939b4a2f48edc6068efe17d36e61f3b271b4d7140384b0ea4656251d5e1db9577500687618fdcad85d3a8ff9a

data/lib/with_ease/closed_struct.rb

@@ -9,7 +9,7 @@ module WithEase
     extend Forward
     include HashApi
 
-    forward :deconstruct_keys, :fetch, :to_a, :to_h, to: :@data
+    forward :[], :[]=, :deconstruct_keys, :fetch, :to_a, :to_h, to: :@data
     forward :deconstruct, to: :to_a
 
     # def fetch(key, *defaults, &blk)
@@ -28,6 +28,12 @@ module WithEase
     def initialize(**data, &blk)
       @data = data.dup
       @keys = Set.new(data.keys)
+      (class << self; self; end).module_eval do
+        data.each do |k,|
+          define_method k do @data.fetch(k) end
+          define_method "#{k}=" do |val| @data[k] = val end
+        end
+      end
     end
 
   end

data/lib/with_ease/constructor_functions.rb

@@ -6,5 +6,5 @@ require_relative 'open_struct'
 
 def ClosedStruct(**k) = WithEase::ClosedStruct.new(**k)
 def Iterator(init, &blk) = WithEase::Iterator.new(init, &blk)
-def OpenStruct(**k) = WithEase::OpenStruct.new(**k)
+def OpenStruct(**k) = OpenStruct.new(**k)
 # SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/with_ease/open_struct/hash_api.rb

@@ -16,15 +16,18 @@ module WithEase
         end
       end
 
-      def update(hash_like=nil, **keys, &blk)
+      def update(*positionals, **keys, &blk)
         if blk
-          return _update_with_blk(hash_like, **keys, &blk)
+          return _update_with_blk(*positionals, **keys, &blk)
         end
 
-        if hash_like
+        case positionals
+        in []
+          _update(keys)
+        in [hash_like]
           _update(hash_like.to_h.merge(**keys))
         else
-          _update(keys)
+          raise ArgumentError, "must not provide more than one postional argument"
         end
       end
 
@@ -47,10 +50,23 @@ module WithEase
         self
       end
 
-      def _update_with_blk(key, **keys, &blk)
-        raise ArgumentError, "no **keys arguments allowed in block form" unless keys.empty?
-        value = fetch(key)
-        _update(key => blk.(value))
+      def _update_with_blk(*positionals, **keys, &blk)
+        case positionals
+        in []
+          new_hash = to_h.update(**keys, &blk)
+          _update(new_hash)
+        in [key]
+          if keys.has_key?(:default)
+            value = fetch(key, keys.delete(:default))
+            raise ArgumentError, "only :default key is allowed with positional key" unless keys.empty?
+            _update(key => blk.(value))
+          else
+            value = fetch(key)
+            raise ArgumentError, "only :default key is allowed with positional key" unless keys.empty?
+            _update(key => blk.(value))
+          end
+        in [_, _, *]
+        end
       end
     end
   end

data/lib/with_ease/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module WithEase
-    VERSION = "0.0.2"
+    VERSION = "0.0.4"
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: with_ease
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Robert Dober