rubill 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfa35c17dedae428277fbad66942a6e2e4c1ff45
-  data.tar.gz: e37d4ddd90ff38b584d20a5fc4caee707aecc08f
+  metadata.gz: f96a5cd060d28c4392edf23dc9c628a63d1d860c
+  data.tar.gz: 23030225af499e6ef66a6697f5e63d38a99dba9c
 SHA512:
-  metadata.gz: 89ec10063490ad9106136d2271d8bd6c33022251e89936c5301f085433f473a393761f914fa6f781407f2dac3b2cc567c1f868e59126f47270dbb3411e8ae939
-  data.tar.gz: 27a82b53109929435f5058eb97d7182aae018795e6d37de4bf109c49e53b430f7deda1d844f7f1de037c1b30e81a3a9ee30c1d33439810e0bea129607745a17c
+  metadata.gz: fc8c0601f8b9b4e832e79fe751a0f7dd6028b295931242722f36b8be839da2c9ead9bf14cfb4799fb633778cd79f612706251320b63e9756c30077785a876446
+  data.tar.gz: 6313e9208df792a06532ce0fd718d0722151d21a529a377d1cbfcc39797e2c19b93ada6eceb6c8137e618dbf4fc196573b05e17b227e57c8294bda3313b3b6c7

data/lib/rubill.rb

@@ -43,18 +43,8 @@ module Rubill
   end
 end
 
-require "rubill/session"
-require "rubill/query"
 require "rubill/base"
-require "rubill/bill"
-require "rubill/bill_payment"
-require "rubill/invoice"
-require "rubill/attachment"
-require "rubill/sent_payment"
-require "rubill/sent_bill_payment"
-require "rubill/received_payment"
-require "rubill/vendor"
-require "rubill/customer"
-require "rubill/customer_contact"
-require "rubill/attachment"
+require "rubill/query"
+require "rubill/session"
 
+Dir["#{File.dirname(__FILE__)}/rubill/entities/*.rb"].each { |f| require f }

data/lib/rubill/base.rb

@@ -48,6 +48,12 @@ module Rubill
       Query.delete(remote_class_name, id)
     end
 
+    def self.find_by_name(name)
+      raw_result = Query.list(remote_class_name, 0, 1, [Query::Filter.new("name", "=", name)])
+
+      new(raw_result.first)
+    end
+
     def self.where(filters=[])
       raise ArgumentError unless filters.is_a?(Enumerable)
       raise ArgumentError if !filters.is_a?(Hash) && !filters.all? { |f| f.is_a?(Query::Filter) }
@@ -84,7 +90,8 @@ module Rubill
     private
 
     def self.remote_class_name
-      raise NotImplementedError
+      # Assume remote class name is the same as the class name
+      self.name.sub('Rubill::', '')
     end
   end
 end

data/lib/rubill/entities/actg_class.rb

@@ -0,0 +1,3 @@
+module Rubill
+  class ActgClass; end
+end

data/lib/rubill/{attachment.rb → entities/attachment.rb}

@@ -6,12 +6,9 @@ module Rubill
       Query.upload_attachment({
         id: object_id,
         fileName: file_name,
+        document: content,
         content: content
       })
     end
-
-    def self.remote_class_name
-      "Attachment"
-    end
   end
 end

data/lib/rubill/{bill.rb → entities/bill.rb}

@@ -3,9 +3,5 @@ module Rubill
     def self.send_payment(opts)
       SentPayment.create(opts)
     end
-
-    def self.remote_class_name
-      "Bill"
-    end
   end
 end

data/lib/rubill/{bill_payment.rb → entities/bill_payment.rb}

@@ -3,9 +3,5 @@ module Rubill
     def self.pay_bills(opts)
       SentBillPayment.create(opts)
     end
-
-    def self.remote_class_name
-      "BillPayment"
-    end
   end
 end

data/lib/rubill/entities/customer.rb

@@ -0,0 +1,7 @@
+module Rubill
+  class Customer < Base
+    def contacts
+      CustomerContact.active_by_customer(id)
+    end
+  end
+end

data/lib/rubill/{customer_contact.rb → entities/customer_contact.rb}

@@ -12,9 +12,5 @@ module Rubill
         ]
       )
     end
-
-    def self.remote_class_name
-      "CustomerContact"
-    end
   end
 end

data/lib/rubill/{invoice.rb → entities/invoice.rb}

@@ -38,9 +38,5 @@ module Rubill
         description: description,
       }
     end
-
-    def self.remote_class_name
-      "Invoice"
-    end
   end
 end

data/lib/rubill/entities/item.rb

@@ -0,0 +1,3 @@
+module Rubill
+  class Item < Base; end
+end

data/lib/rubill/entities/location.rb

@@ -0,0 +1,3 @@
+module Rubill
+  class Location; end
+end

data/lib/rubill/{vendor.rb → entities/vendor.rb}

@@ -1,9 +1,5 @@
 module Rubill
   class Vendor < Base
-    def self.remote_class_name
-      "Vendor"
-    end
-
     def bills
       Bill.where([
         Query::Filter.new("isActive", "=", "1"),

data/lib/rubill/query.rb

@@ -61,6 +61,14 @@ module Rubill
       execute("/SendVendorInvite.json", vendorId: vendorId, email: email)
     end
 
+    def self.get_disbursement_data(id)
+      execute("/GetDisbursementData.json", sentPayId: id)
+    end
+
+    def self.get_check_image_data(id)
+      execute("/GetCheckImageData.json", sentPayId: id)
+    end
+
     def execute
       Session.instance.execute(self)
     end

data/lib/rubill/session.rb

@@ -1,17 +1,16 @@
-require "httmultiparty"
+require "rest-client"
 require "json"
 require "singleton"
+require "tempfile"
+
 
 module Rubill
   class APIError < StandardError; end
 
   class Session
-    include HTTParty
     include Singleton
 
-    attr_accessor :id
-
-    base_uri "https://api.bill.com/api/v2"
+    attr_accessor :id, :base_uri
 
     def initialize
       config = self.class.configuration
@@ -20,7 +19,9 @@ module Rubill
       end
 
       if config.sandbox
-        self.class.base_uri "https://api-stage.bill.com/api/v2"
+        self.base_uri = "https://api-stage.bill.com/api/v2"
+      else
+        self.base_uri = "https://api.bill.com/api/v2"
       end
 
       login
@@ -31,21 +32,23 @@ module Rubill
     end
 
     def login
-      self.id = self.class.login
+      self.id = self.class.login(self.base_uri)
     end
 
-    def self.login
+    def self.login(base_uri)
       login_options = {
         password: configuration.password,
         userName: configuration.user_name,
         devKey: configuration.dev_key,
         orgId: configuration.org_id,
       }
-      login = _post("/Login.json", login_options)
+      login = _post(base_uri + "/Login.json", login_options)
       login[:sessionId]
     end
 
     def options(data={})
+      data = data.dup
+      data.delete(:content)
       {
         sessionId: id,
         devKey: self.class.configuration.dev_key,
@@ -53,13 +56,22 @@ module Rubill
       }
     end
 
-    def self.default_headers
-      {"Content-Type" => "application/x-www-form-urlencoded"}
+    def file_from_data(data = {})
+      if data && data.is_a?(Hash) && data.key?(:fileName)
+        file = Tempfile.new(data[:fileName])
+        file.write data[:content]
+        file.rewind
+      end
+
+      file
     end
 
     def _post(url, data, retries=0)
       begin
-        self.class._post(url, options(data))
+        file = file_from_data(data)
+        response_data = self.class._post(self.base_uri + url, options(data), file)
+        file.close if file
+        response_data
       rescue APIError => e
         if e.message =~ /Session is invalid/ && retries < 3
           login
@@ -70,23 +82,19 @@ module Rubill
       end
     end
 
-    def self._post(url, options)
-      if options.key?(:fileName)
-        file = StringIO.new(options.delete(:content))
-      end
-
-      post_options = {
-        body: options,
-        headers: default_headers,
-      }
+    def self._post(url, options, file = nil)
+      post_options = options
 
-      post_options[:file] = file if file
+      if file
+        post_options[:file] = file
+        post_options[:multipart] = true
+      end
 
       if self.configuration.debug
         post_options[:debug_output] = $stdout
       end
 
-      response = post(url, post_options)
+      response = RestClient.post(url, post_options)
       result = JSON.parse(response.body, symbolize_names: true)
 
       unless result[:response_status] == 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubill
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Andrew Taber
@@ -11,7 +11,7 @@ cert_chain: []
 date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httmultiparty
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,19 +73,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rubill.rb
-- lib/rubill/attachment.rb
 - lib/rubill/base.rb
-- lib/rubill/bill.rb
-- lib/rubill/bill_payment.rb
-- lib/rubill/customer.rb
-- lib/rubill/customer_contact.rb
-- lib/rubill/invoice.rb
+- lib/rubill/entities/actg_class.rb
+- lib/rubill/entities/attachment.rb
+- lib/rubill/entities/bill.rb
+- lib/rubill/entities/bill_payment.rb
+- lib/rubill/entities/customer.rb
+- lib/rubill/entities/customer_contact.rb
+- lib/rubill/entities/invoice.rb
+- lib/rubill/entities/item.rb
+- lib/rubill/entities/location.rb
+- lib/rubill/entities/received_payment.rb
+- lib/rubill/entities/sent_bill_payment.rb
+- lib/rubill/entities/sent_payment.rb
+- lib/rubill/entities/vendor.rb
 - lib/rubill/query.rb
-- lib/rubill/received_payment.rb
-- lib/rubill/sent_bill_payment.rb
-- lib/rubill/sent_payment.rb
 - lib/rubill/session.rb
-- lib/rubill/vendor.rb
 homepage: http://rubygems.org/gems/rubill
 licenses:
 - MIT
@@ -106,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Interface with Bill.com

data/lib/rubill/customer.rb

@@ -1,15 +0,0 @@
-module Rubill
-  class Customer < Base
-    def self.find_by_name(name)
-      where([Query::Filter.new("name", "=", name)]).first
-    end
-
-    def contacts
-      CustomerContact.active_by_customer(id)
-    end
-
-    def self.remote_class_name
-      "Customer"
-    end
-  end
-end