options_model 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 658ee8fa02e09a0d6965e6331ecc3d281eec4ab7
-  data.tar.gz: 35a3deec15574e4c47eec496b95fdfc6b92c7854
+  metadata.gz: c137c194481be3add8c0ffdaefe2ccfb35e697ce
+  data.tar.gz: 3088d2da15e69fb0ab15c37a37669f1b93e59c38
 SHA512:
-  metadata.gz: fed38e4816859b310c9ae9a5b47c3f632bcf75a66b5a6414d7323c6694e9f6fbb64fd3cd91148afb5989c9a04f3c74ede3c421faa3c527844d456e2b07507e69
-  data.tar.gz: aa7bc5057fb324506bb6e31ed58f526317a241b5ecb3136da78bcbd4746ff33e1f5d0bece4a9e8f4ae71772728d39bca6cb9c6f653b66a72ce4c4bb048db866b
+  metadata.gz: 2c10190f8502e9b3f1ad1692d1ad510a5f7b952f25136df8658bf18b4ef907795465e2a114ea3df8feb13bee10731dc5354d5c77006957b9cf8d0208c0e3ba73
+  data.tar.gz: ccd5d5ad6cad61e317851886cbbb12f6af3c8f1a3b30253b7c932682c93b80ceaaf954f3852aee2c62a097e4a36c4255ae623169d4e4120e31a75954be2a871e

data/lib/options_model/base.rb

@@ -14,6 +14,18 @@ module OptionsModel
       end
     end
 
+    def ==(other)
+      other.instance_of?(self.class) &&
+        attributes == other.attributes &&
+        nested_attributes == other.nested_attributes &&
+        unused_attributes == other.unused_attributes
+    end
+    alias :eql? :==
+
+    def hash
+      [attributes, nested_attributes, unused_attributes].hash
+    end
+
     def inspect
       "#<#{self.class.name}:OptionsModel #{self.to_h}>"
     end

data/lib/options_model/concerns/attribute_assignment.rb

@@ -57,23 +57,17 @@ module OptionsModel
         end
       end
 
-      def _attributes
+      def attributes
         @attributes ||= ActiveSupport::HashWithIndifferentAccess.new
       end
-      private :_attributes
-      alias_method :attributes, :_attributes
 
-      def _nested_attributes
+      def nested_attributes
         @nested_attributes ||= ActiveSupport::HashWithIndifferentAccess.new
       end
-      private :_nested_attributes
-      alias_method :nested_attributes, :_nested_attributes
 
-      def _unused_attributes
+      def unused_attributes
         @unused_attributes ||= ActiveSupport::HashWithIndifferentAccess.new
       end
-      private :_unused_attributes
-      alias_method :unused_attributes, :_unused_attributes
     end
   end
 end

data/lib/options_model/concerns/attributes.rb

@@ -51,7 +51,8 @@ module OptionsModel
           end
 
           self.attribute_names_for_inlining << name
-          name
+
+          self
         end
 
         def enum_attribute(name, enum, default: nil, allow_nil: false)
@@ -74,6 +75,8 @@ module OptionsModel
 
             validates name, inclusion: {in: enum}, allow_nil: allow_nil
           end
+
+          self
         end
 
         def embeds_one(name, class_name: nil, anonymous_class: nil)
@@ -117,7 +120,8 @@ module OptionsModel
           end
 
           self.attribute_names_for_nesting << name
-          name
+
+          self
         end
 
         def attribute_defaults

data/lib/options_model/concerns/serialization.rb

@@ -6,22 +6,13 @@ module OptionsModel
       def to_h
         hash = {}
 
-        self.class.attribute_names.each do |attribute_name|
-          attribute = public_send(attribute_name)
-          if attribute.is_a?(OptionsModel::Base)
-            hash[attribute_name] = attribute.to_h
-          else
-            hash[attribute_name] = attribute
-          end
-        end
+        hash.merge! unused_attributes if self.class.with_unused_attributes?
+        hash.merge! attributes
+        hash.merge! nested_attributes.reduce({}) { |h, (k, v)| h[k] = v.to_h; h }
 
         hash
       end
 
-      def to_h_with_unused
-        to_h.merge unused_attributes
-      end
-
       module ClassMethods
         def dump(obj)
           return YAML.dump({}) unless obj
@@ -47,6 +38,14 @@ module OptionsModel
 
           new hash
         end
+
+        def with_unused_attributes!
+          @with_unused_attributes = true
+        end
+
+        def with_unused_attributes?
+          @with_unused_attributes
+        end
       end
     end
   end

data/lib/options_model/version.rb

@@ -1,3 +1,3 @@
 module OptionsModel
-  VERSION = "0.0.3".freeze
+  VERSION = "0.0.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: options_model
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - jasl