api-client 1.5.2 → 1.5.3

data/CHANGELOG.md

@@ -1,10 +1,17 @@
 # CHANGELOG
 
+## v1.5.3
+
+* Improving #unique_messages method to work with #to_sentence from ActiveSupport.
+
+## v1.5.2
+
+* Fixed return from #add_errors.
+
 ## v1.5.1
 
 * Fixed Error Setter for erros from an external API.
 
-
 ## v1.5.0
 
 * Handler of arrays as response.

data/lib/api-client/base.rb

@@ -54,7 +54,8 @@ module ApiClient
     #
     # @param [Hash] errors of the object..
     def errors=(errors = {})
-      @errors = Errors.new(self).add_errors(Hash[errors.map{|(key,value)| [key.to_sym,value]}])
+      @errors = Errors.new(self)
+      @errors.add_errors(Hash[errors.map{|(key,value)| [key.to_sym,value]}])
     end
 
     protected

data/lib/api-client/errors.rb

@@ -11,15 +11,34 @@ class ApiClient::Errors < ActiveModel::Errors
     end
   end
 
-  # Create a hash of attributes with unique validation error messages.
+  # Returns a unique message for each array of error messages in a hash.
   #
-  # Example:
-  #    user.errors.unique_messages   #=> { :name => [ can't be empty and is invalid ]}
+  #   class Person
+  #     validates_presence_of :name, :address, :email
+  #     validates_length_of :name, in: 5..30
+  #   end
   #
-  # @return [Hash] The hash of attributes with a unique error message.
+  #   person = Person.create(address: '123 First St.')
+  #   person.errors.unique_messages
+  #   # => { :name => "is too short (minimum is 5 characters) and can't be blank", :address => nil, :email => "can't be blank" }
   def unique_messages
     errors = {}
-    to_hash.each do |attribute, messages| errors[attribute] = messages.join(" and ") end
+    map { |attribute, messages| errors[attribute] = unique_message(attribute) }
     errors
   end
+
+  # Returns a unique message for a given attribute.
+  #
+  #   class Person
+  #     validates_presence_of :name, :address, :email
+  #     validates_length_of :name, in: 5..30
+  #   end
+  #
+  #   person = Person.create(address: '123 First St.')
+  #   person.errors.unique_message(:name) # => "is too short (minimum is 5 characters) and can't be blank"
+  #   person.errors.unique_message(:address) # => nil
+  def unique_message(attribute)
+    return '' if messages[attribute].blank?
+    messages[attribute].to_sentence
+  end
 end

data/lib/api-client/version.rb

@@ -1,5 +1,5 @@
 # High Level Namespace of the library ApiClient.
 module ApiClient
   # Version of the library.
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

data/spec/api-client/base_spec.rb

@@ -50,7 +50,7 @@ describe ApiClient::Base do
       end
 
       it "should return the errors" do
-        @user.errors.should == {:a => :bc}
+        @user.errors.messages.should == {:a => :bc}
       end
     end
 
@@ -71,7 +71,7 @@ describe ApiClient::Base do
     end
 
     it "should set @errors with symbolic keys" do
-      @user.errors.should == { :a => "message", :b => "message" }
+      @user.errors.messages.should == { :a => "message", :b => "message" }
     end
   end
-end
+end

data/spec/api-client/errors_spec.rb

@@ -21,4 +21,15 @@ describe ApiClient::Errors do
       @user.errors.unique_messages.should == { :a => "can't be blank and is not included in the list" }
     end
   end
+
+  describe "#unique_message" do
+    before :each do
+      @user = User.new
+      @user.valid?
+    end
+
+    it "should return a unique message for the given attribute" do
+      @user.errors.unique_message(:a).should == "can't be blank and is not included in the list"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-client
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -160,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -575002660403185230
+      hash: 3311950444943388535
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -575002660403185230
+      hash: 3311950444943388535
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24