fortnox-api 0.5.2 → 0.6.0

data/lib/fortnox/api/repositories/base/loaders.rb

@@ -1,67 +1,63 @@
-require "cgi"
+# frozen_string_literal: true
+
+require 'cgi'
 
 module Fortnox
   module API
     module Repository
       module Loaders
-
-        def all()
-          response_hash = get( self.class::URI )
-          instantiate_collection_response( response_hash )
+        def all
+          response_hash = get(self.class::URI)
+          instantiate_collection_response(response_hash)
         end
 
-        def only( filter )
-          response_hash = get( "#{ self.class::URI }?filter=#{ filter }" )
-          instantiate_collection_response( response_hash )
+        def only(filter)
+          response_hash = get("#{self.class::URI}?filter=#{filter}")
+          instantiate_collection_response(response_hash)
         end
 
-        def search( hash )
+        def search(hash)
           attribute, value = hash.first
-          uri_encoded_value = URI.encode(value)
-          uri = "#{ self.class::URI }?#{ attribute }=#{ uri_encoded_value }".freeze
-          response_hash = get( uri )
-          instantiate_collection_response( response_hash )
+          uri_encoded_value = CGI.escape(value)
+          uri = "#{self.class::URI}?#{attribute}=#{uri_encoded_value}"
+          response_hash = get(uri)
+          instantiate_collection_response(response_hash)
         end
 
-        def find( id_or_hash )
-          return find_all_by( id_or_hash ) if id_or_hash.is_a? Hash
-
-          id = Integer( id_or_hash )
-          find_one_by( id )
+        def find(id_or_hash)
+          return find_all_by(id_or_hash) if id_or_hash.is_a? Hash
 
-        rescue ArgumentError
-          raise ArgumentError, "find only accepts a number or hash as argument"
+          find_one_by(id_or_hash)
         end
 
-        def find_one_by( id )
-          response_hash = get( "#{ self.class::URI }#{ id }" )
-          instantiate( @mapper.wrapped_json_hash_to_entity_hash( response_hash ) )
+        def find_one_by(id)
+          response_hash = get("#{self.class::URI}#{id}")
+          instantiate(@mapper.wrapped_json_hash_to_entity_hash(response_hash))
         end
 
-        def find_all_by( hash )
-          response_hash = get( "#{ self.class::URI }?#{ to_query( hash ) }" )
-          instantiate_collection_response( response_hash )
+        def find_all_by(hash)
+          response_hash = get("#{self.class::URI}?#{to_query(hash)}")
+          instantiate_collection_response(response_hash)
         end
 
-        def to_query( hash )
+        def to_query(hash)
           hash.collect do |key, value|
-            escape( key, value )
+            escape(key, value)
           end.sort * '&'
         end
 
-        def escape( key, value )
-          "#{ CGI.escape(key.to_s) }=#{ CGI.escape(value.to_s) }"
+        def escape(key, value)
+          "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}"
         end
 
         private
 
-          def instantiate_collection_response( response_hash )
-            entities_hash = @mapper.wrapped_json_collection_to_entities_hash( response_hash )
-            entities_hash.map do |entity_hash|
-              instantiate( entity_hash )
-            end
+        def instantiate_collection_response(response_hash)
+          entities_hash = @mapper.wrapped_json_collection_to_entities_hash(response_hash)
+          entities_hash.map do |entity_hash|
+            instantiate(entity_hash)
           end
-
+        end
       end
     end
   end

data/lib/fortnox/api/repositories/base/savers.rb

@@ -1,46 +1,48 @@
+# frozen_string_literal: true
+
 module Fortnox
   module API
     module Repository
       module Savers
-
-        def save( entity )
+        def save(entity)
           return true if entity.saved?
 
-          return save_new( entity ) if entity.new?
-          update_existing( entity )
+          return save_new(entity) if entity.new?
+          update_existing(entity)
         end
 
-      private
-        def execute_save( entity )
-          body = get_changes_on( entity ).to_json
+        private
+
+        def execute_save(entity)
+          body = get_changes_on(entity).to_json
           result = yield body
-          instantiate_saved( result )
+          instantiate_saved(result)
         end
 
-        def save_new( entity )
-          execute_save( entity ) do |body|
-            post( self.class::URI, { body: body } )
+        def save_new(entity)
+          execute_save(entity) do |body|
+            post(self.class::URI, body: body)
           end
         end
 
-        def update_existing( entity )
-          execute_save( entity ) do |body|
-            put( get_update_url_for( entity ), { body: body } )
+        def update_existing(entity)
+          execute_save(entity) do |body|
+            put(get_update_url_for(entity), body: body)
           end
         end
 
-        def get_changes_on( entity )
-          hash = @mapper.entity_to_hash( entity, @keys_filtered_on_save )
-          parent_hash = @mapper.entity_to_hash( entity.parent, @keys_filtered_on_save )
+        def get_changes_on(entity)
+          hash = @mapper.entity_to_hash(entity, @keys_filtered_on_save)
+          parent_hash = @mapper.entity_to_hash(entity.parent, @keys_filtered_on_save)
 
-          @mapper.wrap_entity_json_hash( @mapper.diff( hash, parent_hash ) )
+          @mapper.wrap_entity_json_hash(@mapper.diff(hash, parent_hash))
         end
 
-        def get_update_url_for( entity )
-          "#{ self.class::URI }#{ entity.unique_id }"
+        def get_update_url_for(entity)
+          "#{self.class::URI}#{entity.unique_id}"
         end
 
-        def instantiate_saved( wrapped_json_hash )
+        def instantiate_saved(wrapped_json_hash)
           instantiate(
             @mapper.wrapped_json_hash_to_entity_hash(
               wrapped_json_hash

data/lib/fortnox/api/repositories/customer.rb

@@ -1,6 +1,8 @@
-require "fortnox/api/repositories/base"
-require "fortnox/api/models/customer"
-require "fortnox/api/mappers/customer"
+# frozen_string_literal: true
+
+require 'fortnox/api/repositories/base'
+require 'fortnox/api/models/customer'
+require 'fortnox/api/mappers/customer'
 
 module Fortnox
   module API
@@ -8,7 +10,7 @@ module Fortnox
       class Customer < Base
         MODEL = Model::Customer
         MAPPER = Mapper::Customer
-        URI = '/customers/'.freeze
+        URI = '/customers/'
       end
     end
   end

data/lib/fortnox/api/repositories/invoice.rb

@@ -1,6 +1,8 @@
-require "fortnox/api/repositories/base"
-require "fortnox/api/models/invoice"
-require "fortnox/api/mappers/invoice"
+# frozen_string_literal: true
+
+require 'fortnox/api/repositories/base'
+require 'fortnox/api/models/invoice'
+require 'fortnox/api/mappers/invoice'
 
 module Fortnox
   module API
@@ -8,7 +10,7 @@ module Fortnox
       class Invoice < Base
         MODEL = Model::Invoice
         MAPPER = Mapper::Invoice
-        URI = '/invoices/'.freeze
+        URI = '/invoices/'
       end
     end
   end

data/lib/fortnox/api/repositories/order.rb

@@ -1,6 +1,8 @@
-require "fortnox/api/repositories/base"
-require "fortnox/api/models/order"
-require "fortnox/api/mappers/order"
+# frozen_string_literal: true
+
+require 'fortnox/api/repositories/base'
+require 'fortnox/api/models/order'
+require 'fortnox/api/mappers/order'
 
 module Fortnox
   module API
@@ -8,7 +10,7 @@ module Fortnox
       class Order < Base
         MODEL = Model::Order
         MAPPER = Mapper::Order
-        URI = '/orders/'.freeze
+        URI = '/orders/'
       end
     end
   end

data/lib/fortnox/api/repositories/project.rb

@@ -1,6 +1,8 @@
-require "fortnox/api/repositories/base"
-require "fortnox/api/models/project"
-require "fortnox/api/mappers/project"
+# frozen_string_literal: true
+
+require 'fortnox/api/repositories/base'
+require 'fortnox/api/models/project'
+require 'fortnox/api/mappers/project'
 
 module Fortnox
   module API
@@ -8,7 +10,7 @@ module Fortnox
       class Project < Base
         MODEL = Model::Project
         MAPPER = Mapper::Project
-        URI = '/projects/'.freeze
+        URI = '/projects/'
       end
     end
   end

data/lib/fortnox/api/repositories/terms_of_payments.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'fortnox/api/repositories/base'
+require 'fortnox/api/models/terms_of_payments'
+require 'fortnox/api/mappers/terms_of_payments'
+
+module Fortnox
+  module API
+    module Repository
+      class TermsOfPayments < Base
+        MODEL = Model::TermsOfPayments
+        MAPPER = Mapper::TermsOfPayments
+        URI = '/termsofpayments/'
+      end
+    end
+  end
+end

data/lib/fortnox/api/repositories/unit.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'fortnox/api/repositories/base'
+require 'fortnox/api/models/unit'
+require 'fortnox/api/mappers/unit'
+
+module Fortnox
+  module API
+    module Repository
+      class Unit < Fortnox::API::Repository::Base
+        MODEL = Fortnox::API::Model::Unit
+        MAPPER = Fortnox::API::Mapper::Unit
+        URI = '/units/'
+      end
+    end
+  end
+end

data/lib/fortnox/api/request_handling.rb

@@ -1,35 +1,35 @@
+# frozen_string_literal: true
+
 module Fortnox
   module API
     module RequestHandling
-
       private
 
-        def raise_api_error( error, response )
-          message = ( error[ 'message' ] || error[ 'Message' ] || 'Okänt fel' )
+        def raise_api_error(error, response)
+          message = (error['message'] || error['Message'] || 'Okänt fel')
 
-          message += "\n\n#{ response.request.inspect }" if Fortnox::API.debugging
+          message += "\n\n#{response.request.inspect}" if Fortnox::API.debugging
 
           raise Fortnox::API::RemoteServerError, message
         end
 
-        def validate_response( response )
+        def validate_response(response)
           return if response.code == 200
 
-          api_error = response.parsed_response[ 'ErrorInformation' ]
-          raise_api_error( api_error, response ) if api_error
+          api_error = response.parsed_response['ErrorInformation']
+          raise_api_error(api_error, response) if api_error
         end
 
-        def validate_and_parse( response )
-          validate_response( response )
+        def validate_and_parse(response)
+          validate_response(response)
           response.parsed_response
         end
 
         def execute
-          self.class.set_headers( @headers )
-          response = yield( self.class )
+          self.class.set_headers(@headers)
+          response = yield(self.class)
           validate_and_parse response
         end
-
     end
   end
 end

data/lib/fortnox/api/types.rb

@@ -1,6 +1,25 @@
+# frozen_string_literal: true
+
 require 'dry-struct'
 require 'dry-types'
 
+module Dry
+  module Types
+    module Options
+      def is(*option_names)
+        new_options = option_names.each_with_object({}) do |name, hash|
+          hash[name] = true
+        end
+        with(new_options)
+      end
+
+      def is?(option_name)
+        @options[option_name]
+      end
+    end
+  end
+end
+
 module Fortnox
   module API
     module Types
@@ -16,25 +35,57 @@ module Fortnox
 
       require 'fortnox/api/types/sized'
 
-      AccountNumber = Strict::Int.constrained( gteq: 0, lteq: 9999 ).optional
+      AccountNumber = Strict::Int
+                      .constrained(gteq: 0, lteq: 9999)
+                      .optional
 
-      ArticleType = Strict::String.constrained( included_in: ArticleTypes.values ).optional.constructor( EnumConstructors.default )
+      ArticleType = Strict::String
+                    .constrained(included_in: ArticleTypes.values)
+                    .optional
+                    .constructor(EnumConstructors.default)
 
-      CountryCode = Strict::String.constrained( included_in: CountryCodes.values ).optional.constructor( EnumConstructors.sized(2) )
-      Currency = Strict::String.constrained( included_in: Currencies.values ).optional.constructor( EnumConstructors.sized(3) )
-      CustomerType = Strict::String.constrained( included_in: CustomerTypes.values ).optional.constructor( EnumConstructors.default )
+      CountryCode = Strict::String
+                    .constrained(included_in: CountryCodes.values)
+                    .optional
+                    .constructor(EnumConstructors.sized(2))
+      Currency = Strict::String
+                 .constrained(included_in: Currencies.values)
+                 .optional
+                 .constructor(EnumConstructors.sized(3))
+      CustomerType = Strict::String
+                     .constrained(included_in: CustomerTypes.values)
+                     .optional
+                     .constructor(EnumConstructors.default)
 
-      DiscountType = Strict::String.constrained( included_in: DiscountTypes.values ).optional.constructor( EnumConstructors.default )
+      DiscountType = Strict::String
+                     .constrained(included_in: DiscountTypes.values)
+                     .optional
+                     .constructor(EnumConstructors.default)
 
-      Email = Strict::String.constrained( max_size: 1024, format: /\A^$|[\w+\-.]+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i ).optional.constructor{ |v| v.to_s.downcase unless v.nil? }
+      Email = Strict::String
+              .constrained(max_size: 1024, format: /^$|\A[\w+-_.]+@[\w+-_.]+\.[a-z]+\z/i)
+              .optional
+              .constructor { |v| v.to_s.downcase unless v.nil? }
 
-      HouseWorkType = Strict::String.constrained( included_in: HouseWorkTypes.values ).optional.constructor( EnumConstructors.default )
+      HouseworkType = Strict::String
+                      .constrained(included_in: HouseworkTypes.values)
+                      .optional
+                      .constructor(EnumConstructors.default)
 
-      VATType = Strict::String.constrained( included_in: VATTypes.values ).optional.constructor( EnumConstructors.default )
+      VATType = Strict::String
+                .constrained(included_in: VATTypes.values)
+                .optional
+                .constructor(EnumConstructors.default)
 
-      DefaultDeliveryType = Strict::String.constrained( included_in: DefaultDeliveryTypeValues.values ).optional.constructor( EnumConstructors.default )
+      DefaultDeliveryType = Strict::String
+                            .constrained(included_in: DefaultDeliveryTypeValues.values)
+                            .optional
+                            .constructor(EnumConstructors.default)
 
-      ProjectStatusType = Strict::String.constrained( included_in: ProjectStatusTypes.values ).optional.constructor( EnumConstructors.default )
+      ProjectStatusType = Strict::String
+                          .constrained(included_in: ProjectStatusTypes.values)
+                          .optional
+                          .constructor(EnumConstructors.default)
 
       require 'fortnox/api/types/model'
       require 'fortnox/api/types/default_delivery_types'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fortnox/api/types'
 
 module Fortnox
@@ -6,13 +8,13 @@ module Fortnox
       class DefaultDeliveryTypes < Types::Model
         STUB = {}.freeze
 
-        #Default delivery type for invoices. Can be PRINT EMAIL or PRINTSERVICE.
+        # Default delivery type for invoices. Can be PRINT EMAIL or PRINTSERVICE.
         attribute :invoice, Types::DefaultDeliveryType
 
-        #Default delivery type for orders. Can be PRINT EMAIL or PRINTSERVICE.
+        # Default delivery type for orders. Can be PRINT EMAIL or PRINTSERVICE.
         attribute :order, Types::DefaultDeliveryType
 
-        #Default delivery type for offers. Can be PRINT EMAIL or PRINTSERVICE.
+        # Default delivery type for offers. Can be PRINT EMAIL or PRINTSERVICE.
         attribute :offer, Types::DefaultDeliveryType
       end
     end