apple-data 1.0.652 → 1.0.653

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b572baee5af361bd153f67ea1b46426527743c6f7eb8f1b9afc5fd1bbcae5fe
-  data.tar.gz: 24e8bb10e726e5b3b7ed69ee555e9603f72a44f43a05772c88946c6f1eaa45ac
+  metadata.gz: 482821ec962f4b074c21d5f0af855bb40a9c184abc02896489e825a882bafb65
+  data.tar.gz: d0f6b9232b2be836b4062ac088e75725437f703b093e7a511f1a9d9cc1c13e6e
 SHA512:
-  metadata.gz: aa708ca902865bfb9cab22ceba83b0bfff3e13e659aa6f4d532ad3d7cdf9dbc413263a47255d4bbfb679c09bf5d14464370db04ebda4f33b4b7d9177b3e48bf7
-  data.tar.gz: 80c1481f13ed5bce94eb83780f2e63c341af1dac23ee919e0924de1cddeaaa2fb9dda96e2a85eb109fff727944be36d4dae8e038e844951ea119c468096fcd92
+  metadata.gz: ce1b5bcdfc7b2484efe583a56d171dd2ef7b9c71774e60d51cdc08fae9e8c8cb7f14279f26f195d0a646643e5b0324ad8c6c569f6f1a69bc42c27283105043bb
+  data.tar.gz: f2d9137bbafb0ff882773a591bc98c73bfe4459a4933b3da1c70c0e7b36be78aad5219ec51197e7bfef16322a8c6f35ee9f7ae6f79c57c70a907298d0882567a

data/lib/apple_data/data_file.rb

@@ -159,7 +159,7 @@ module AppleData
         [key, instance]
       end
 
-      result.to_h
+      result.to_h.with_indifferent_access
     end
   end
 end

data/lib/apple_data/dsl/data_file_definition.rb

@@ -9,13 +9,21 @@ module AppleData
         @methods = {}
       end
 
-      def collection(name, mapper = nil, &)
-        @collections[name] = AppleData::DSL::CollectionDefinition.new(name, mapper)
-        if block_given? && @collections[name].mapper.nil?
-          @collections[name].mapper = Class.new(AppleData::SchemaBase)
-          @collections[name].mapper.class_eval(&)
+      def collection(collection_name, mapper = nil, &)
+        data_collection_name = self.class.name
+        @collections[collection_name] = AppleData::DSL::CollectionDefinition.new(collection_name, mapper)
+        if block_given? && @collections[collection_name].mapper.nil?
+          @collections[collection_name].mapper = Class.new(AppleData::SchemaBase)
+          @collections[collection_name].mapper.const_set(:DATA_COLLECTION_NAME, data_collection_name)
+          @collections[collection_name].mapper.const_set(:COLLECTION_NAME, collection_name)
+          @collections[collection_name].mapper.instance_eval do
+            def name
+              "#{self.class.const_get(:DATA_COLLECTION_NAME)}:#{self.class.const_get(:COLLECTION_NAME)}"
+            end
+          end
+          @collections[collection_name].mapper.class_eval(&)
         end
-        @collections[name]
+        @collections[collection_name]
       end
 
       def define_method(name, &proc)

data/lib/apple_data/schemas/pki.rb

@@ -15,6 +15,9 @@ AppleData::Schemas::PKI = AppleData::DataFile.define do
   end
 
   collection :oids do
+    attr_accessor :key
+
+    attribute :name, :string
     attribute :title, :string
     attribute :type, :string
     attribute :description, :string
@@ -22,5 +25,9 @@ AppleData::Schemas::PKI = AppleData::DataFile.define do
     attribute :found_in, :string, collection: true
     attribute :issuers, :string, collection: true
     attribute :ous, :string, collection: true
+
+    define_method :to_s do
+      [name, title, description, key].reject(&:blank?).first
+    end
   end
 end

data/lib/apple_data/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppleData
-  VERSION = '1.0.652'
+  VERSION = '1.0.653'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apple-data
 version: !ruby/object:Gem::Version
-  version: 1.0.652
+  version: 1.0.653
 platform: ruby
 authors:
 - Rick Mark