lib-dhcp 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ffe82d84dae72c2b9d49014d81d49a095c2e259ea294d9259d9f5580981382b
-  data.tar.gz: '058fb612148cce29c0753ac7340a45c0d2a34fd7031c474f9854b49ce2def7ac'
+  metadata.gz: b0d4ea6b825ace1374de09fc3122931fcfbb953b97997a97e9e32a3d990a325d
+  data.tar.gz: 45a0e45100f0af8704ba1c8b60211faae6ef257e1741d385a1e7128277003b4a
 SHA512:
-  metadata.gz: 8a4f90d0b532df2c5de523e94e588082073c5347699504839ed918a4f4824d6bc6ffbcf0c3384e211593b2cf4337f1a7e6fe5ee8302a45a9f32a1c0119f3a365
-  data.tar.gz: 49896f14cf677a0258825d1c68bebb10f2c3b69ba856dfc153d6abe9501f6c898f58e3366e16a6ba757cd4849124ec9581cf208d4a8909b32b442291c25e0c90
+  metadata.gz: 139d298457dda5815cefaa97ab7c79880a6e83d8f5c8c5512ec9daaf5c453be2809d9c2b93374b7bf887ecb51fb8ac4284aa2eaef3ceca19d89cfee6b30f673f
+  data.tar.gz: 1bd83b155964d62d34573d10d5751a0cf5dfb3dc93b1a9e530c8ff0850a2620db6a92a40ce96382fbef20e64ac6496518c2b75394dfa0e744950224d068f6bac

data/lib/lib/dhcp/options/option.rb

@@ -59,8 +59,10 @@ module Lib
       end
 
       def self.from_json(json)
-        json = json.is_a?(Hash) ? json : JSON.parse(json)
-        self.new(json.transform_keys(&:to_sym)[:oid], json.transform_keys(&:to_sym)[:value])
+        json = json.is_a?(Hash) ? JSON.parse(json.to_json, symbolize_names: true) : JSON.parse(json, symbolize_names: true)
+        Lib::DHCP.const_get("Option#{json.transform_keys(&:to_sym)[:oid].to_i}").new(
+          json.transform_keys(&:to_sym)[:value]
+        )
       end
 
       def self.unpack(packet)

data/lib/lib/dhcp/options/type/sub_option.rb

@@ -17,16 +17,21 @@ module Lib
           end
 
           def initialize(*sub_option)
+            sub_option = sub_option.first if sub_option.first.is_a?(Array) && sub_option.first.first.is_a?(Hash)
             oid = self.class.name.split('::').last.sub(/Option/, '').to_i
             sub_options = []
             sub_option.each do |sub|
-              if sub.is_a? Lib::DHCP::SubOption
-                opt =  sub
-              elsif sub.is_a? Array
+              case sub
+              when Array
                 opt = Lib::DHCP::SubOption.new(sub[0], sub[1])
+              when Lib::DHCP::SubOption
+                opt = sub
+              when Hash
+                opt = Lib::DHCP::SubOption.new(sub[:oid], sub[:value])
               else
                 raise ArgumentError, 'Unknown SubOption parameter type'
               end
+
               sub_options << opt
               define_singleton_method("option#{opt.oid.to_i}".to_sym) { opt }
               #define_singleton_method(:option1) {opt}

data/lib/lib/dhcp/packet.rb

@@ -79,11 +79,14 @@ module Lib
         dhcp
       end
 
-      # def self.from_json(json)
-      #   #json = json.is_a?(Hash) ? json : JSON.parse(json)
-      #   super
-      #   #self.options = json['options']
-      # end
+      def self.from_json(json)
+        json = json.is_a?(Hash) ? json : JSON.parse(json, symbolize_names: true)
+        message = super
+        json[:options].each do |option|
+          message.options.add Lib::DHCP::Option.from_json(option.to_json)
+        end
+        message
+      end
 
       def pack
         # TODO Max Message Size support

data/lib/lib/dhcp/version.rb

@@ -1,5 +1,5 @@
 module Lib
   module DHCP
-    VERSION = '0.2.4'
+    VERSION = '0.2.5'
   end
 end

data/lib-dhcp.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'
 
-  spec.add_dependency 'lib-bootp', '~> 0.2.5'
-  spec.add_dependency 'net-address', '~> 0.2.2'
+  spec.add_dependency 'lib-bootp', '~> 0.2.6'
+  spec.add_dependency 'net-address', '~> 0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lib-dhcp
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Piotr Wojcieszonek
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-20 00:00:00.000000000 Z
+date: 2025-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: net-address
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 description: Set of classes to low level handle the BOOTP protocol.
 email:
 - piotr@wojcieszonek.pl