billogram 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d7211264da1c2a244ae49fe823f3a40a2a18e98
-  data.tar.gz: 9d66bdce3035c05061059e04fa1361d44722bb54
+  metadata.gz: 1e1cd468bd3eab2cb8de98ae549c52e36f1da713
+  data.tar.gz: 7ac88f9d37a3c31796f42736ac7721749b00832f
 SHA512:
-  metadata.gz: 6837655055e15ddb79db3decf6e7282b5fc61135e8af8120c8c0d366b57884f0e3e426e85e5f5b07789dc4fc383e695d79be1373531974ddb868825d1cdca6d2
-  data.tar.gz: 361595e478a07938f8ea6d94269d22da334e0eefd3b715d566a0ffeaff2e86c524c7c6cd4d2e8842734c26935e6efecd8f930b6612d5c0d7bcb31e80ae0586a0
+  metadata.gz: 846d964585e1c6c635391aaa1e20220c3031ce2e94335028e38630dd20df85e39be6f8179a0a2145cf4552ea0b8fd4cf8d79273b71137f2eada9c2a667499cb7
+  data.tar.gz: 254c14107ceff556a081b7d03b8331fb8e1307269c7ea6db9d7916256f4a6d671ee0d4a91ec4c015c63d15b292c6e9eaea1009eff5c6c5180a3b93c03a521cf6

data/lib/billogram.rb

@@ -4,6 +4,7 @@ require "billogram/error"
 require "billogram/relation"
 require "billogram/relation_builder"
 require "billogram/resource"
+require "billogram/request"
 require "billogram/resources/address"
 require "billogram/resources/bookkeeping"
 require "billogram/resources/callbacks"
@@ -24,8 +25,6 @@ require "billogram/resources/settings"
 require "billogram/resources/tax"
 require "billogram/version"
 
-require "billogram/inflections"
-
 module Billogram
   class << self
     attr_accessor :username, :password, :base_uri

data/lib/billogram/error.rb

@@ -8,12 +8,7 @@ module Billogram
     class InternalServerError < Error; end
 
     def self.from_response(response)
-      status  = response.response.code.to_i
-      body    = response.body.to_s
-      headers = response.headers
-      message = error_message(response)
-
-      if klass =  case status
+      if klass =  case response.code.to_i
                   when 400      then BadRequest
                   when 401      then Unauthorized
                   when 403      then Forbidden
@@ -21,15 +16,7 @@ module Billogram
                   when 500      then InternalServerError
                   else               Billogram::Error
                   end
-        klass.new(message)
-      end
-    end
-
-    private
-
-    def self.error_message(response)
-      if data = response["data"]
-        data.fetch("message", "")
+        klass.new(response["data"]["message"])
       end
     end
   end

data/lib/billogram/request.rb

@@ -0,0 +1,26 @@
+module Billogram
+  class Request
+    attr_reader :url, :type, :params
+
+    def initialize(type, url, params = {})
+      @url = url
+      @type = type
+      @params = params
+    end
+
+    def content
+      case type
+      when :post, :put
+        { body: params.to_json }
+      when :get
+        { query: params }
+      when :delete
+        {}
+      end
+    end
+
+    def execute
+      Billogram.client.send(type, url, content)
+    end
+  end
+end

data/lib/billogram/resource.rb

@@ -2,7 +2,7 @@ require "active_support/core_ext/string/inflections.rb"
 
 module Billogram
   class Resource
-    DEFAULT_OPTIONS = { page: 1, page_size: 50 }
+    DEFAULT_SEARCH_OPTIONS = { page: 1, page_size: 50 }
 
     class << self
       def relations
@@ -15,24 +15,24 @@ module Billogram
       end
 
       def search(options = {})
-        query = DEFAULT_OPTIONS.merge(options)
-        perform_request("#{endpoint}", :get, query)
+        query = DEFAULT_SEARCH_OPTIONS.merge(options)
+        perform_request(:get, "#{endpoint}", query)
       end
 
       def fetch(id = nil)
-        perform_request("#{endpoint}/#{id}", :get)
+        perform_request(:get, "#{endpoint}/#{id}")
       end
 
       def create(attributes)
-        perform_request("#{endpoint}", :post, attributes)
+        perform_request(:post, "#{endpoint}", attributes)
       end
 
       def update(id, attributes)
-        perform_request("#{endpoint}/#{id}", :put, attributes)
+        perform_request(:put, "#{endpoint}/#{id}", attributes)
       end
 
       def delete(id)
-        Billogram.client.put("#{endpoint}/#{id}")
+        perform_request(:delete, "#{endpoint}/#{id}")
       end
 
       def relation(name, type, class_override: nil)
@@ -48,17 +48,9 @@ module Billogram
         end
       end
 
-      def perform_request(url, type, params = {})
-        case type
-        when :post, :put
-          query = { body: params.to_json }
-        when :get
-          query = { query: params }
-        else nil
-        end
-
-        response = Billogram.client.send(type, url, query)
-        build_objects(response) unless type == :delete
+      def perform_request(type, url, params = {})
+        response = Request.new(type, url, params).execute
+        build_objects(response)
       end
     end
 
@@ -78,10 +70,6 @@ module Billogram
       self.class.delete(id)
     end
 
-    def perform_request(*args)
-      self.class.perform_request(*args)
-    end
-
     def endpoint
       self.class.endpoint
     end

data/lib/billogram/resources/customer.rb

@@ -3,8 +3,11 @@ module Billogram
     attr_accessor :customer_no, :name, :notes, :org_no, :vat_no, :created_at,
       :updated_at, :company_type
 
+    alias_method :id, :customer_no
+
     relation :address, :one
     relation :contact, :one
     relation :delivery_address, :one, class_override: "Address"
+
   end
 end

data/lib/billogram/resources/invoice.rb

@@ -1,7 +1,6 @@
 module Billogram
   class Invoice < Resource
     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,
@@ -18,6 +17,9 @@ module Billogram
     relation :items, :many
     relation :events, :many
 
+    extend Forwardable
+    delegate perform_request: self
+
     def sell
       perform_request(command_path(:sell), :post)
     end

data/lib/billogram/resources/item.rb

@@ -2,6 +2,8 @@ module Billogram
   class Item < Resource
     attr_accessor :item_no, :title, :description, :price, :vat, :unit, :created_at, :updated_at
 
+    alias_method :id, :item_no
+
     relation :bookkeeping, :one
     relation :regional_sweden, :one
   end

data/lib/billogram/resources/regional_sweden.rb

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

data/lib/billogram/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billogram
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Mark Birman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,6 +145,7 @@ files:
 - 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/bookkeeping.rb