instructor 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cd00ebac302eeb7cfa5c285a0b52b0743b71c4f2f68f26ec3f6e4a002afd5d3
-  data.tar.gz: 25287b9950c2cdc587c14fb470c9aee52541e250e194798c262e1c974cbe9331
+  metadata.gz: 992b8c2f314c7e4554d7bde50f250944b6c1d19e1d8131d2c3094713829656d5
+  data.tar.gz: a56ca45c13c3e97ecaf33dcb0308ee387b4841755f53547156053ec1a23584fd
 SHA512:
-  metadata.gz: b5866652fa837154d5fa1584ec92428f31b5b0a743bc31345a9222bfbd37cc172737ddd88e112e81d6b0787723ab0f635b98626d9c582d8742094005c73f58a8
-  data.tar.gz: 2f97342b9f42834d222266de864a7cf0af00537fa5c79eb75cda9e3b140f77a0a6e17943d2aa6a597ecca667af98898a6a17ae9024e596299306a6f5ad0d7951
+  metadata.gz: 243d36cf47340dff1ce84bcb7afb31395780cefe7559c2e8c657dd22372fb649a7a349ce6bb653ad65e459c16e37a3e3b86ce4a0b0bb69e620888f8c4d5d2e76
+  data.tar.gz: a53aa80dd9c74c3c101204e272d8b4044ba29e5be8a3b017d5fba33ed03cdf6868a82fa48c8b93fcd07363b3ab22d9b5521a866b4587df8365871f882f8d0cb1

data/lib/instructor/base.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative "concerns/callbacks"
-require_relative "concerns/defaults"
 require_relative "concerns/attributes"
 require_relative "concerns/arguments"
 require_relative "concerns/options"
@@ -14,8 +13,8 @@ module Instructor
     include ActiveModel::Model
     include ActiveModel::Validations::Callbacks
     include Tablesalt::StringableObject
+    include Tablesalt::Dsl::Defaults
     include Instructor::Callbacks
-    include Instructor::Defaults
     include Instructor::Attributes
     include Instructor::Arguments
     include Instructor::Options

data/lib/instructor/version.rb

@@ -2,5 +2,5 @@
 
 module Instructor
   # This constant is managed by spicerack
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instructor
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Eric Garside
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.1
+- !ruby/object:Gem::Dependency
+  name: tablesalt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 description: Input structure base object for capturing and validating input with a
   nice DSL
 email:
@@ -54,7 +68,6 @@ files:
 - lib/instructor/concerns/attributes.rb
 - lib/instructor/concerns/callbacks.rb
 - lib/instructor/concerns/core.rb
-- lib/instructor/concerns/defaults.rb
 - lib/instructor/concerns/options.rb
 - lib/instructor/custom_matchers.rb
 - lib/instructor/custom_matchers/define_argument.rb

data/lib/instructor/concerns/defaults.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-# Defaults allow attributes to be initialized with a value if none have been provided.
-module Instructor
-  module Defaults
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :_defaults, instance_writer: false, default: {}
-    end
-
-    class_methods do
-      def inherited(base)
-        dup = _defaults.dup
-        base._defaults = dup.each { |k, v| dup[k] = v.dup }
-        super
-      end
-
-      private
-
-      def define_default(attribute, static: nil, &block)
-        _defaults[attribute] = Value.new(static: static, &block)
-      end
-    end
-
-    class Value
-      def initialize(static: nil, &block)
-        @value = (static.nil? && block_given?) ? block : static
-      end
-
-      def value
-        (@value.respond_to?(:call) ? instance_eval(&@value) : @value).dup
-      end
-    end
-  end
-end