billogram 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d19c8617149c997055c24fe28e8cf5246e7ef935
-  data.tar.gz: 6a6eb3b078172b0a9601ab22d5fd969ce2d105bd
+  metadata.gz: 2d7211264da1c2a244ae49fe823f3a40a2a18e98
+  data.tar.gz: 9d66bdce3035c05061059e04fa1361d44722bb54
 SHA512:
-  metadata.gz: 5cfa00c57beb5c319928ef035d57b0b74a97d240727241108bb1d8d4b39d569ce26790b526bf987ccc44b1105ec7c310d6317132afb8a075b3ba51757aac3fd0
-  data.tar.gz: 913bd36349fc91fc4578a239af5be0ef1ef5ca42ba0b2af8579c32e3c60b16ff290b716a1526335959642b26d7da0d48bd440c380c9a873a54ac0ef71c592ef3
+  metadata.gz: 6837655055e15ddb79db3decf6e7282b5fc61135e8af8120c8c0d366b57884f0e3e426e85e5f5b07789dc4fc383e695d79be1373531974ddb868825d1cdca6d2
+  data.tar.gz: 361595e478a07938f8ea6d94269d22da334e0eefd3b715d566a0ffeaff2e86c524c7c6cd4d2e8842734c26935e6efecd8f930b6612d5c0d7bcb31e80ae0586a0

data/README.md

@@ -22,20 +22,20 @@ Or install it yourself as:
 
 ## Usage
 
-First you need to configure the client
+TODO: Write usage instructions here
 
-```ruby
-Billogram.configure do |config|
-  config.username = '6012-qJzHT0qU'
-  config.password = '55105e0460d5844274dc8f7070fc0a41'
-  config.base_uri = "https://sandbox.billogram.com/api/v2/"
-end
+## Development
 
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-Billogram::Customer.search({filter_type: :field, filter_field: :customer_no, filter_value: 1})
-````
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-List of available methods:
-```ruby
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/billogram.
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
-```

data/lib/billogram.rb

@@ -1,21 +1,27 @@
 require "httparty"
 require "billogram/client"
 require "billogram/error"
+require "billogram/relation"
 require "billogram/relation_builder"
 require "billogram/resource"
-require 'billogram/resources/address'
-require 'billogram/resources/bookkeeping'
-require 'billogram/resources/callbacks'
-require 'billogram/resources/contact'
-require 'billogram/resources/customer'
-require 'billogram/resources/data'
-require 'billogram/resources/detailed_sums'
-require 'billogram/resources/delivery_address'
-require 'billogram/resources/event'
-require 'billogram/resources/info'
-require 'billogram/resources/invoice'
-require 'billogram/resources/item'
-require 'billogram/resources/regional_sweden'
+require "billogram/resources/address"
+require "billogram/resources/bookkeeping"
+require "billogram/resources/callbacks"
+require "billogram/resources/contact"
+require "billogram/resources/customer"
+require "billogram/resources/data"
+require "billogram/resources/detailed_sums"
+require "billogram/resources/domestic_bank_account"
+require "billogram/resources/event"
+require "billogram/resources/info"
+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/payment"
+require "billogram/resources/settings"
+require "billogram/resources/tax"
 require "billogram/version"
 
 require "billogram/inflections"

data/lib/billogram/relation.rb

@@ -0,0 +1,27 @@
+module Billogram
+  class Relation
+    attr_reader :name, :type, :class_override
+
+    def initialize(name, type, class_override: nil)
+      @name = name
+      @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
+    end
+  end
+end

data/lib/billogram/relation_builder.rb

@@ -8,38 +8,34 @@ module Billogram
     end
 
     def call
-      resource_relations.each do |type, relation_names|
-        build_relation(type, relation_names)
+      resource_relations.each do |relation|
+        build_relation(relation)
       end
     end
 
     private
 
-    def relation_class(relation_name)
-      "Billogram::#{relation_name.to_s.classify}".constantize
-    end
-
-    def relation_attributes(relation_name)
-      attributes.delete(relation_name.to_s)
+    def extract_attributes(relation)
+      attributes.delete(relation.name.to_s)
     end
 
     def resource_relations
       resource.class.relations
     end
 
-    def build_relation(type, relation_names)
-      relation_names.each do |name|
-        if attrs = relation_attributes(name)
-          if type == :one
-            value = relation_class(name).new(attrs)
-          elsif type == :many
-            singular = name.to_s.singularize
-            value = attrs.map{|item| relation_class(singular).new(item) }
-          end
-
-          resource.public_send("#{name}=", value)
-        end
+    def build_relation(relation)
+      if attrs = extract_attributes(relation)
+        value = send("build_#{relation.type}", relation, 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

@@ -6,7 +6,7 @@ module Billogram
 
     class << self
       def relations
-        @relations ||= { one: Set.new, many: Set.new }
+        @relations ||= []
       end
 
       def endpoint(value = nil)
@@ -19,7 +19,7 @@ module Billogram
         perform_request("#{endpoint}", :get, query)
       end
 
-      def fetch(id)
+      def fetch(id = nil)
         perform_request("#{endpoint}/#{id}", :get)
       end
 
@@ -35,9 +35,9 @@ module Billogram
         Billogram.client.put("#{endpoint}/#{id}")
       end
 
-      def relation(relation_name, relation_type = :one)
-        relations[relation_type] << relation_name
-        attr_accessor relation_name
+      def relation(name, type, class_override: nil)
+        relations << Relation.new(name, type, class_override: class_override)
+        attr_accessor name
       end
 
       def build_objects(data)

data/lib/billogram/resources/address.rb

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

data/lib/billogram/resources/bookkeeping.rb

@@ -1,5 +1,12 @@
 module Billogram
   class Bookkeeping < Resource
-    attr_accessor :income_account, :vat_account
+    attr_accessor :income_account, :vat_account, :income_account_for_vat_25,
+      :income_account_for_vat_12, :income_account_for_vat_6,
+      :income_account_for_vat_0, :reversed_vat_account, :vat_account_for_vat_25,
+      :vat_account_for_vat_12, :vat_account_for_vat_6, :account_receivable_account,
+      :client_funds_account, :banking_account, :interest_fee_account,
+      :reminder_fee_account, :rounding_account, :factoring_receivable_account
+
+    relation :regional_sweden, :one
   end
 end

data/lib/billogram/resources/customer.rb

@@ -1,9 +1,10 @@
 module Billogram
   class Customer < Resource
-    attr_accessor :customer_no, :name, :notes, :org_no, :vat_no, :created_at, :updated_at, :company_type
+    attr_accessor :customer_no, :name, :notes, :org_no, :vat_no, :created_at,
+      :updated_at, :company_type
 
     relation :address, :one
     relation :contact, :one
-    relation :delivery_address, :one
+    relation :delivery_address, :one, class_override: "Address"
   end
 end

data/lib/billogram/resources/domestic_bank_account.rb

@@ -0,0 +1,5 @@
+module Billogram
+  class DomesticBankAccount < Resource
+    attr_accessor :account_no, :clearing_no
+  end
+end

data/lib/billogram/resources/event.rb

@@ -4,6 +4,6 @@ module Billogram
 
     attr_accessor :created_at, :type
 
-    relation :data, :one
+    relation :data, :one, class_override: "Data"
   end
 end

data/lib/billogram/resources/international_bank_account.rb

@@ -0,0 +1,5 @@
+module Billogram
+  class InternationalBankAccount < Resource
+    attr_accessor :bank, :iban, :bic, :swift
+  end
+end

data/lib/billogram/resources/invoice.rb

@@ -12,8 +12,8 @@ module Billogram
     relation :info, :one
     relation :customer, :one
     relation :regional_sweden, :one
-    relation :callbacks, :one
-    relation :detailed_sums, :one
+    relation :callbacks, :one, class_override: "Callbacks"
+    relation :detailed_sums, :one, class_override: "DetailedSums"
 
     relation :items, :many
     relation :events, :many

data/lib/billogram/resources/invoice_defaults.rb

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

data/lib/billogram/resources/payment.rb

@@ -0,0 +1,8 @@
+module Billogram
+  class Payment < Resource
+    attr_accessor :bankgiro, :plusgiro
+
+    relation :domestic_bank_account, :one
+    relation :international_bank_account, :one
+  end
+end

data/lib/billogram/resources/settings.rb

@@ -0,0 +1,13 @@
+module Billogram
+  class Settings < Resource
+
+    attr_accessor :name, :org_no
+
+    relation :contact, :one
+    relation :address, :one
+    relation :payment, :one
+    relation :tax, :one
+    relation :bookkeeping, :one
+    relation :invoices, :one, class_override: "InvoiceDefaults"
+  end
+end

data/lib/billogram/resources/tax.rb

@@ -0,0 +1,5 @@
+module Billogram
+  class Tax < Resource
+    attr_accessor :is_vat_registered, :has_fskatt, :vat_no
+  end
+end

data/lib/billogram/version.rb

@@ -1,3 +1,3 @@
 module Billogram
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billogram
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Birman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,7 +143,7 @@ files:
 - lib/billogram.rb
 - lib/billogram/client.rb
 - lib/billogram/error.rb
-- lib/billogram/inflections.rb
+- lib/billogram/relation.rb
 - lib/billogram/relation_builder.rb
 - lib/billogram/resource.rb
 - lib/billogram/resources/address.rb
@@ -152,13 +152,18 @@ files:
 - lib/billogram/resources/contact.rb
 - lib/billogram/resources/customer.rb
 - lib/billogram/resources/data.rb
-- lib/billogram/resources/delivery_address.rb
 - lib/billogram/resources/detailed_sums.rb
+- lib/billogram/resources/domestic_bank_account.rb
 - lib/billogram/resources/event.rb
 - lib/billogram/resources/info.rb
+- lib/billogram/resources/international_bank_account.rb
 - lib/billogram/resources/invoice.rb
+- lib/billogram/resources/invoice_defaults.rb
 - lib/billogram/resources/item.rb
+- lib/billogram/resources/payment.rb
 - lib/billogram/resources/regional_sweden.rb
+- lib/billogram/resources/settings.rb
+- lib/billogram/resources/tax.rb
 - lib/billogram/version.rb
 homepage: http://github.com/mbirman/billogram
 licenses:

data/lib/billogram/inflections.rb

@@ -1,5 +0,0 @@
-ActiveSupport::Inflector.inflections do |inflect|
-  inflect.irregular 'data', 'data'
-  inflect.irregular 'callbacks', 'callbacks'
-  inflect.irregular 'sums', 'sums'
-end

data/lib/billogram/resources/delivery_address.rb

@@ -1,5 +0,0 @@
-module Billogram
-  class DeliveryAddress < Address
-    attr_accessor :name
-  end
-end