domain_model 0.1.4 → 0.2.0

data/Gemfile

@@ -1,4 +1,2 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in model.gemspec
 gemspec

data/domain_model.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/domain_model/version.rb

@@ -1,3 +1,3 @@
 module DomainModel
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/domain_model.rb

@@ -23,6 +23,30 @@ module DomainModel
     errors
   end
 
+  def flat_errors
+    errors = self.errors
+
+    self.class.fields.each do |field|
+      next unless field.validate?
+
+      value = self.send(field.name)
+
+      if !field.collection? && value.is_a?(DomainModel)
+        value.flat_errors.each { |k, v| errors.add(:"#{field.name}.#{k}", v) }
+      end
+
+      if field.collection? && value.is_a?(Enumerable)
+        value.each_with_index do |element, index|
+          if element.is_a?(DomainModel)
+            element.flat_errors.each { |k, v| errors.add(:"#{field.name}[#{index}].#{k}", v) }
+          end
+        end
+      end
+    end
+
+    errors
+  end
+
   def valid?
     errors.empty?
   end
@@ -161,23 +185,36 @@ module DomainModel
   end
 
   class ModelErrors
+    include Enumerable
+
     def initialize
       @hash = Hash.new
     end
 
     def add(field_name, error)
+      errors = Array(error)
+
+      return if errors.empty?
+
       @hash[field_name] ||= []
       @hash[field_name] += Array(error)
     end
 
     def [](field_name)
       @hash[field_name] || []
-
     end
 
     def empty?
       @hash.values.flatten.empty?
     end
+
+    def each(&block)
+      @hash.each(&block)
+    end
+
+    def fields
+      @hash.keys
+    end
   end
 
   class FieldErrors

data/spec/domain_model_spec.rb

@@ -201,6 +201,21 @@ describe DomainModel do
       expect(Client.new.errors).to be_empty
     end
 
+    it "does not include fields with no errors" do
+      define { field :field }
+      client = Client.new(:field => :wrong)
+
+      expect(client.errors.fields).to eq([])
+    end
+
+    it "is enumerable" do
+      define { field :field, :required => true }
+      client = Client.new
+
+      expect(client.errors.is_a?(Enumerable)).to eq(true)
+      expect(client.errors.entries).to eq([[:field, ["cannot be nil"]]])
+    end
+
     it "includes errors for incorrect types" do
       define { field :field, :type => String }
       client = Client.new(:field => :wrong)
@@ -351,6 +366,73 @@ describe DomainModel do
     end
   end
 
+  describe ".flat_errors" do
+    describe "associated DomainModels" do
+      subject do
+        name_class = Class.new do
+          include DomainModel
+
+          field :first, :required => true
+          field :last,  :required => true
+        end
+
+        person_class = Class.new do
+          include DomainModel
+
+          field :name, :validate => true, :type => name_class
+          field :friends_names, :validate => true, :collection => true, :type => name_class
+        end
+
+        person_class.new({
+          :name => name_class.new,
+          :friends_names => [name_class.new]
+        })
+      end
+
+      it "includes associated models errors for scalar fields" do
+        expect(subject.flat_errors[:"name.first"]).to eq(["cannot be nil"])
+      end
+
+      it "includes associated models errors for collection fields" do
+        expect(subject.flat_errors[:"friends_names[0].first"]).to eq(["cannot be nil"])
+      end
+
+      it "does not raise exceptions if a scalar field not a DomainModel" do
+        subject.name = "WRONG"
+        expect { subject.flat_errors }.not_to raise_error
+      end
+
+      it "does not raise expections if a colleciton field is non-enumerable" do
+        subject.friends_names = 5
+        expect { subject.flat_errors }.not_to raise_error
+      end
+
+
+      it "does not raise expetions if an element of a Collection is not a DomainModel" do
+        subject.friends_names = ["WRONG"]
+        expect { subject.flat_errors }.not_to raise_error
+      end
+    end
+
+    it "does not attempt to retrieve errors from associated non-DomainModels" do
+      name_class = Class.new do
+        # Not a DomainModel
+        def valid?
+          false
+        end
+      end
+
+      person_class = Class.new do
+        include DomainModel
+
+        field :name, :validate => true, :type => name_class
+      end
+
+      person = person_class.new(:name => name_class.new)
+      expect(person.errors.fields).to eq([:name])
+    end
+  end
+
   describe "#==" do
     before { define { field :field } }
 

metadata

@@ -1,57 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: domain_model
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Rafer Hazen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 description: Minimal framework for definition of (optionally) type-aware domain models
 email:
 - rafer@ralua.com
@@ -72,26 +79,27 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Minimal framework for definition of (optionally) type-aware domain models
 test_files:
 - spec/domain_model_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGVkNWYxNzY4NDEyOThhMDM3NDY5MDM5YmQzNGRmNDFjYjBmYTcwMA==
-  data.tar.gz: !binary |-
-    MjQxZWFkZmZjZmY5ZmI3N2RkNWM2M2I3Y2YzODAyMGNhMGNlZjU3Ng==
-SHA512:
-  metadata.gz: !binary |-
-    ODNlMDk1Y2M5NTlhOTZhODM1NDE2MDg4NmYzMTA4ODU1YTM2ZjVhODJmY2Fi
-    MTBlMGJjNjZmMDY4NzRjZWMxZmEzZDE2N2Y4ODgyZDc0MmU4N2RjNTlkZWZj
-    NTZlMTFhNjMyMmE1NTQ3ZjljZTE4MzAzZDRjMGI1NjQ4ZjkwMTM=
-  data.tar.gz: !binary |-
-    MTg1ZjJhODQwYWVhZDc2ZjUwYmRjNzY3MjM0ZTE5MzAyYTU1ZjY1NWI1ZTZh
-    MDRkMGI4YTEyZDczYWVmZDNmZWUxZjE1YzBkZTQ3NWZhZmY3ZmU4MDYzZjI3
-    ODE4YmI3MmJiMWM5ZDhiMDc3ZjJhMjQzZjJiZDY4MTM5MWQ1ZGM=