billogram 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e1cd468bd3eab2cb8de98ae549c52e36f1da713
-  data.tar.gz: 7ac88f9d37a3c31796f42736ac7721749b00832f
+  metadata.gz: 66bc9d6fc1707cc2615a8aa63e3fdd211e68ca4f
+  data.tar.gz: 8ad753d1c3b129104bb8c0557e4f92251e264e7d
 SHA512:
-  metadata.gz: 846d964585e1c6c635391aaa1e20220c3031ce2e94335028e38630dd20df85e39be6f8179a0a2145cf4552ea0b8fd4cf8d79273b71137f2eada9c2a667499cb7
-  data.tar.gz: 254c14107ceff556a081b7d03b8331fb8e1307269c7ea6db9d7916256f4a6d671ee0d4a91ec4c015c63d15b292c6e9eaea1009eff5c6c5180a3b93c03a521cf6
+  metadata.gz: 829e2453b693f4e409f6d5374656e7ead261a505e21ae6a68d3efffe15c145964bb1ba9959aec4b855f9ffcb8b06042da8e341f1e4fa3962b97fd6197f4ebf40
+  data.tar.gz: 45e1132b2af23d470cdb4c0cc94e125bda47142d6ed4e1a89d66900d8a9a183ce9f0046f60375d6b8d3a17b7eab00a4c8b1cca7bec5eb4d74dc7072e55a45121

data/lib/billogram.rb

@@ -1,11 +1,13 @@
 require "httparty"
 require "billogram/client"
+require "billogram/endpoint"
 require "billogram/error"
 require "billogram/relation"
 require "billogram/relation_builder"
 require "billogram/resource"
 require "billogram/request"
 require "billogram/resources/address"
+require "billogram/resources/automatic_reminder"
 require "billogram/resources/bookkeeping"
 require "billogram/resources/callbacks"
 require "billogram/resources/contact"
@@ -19,8 +21,10 @@ require "billogram/resources/international_bank_account"
 require "billogram/resources/invoice"
 require "billogram/resources/invoice_defaults"
 require "billogram/resources/item"
-require "billogram/resources/regional_sweden"
+require "billogram/resources/logotype"
 require "billogram/resources/payment"
+require "billogram/resources/regional_sweden"
+require "billogram/resources/report"
 require "billogram/resources/settings"
 require "billogram/resources/tax"
 require "billogram/version"

data/lib/billogram/client.rb

@@ -25,7 +25,7 @@ module Billogram
 
     def handle_request(method, *args)
       response = self.class.send(method, *args)
-      return response.parsed_response["data"] if response.code == 200
+      return response.parsed_response["data"] if response.success?
       raise Billogram::Error.from_response(response)
     end
   end

data/lib/billogram/endpoint.rb

@@ -0,0 +1,53 @@
+module Billogram
+  module Endpoint
+    def self.included(base)
+      base.include(InstanceMethods)
+      base.extend(ClassMethods)
+    end
+
+    module InstanceMethods
+      def update(attributes)
+        self.class.perform_request(:put, "#{endpoint}/#{id}", attributes)
+      end
+
+      def delete
+        self.class.perform_request(:delete, "#{endpoint}/#{id}")
+      end
+
+      def endpoint
+        self.class.endpoint
+      end
+    end
+
+    module ClassMethods
+      attr_writer :default_search_options
+      
+      def default_search_options
+        @default_search_options ||= { page: 1, page_size: 50 }
+      end
+
+      def endpoint(value = nil)
+        @endpoint = value if value
+        @endpoint || name.demodulize.underscore
+      end
+
+      def search(options = {})
+        query = default_search_options.merge(options)
+        perform_request(:get, "#{endpoint}", query)
+      end
+
+      def fetch(id = nil)
+        perform_request(:get, "#{endpoint}/#{id}")
+      end
+
+      def create(attributes)
+        perform_request(:post, "#{endpoint}", attributes)
+      end
+
+      def perform_request(type, url, params = {})
+        response = Request.new(type, url, params).execute
+        build_objects(response)
+      end
+    end
+  end
+end

data/lib/billogram/relation.rb

@@ -3,25 +3,13 @@ module Billogram
     attr_reader :name, :type, :class_override
 
     def initialize(name, type, class_override: nil)
-      @name = name
+      @name = name.to_s
       @type = type
       @class_override = class_override
     end
 
     def relation_class
-      "Billogram::#{class_override || class_name}".constantize
-    end
-
-    def class_name
-      @class_name ||= send("class_name_for_#{type}").classify
-    end
-
-    def class_name_for_one
-      name.to_s
-    end
-
-    def class_name_for_many
-      name.to_s.singularize
+      "Billogram::#{class_override || name.classify}".constantize
     end
   end
 end

data/lib/billogram/relation_builder.rb

@@ -15,27 +15,15 @@ module Billogram
 
     private
 
-    def extract_attributes(relation)
-      attributes.delete(relation.name.to_s)
-    end
-
     def resource_relations
       resource.class.relations
     end
 
     def build_relation(relation)
-      if attrs = extract_attributes(relation)
-        value = send("build_#{relation.type}", relation, attrs)
+      if attrs = attributes.delete(relation.name)
+        value = relation.relation_class.build_objects(attrs)
         resource.public_send("#{relation.name}=", value)
       end
     end
-
-    def build_one(relation, attrs)
-      relation.relation_class.new(attrs)
-    end
-
-    def build_many(relation, attrs)
-      attrs.map{|item| relation.relation_class.new(item) }
-    end
   end
 end

data/lib/billogram/resource.rb

@@ -2,39 +2,11 @@ require "active_support/core_ext/string/inflections.rb"
 
 module Billogram
   class Resource
-    DEFAULT_SEARCH_OPTIONS = { page: 1, page_size: 50 }
-
     class << self
       def relations
         @relations ||= []
       end
 
-      def endpoint(value = nil)
-        @endpoint = value if value
-        @endpoint || name.demodulize.underscore
-      end
-
-      def search(options = {})
-        query = DEFAULT_SEARCH_OPTIONS.merge(options)
-        perform_request(:get, "#{endpoint}", query)
-      end
-
-      def fetch(id = nil)
-        perform_request(:get, "#{endpoint}/#{id}")
-      end
-
-      def create(attributes)
-        perform_request(:post, "#{endpoint}", attributes)
-      end
-
-      def update(id, attributes)
-        perform_request(:put, "#{endpoint}/#{id}", attributes)
-      end
-
-      def delete(id)
-        perform_request(:delete, "#{endpoint}/#{id}")
-      end
-
       def relation(name, type, class_override: nil)
         relations << Relation.new(name, type, class_override: class_override)
         attr_accessor name
@@ -47,33 +19,16 @@ module Billogram
         else data
         end
       end
-
-      def perform_request(type, url, params = {})
-        response = Request.new(type, url, params).execute
-        build_objects(response)
-      end
     end
 
     def initialize(attributes = {})
       Hash(attributes).each do |key, value|
-        public_send("#{key}=", value) if respond_to?(key)
+        public_send("#{key}=", value)
       end
 
       RelationBuilder.new(self, attributes).call
     end
 
-    def update(attributes)
-      self.class.update(id, attributes)
-    end
-
-    def delete
-      self.class.delete(id)
-    end
-
-    def endpoint
-      self.class.endpoint
-    end
-
     def to_json(*args)
       instance_variables
         .map{|var| ["#{var}"[1..-1], instance_variable_get(var)]}

data/lib/billogram/resources/address.rb

@@ -1,6 +1,6 @@
 module Billogram
   class Address < Resource
     attr_accessor :street_address, :careof, :use_careof_as_attention, :zipcode,
-      :city, :country, :name
+      :city, :country, :name, :attention
   end
 end

data/lib/billogram/resources/automatic_reminder.rb

@@ -0,0 +1,5 @@
+module Billogram
+  class AutomaticReminder < Resource
+    attr_accessor :message, :delay_days
+  end
+end

data/lib/billogram/resources/callbacks.rb

@@ -1,6 +1,6 @@
 module Billogram
   class Callbacks < Resource
-    attr_accessor :callback_id, :custom, :signature, :sandbox
+    attr_accessor :callback_id, :custom, :signature, :sandbox, :url, :sign_key
 
     relation :event, :one
     relation :invoice, :one

data/lib/billogram/resources/customer.rb

@@ -1,13 +1,14 @@
 module Billogram
   class Customer < Resource
+    include Endpoint
+
     attr_accessor :customer_no, :name, :notes, :org_no, :vat_no, :created_at,
-      :updated_at, :company_type
+      :updated_at, :company_type, :phone, :email
 
     alias_method :id, :customer_no
 
     relation :address, :one
     relation :contact, :one
     relation :delivery_address, :one, class_override: "Address"
-
   end
 end

data/lib/billogram/resources/event.rb

@@ -1,5 +1,7 @@
 module Billogram
   class Event < Resource
+    include Endpoint
+
     endpoint 'billogram_event'
 
     attr_accessor :created_at, :type

data/lib/billogram/resources/invoice.rb

@@ -1,6 +1,9 @@
 module Billogram
   class Invoice < Resource
+    include Endpoint
+
     endpoint 'billogram'
+
     attr_accessor :id, :invoice_no, :ocr_number, :invoice_date, :due_date, :due_days, 
                   :invoice_fee, :invoice_fee_vat, :reminder_fee, :interest_rate,
                   :interest_fee, :currency, :delivery_method, :state, :url, :flags,
@@ -17,53 +20,23 @@ module Billogram
     relation :items, :many
     relation :events, :many
 
-    extend Forwardable
-    delegate perform_request: self
+    COMMANDS = [ :sell, :remind, :collect, :writeoff, :resend, :remind, :payment, :credit, :message, :attach ]
 
-    def sell
-      perform_request(command_path(:sell), :post)
-    end
-
-    def collect
-      perform_request(command_path(:collect), :post)
-    end
-
-    def writeoff
-      perform_request(command_path(:writeoff), :post)
+    COMMANDS.each do |command|
+      define_method command do |*args|
+        send_command(command, *args)
+      end
     end
 
     def send!(method: )
-      perform_request(command_path(:send), :post, {method: method})
-    end
-
-    def resend(method: )
-      perform_request(command_path(:resend), :post, {method: method})
-    end
-
-    def remind(method: )
-      perform_request(command_path(:remind), :post, {method: method})
-    end
-
-    def payment(amount: )
-      perform_request(command_path(:payment), :post, {amount: amount})
-    end
-
-    def credit(options = {})
-      perform_request(command_path(:credit), :post, options)
-    end
-
-    def message(message: )
-      perform_request(command_path(:message), :post, {message: message})
-    end
-
-    def attach(options = {})
-      perform_request(command_path(:attach), :post, options)
+      send_command(:send, {method: method})
     end
 
     private
 
-    def command_path(command)
-      "#{endpoint}/#{id}/command/#{command}"
+    def send_command(command, options = {})
+      path = "#{endpoint}/#{id}/command/#{command}"
+      self.class.perform_request(:post, path, options)
     end
   end
 end

data/lib/billogram/resources/invoice_defaults.rb

@@ -1,6 +1,8 @@
 module Billogram
   class InvoiceDefaults < Resource
     attr_accessor :default_message, :default_interest_rate, :default_reminder_fee,
-      :default_invoice_fee, :automatic_reminders
+      :default_invoice_fee
+
+    relation :automatic_reminders, :many
   end
 end

data/lib/billogram/resources/item.rb

@@ -1,6 +1,9 @@
 module Billogram
   class Item < Resource
-    attr_accessor :item_no, :title, :description, :price, :vat, :unit, :created_at, :updated_at
+    include Endpoint
+
+    attr_accessor :item_no, :title, :description, :price, :vat, :unit,
+      :created_at, :updated_at, :count, :discount
 
     alias_method :id, :item_no
 

data/lib/billogram/resources/logotype.rb

@@ -0,0 +1,11 @@
+module Billogram
+  class Logotype < Resource
+    include Endpoint
+
+    attr_accessor :content, :file_type
+
+    def self.upload(*args)
+      create(*args)
+    end
+  end
+end

data/lib/billogram/resources/regional_sweden.rb

@@ -1,6 +1,6 @@
 module Billogram
   class RegionalSweden < Resource
     attr_accessor :rotavdrag, :rotavdrag_personal_number, :rotavdrag_description,
-      :reversed_vat, :rotavdrag_account
+      :reversed_vat, :rotavdrag_account, :rotavdrag_sum
   end
 end

data/lib/billogram/resources/report.rb

@@ -0,0 +1,9 @@
+module Billogram
+  class Report < Resource
+    include Endpoint
+
+    attr_accessor :filename, :type, :file_type, :info, :created_at, :content
+
+    alias_method :id, :filename
+  end
+end

data/lib/billogram/resources/settings.rb

@@ -1,5 +1,6 @@
 module Billogram
   class Settings < Resource
+    include Endpoint
 
     attr_accessor :name, :org_no
 

data/lib/billogram/version.rb

@@ -1,3 +1,3 @@
 module Billogram
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: billogram
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Mark Birman
@@ -142,12 +142,14 @@ files:
 - bin/setup
 - lib/billogram.rb
 - lib/billogram/client.rb
+- lib/billogram/endpoint.rb
 - lib/billogram/error.rb
 - lib/billogram/relation.rb
 - lib/billogram/relation_builder.rb
 - lib/billogram/request.rb
 - lib/billogram/resource.rb
 - lib/billogram/resources/address.rb
+- lib/billogram/resources/automatic_reminder.rb
 - lib/billogram/resources/bookkeeping.rb
 - lib/billogram/resources/callbacks.rb
 - lib/billogram/resources/contact.rb
@@ -161,8 +163,10 @@ files:
 - lib/billogram/resources/invoice.rb
 - lib/billogram/resources/invoice_defaults.rb
 - lib/billogram/resources/item.rb
+- lib/billogram/resources/logotype.rb
 - lib/billogram/resources/payment.rb
 - lib/billogram/resources/regional_sweden.rb
+- lib/billogram/resources/report.rb
 - lib/billogram/resources/settings.rb
 - lib/billogram/resources/tax.rb
 - lib/billogram/version.rb