opt_struct 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55e3b71a809a00e523194d64dafde4a2d6e2e738
-  data.tar.gz: 2cacaade967a5840dfe41d0f7d2358b55b1dc603
+  metadata.gz: 86875cc60a9f0c8baa956deb6b0f262ec19bab4e
+  data.tar.gz: bfa7c755fc3a9f33fcf4f75be7c9a3a4d94d350b
 SHA512:
-  metadata.gz: 62439a89421d58a67470a4c3c614833a160781cd9a58711eeb4e5c4683986433d1eca64433f059f79bd6bfe12608096886eccca13cbea748ce813fb2f02cffa5
-  data.tar.gz: a33b20f55781929e3d955c69826ef0287cdefc388e0f88ef7eb57baaa8f12716704299b32b3dbd0eda22a301b6801b9b0f346b10df39036fd07981eee8244486
+  metadata.gz: 8382e279bf7d34c822df3ce74b6dad5f99f5a39a3300110eac6ad5009ddfbd14ba0ffe83a2ff2e83e7348c2505add8ff5b01cb804ede7c120c9534d07cbb7191
+  data.tar.gz: 30ad8a248b2eb6cae7284f947fe2fe629799f47b34e80985329b6560c358d72f8a7be8a70b5f8e14b686fbf0cf1ff9c9dce3efd51ff94c801a416cef913fc3b5

data/lib/opt_struct.rb

@@ -2,48 +2,51 @@ require "opt_struct/class_methods"
 require "opt_struct/instance_methods"
 
 module OptStruct
-  def self.inject_struct(target_klass, &more_block)
-    target_klass.instance_exec do
-      extend ClassMethods
-      attr_reader :options
-      include InstanceMethods
+  def self._inject_struct(target, source, args = [], defaults = {}, &callback)
+    structs = Array(source.instance_variable_get(:@_opt_structs)).dup
+    if args.any? || defaults.any? || callback
+      structs << [args, defaults, callback]
     end
-    target_klass.instance_exec(&more_block) if block_given?
-    target_klass
+    target.instance_variable_set(:@_opt_structs, structs)
+    if target.is_a?(Class)
+      target.instance_exec do
+        extend ClassMethods
+        attr_reader :options
+        include InstanceMethods
+      end
+      structs.each do |s_args, s_defaults, s_callback|
+        target.class_exec do
+          expect_arguments *s_args if s_args.any?
+          options s_defaults if s_defaults.any?
+        end
+        target.class_exec(&s_callback) if s_callback
+      end
+    else
+      target.instance_exec do
+        def self.included(klass)
+          OptStruct._inject_struct(klass, self)
+          super(klass)
+        end
+      end
+    end
+    target
   end
 
   def self.included(klass)
-    inject_struct(klass)
+    _inject_struct(klass, self)
+    super(klass)
   end
 
   def self.new(*args, **defaults, &callback)
     check_for_invalid_args(args)
     args.map!(&:to_sym)
-    klass = inject_struct(Class.new) do
-      expect_arguments *args
-      options defaults
-    end
-    klass.class_exec(&callback) if callback
-    klass
+    _inject_struct(Class.new, self, args, defaults, &callback)
   end
 
   def self.build(*args, **defaults, &callback)
     check_for_invalid_args(args)
     args.map!(&:to_sym)
-    Module.new do
-      @arguments = args
-      @defaults = defaults
-      @callback = callback
-
-      def self.included(klass)
-        arguments, defaults, callback = @arguments, @defaults, @callback
-        OptStruct.inject_struct(klass) do
-          expect_arguments *arguments
-          options defaults
-        end
-        klass.class_exec(&callback) if callback
-      end
-    end
+    _inject_struct(Module.new, self, args, defaults, &callback)
   end
 
   private

data/opt_struct.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "opt_struct"
-  spec.version       = "0.5.0"
+  spec.version       = "0.6.0"
   spec.authors       = ["Carl Zulauf"]
   spec.email         = ["carl@linkleaf.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_struct
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Carl Zulauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler