elmas 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb71ef967c15aeffc592ac76915b0f31078877f1
-  data.tar.gz: 1ef5c1c7611901311cd897933d8deb26748e8239
+  metadata.gz: 31ec8dd25ceb6a01b7d07b240c16b8d33616cb33
+  data.tar.gz: 6877c0e58d2ba5c5ff77eba97a599e5ecf220ef7
 SHA512:
-  metadata.gz: 2d9b9152c771283da77515702a6976d991027041a48ac2e92a8857a37003b95b057d3fa31bda66ba898f388c87d59fb2f1736c3ed7a5464f03bc26244d3aed2f
-  data.tar.gz: 24f03387316472d659d09c34482ee728535a665af923ff3eee4ca71a847310e6d63c121cd3548784a80358cc5824e44d1d459d5579ad82a687bdba3d76a58b88
+  metadata.gz: 2c9aecd1f8e78b21621aec927ea74ece5e3d2e55780e5b650eb4e2278a960a543d5a83c18148117156ee07e4ab717ba48708d299db33c61d543d7e1220e6e9cc
+  data.tar.gz: e7047f922618c9efaf666e6ad2dd46a80381349c0fd9c038d25cfd462fdf076e736fea865d5abfac2684f60f5ebd44353ce2acc0ee736dc9eed6b7a0105ab7ee

data/README.md

@@ -155,10 +155,33 @@ contact.find_all(select: [:last_name, :first_name])
 To create a new contact
 
 ```ruby
-contact = Elmas::Contact.new(first_name: "Karel", last_name: "Appel"  )
+contact = Elmas::Contact.new(first_name: "Karel", last_name: "Appel", account: "8d87c8c5-f1c6-495c-b6af-d5ba396873b5"  )
 contact.save
 ```
 
+### Projects and Time Tracking
+
+Project Types:
+
+- :type=>2, :type_description=>"Fixed price"
+- :type=>3, :type_description=>"Time and Material"
+- :type=>4, :type_description=>"Non billable"
+- :type=>5, :type_description=>"Prepaid"
+
+To create a new project
+
+```ruby
+project = Elmas::Project.new(code: "PROJ902343", description: "Great project", account: "8d87c8c5-f1c6-495c-b6af-d5ba396873b5", type: 2 )
+project.save
+```
+
+To submit a new time transaction
+
+```ruby
+hours = Elmas::TimeTransaction.new(account: "8d87c8c5-f1c6-495c-b6af-d5ba396873b5", item: "eb73942a-53c0-4ee9-bbb2-6d985814a1b1", quantity: 3.0, notes: "")
+hours.save
+```
+
 ### SalesInvoice flow
 SalesInvoices have a relationship with SalesInvoiceLines. A SalesInvoice has many
 SalesInvoiceLines and a SalesInvoiceLine belongs to a SalesInvoice. To create a

data/lib/elmas/exception.rb

@@ -1,17 +1,13 @@
 module Elmas
   class BadRequestException < Exception
-    def initialize(object)
+    def initialize(response, parsed)
+      @response = response
+      @parsed = parsed
       super(message)
-      @object = object
     end
 
     def message
-      case @object
-      when 500
-        "Server error"
-      else
-        "Something went wrong"
-      end
+      "code #{@response.status}: #{@parsed.error_message}"
     end
   end
 

data/lib/elmas/oauth.rb

@@ -19,9 +19,13 @@ module Elmas
     end
 
     def authorized?
-      response = get("/Current/Me", no_division: true)
-      !response.unauthorized?
       # Do a test call, return false if 401 or any error code
+      begin
+        response = get("/Current/Me", no_division: true)
+      rescue BadRequestException => e
+        Elmas.error "Not yet authorized"
+        return false
+      end
     end
 
     def authorize_division

data/lib/elmas/parser.rb

@@ -1,27 +1,33 @@
 module Elmas
   class Parser
+    attr_accessor :parsed_json
+
     def initialize(json)
-      @object = JSON.parse(json)
+      @parsed_json = JSON.parse(json)
     rescue JSON::ParserError => e
-      Elmas.error("There was an error parsing the response, #{e.message}")
-      @error_message = e.message
-      return false
+      Elmas.error 'There was an error parsing the response'
+      Elmas.error "#{e.class}: #{e.message}"
+      @error_message = "#{e.class}: #{e.message}"
     end
 
     def results
-      @object["d"]["results"] if @object
+      result['results'] if result && result['results']
     end
 
     def metadata
-      @object["d"]["__metadata"] if @object
+      result['__metadata'] if result && result['__metadata']
     end
 
     def result
-      @object["d"] if @object
+      parsed_json['d']
     end
 
     def error_message
-      @error_message ||= @object["error"]["message"]["value"]
+      @error_message ||= begin
+        if parsed_json['error']
+          parsed_json['error']['message']['value']
+        end
+      end
     end
 
     def first_result

data/lib/elmas/resources/account.rb

@@ -11,7 +11,7 @@ module Elmas
       [:name]
     end
 
-    # https://start.exactonline.nl/docs/HlpRestAPIResourcesDetails.aspx?id=9
+    # https://start.exactonline.nl/docs/HlpRestAPIResourcesDetails.aspx?name=CRMAccounts
     def other_attributes # rubocop:disable Metrics/MethodLength
       [
         :accountant, :account_manager, :activity_sector,

data/lib/elmas/resources/project.rb

@@ -0,0 +1,34 @@
+module Elmas
+  class Project
+    include Elmas::Resource
+
+    def base_path
+      "project/Projects"
+    end
+
+    def mandatory_attributes
+      [:account, :description, :code, :type]
+    end
+
+    # https://start.exactonline.nl/docs/HlpRestAPIResourcesDetails.aspx?name=ProjectProjects
+    def other_attributes # rubocop:disable Metrics/MethodLength
+      [
+        :account, :account_code, :AccountContact, :account_name,
+        :allow_additional_invoicing, :block_entry, :block_rebilling,
+        :budgeted_amount, :budgeted_costs, :budgeted_hours_per_hour_type,
+        :BudgetedRevenue, :BudgetType, :BudgetTypeDescription, :clasification,
+        :classification_description, :code, :costs_amount_fc, :created,
+        :creator, :creator_full_name, :customer_p_onumber, :description,
+        :division, :division_name, :end_date, :fixed_price_item,
+        :fixed_price_item_description, :invoice_as_quoted, :invoice_terms,
+        :manager, :manager_fullname, :markup_percentage, :modified, :modifier,
+        :modifier_full_name, :notes, :prepaid_item, :prepaid_item_description,
+        :prepaid_type, :prepaid_type_description,
+        :project_restriction_employees, :project_restriction_items,
+        :project_restriction_rebillings, :sales_time_quantity,
+        :source_quotation, :start_date, :time_quantity_to_alert, :type,
+        :type_description, :use_billing_milestones
+      ]
+    end
+  end
+end

data/lib/elmas/resources/time_transaction.rb

@@ -0,0 +1,28 @@
+module Elmas
+  class TimeTransaction
+    include Elmas::Resource
+
+    def base_path
+      "project/TimeTransactions"
+    end
+
+    def mandatory_attributes
+      [:account, :item, :quantity]
+    end
+
+    # https://start.exactonline.nl/docs/HlpRestAPIResourcesDetails.aspx?name=ProjectTimeTransactions
+    def other_attributes
+      [
+        :account, :account_name, :activity, :activity_description, :amount, :amount_fc,
+        :attachment, :created, :creator, :creator_full_name, :currency, :date,
+        :division, :division_description, :employee, :end_time, :entry_number,
+        :error_text, :hour_status, :item, :item_description, :item_divisable,
+        :modified, :modifier, :modifier_full_name, :notes, :price, :price_fc, :project,
+        :project_account, :project_account_code, :project_account_name,
+        :project_description, :quantity, :start_time, :subscription,
+        :subscription_account, :subscription_account_code, :subscription_account_name,
+        :subscription_description, :subscription_number, :type
+      ]
+    end
+  end
+end

data/lib/elmas/response.rb

@@ -7,7 +7,10 @@ module Elmas
 
     def initialize(response)
       @response = response
-      log_error if fail?
+      if fail?
+        log_error
+        raise BadRequestException.new(@response, parsed)
+      end
     end
 
     def success?
@@ -68,10 +71,6 @@ module Elmas
       Elmas.error(message)
     end
 
-    def unauthorized?
-      UNAUTHORIZED_CODES.include? status
-    end
-
     SUCCESS_CODES = [
       201, 202, 203, 204, 301, 302, 303, 304
     ]

data/lib/elmas/sanitizer.rb

@@ -33,7 +33,7 @@ module Elmas
       end
 
       def sanitize_date_time(value)
-        value.strftime("datetime'%Y-%m-%dT%H:%M'")
+        value.strftime("%Y-%m-%d")
       end
 
       def sanitize_has_many(value)

data/lib/elmas/uri.rb

@@ -27,7 +27,12 @@ module Elmas
         if attribute == :id
           return id_filter
         else
-          return ["$filter", "#{Utils.camelize(attribute)} eq '#{@attributes[attribute]}'"]
+          if @attributes[attribute].is_a?(Fixnum)
+            value = @attributes[attribute]
+          else
+            value = "'#{@attributes[attribute]}'"
+          end
+          return ["$filter", "#{Utils.camelize(attribute)} eq #{value}"]
         end
       end
 

data/lib/elmas/version.rb

@@ -1,7 +1,7 @@
 module Elmas
   class Version
-    MAJOR = 0
-    MINOR = 2
+    MAJOR = 1
+    MINOR = 0
     PATCH = 0
 
     class << self

data/lib/elmas.rb

@@ -22,6 +22,8 @@ require "elmas/resources/sales_entry"
 require "elmas/resources/sales_entry_line"
 require "elmas/resources/sales_order"
 require "elmas/resources/sales_order_line"
+require "elmas/resources/project"
+require "elmas/resources/time_transaction"
 require "elmas/resources/purchase_entry"
 require "elmas/resources/purchase_entry_line"
 require "elmas/resources/costunit"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elmas
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Marthyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -256,6 +256,7 @@ files:
 - lib/elmas/resources/item_group.rb
 - lib/elmas/resources/journal.rb
 - lib/elmas/resources/mailbox.rb
+- lib/elmas/resources/project.rb
 - lib/elmas/resources/purchase_entry.rb
 - lib/elmas/resources/purchase_entry_line.rb
 - lib/elmas/resources/sales_entry.rb
@@ -265,6 +266,7 @@ files:
 - lib/elmas/resources/sales_order.rb
 - lib/elmas/resources/sales_order_line.rb
 - lib/elmas/resources/shared_sales_attributes.rb
+- lib/elmas/resources/time_transaction.rb
 - lib/elmas/resources/transaction.rb
 - lib/elmas/resources/transaction_line.rb
 - lib/elmas/resources/vat_code.rb