dynaccount 0.9.8 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baf9f799dcdf1ef93d98008cad8bd878c6542463dea6853741141b440e6d02a1
-  data.tar.gz: 1b8605d21cbac08eea7a5fbb345ec937f923cb41fe1435f3eeeffda423c005e5
+  metadata.gz: a26d67f18104d7a05a069ea9791dd57c5640edba5a58389e8ca6acd3712a5c0a
+  data.tar.gz: 26bccedbd940bf8427cfc1c1a53f1558075e2a1f594358ac3c7122262cc84f54
 SHA512:
-  metadata.gz: ef973f5d915ebb8b7ecfb0a8b88b581c711260d9167e6473c38c787a328430a2be882e742ba4936ca87632cd26b3058688c1357afe5aaf46b04c89e68061d981
-  data.tar.gz: c3c2c17adfa369fb4b54dabd85d5b05f005fc639f77fd99e2881833fe8848aba31d7ce5adcbac2d80ad37c05195203e360bd4661a1efcbf500cf515e2229c03b
+  metadata.gz: f30201ed6512c1e90f95d7584f0ec5f7e68f57986c91a1bbf3c7946b76eac13128e98f79d3acf040f5d8dd9827044cc47a586aba46306dc36c6a6ef905a071da
+  data.tar.gz: f8a8f9c8ce4bc1908ebaf30ca578c94fd43d5fef5ac14fc444a2d5a574682fc6f8734059a9f96ca86a174647f9f5f768ee80ae7a994e338a505d5542cd6358a1

data/README.md

@@ -1,7 +1,7 @@
 # Dynaccount
 This dynaccount gem is created to create an ActiveRecord-like interaction to [Dynaccount](https://dynaccount.com), accounting system's API.
 
-The current API-version is `v5`.
+The current API-version is `v6`.
 
 ## Usage
 

data/lib/dynaccount.rb

@@ -72,6 +72,8 @@ require 'dynaccount/vatcode'
 require 'dynaccount/year'
 require 'dynaccount/year_period'
 
+require 'dynaccount/query_builder'
+
 module Dynaccount
   @base_url = 'api.dynaccount.com'
 
@@ -83,13 +85,14 @@ module Dynaccount
         faraday.request :url_encoded
         logger = Logger.new STDOUT
         logger.level = debug ? Logger::DEBUG : Logger::INFO
-        faraday.response :logger, logger, bodies: (debug || false)
+        faraday.response :logger, logger, bodies: true
         faraday.adapter  :net_http_persistent
       end
 
       @api_connection.post do |req|
         req.url url
-        req.body = "#{URI.encode_www_form(params)}#{'&' unless params.empty?}__api_hash=#{api_hash(request_url(url), params)}"
+        req.headers['X-Hash'] = api_hash(request_url(url), params)
+        req.body = URI.encode_www_form(params).to_s
       end
     end
 
@@ -98,9 +101,7 @@ module Dynaccount
     end
 
     def api_hash(url, params = {})
-      # p "#{url}#{URI.encode_www_form(params)}#{api_secret}"
-      (Digest::SHA1.new << "#{url}#{URI.encode_www_form(params)}#{api_secret}")
-        .to_s
+      (Digest::SHA1.new << "#{url}#{URI.encode_www_form(params)}#{api_secret}").to_s
     end
   end
 end

data/lib/dynaccount/action.rb

@@ -9,7 +9,7 @@ module Dynaccount
     end
 
     def self.url(action)
-      "/v5/#{Dynaccount.api_id}/#{Dynaccount.api_key}/action/#{action}/json/"
+      "/v6/#{Dynaccount.api_id}/#{Dynaccount.api_key}/action/#{action}/"
     end
   end
 end

data/lib/dynaccount/dynaccount_object.rb

@@ -32,7 +32,7 @@ module Dynaccount
     end
 
     def self.create(attributes = {})
-      req = JSON.parse(Dynaccount.request(url(nil, 'put'), attributes, :post).body)['result'].map { |res| new(res) }
+      req = JSON.parse(Dynaccount.request(url(nil, 'put'), attributes, :post).body).fetch('result', []).map { |res| new(res) }
       req[0]
     end
 
@@ -41,24 +41,44 @@ module Dynaccount
     end
 
     def self.find(id)
-      req = JSON.parse(Dynaccount.request(url(id, 'get'), {}, :post).body)['result'].map { |res| new(res) }
+      req = JSON.parse(Dynaccount.request(url(id, 'get'), {}, :post).body).fetch('result', []).map { |res| new(res) }
       return req[0] if req.size == 1
       req
-    rescue JSON::ParserError => e
+    rescue JSON::ParserError => _e
       return nil
     end
 
     def self.find_by(params = {})
-      req = JSON.parse(Dynaccount.request(url(nil, 'get', params), {}, :post).body)['result'].map { |res| new(res) }
+      req = JSON.parse(Dynaccount.request(url(nil, 'get', params), {}, :post).body).fetch('result', []).map { |res| new(res) }
       return req[0] if req.size == 1
       req
-    rescue JSON::ParserError => e
+    rescue JSON::ParserError => _e
       return nil
     end
 
+    def self.run_query(select: [], where: {}, limit: nil, offset: nil, order: [])
+      params = {}
+      params.merge!(select: select.join('%2C')) if select&.any?
+      params.merge!(where.tap {|w| w&.delete(:select) }) if where
+      params.merge!(order: "#{order[0]}+#{order[1]}") if order&.count == 2
+      params.merge!(limit: "#{[offset, limit].select {|i| i.is_a?(Integer) }.join('%2C')}") if [offset, limit].select {|i| i.is_a?(Integer) }.any?
+
+      JSON.parse(
+        Dynaccount.request(url(nil, 'get', params), {}, :post).body
+      ).fetch('result', []).map { |res| new(res) }
+    rescue JSON::ParserError => _e
+      return nil
+    end
+
+    def self.query
+      Dynaccount::QueryBuilder.new(self)
+    end
+
     def self.url(id, action, params = {})
-      url = "/v5/#{Dynaccount.api_id}/#{Dynaccount.api_key}/#{action}/#{api_path}/json/#{"#{id}/" unless id.nil?}"
-      url += "?" + params.map { |k,v| "#{k}=#{v}" }.join('&') if params.any?
+      url = "/v6/#{Dynaccount.api_id}/#{Dynaccount.api_key}/#{action}/#{api_path}/#{"#{id}/" unless id.nil?}"
+      url += "?" + params.map do |k,v|
+        "#{k}=#{v.to_s.gsub(/[^a-zA-Z0-9_\-.]/n) { sprintf("%%%02X", $&.unpack("C")[0]) }.encode('utf-8')}"
+      end.sort.join('&') if params.any?
       url
     end
 

data/lib/dynaccount/query_builder.rb

@@ -0,0 +1,54 @@
+module Dynaccount
+  class QueryBuilder
+    attr_accessor :klass, :selects, :wheres, :limits, :offsets, :orders
+
+    def initialize(klass)
+      self.klass = klass
+    end
+
+    def order(o)
+      if o.is_a?(Hash)
+        unless [:DESC, :ASC].include?(o[o.keys.first].to_sym)
+          raise ArgumentError.new("Wrong argument #{o[o.keys.first]}. Should be :ASC or :DESC")
+        end
+
+        self.orders = [o.keys.first, o[o.keys.first].to_sym]
+      elsif [String, Symbol].include?(o.class)
+        self.orders = [o.to_s, :asc]
+      else
+        self.orders = nil
+      end
+    end
+
+    def select(*args)
+      self.selects = args.map(&:to_s)
+    rescue NoMethodError
+      raise ArgumentError.new("Wrong argument #{args}. All should be castable to string")
+    end
+
+    def where(**args)
+      self.wheres = args
+    rescue NoMethodError
+      raise ArgumentError.new("Wrong argument #{args}. All should be castable to string")
+    end
+
+    def limit(l)
+      self.limits = l
+    end
+
+    def offset(o)
+      self.offsets = o
+    end
+
+
+    def execute
+      klass.run_query(
+        select: self.selects,
+        where: self.wheres,
+        limit: self.limits,
+        offset: self.offsets,
+        order: self.orders
+      )
+    end
+  end
+end

data/lib/dynaccount/version.rb

@@ -1,3 +1,3 @@
 module Dynaccount
-  VERSION = '0.9.8'.freeze
+  VERSION = '0.9.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynaccount
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.10
 platform: ruby
 authors:
 - Frederik Spang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -131,6 +131,7 @@ files:
 - lib/dynaccount/product_list.rb
 - lib/dynaccount/product_list_product.rb
 - lib/dynaccount/product_supplier.rb
+- lib/dynaccount/query_builder.rb
 - lib/dynaccount/stock_adjustment.rb
 - lib/dynaccount/unit.rb
 - lib/dynaccount/vatcode.rb