netbox-client-ruby 0.0.1 → 0.0.2

data/lib/netbox_client_ruby/api/ipam/ip_address.rb

@@ -2,41 +2,35 @@ require 'netbox_client_ruby/entity'
 require 'netbox_client_ruby/api/dcim/interface'
 require 'netbox_client_ruby/api/ipam/vrf'
 require 'netbox_client_ruby/api/tenancy/tenant'
+require 'ipaddress'
 
 module NetboxClientRuby
   class IpAddress
     include NetboxClientRuby::Entity
 
+    STATUS_VALUES = {
+      active: 1,
+      reserved: 2,
+      deprecated: 3,
+      dhcp: 5
+    }.freeze
+
     id id: :id
     deletable true
     path 'ipam/ip-addresses/:id.json'
     creation_path 'ipam/ip-addresses/'
     object_fields(
-      vrf: proc { |raw_data| NetboxClientRuby::Vrf.new raw_data['id'] },
-      tenant: proc { |raw_data| NetboxClientRuby::Tenant.new raw_data['id'] },
-      status: proc { |raw_data| NetboxClientRuby::IpAddressStatus.new raw_data['value'] },
-      interface: proc { |raw_data| NetboxClientRuby::Interface.new raw_data['id'] }
+      vrf: proc { |raw_data| Vrf.new raw_data['id'] },
+      tenant: proc { |raw_data| Tenant.new raw_data['id'] },
+      status: proc { |raw_data| STATUS_VALUES.key(raw_data['value']) || raw_data['value'] },
+      interface: proc { |raw_data| Interface.new raw_data['id'] },
+      address: proc { |raw_ip| IPAddress.parse(raw_ip) }
     )
     readonly_fields :display_name
-  end
-
-  class IpAddressStatus
-    attr_reader :value, :label
 
-    def initialize(status_value)
-      @value = status_value
-      @label = case status_value
-               when 1 then
-                 'Active'.freeze
-               when 2 then
-                 'Reserved'.freeze
-               when 3 then
-                 'Deprecated'.freeze
-               when 5 then
-                 'DHCP'.freeze
-               else
-                 'UNDEFINED'.freeze
-               end
+    def status=(value)
+      status_code_lookup = STATUS_VALUES.fetch(value, value)
+      method_missing(:status=, status_code_lookup)
     end
   end
 end

data/lib/netbox_client_ruby/entity.rb

@@ -152,15 +152,19 @@ module NetboxClientRuby
       self
     end
 
-    def update(updated_fields)
-      checked_updated_fields = {}
-      updated_fields.each do |key, values|
-        s_key = key.to_s
-
-        checked_updated_fields[s_key] = values unless readonly_fields.include? s_key
+    def update(new_values)
+      new_values.each do |attribute, values|
+        s_attribute = attribute.to_s
+        next if readonly_fields.include? s_attribute
+
+        sym_attr_writer = "#{attribute}=".to_sym
+        if methods.include?(sym_attr_writer)
+          public_send(sym_attr_writer, values)
+        else
+          dirty_data[s_attribute] = values
+        end
       end
 
-      dirty_data.merge! checked_updated_fields
       patch
     end
 
@@ -193,10 +197,9 @@ module NetboxClientRuby
         end
       end
 
-      return objectify(name, object_fields[name]) if object_fields.keys.include? name
-
-      return dirty_data[name] if dirty_data.keys.include? name
-      return data[name] if data.is_a?(Hash) && data.keys.include?(name)
+      return dirty_data[name] if dirty_data.key? name
+      return objectify(data[name], object_fields[name]) if object_fields.key? name
+      return data[name] if data.is_a?(Hash) && data.key?(name)
 
       super
     end
@@ -207,10 +210,9 @@ module NetboxClientRuby
       return false if name.end_with?('=') && readonly_fields.include?(name[0..-2])
       return false if name.end_with?('=') && instance_variables.include?(name[0..-2])
 
-      return true if object_fields.keys.include? name
-
-      return true if dirty_data.keys.include? name
-      return true if data.is_a?(Hash) && data.keys.include?(name)
+      return true if dirty_data.key? name
+      return true if object_fields.key? name
+      return true if data.is_a?(Hash) && data.key?(name)
 
       super
     end
@@ -290,14 +292,12 @@ module NetboxClientRuby
       end
     end
 
-    def objectify(name, klass_or_proc = nil)
-      raw_data = data[name]
-      
+    def objectify(raw_data, klass_or_proc = nil)
       return nil if raw_data.nil?
 
       return data_to_obj(raw_data, klass_or_proc) unless raw_data.is_a? Array
 
-      data[name].map do |raw_data_entry|
+      raw_data.map do |raw_data_entry|
         data_to_obj(raw_data_entry, klass_or_proc)
       end
     end

data/netbox-client-ruby.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'faraday', '~> 0.12'
   spec.add_runtime_dependency 'faraday_middleware', '~> 0.11.0'
   spec.add_runtime_dependency 'faraday-detailed_logger', '~> 2.1'
+  spec.add_runtime_dependency 'ipaddress', '>= 0.8.3'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netbox-client-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Christian Mäder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: ipaddress
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +188,7 @@ files:
 - docker-compose.yml
 - docker/start.sh
 - docker/start.test.sh
+- dump.sql
 - lib/netbox-client-ruby.rb
 - lib/netbox_client_ruby.rb
 - lib/netbox_client_ruby/api.rb
@@ -248,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A read/write client for Netbox v2.