destination_errors 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f3a5e8c45326abaec74d12735ed07c34fcb6967
-  data.tar.gz: 8d1a0884a7e647e46cae1b7f2e6961ce9512f299
+  metadata.gz: 707945486ea424f4a1e970e612f4ccfdd707c3b8
+  data.tar.gz: f6a93ecd7843317ca5195da41fc418eee1a51c8c
 SHA512:
-  metadata.gz: 5fed81c47120851263221c1b7e788a68eab6f408998d136bf1462fd2547c56450963274cda4e8a3a70e2c7e9e4984a25a68480eeeb1e4c83ca8aa4f0c34b70ac
-  data.tar.gz: b669a0e57adae8765dea6cebfe327ff7814640c46b666148ed34a406b9598d11ce38b395ffd1fe4271f663792097858c87a460b9eb6c987639747aeb6eaba849
+  metadata.gz: ccb67dccca62ed177a8ec0a480fdd661ef72d5058d0c63b63717d8d0d6c5d0e3eb04c1161b8aadbf5a0e4eaa4a740b59ec8a4cc27f56a465848409a05f4b9f1b
+  data.tar.gz: 6a8cb2ff47ef2eb9d2da2b8f4315663750b7c1d52c2c945b2133e19ec4aded6fdaaede25963ffa389f4336473ca2204a4b9cd90073a6ebc0f446f557ec6fa94b

data/lib/destination_errors.rb

@@ -1,4 +1,6 @@
 require "destination_errors/version"
+require "destination_errors/unique_errors"
+require "destination_errors/active_model_integration"
 
 #
 #   There are three steps to implementing this module in a class:
@@ -29,16 +31,14 @@ require "destination_errors/version"
 #     end
 #
 
-require "active_model"
-
 module DestinationErrors
 
   def self.included(base)
-    base.include(ActiveModel::Validations)
     base.prepend(Initializer)
     base.extend(ClassMethods)
+    base.include(DestinationErrors::ActiveModelIntegration)
+    base.include(DestinationErrors::UniqueErrors)
     base.class_eval do
-      attr_reader :errors
       attr_accessor :errors_finalized
       attr_accessor :surface_errors_on
       class_attribute :error_surfaces
@@ -47,7 +47,6 @@ module DestinationErrors
 
   module Initializer
     def initialize(*args)
-      @errors = ActiveModel::Errors.new(self)
       @surface_errors_on = nil
       super
     end
@@ -66,11 +65,6 @@ module DestinationErrors
     return true
   end
 
-  # Required for ActiveModel::Validations
-  def read_attribute_for_validation(attr)
-    send(attr)
-  end
-
   # dynamically access the surface where errors are being aggregated
   def error_destination
     @error_destination = error_destination_is_self? ?
@@ -83,16 +77,6 @@ module DestinationErrors
     def has_error_surfaces(value)
       self.error_surfaces = value
     end
-
-    # Required for ActiveModel::Validations
-    def human_attribute_name(attr, options = {})
-      attr
-    end
-
-    # Required for ActiveModel::Validations
-    def lookup_ancestors
-      [self]
-    end
   end
 
   protected
@@ -119,7 +103,7 @@ module DestinationErrors
           errors.messages :
           self.send(surface).errors.messages
       ).each do |key, message_array|
-        move_error_to_destination(key, message_array)
+        move_error_to_destination(key, *message_array)
       end
     end
   end
@@ -146,21 +130,13 @@ module DestinationErrors
     surface_errors_on.nil? || !self.send(surface_errors_on)
   end
 
-  def move_error_to_destination(key, message_array)
+  def move_error_to_destination(key, *message_array)
     if error_destination.respond_to?(key)
-      add_uniquely(key, message_array)
+      add_errors_uniquely(key, *message_array)
     elsif key == :base
-      add_uniquely(:base, message_array)
+      add_errors_uniquely(:base, *message_array)
     else
-      add_uniquely(:base, message_array.map {|message| "#{key} #{message}"})
-    end
-  end
-
-  def add_uniquely(key, message_array)
-    message_array.each do |message|
-      unless error_destination.errors[key].include?(message)
-        error_destination.errors.add(key, message)
-      end
+      add_errors_uniquely(:base, *message_array.map {|message| "#{key} #{message}"})
     end
   end
 

data/lib/destination_errors/active_model_integration.rb

@@ -0,0 +1,39 @@
+require "active_model"
+
+module DestinationErrors
+  module ActiveModelIntegration
+
+    # Required for ActiveModel::Validations
+    def read_attribute_for_validation(attr)
+      send(attr)
+    end
+
+    def self.included(base)
+      base.include(ActiveModel::Validations)
+      base.prepend(Initializer)
+      base.extend(ClassMethods)
+      base.class_eval do
+        attr_reader :errors
+      end
+    end
+
+    module Initializer
+      def initialize(*args)
+        @errors = ActiveModel::Errors.new(self)
+        super
+      end
+    end
+
+    module ClassMethods
+      # Required for ActiveModel::Validations
+      def human_attribute_name(attr, options = {})
+        attr
+      end
+
+      # Required for ActiveModel::Validations
+      def lookup_ancestors
+        [self]
+      end
+    end
+  end
+end

data/lib/destination_errors/unique_errors.rb

@@ -0,0 +1,16 @@
+module DestinationErrors
+  module UniqueErrors
+
+    def self.included(base)
+      base.include(ErrorAggregation)
+    end
+
+    module ErrorAggregation
+      def add_errors_uniquely(key, *message_array)
+        message_array.each do |message|
+          error_destination.errors.add(key, message) unless error_destination.errors[key].include?(message)
+        end
+      end
+    end
+  end
+end

data/lib/destination_errors/version.rb

@@ -1,3 +1,3 @@
 module DestinationErrors
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: destination_errors
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Peter Boling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -100,6 +100,8 @@ files:
 - bin/setup
 - destination_errors.gemspec
 - lib/destination_errors.rb
+- lib/destination_errors/active_model_integration.rb
+- lib/destination_errors/unique_errors.rb
 - lib/destination_errors/version.rb
 homepage: https://github.com/trumaker/destination_errors
 licenses:
@@ -121,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Mixin providing management of error surfaces within the familiar territory