options_model 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b29481d30d2e37360341fd4b6cf8c3be0c6823c30626025059549d26b4dba5a
-  data.tar.gz: c1dc86ae7c246c954f9338af71234034c53f150e2c9bdce47df4cf39d9853424
+  metadata.gz: 8eaa7e2d11c4dd87d81036b30896555ffcc410b17c8ca79a291f37c33f50f7de
+  data.tar.gz: 4db3c76e03c75cd3666b44ad5303528cd237a5e14310806bc5f389284d1f57fc
 SHA512:
-  metadata.gz: f7f1c6c8957d032681cc2d06a05847826de7ca5ab656b6b1c5b1e9d08bda49b9087a10eac79207c53920afbd58fbb93dd19f8d07982a0c24b7a3b919cc48ac33
-  data.tar.gz: 87eb8bc873361551155f0675f0207e9fa9796e8462920d4123dfd060bfbfdae7017e25bc2a2a2fcf2cea38e82dfca0688e7ddb6168ad43e6d3bce25dd25ee141
+  metadata.gz: 4dfdd530b69791f07c5d4b6d62f4acb4dfb4145e1e6adae8a2ad438843cdb7b3d8568ce538b80b466f85d1873c663fd34d44b5ab1ad460a6f460e63d2c8516f8
+  data.tar.gz: 470b7b027c9a9bac80472fbc3635ebd5f8c150f5121956e6b5d31b3141e890c4a5fc64d36a3c51686f5c25e26f4800e8ae08de809e03d2fdd55a46481afc366e

data/lib/options_model/base.rb

@@ -10,9 +10,7 @@ module OptionsModel
     validate do
       self.class.attribute_names.each do |attribute_name|
         attribute = public_send(attribute_name)
-        if attribute.is_a?(self.class) && attribute.invalid?
-          errors.add attribute_name, :invalid
-        end
+        errors.add attribute_name, :invalid if attribute.is_a?(self.class) && attribute.invalid?
       end
     end
 
@@ -22,14 +20,14 @@ module OptionsModel
         nested_attributes == other.nested_attributes &&
         unused_attributes == other.unused_attributes
     end
-    alias :eql? :==
+    alias eql? ==
 
     def hash
       [attributes, nested_attributes, unused_attributes].hash
     end
 
     def inspect
-      "#<#{self.class.name}:OptionsModel #{self.to_h}>"
+      "#<#{self.class.name}:OptionsModel #{to_h}>"
     end
 
     def self.inspect

data/lib/options_model/concerns/attribute_assignment.rb

@@ -15,12 +15,10 @@ module OptionsModel
         update_attributes(other)
       end
 
-      def update_attributes(other)
+      def update(other)
         return unless other
 
-        unless other.respond_to?(:to_h)
-          raise ArgumentError, "#{other} must be respond to `to_h`"
-        end
+        raise ArgumentError, "#{other} must be respond to `to_h`" unless other.respond_to?(:to_h)
 
         other.to_h.each do |k, v|
           if respond_to?("#{k}=")
@@ -31,6 +29,8 @@ module OptionsModel
         end
       end
 
+      alias update_attributes update
+
       def [](key)
         public_send(key) if respond_to?(key)
       end
@@ -45,9 +45,7 @@ module OptionsModel
       end
 
       def fetch(key, default = nil)
-        if self.class.attribute_names.exclude?(key.to_sym) && default.nil? && !block_given?
-          raise KeyError, "attribute not found"
-        end
+        raise KeyError, "attribute not found" if self.class.attribute_names.exclude?(key.to_sym) && default.nil? && !block_given?
 
         value = respond_to?(key) ? public_send(key) : nil
         return value if value

data/lib/options_model/concerns/attributes.rb

@@ -16,10 +16,9 @@ module OptionsModel
 
           attribute_defaults[name] = default
           default_extractor =
-            case
-            when default.respond_to?(:call)
+            if default.respond_to?(:call)
               ".call"
-            when default.duplicable?
+            elsif default.duplicable?
               ".deep_dup"
             else
               ""
@@ -55,13 +54,11 @@ module OptionsModel
               end
               STR
 
-              if cast_type == :boolean
-                generated_attribute_methods.send :alias_method, :"#{name}?", name
-              end
+              generated_attribute_methods.send :alias_method, :"#{name}?", name if cast_type == :boolean
             end
           end
 
-          self.attribute_names_for_inlining << name
+          attribute_names_for_inlining << name
 
           self
         end
@@ -69,9 +66,8 @@ module OptionsModel
         def enum_attribute(name, enum, default: nil, allow_nil: false)
           check_not_finalized!
 
-          unless enum.is_a?(Array) && enum.any?
-            raise ArgumentError, "enum should be an Array and can't empty"
-          end
+          raise ArgumentError, "enum should be an Array and can't empty" unless enum.is_a?(Array) && enum.any?
+
           enum = enum.map(&:to_s)
 
           attribute name, :string, default: default
@@ -80,11 +76,11 @@ module OptionsModel
           generated_class_methods.synchronize do
             generated_class_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
             def #{pluralized_name}
-              %w(#{enum.join(" ")}).freeze
+              %w(#{enum.join(' ')}).freeze
             end
             STR
 
-            validates name, inclusion: {in: enum}, allow_nil: allow_nil
+            validates name, inclusion: { in: enum }, allow_nil: allow_nil
           end
 
           self
@@ -93,17 +89,15 @@ module OptionsModel
         def embeds_one(name, class_name: nil, anonymous_class: nil)
           check_not_finalized!
 
-          if class_name.blank? && anonymous_class.nil?
-            raise ArgumentError, "must provide at least one of `class_name` or `anonymous_class`"
-          end
+          raise ArgumentError, "must provide at least one of `class_name` or `anonymous_class`" if class_name.blank? && anonymous_class.nil?
 
           name = name.to_sym
           check_name_validity! name
 
-          if class_name.present?
-            nested_classes[name] = class_name.constantize
+          nested_classes[name] = if class_name.present?
+            class_name.constantize
           else
-            nested_classes[name] = anonymous_class
+            anonymous_class
           end
 
           generated_attribute_methods.synchronize do
@@ -130,7 +124,7 @@ module OptionsModel
             STR
           end
 
-          self.attribute_names_for_nesting << name
+          attribute_names_for_nesting << name
 
           self
         end
@@ -160,60 +154,56 @@ module OptionsModel
         end
 
         def finalize!(nested = true)
-          if nested
-            nested_classes.values.each(&:finalize!)
-          end
+          nested_classes.values.each(&:finalize!) if nested
 
           @finalized = true
         end
 
         protected
 
-        def check_name_validity!(symbolized_name)
-          if dangerous_attribute_method?(symbolized_name)
-            raise ArgumentError, "#{symbolized_name} is defined by #{OptionsModel::Base}. Check to make sure that you don't have an attribute or method with the same name."
-          end
+          def check_name_validity!(symbolized_name)
+            if dangerous_attribute_method?(symbolized_name)
+              raise ArgumentError, "#{symbolized_name} is defined by #{OptionsModel::Base}. Check to make sure that you don't have an attribute or method with the same name."
+            end
 
-          if attribute_names_for_inlining.include?(symbolized_name) || attribute_names_for_nesting.include?(symbolized_name)
-            raise ArgumentError, "duplicate define attribute `#{symbolized_name}`"
+            if attribute_names_for_inlining.include?(symbolized_name) || attribute_names_for_nesting.include?(symbolized_name)
+              raise ArgumentError, "duplicate define attribute `#{symbolized_name}`"
+            end
           end
-        end
 
-        def check_not_finalized!
-          if finalized?
-            raise "can't modify finalized #{self}"
+          def check_not_finalized!
+            raise "can't modify finalized #{self}" if finalized?
           end
-        end
 
-        # A method name is 'dangerous' if it is already (re)defined by OptionsModel, but
-        # not by any ancestors. (So 'puts' is not dangerous but 'save' is.)
-        def dangerous_attribute_method?(name) # :nodoc:
-          method_defined_within?(name, OptionsModel::Base)
-        end
+          # A method name is 'dangerous' if it is already (re)defined by OptionsModel, but
+          # not by any ancestors. (So 'puts' is not dangerous but 'save' is.)
+          def dangerous_attribute_method?(name) # :nodoc:
+            method_defined_within?(name, OptionsModel::Base)
+          end
 
-        def method_defined_within?(name, klass, superklass = klass.superclass) # :nodoc:
-          if klass.method_defined?(name) || klass.private_method_defined?(name)
-            if superklass.method_defined?(name) || superklass.private_method_defined?(name)
-              klass.instance_method(name).owner != superklass.instance_method(name).owner
+          def method_defined_within?(name, klass, superklass = klass.superclass) # :nodoc:
+            if klass.method_defined?(name) || klass.private_method_defined?(name)
+              if superklass.method_defined?(name) || superklass.private_method_defined?(name)
+                klass.instance_method(name).owner != superklass.instance_method(name).owner
+              else
+                true
+              end
             else
-              true
+              false
             end
-          else
-            false
           end
-        end
 
-        def generated_attribute_methods
-          @generated_attribute_methods ||= Module.new {
-            extend Mutex_m
-          }.tap { |mod| include mod }
-        end
+          def generated_attribute_methods
+            @generated_attribute_methods ||= Module.new do
+              extend Mutex_m
+            end.tap { |mod| include mod }
+          end
 
-        def generated_class_methods
-          @generated_class_methods ||= Module.new {
-            extend Mutex_m
-          }.tap { |mod| extend mod }
-        end
+          def generated_class_methods
+            @generated_class_methods ||= Module.new do
+              extend Mutex_m
+            end.tap { |mod| extend mod }
+          end
       end
     end
   end

data/lib/options_model/concerns/serialization.rb

@@ -35,7 +35,7 @@ module OptionsModel
           return new unless yaml
           return new unless yaml.is_a?(String) && /^---/.match?(yaml)
 
-          hash = YAML.load(yaml) || Hash.new
+          hash = YAML.safe_load(yaml) || {}
 
           unless hash.is_a? Hash
             raise ArgumentError,

data/lib/options_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OptionsModel
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: options_model
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel