fakturan_nu 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ab202040f38b9432b6b261c32a0aa67f89d38d2
-  data.tar.gz: 4fea1eda6ee8ecd18f6e34a1d2fd8c44f83896b0
+  metadata.gz: bb8aaece005780b6c5dcb3c76e27099268892c1e
+  data.tar.gz: 2991573e89a82de2fb2d211aff1a2e9693ebdf1c
 SHA512:
-  metadata.gz: 65be8dbc83508e8944cf56db81c757e96e241c65097834949858f9a612b54d3920bb719823043d7ca9f2f120366aee3662ed594a5e5a981e2f3e1de62d3fe079
-  data.tar.gz: c6863d2a83780936fa5886ddde654cfa31de7a6866c7865d1a043de9dcc2f2fb4f7b2f06aaa3ff087618395876665fefba9c07553804a7f8343a0539442a71d2
+  metadata.gz: eff15b4eb0b0c6644ddb5027530b6e2cc3c34282e45a5d6a1d639ba44fecd2a3fe52c4c8b9beeada2f5f9893033f30d32913dab4bc3fdd96ff822c5da124ee4f
+  data.tar.gz: f574a12863ac0225d212d4efef0b98678d7d0fb591ce988aba66e6f8bdd3a3725574512437b0217d2e01fb100d6f839c8f1398430f5d75041f515346e6287b35

data/fakturan_nu.gemspec

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'fakturan_nu'
-  s.version     = '1.0.2'
-  s.date        = '2015-04-13'
+  s.version     = '1.1.0'
+  s.date        = '2015-04-14'
   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/base.rb

@@ -37,9 +37,12 @@ module Fakturan
         ass_name, field_name = field.split(".").map(&:to_sym)
         field_name = ass_name unless field_name
 
-        if association = self.class.reflect_on_association(ass_name) # The errors are for an associatied object
+        # 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?
           if association.type == Spyke::Associations::HasMany
-            field_errors.each do |new_error_hash_with_index|
+            # We need to add one error to our "base" object so that it's not valid
+            self.add_to_errors(field_name.to_sym, [{error: :invalid}])
+            field_errors.each do |new_error_hash_with_index| # new_error_hash_OR_error_type ("blank") on presence of has_many
               new_error_hash_with_index.each do |index, inner_errors_hash|
                 error_attribute = inner_errors_hash.keys.first.split('.').last.to_sym
                 self.send(ass_name)[index.to_i].add_to_errors(error_attribute, inner_errors_hash.values.last)

data/test/exceptions_test.rb

@@ -1,4 +1,6 @@
 require 'test_helper'
+require 'fixtures'
+
 VCR.turn_off!
 
 module Fakturan
@@ -68,6 +70,24 @@ module Fakturan
       assert_equal 400, error.status
     end
 
+    def test_validation_errors_on_blank_associated_objects
+      stub_api_request(:post, '/trees').to_return(body: {errors: {apples: [{error: :blank}], crown: [{error: :blank}]}}.to_json, status: 422)
+      a = Fakturan::Tree.new()
+      assert_equal false, a.save
+      assert_equal (["Apples can't be blank", "Crown can't be blank"]), a.errors.to_a
+      assert_equal ({:apples=>[{:error=>:blank}], :crown=>[{:error=>:blank}]}), a.errors.details
+    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)
+
+      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
+      assert_equal "Rows is invalid", invoice.errors.to_a.first
+    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)
 
@@ -75,7 +95,7 @@ module Fakturan
       invoice.save
 
       assert_equal "Client company can't be blank", invoice.errors.to_a.last
-      assert_equal ({date: [{error: :blank}, {error: :invalid}]}), invoice.errors.details
+      assert_equal ({date: [{error: :blank}, {error: :invalid}], :rows=>[{:error=>:invalid}]}), invoice.errors.details
       assert_equal ({:product_code=>[{:error=>:too_long, :count=>30}]}), invoice.rows[0].errors.details
       # This one checks that our index / ordering has succeded and we have put the errors on the correct object
       assert_equal ({:product_code=>[{:error=>:too_long, :count=>30}]}), invoice.rows[2].errors.details

data/test/fixtures.rb

@@ -0,0 +1,17 @@
+module Fakturan
+  class Tree < Base
+    uri 'trees/(:id)'
+    has_many :apples, uri: nil
+    has_one :crown, uri: nil
+
+    accepts_nested_attributes_for :apples, :crown
+  end
+
+  class Apple < Base
+    attributes :colour
+  end
+
+  class Crown < Base
+    attributes :fluffyness
+  end
+end

data/test/models_test.rb

@@ -18,7 +18,7 @@ module Fakturan
     i_suck_and_my_tests_are_order_dependent!
 
     def good_invoice_params
-      @good_invoice_params  ||= { client: { company: 'Imagine it AB' }, date: Date.today, address: { name: "Imagine it AB", street_address: "Tage Erlandergatan 4" } }
+      @good_invoice_params  ||= { client: { company: 'Imagine it AB' }, date: "2015-04-07".to_date, address: { name: "Imagine it AB", street_address: "Tage Erlandergatan 4" } }
     end
 
     def get_good_invoice
@@ -121,7 +121,7 @@ module Fakturan
 
     def test_should_be_able_to_set_params_on_association
       invoice = Fakturan::Invoice.new
-      invoice.date = Date.today.to_s
+      invoice.date = "2015-04-07"
       invoice.build_client
       invoice.client.company = 'Imagine it AB'
       assert invoice.save

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakturan_nu
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Jonathan Bourque Olivegren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spyke
@@ -202,6 +202,7 @@ files:
 - lib/fakturan_nu/spyke_extensions.rb
 - test/basics_test.rb
 - test/exceptions_test.rb
+- test/fixtures.rb
 - test/models_test.rb
 - test/test_helper.rb
 - test/vcr_cassettes/models.yml