apple-data 1.0.651 → 1.0.653

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0c08f469c75dfae827884566fe4ce755af8498b7796c3386fa480a069146ac0
-  data.tar.gz: 4a024ac00342adc29f4a51e9db9e8db1569873e619cefd72801fc712c8b5e91d
+  metadata.gz: 482821ec962f4b074c21d5f0af855bb40a9c184abc02896489e825a882bafb65
+  data.tar.gz: d0f6b9232b2be836b4062ac088e75725437f703b093e7a511f1a9d9cc1c13e6e
 SHA512:
-  metadata.gz: c7b8ff4a5926f27d734326b1c824036038b74480852033d7a44de883456c87ef49e4d4833c4942bfab685e42d9aaff349ee03c46ad8961f88bc3d39d6542fed0
-  data.tar.gz: 06c32e5eb6fa6ac49a7711381bd6269e032f53f3abb82acd83c29f564c797dedb0cab57c71fc0c6a3b4a8019f543f198aa4806b5fb60b18931c6bfb0a28ab619
+  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

@@ -6,15 +6,28 @@ module AppleData
     class DataFileDefinition
       def initialize
         @collections = {}
+        @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)
+        @methods[name] = proc
       end
 
       attr_writer :default_filename
@@ -29,6 +42,10 @@ module AppleData
           collection_definition.build!(klass)
         end
 
+        @methods.each do |name, proc|
+          klass.define_method(name, &proc)
+        end
+
         klass
       end
     end

data/lib/apple_data/schemas/img4.rb

@@ -16,4 +16,9 @@ AppleData::Schemas::IMG4 = AppleData::DataFile.define do
   collection :types do
     attribute :description, :string
   end
+
+  define_method :all do
+    [img4_tags, manifest_properties, objects, lpol_properties, core, types,
+     cryptex_properties].reduce(&:merge).with_indifferent_access
+  end
 end

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.651'
+  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.651
+  version: 1.0.653
 platform: ruby
 authors:
 - Rick Mark