fortnox-api 0.5.2 → 0.6.0

data/lib/fortnox/api/types/required.rb

@@ -1,13 +1,13 @@
+# frozen_string_literal: true
+
 module Fortnox
   module API
     module Types
-
       module Required
-        String = Types::Strict::String.constructor{ |value| value.to_s unless value.nil? }.with( required: true )
-        Integer = Types::Strict::Int.constructor{ |value| value.to_i unless value.nil? }.with( required: true )
-        Float = Types::Strict::Float.constructor{ |value| value.to_f unless value.nil? }.with( required: true )
+        String = Types::Strict::String.constructor { |value| value.to_s unless value.nil? }.is(:required)
+        Integer = Types::Strict::Int.constructor { |value| value.to_i unless value.nil? }.is(:required)
+        Float = Types::Strict::Float.constructor { |value| value.to_f unless value.nil? }.is(:required)
       end
-
     end
   end
 end

data/lib/fortnox/api/types/sized.rb

@@ -1,22 +1,30 @@
+# frozen_string_literal: true
+
 module Fortnox
   module API
     module Types
       module Sized
         module String
-          def self.[]( size )
-            Types::Strict::String.constrained( max_size: size ).optional.constructor{ |value| value.to_s unless value.nil? }
+          def self.[](size)
+            Types::Strict::String.constrained(max_size: size).optional.constructor do |value|
+              value.to_s unless value.nil?
+            end
           end
         end
 
         module Integer
-          def self.[]( low, high )
-            Types::Strict::Int.constrained( gteq: low, lteq: high ).optional.constructor{ |value| value.to_i unless value.nil? }
+          def self.[](low, high)
+            Types::Strict::Int.constrained(gteq: low, lteq: high).optional.constructor do |value|
+              value.to_i unless value.nil?
+            end
           end
         end
 
         module Float
-          def self.[]( low, high )
-            Types::Strict::Float.constrained( gteq: low, lteq: high ).optional.constructor{ |value| value.to_f unless value.nil? }
+          def self.[](low, high)
+            Types::Strict::Float.constrained(gteq: low, lteq: high).optional.constructor do |value|
+              value.to_f unless value.nil?
+            end
           end
         end
       end

data/lib/fortnox/api/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Fortnox
   module API
-    VERSION = "0.5.2".freeze
+    VERSION = '0.6.0'
   end
 end

data/spec/fortnox/api/mappers/article_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'fortnox/api'
 require 'fortnox/api/mappers/customer'
@@ -10,6 +12,6 @@ describe Fortnox::API::Mapper::Article do
   json_entity_collection = 'Articles'
 
   it_behaves_like 'mapper', key_map, json_entity_type, json_entity_collection do
-    let(:mapper){ described_class.new }
+    let(:mapper) { described_class.new }
   end
 end

data/spec/fortnox/api/mappers/base/from_json_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'fortnox/api/mappers/base/from_json'
 require 'fortnox/api/mappers/contexts/json_conversion'
 
 describe Fortnox::API::Mapper::FromJSON do
-  include_context 'JSON conversion'
+  include_context 'with JSON conversion'
 
   before do
     module Test
@@ -12,20 +14,20 @@ describe Fortnox::API::Mapper::FromJSON do
       end
     end
 
-    register_mapper( :categories, Test::CategoryMapper )
-    register_mapper( :designer, Test::ProductDesignerMapper )
+    register_mapper(:categories, Test::CategoryMapper)
+    register_mapper(:designer, Test::ProductDesignerMapper)
   end
 
-  let( :mapper ){ Test::ProductMapper.new }
+  let(:mapper) { Test::ProductMapper.new }
 
   describe 'wrapped_json_hash_to_entity_hash' do
-    let( :entity_hash ){ mapper.wrapped_json_hash_to_entity_hash( wrapped_json_hash ) }
-    let( :wrapped_json_hash ) do
+    let(:entity_hash) { mapper.wrapped_json_hash_to_entity_hash(wrapped_json_hash) }
+    let(:wrapped_json_hash) do
       {
         'Product' => {
           '@url': 'someurl@example.com',
           'Name': 'Ford Mustang',
-          'VAT': 30000,
+          'VAT': 30_000,
           'Categories': [{ 'Name' => 'Cars', 'ID' => '1' }, { 'Name' => 'Fast cars', 'ID' => '2' }],
           'Designer': { 'Name' => 'John Najjar', 'ID' => '23' }
         }
@@ -33,11 +35,11 @@ describe Fortnox::API::Mapper::FromJSON do
     end
 
     specify 'converts keys without mapping correctly' do
-      expect( entity_hash[:name] ).to eq 'Ford Mustang'
+      expect(entity_hash[:name]).to eq 'Ford Mustang'
     end
 
     specify 'converts keys with mapping correctly' do
-      expect( entity_hash[:vat] ).to eq 30000
+      expect(entity_hash[:vat]).to eq 30_000
     end
 
     specify 'converts keys starting with "@" correctly'
@@ -46,20 +48,20 @@ describe Fortnox::API::Mapper::FromJSON do
     # end
 
     context 'with nested models' do
-      let( :expected_nested_model_hash ) do
+      let(:expected_nested_model_hash) do
         [{ name: 'Cars', id: '1' }, { name: 'Fast cars', id: '2' }]
       end
 
       specify 'are converted correctly' do
-        expect( entity_hash[:categories] ).to eq( expected_nested_model_hash )
+        expect(entity_hash[:categories]).to eq(expected_nested_model_hash)
       end
     end
 
     context 'with nested model' do
-      let( :expected_nested_model_hash ){ { name: 'John Najjar', id: '23' } }
+      let(:expected_nested_model_hash) { { name: 'John Najjar', id: '23' } }
 
       specify 'is converted correctly' do
-        expect( entity_hash[:designer] ).to eq( expected_nested_model_hash )
+        expect(entity_hash[:designer]).to eq(expected_nested_model_hash)
       end
     end
   end

data/spec/fortnox/api/mappers/base/to_json_spec.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'fortnox/api/mappers/base/to_json'
 require 'fortnox/api/mappers/contexts/json_conversion'
 
 describe Fortnox::API::Mapper::ToJSON do
-  # TODO:
-  # Following error is risen sometimes when all specs are run:
+  # TODO: Following error is risen sometimes when all specs are run:
   # "NoMethodError: undefined method `call\' for Test::ProductMapper:Class`"
   it 'should be tested when random error is fixed!'
 
@@ -12,7 +13,7 @@ describe Fortnox::API::Mapper::ToJSON do
     it 'should be tested'
   end
 
-  # include_context 'JSON conversion'
+  # include_context 'with JSON conversion'
 
   # before do
   #   module Test

data/spec/fortnox/api/mappers/base_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'fortnox/api'
 require 'fortnox/api/mappers'
@@ -8,73 +10,75 @@ describe Fortnox::API::Mapper::Base do
   it_behaves_like 'mapper', nil, nil, nil, check_constants: false
 
   shared_examples_for 'simple mapper' do |registry_key, exp_value|
-    subject{ mapper.call( value ) }
-    let( :mapper ){ Fortnox::API::Registry[ registry_key ] }
-    it{ is_expected.to eq( exp_value ) }
+    subject { mapper.call(value) }
+
+    let(:mapper) { Fortnox::API::Registry[registry_key] }
+    it { is_expected.to eq(exp_value) }
   end
 
   shared_examples_for 'identity mapper' do |registry_key|
-    subject{ mapper.call( value ) }
-    let( :mapper ){ Fortnox::API::Registry[ registry_key ] }
-    it{ is_expected.to eq( value ) }
+    subject { mapper.call(value) }
+
+    let(:mapper) { Fortnox::API::Registry[registry_key] }
+    it { is_expected.to eq(value) }
   end
 
   describe 'string' do
     include_examples 'identity mapper', :string do
-      let( :value ){ Fortnox::API::Types::Nullable::String[ 'test' ] }
+      let(:value) { Fortnox::API::Types::Nullable::String['test'] }
     end
   end
 
   describe 'int' do
     include_examples 'identity mapper', :int do
-      let( :value ){ Fortnox::API::Types::Nullable::Integer[ 1337 ] }
+      let(:value) { Fortnox::API::Types::Nullable::Integer[1337] }
     end
   end
 
   describe 'float' do
     include_examples 'identity mapper', :float do
-      let( :value ){ Fortnox::API::Types::Nullable::Float[ 13.37 ] }
+      let(:value) { Fortnox::API::Types::Nullable::Float[13.37] }
     end
   end
 
   describe 'boolean' do
     include_examples 'identity mapper', :boolean do
-      let( :value ){ Fortnox::API::Types::Nullable::Boolean[ false ] }
+      let(:value) { Fortnox::API::Types::Nullable::Boolean[false] }
     end
   end
 
   describe 'array' do
     include_examples 'identity mapper', :array do
-      let( :value ){ [1,3,3,7] }
+      let(:value) { [1, 3, 3, 7] }
     end
   end
 
   describe 'array with very large int (Bigint if Ruby <2.4)' do
     include_examples 'identity mapper', :array do
-      let( :value ){ [(100**10)] }
+      let(:value) { [(100**10)] }
     end
   end
 
   describe 'advanced array' do
-    include_examples 'simple mapper', :array, [ "2016-01-01", "2016-01-02" ] do
-      let( :value ){ [ Date.new(2016, 1, 1), Date.new(2016, 1, 2) ] }
+    include_examples 'simple mapper', :array, ['2016-01-01', '2016-01-02'] do
+      let(:value) { [Date.new(2016, 1, 1), Date.new(2016, 1, 2)] }
     end
   end
 
   describe 'hash' do
     include_examples 'identity mapper', :hash do
-      let( :value ){ { string: 'test', int: 1337, float: 13.37 } }
+      let(:value) { { string: 'test', int: 1337, float: 13.37 } }
     end
   end
 
   describe 'advanced hash' do
     expected_hash = {
       string: 'test',
-      date_array: [ "2016-01-01", "2016-01-02"],
-      nested_hash: { date: "2016-01-03", string: 'test' }
+      date_array: ['2016-01-01', '2016-01-02'],
+      nested_hash: { date: '2016-01-03', string: 'test' }
     }
     include_examples 'identity mapper', :hash, expected_hash do
-      let( :value ) do
+      let(:value) do
         {
           string: 'test',
           date_array: [Date.new(2016, 1, 1), Date.new(2016, 1, 2)],
@@ -86,77 +90,78 @@ describe Fortnox::API::Mapper::Base do
 
   describe 'trueclass' do
     include_examples 'identity mapper', :trueclass do
-      let( :value ){ true }
+      let(:value) { true }
     end
   end
   describe 'falseclass' do
     include_examples 'identity mapper', :falseclass do
-      let( :value ){ false }
+      let(:value) { false }
     end
   end
 
   describe 'date' do
-    include_examples 'simple mapper', :date, "2016-01-01" do
-      let( :value ){ Date.new(2016, 1, 1) }
+    include_examples 'simple mapper', :date, '2016-01-01' do
+      let(:value) { Date.new(2016, 1, 1) }
     end
   end
 
   describe 'nilclass' do
     include_examples 'identity mapper', :nilclass do
-      let( :value ){ Fortnox::API::Types::Nullable::String[ nil ] }
+      let(:value) { Fortnox::API::Types::Nullable::String[nil] }
     end
   end
 
   describe 'AccountNumber' do
     include_examples 'identity mapper', :account_number do
-      let( :value ){ Fortnox::API::Types::AccountNumber[ 1234 ] }
+      let(:value) { Fortnox::API::Types::AccountNumber[1234] }
     end
   end
 
   describe 'CountryCode' do
     include_examples 'identity mapper', :country_code do
-      let( :value ){ Fortnox::API::Types::CountryCode[ 'SE' ] }
+      let(:value) { Fortnox::API::Types::CountryCode['SE'] }
     end
   end
 
   describe 'Currency' do
     include_examples 'identity mapper', :currency do
-      let( :value ){ Fortnox::API::Types::Currency[ 'SEK' ] }
+      let(:value) { Fortnox::API::Types::Currency['SEK'] }
     end
   end
 
   describe 'CustomerType' do
     include_examples 'identity mapper', :customer_type do
-      let( :value ){ Fortnox::API::Types::CustomerType[ 'PRIVATE' ] }
+      let(:value) { Fortnox::API::Types::CustomerType['PRIVATE'] }
     end
   end
 
   describe 'DiscountType' do
     include_examples 'identity mapper', :discount_type do
-      let( :value ){ Fortnox::API::Types::DiscountType[ 'PERCENT' ] }
+      let(:value) { Fortnox::API::Types::DiscountType['PERCENT'] }
     end
   end
 
   describe 'Email' do
     include_examples 'identity mapper', :email do
-      let( :value ){ Fortnox::API::Types::Email[ 'email@example.com' ] }
+      let(:value) { Fortnox::API::Types::Email['email@example.com'] }
     end
   end
 
-  describe 'HouseWorkType' do
-    include_examples 'identity mapper', :house_work_type do
-      let( :value ){ Fortnox::API::Types::HouseWorkType[ 'CONSTRUCTION' ] }
+  describe 'HouseworkType' do
+    include_examples 'identity mapper', :housework_type do
+      let(:value) { Fortnox::API::Types::HouseworkType['CONSTRUCTION'] }
     end
   end
 
   describe 'VATType' do
     include_examples 'identity mapper', :vat_type do
-      let( :value ){ Fortnox::API::Types::VATType[ 'SEVAT' ] }
+      let(:value) { Fortnox::API::Types::VATType['SEVAT'] }
     end
   end
 
   describe '#canonical_name_sym' do
-    subject{ described_class.canonical_name_sym }
-    it{ is_expected.to eq( described_class.name.split( '::' ).last.downcase.to_sym ) }
+    subject { described_class.canonical_name_sym }
+
+    it { is_expected.to eq(described_class.name.split('::').last.downcase.to_sym) }
   end
 end

data/spec/fortnox/api/mappers/contexts/json_conversion.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'fortnox/api'
 require 'fortnox/api/mappers'
 
-shared_context 'JSON conversion' do
+shared_context 'with JSON conversion' do
   before do
     module Test
       class BaseMapper
@@ -20,8 +22,8 @@ shared_context 'JSON conversion' do
           vat: 'VAT',
           url: '@url' # TODO: How to handle url attribute?
         }.freeze
-        JSON_ENTITY_WRAPPER = 'Product'.freeze
-        JSON_COLLECTION_WRAPPER = 'Products'.freeze
+        JSON_ENTITY_WRAPPER = 'Product'
+        JSON_COLLECTION_WRAPPER = 'Products'
       end
 
       class Category < Fortnox::API::Model::Base
@@ -38,19 +40,18 @@ shared_context 'JSON conversion' do
         attribute :url, 'strict.string'
         attribute :name, 'strict.string'
         attribute :vat, 'strict.float'
-        attribute :categories, Dry::Types['coercible.array'].member( Test::Category )
+        attribute :categories, Dry::Types['coercible.array'].member(Test::Category)
         attribute :designer, Test::ProductDesigner
       end
     end
 
-    def register_mapper( mapper_sym, mapper )
-      unless Fortnox::API::Registry.key? mapper_sym
-        Fortnox::API::Registry.register( mapper_sym, mapper )
-      end
+    def register_mapper(mapper_sym, mapper)
+      return if Fortnox::API::Registry.key? mapper_sym
+      Fortnox::API::Registry.register(mapper_sym, mapper)
     end
 
-    register_mapper( :category, Test::CategoryMapper)
-    register_mapper( :productdesigner, Test::ProductDesignerMapper )
-    register_mapper( :product, Test::ProductMapper )
+    register_mapper(:category, Test::CategoryMapper)
+    register_mapper(:productdesigner, Test::ProductDesignerMapper)
+    register_mapper(:product, Test::ProductMapper)
   end
 end

data/spec/fortnox/api/mappers/customer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'fortnox/api'
 require 'fortnox/api/mappers/customer'
@@ -20,6 +22,6 @@ describe Fortnox::API::Mapper::Customer do
   json_entity_collection = 'Customers'
 
   it_behaves_like 'mapper', key_map, json_entity_type, json_entity_collection do
-    let(:mapper){ described_class.new }
+    let(:mapper) { described_class.new }
   end
 end

data/spec/fortnox/api/mappers/default_delivery_types_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'fortnox/api'
 require 'fortnox/api/mappers/default_delivery_types'
@@ -7,6 +9,6 @@ describe Fortnox::API::Mapper::DefaultDeliveryTypes do
   key_map = {}
 
   it_behaves_like 'mapper', key_map do
-    let(:mapper){ described_class.new }
+    let(:mapper) { described_class.new }
   end
 end