nform 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f1feff130275754a2c51683b9bcb04503a42b19
-  data.tar.gz: 5785fae3630918cb9ca7c98337984e7bf3324812
+  metadata.gz: 650de4de056c13e0ad264142166a65fdad7d92a6
+  data.tar.gz: e6768bf06dc70032b5e630809f93e10330e1c1c7
 SHA512:
-  metadata.gz: cfa1902ba17fb5f1adc46720ff25f111ed511f54221a11a52a141409c49dbee75a2e3659a5b7f71ca4606398488bfefb4d1b1613bd9d26776f3da4fa5ff36fc6
-  data.tar.gz: 9a3136dd6ba4dabf064c6fe8609e9a638729efd2403dc435be8c4a56f39b12d51f76faf744607dd40f2029bf1b2d388779328a7a0863ee73f8387e9470da40db
+  metadata.gz: 4eba41db6bec1c34ba333032f91533685384893be4ba8c9357a1e34bd480879d91affb7c58a03613f620fe973c81680304919da9a04eb3b0f9f27a52083199cf
+  data.tar.gz: e2b51d4902daab7e3ce23b930c5e62dbfce89ed0358c09ef1159973e303a3d8d619e782248d5bc296656d6bf25db65ad14db0a47854a755f3663dc285bcb2d87

data/lib/nform/attributes.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/hash'
 require 'nform/coercions'
+require 'set'
 
 module NForm
   module Attributes
@@ -18,10 +19,21 @@ module NForm
       @undef_attr = option
     end
 
+    def hash_representation(option)
+      unless %i|partial complete|.include?(option)
+        raise ArgumentError, "Unknown option `#{option}` for hash representation. Options are :partial or :complete"
+      end
+      @hash_rep = option
+    end
+
     def __undef_attr
       @undef_attr ||= :raise
     end
 
+    def __hash_rep
+      @hash_rep ||= :complete
+    end
+
     def define_attributes
       attribute_set.each do |name,options|
         define_method(name) do
@@ -31,6 +43,7 @@ module NForm
         # TODO: must use coercion set
         c = get_coercion(options[:coerce])
         define_method("#{name}=") do |input|
+          @__touched_keys << name
           instance_variable_set("@#{name}", c.call(input,self))
         end
       end
@@ -60,43 +73,43 @@ module NForm
 
     module InstanceMethods
       def initialize(input={})
+        @__touched_keys = Set.new
         i = input.symbolize_keys
         require_attributes!(i)
         self.class.define_attributes
         set_attributes!(i)
-        set_missing_defaults
       end
 
       def to_hash
-        self.class.attribute_set.each.with_object({}) do |(k,v),memo|
+        if self.class.__hash_rep == :partial
+          @__touched_keys
+        else
+          self.class.attribute_set.keys
+        end.each.with_object({}) do |k,memo|
           memo[k] = send(k)
         end
       end
 
       private
       def require_attributes!(input_hash)
+        # Check for missing required attributes
         required = self.class.attribute_set.map{|name,options| name if options[:required]}.compact
         missing  = (required - input_hash.keys)
         if missing.any?
           raise ArgumentError, "Missing required attributes: #{missing.inspect}"
         end
-      end
 
-      def set_attributes!(input_hash)
-        input_hash.each do |k,v|
-          if self.class.__undef_attr == :raise
-            raise ArgumentError, "Undefined attribute: #{k}" unless respond_to?("#{k}=")
-          end
-          send "#{k}=", v if respond_to?("#{k}=")
+        # Check for unallowed extra attributes
+        if self.class.__undef_attr == :raise
+          extra = (input_hash.keys - self.class.attribute_set.keys)
+          raise ArgumentError, "Undefined attribute(s): #{extra.join(',')}" if extra.any?
         end
       end
 
-      def set_missing_defaults
-        self.class.attribute_set.each do |name, options|
-          default = options[:default]
-          unless default.nil?
-            send("#{name}=",default) if send(name).nil?
-          end
+      def set_attributes!(input_hash)
+        self.class.attribute_set.each do |a, opts|
+          val = input_hash[a] || opts[:default]
+          send "#{a}=", val if input_hash.has_key?(a) || !opts[:default].nil?
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nform
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Burleson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A form / service / view object library.