opt_struct 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86875cc60a9f0c8baa956deb6b0f262ec19bab4e
-  data.tar.gz: bfa7c755fc3a9f33fcf4f75be7c9a3a4d94d350b
+  metadata.gz: 97cdaee22a1c74440c23a4107a054b31be14e14c
+  data.tar.gz: 103a25d331444af311700ee23efa51fcc3526c82
 SHA512:
-  metadata.gz: 8382e279bf7d34c822df3ce74b6dad5f99f5a39a3300110eac6ad5009ddfbd14ba0ffe83a2ff2e83e7348c2505add8ff5b01cb804ede7c120c9534d07cbb7191
-  data.tar.gz: 30ad8a248b2eb6cae7284f947fe2fe629799f47b34e80985329b6560c358d72f8a7be8a70b5f8e14b686fbf0cf1ff9c9dce3efd51ff94c801a416cef913fc3b5
+  metadata.gz: 6a62a3d36c523e61e0c470ce3e9549d7a9991b2f621906f3c932d215fb4c8227fc1ad55a38b7f24839dc943f0dc3cd0d30e58c2a49e3f87d26acd58fbefa5a63
+  data.tar.gz: 6e52a658e7250f1f1ff142c1b9ab83eedf8460d7bacfc2ff9d8dad9272421b78a1aab572a6d51b311abacfe85f638a1970452d3f7695d0d3b5846f8cf5639f29

data/lib/opt_struct.rb

@@ -1,7 +1,9 @@
 require "opt_struct/class_methods"
+require "opt_struct/module_methods"
 require "opt_struct/instance_methods"
 
 module OptStruct
+
   def self._inject_struct(target, source, args = [], defaults = {}, &callback)
     structs = Array(source.instance_variable_get(:@_opt_structs)).dup
     if args.any? || defaults.any? || callback
@@ -15,19 +17,12 @@ module OptStruct
         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
+        target.expect_arguments *s_args if s_args.any?
+        target.options s_defaults       if s_defaults.any?
+        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
+      target.singleton_class.prepend ModuleMethods
     end
     target
   end
@@ -37,21 +32,16 @@ module OptStruct
     super(klass)
   end
 
-  def self.new(*args, **defaults, &callback)
-    check_for_invalid_args(args)
-    args.map!(&:to_sym)
-    _inject_struct(Class.new, self, args, defaults, &callback)
+  def self.prepended(klass)
+    _inject_struct(klass, self)
+    super(klass)
   end
 
-  def self.build(*args, **defaults, &callback)
-    check_for_invalid_args(args)
-    args.map!(&:to_sym)
-    _inject_struct(Module.new, self, args, defaults, &callback)
+  def self.new(*args, **defaults, &callback)
+    _inject_struct(Class.new, self, args.map(&:to_sym), defaults, &callback)
   end
 
-  private
-
-  def self.check_for_invalid_args(args)
-
+  def self.build(*args, **defaults, &callback)
+    _inject_struct(Module.new, self, args.map(&:to_sym), defaults, &callback)
   end
 end

data/lib/opt_struct/class_methods.rb

@@ -16,12 +16,16 @@ module OptStruct
     end
 
     def option_reader(*keys)
+      check_reserved_words(keys)
+
       keys.each do |key|
         define_method(key) { options[key] }
       end
     end
 
     def option_writer(*keys)
+      check_reserved_words(keys)
+
       keys.each do |key|
         define_method("#{key}=") { |value| options[key] = value }
       end
@@ -52,6 +56,8 @@ module OptStruct
     end
 
     def expect_arguments(*arguments)
+      check_reserved_words(arguments)
+
       existing = expected_arguments.count
       expected_arguments.concat(arguments)
 
@@ -66,5 +72,17 @@ module OptStruct
     def expected_arguments
       @expected_arguments ||= []
     end
+
+    private
+
+    RESERVED_WORDS = %i(class options fetch check_required_args check_required_keys)
+
+    def check_reserved_words(words)
+      Array(words).each do |word|
+        if RESERVED_WORDS.member?(word)
+          raise ArgumentError, "Use of reserved word is not permitted: #{word.inspect}"
+        end
+      end
+    end
   end
 end

data/lib/opt_struct/module_methods.rb

@@ -0,0 +1,30 @@
+module OptStruct
+  module ModuleMethods
+
+    def included(klass)
+      OptStruct._inject_struct(klass, self)
+      super(klass)
+    end
+
+    def prepended(klass)
+      OptStruct._inject_struct(klass, self)
+      super(klass)
+    end
+
+    # These methods are meant to duplicate the macro methods in ClassMethods
+    # When they are called in a module the action is deferred by adding a block to the struct chain
+    %i(
+      required
+      option_reader
+      option_writer
+      option_accessor
+      option
+      options
+      expect_arguments
+    ).each do |class_method|
+      define_method(class_method) do |*args|
+        @_opt_structs << [[], {}, -> { send(class_method, *args) }]
+      end
+    end
+  end
+end

data/opt_struct.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "opt_struct"
-  spec.version       = "0.6.0"
+  spec.version       = "0.7.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.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Carl Zulauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-10 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,6 +63,7 @@ files:
 - lib/opt_struct.rb
 - lib/opt_struct/class_methods.rb
 - lib/opt_struct/instance_methods.rb
+- lib/opt_struct/module_methods.rb
 - opt_struct.gemspec
 homepage: https://github.com/carlzulauf/opt_struct
 licenses: