fakturan_nu 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5501ee1e60ab587b727359c3bd163ea3fe3c8442
-  data.tar.gz: 86a6c09815b128c03dc479b33e46655e67eb9fb6
+  metadata.gz: 6dafebdb78acba0e505fbe6832ca7ba96da38b30
+  data.tar.gz: 1ff884a250089a2fe0b7c59d96d9aac9819fcf71
 SHA512:
-  metadata.gz: 6e4e9a54718fd57b108e7b8f7e6697e2b62aa70d9ec2e26e19fe1c0c87d25d0a292661a01aefde065cb6743225f8444a20711b12d916d88112be5a80407e3e41
-  data.tar.gz: e838c643cba76d590bc423f6976011d556ea7cdf0de864c53d1c26d0011eeca31dc004c3177bcb059b118087b25f0574aa69081ac50f58429e5d46365d0c073c
+  metadata.gz: c69f27084c5484188782861526bd1c3959900de013e57a18366fa6b132226a7dec4ad3640b37127b608aab19bf5efe4af1e754cf16214cdf4ecb6f420f3306f4
+  data.tar.gz: 3511e035cc2b28edb65ccccec8e45d952503ae07afaebff9b3591407c6e104f73f8795cfe2cfb5370025d7bb2b30fa4ff5c16f42e84229e766825c3e4bff0ec1

data/fakturan_nu.gemspec

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'fakturan_nu'
-  s.version     = '1.1.4'
-  s.date        = '2015-04-30'
+  s.version     = '1.1.5'
+  s.date        = '2015-05-08'
   s.summary     = 'A ruby client for the Fakturan.nu - API'
   s.description = 'A ruby client for the Fakturan.nu - API. Fakturan.nu is a webbapp for billing.'
   s.authors     = ['Jonathan Bourque Olivegren']

data/lib/fakturan_nu/address.rb

@@ -1,5 +1,7 @@
 module Fakturan
   class Address < Base
     uri nil
+
+    attributes :name, :care_of, :street_address, :zip_code, :city, :country
   end
 end

data/lib/fakturan_nu/base.rb

@@ -34,8 +34,10 @@ module Fakturan
     # to allow for nested errors on associated objects
     def add_errors_to_model(errors_hash)
       errors_hash.each do |field, field_errors|
-        ass_name, field_name = field.split(".").map(&:to_sym)
-        field_name = ass_name unless field_name
+
+        path_parts = field.split(".").map(&:to_sym) # 'client.address.country' for example, usually only 1-2 levels though (but sometimes more)
+        ass_name = path_parts.first
+        field_name = path_parts.last # Will be the same as ass_name if only 1 level
 
         # The errors are for an associated object, and there is an associated object to put them on
         if (association = self.class.reflect_on_association(ass_name)) && !self.send(ass_name).blank?
@@ -51,22 +53,30 @@ module Fakturan
               end
             end
           else # It's a belongs_to or has_one
-            # We add the error to the associated object
-            self.send(ass_name).add_to_errors(field_name, field_errors)
-            # and then we get the errors (with generated messages) and add them to
-            # the parent (but without details, like nested_attributes works)
-            # This only makes sense on belongs_to and has_one, since it's impossible
-            # to know which object is refered to on has_many
-            self.send(ass_name).errors.each do |attribute, message|
-              attribute = "#{ass_name}.#{attribute}"
-              errors[attribute] << message
-              errors[attribute].uniq!
+            path_progression = [] # Will become: [['client'], ['client', 'address'], ['client', 'address', 'country']]
+            path_progression = path_parts[0..-2].map {|ass_key| path_progression += [ass_key]}
+
+            path_progression.each do |path_sub_parts|
+              full_field_path = path_parts[path_sub_parts.length-1..path_parts.length].join('.')
+              field_name = path_parts[1..path_sub_parts.length].last.to_s
+              association_target = path_sub_parts.inject(self, :send)
+              association_target_parent = path_sub_parts[0..-2].inject(self, :send)
+
+              # We add the error to the associated object
+              association_target.add_to_errors(field_name, field_errors)
+              # and then we get the errors (with generated messages) and add them to
+              # the parent (but without details, like nested_attributes works)
+              # This only makes sense on belongs_to and has_one, since it's impossible
+              # to know which object is refered to on has_many
+              association_target.errors.each do |attribute, message|
+                association_target_parent.errors[full_field_path] << message
+                association_target_parent.errors[full_field_path].uniq!
+              end
             end
           end
         else
           self.add_to_errors(field_name.to_sym, field_errors)
         end
-
       end
     end
 

data/lib/fakturan_nu/client.rb

@@ -2,7 +2,7 @@ module Fakturan
   class Client < Base
     uri "clients/(:id)"
     has_many :invoices, uri: "clients/:id/invoices", foreign_key: 'id'
-    has_one :address
+    has_one :address, uri: nil
 
     accepts_nested_attributes_for :address
 

data/test/exceptions_test.rb

@@ -71,14 +71,14 @@ module Fakturan
     end
 
     def test_multiple_validation_errors_on_has_many
-      stub_api_request(:post, '/trees').to_return(body: {errors: {apples: [{"0" => {"apples.colour" => [{error: :too_short, count:4}], "apples.shape" => [{error: :taken, value: "square"}]}}]}}.to_json, status: 422)
+      stub_api_request(:post, '/trees').to_return(body: {errors: {apples: [{"0" => {:"apples.colour" => [{error: :too_short, count:4}], :"apples.shape" => [{error: :taken, value: "square"}]}}]}}.to_json, status: 422)
       tree = Fakturan::Tree.new({"apples"=>[{"colour"=>"", "shape"=>"square"}]})
       assert_equal false, tree.save
       assert_equal ({:colour=>[{:error=>:too_short, :count=>4}], :shape=>[{:error=>:taken, :value=>"square"}]}), tree.apples.first.errors.details
     end
 
     def test_validation_errors_on_associations_when_created_through_params
-      stub_api_request(:post, '/trees').to_return(body: {errors: {apples: [{"0" => {"apples.colour" => [{error: :blank}]}}], "crown.fluffyness" => [{error: :invalid}]}}.to_json, status: 422)
+      stub_api_request(:post, '/trees').to_return(body: {errors: {apples: [{"0" => {:"apples.colour" => [{error: :blank}]}}], :"crown.fluffyness" => [{error: :invalid}]}}.to_json, status: 422)
       tree = Fakturan::Tree.new({"apples"=>[{"something"=>""}], "crown"=>{"fluffyness"=>""}})
       assert_equal false, tree.save
       assert_equal ({:colour=>[{:error=>:blank}]}), tree.apples.first.errors.details
@@ -95,7 +95,7 @@ module Fakturan
     end
 
     def test_save_fails_when_has_many_validation_fails
-      stub_api_request(:post, '/invoices').to_return(body: {errors: {rows: [{"0" => {"rows.product_code" => [{error: :too_long, count:30}]}}] }}.to_json, status: 422)
+      stub_api_request(:post, '/invoices').to_return(body: {errors: {rows: [{"0" => {:"rows.product_code" => [{error: :too_long, count:30}]}}] }}.to_json, status: 422)
       invoice = Fakturan::Invoice.new(client: { company: "Acme inc" }, rows: [{product_code: '1234567890123456789012345678901'}])
       assert_equal false, invoice.save
       assert_equal ({:product_code=>[{:error=>:too_long, :count=>30}]}), invoice.rows[0].errors.details
@@ -103,7 +103,7 @@ module Fakturan
     end
 
     def test_validation_errors_on_associations
-      stub_api_request(:post, '/invoices').to_return(body: {errors: {date: [{error: :blank},{error: :invalid}], rows: [{"0" => {"rows.product_code" => [{error: :too_long, count:30}]}}, {"2" => {"rows.product_code" => [{error: :too_long, count:30}]}}], "client.company" => [{ error: :blank}]}}.to_json, status: 422)
+      stub_api_request(:post, '/invoices').to_return(body: {errors: {date: [{error: :blank},{error: :invalid}], rows: [{"0" => {:"rows.product_code" => [{error: :too_long, count:30}]}}, {"2" => {:"rows.product_code" => [{error: :too_long, count:30}]}}], :"client.company" => [{ error: :blank}]}}.to_json, status: 422)
       invoice = Fakturan::Invoice.new(client: {}, rows: [{product_code: '1234567890123456789012345678901'}, {product_code: '1'}, {product_code: '1234567890123456789012345678901'}])
       invoice.save
       assert_equal "Client company can't be blank", invoice.errors.to_a.last
@@ -114,6 +114,15 @@ module Fakturan
       assert_equal ({:company=>[{:error=>:blank}]}), invoice.client.errors.details
     end
 
+    def test_validation_errors_on_nested_associated_objects
+      stub_api_request(:post, '/invoices').to_return(body: {errors: {date: [{error: :blank},{error: :invalid}], :"client.address.country" => [{ error: :blank}]}}.to_json, status: 422)
+      invoice = Fakturan::Invoice.new(client: { address: { street_address: 'Some street' } })
+      assert_equal false, invoice.save
+      assert_equal "Client address country can't be blank", invoice.errors.to_a.last
+      assert_equal ({date: [{error: :blank}, {error: :invalid}]}), invoice.errors.details
+      assert_equal ({:date => ["can't be blank", "is invalid"], :"client.address.country" => ["can't be blank"]}), invoice.errors.messages
+    end
+
     def test_raise_resource_invalid
       stub_api_request(:post, '/invoices').to_return(body: { errors: { client_id: [{ error: :blank}], date: [{ error: :blank}, { error: :invalid}] }}.to_json, status: 422)
       error = assert_raises Fakturan::Error::ResourceInvalid do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakturan_nu
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Jonathan Bourque Olivegren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spyke