gotransverse-tract-api 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1c38c026591c1c63f33dd05330b3fcf5da1140e
-  data.tar.gz: 5617de649a6f0afe16e934cd55908f5a0c959d3f
+  metadata.gz: fce9f9f3e3f911147aaf81a575781c67600ddd97
+  data.tar.gz: f776201ed0e6a007baff0db725c7c752ea84a1ed
 SHA512:
-  metadata.gz: 8d81eec88b40f116b0e1b9dc98f901272d95ad96a6790284edf3f47db65a1ae1282a85891db133421b78ea267016fd0df5eacb5733b512651bd514f43c2c9b3c
-  data.tar.gz: 4fcf5c8bc8e5965fa622aa4af21cb097e1bd78b265bb485b45eceb973c5897eb56f7b16902ce15335c1dc56f1c30b4e2712b9e5aaed3cff223001229a2d59e01
+  metadata.gz: 570bb59248b7a871f612ad16db32846c5461e6f6d9268ff46551663901f509bfb8b1571091bd0e6e82f7116c0cd6dfbbd2d0bdd819eba2a08288aef4dee40be3
+  data.tar.gz: 68f1dbab0601e8e1b09b7f1315f7b4917f89c4b3c66a33256d69a0286154208e3ae32939da19c3ee4298a1182c4cff0b0382d8ccc2c0549205a6cdfefbacc0fa

data/lib/gotransverse-tract-api/api_data.rb

@@ -212,7 +212,7 @@ module GoTransverseTractApi
           startDate: billing_account[:start_date],
           taxExempt: billing_account[:tax_exempt],
           eid: billing_account[:eid]
-        }.delete_if{|k,v| v.nil?},
+        },
         dailyBillCycle: {
           name: billing_account[:daily_bill_cycle][:name],
           startDate: billing_account[:daily_bill_cycle][:start_date],
@@ -222,7 +222,7 @@ module GoTransverseTractApi
           usePaymentTerm: billing_account[:daily_bill_cycle][:use_payment_term],
           status: billing_account[:daily_bill_cycle][:status],
           eid: billing_account[:daily_bill_cycle][:eid]
-        }.delete_if{|k,v| v.nil?},
+        },
         person: {
           attributes: {
             firstName: billing_account[:person][:first_name],
@@ -230,22 +230,22 @@ module GoTransverseTractApi
             eid: billing_account[:person][:eid]
           },
           addresses: get_addresses(billing_account[:person])
-        }.delete_if{|k,v| v.nil?},
+        },
         billingAccountCategory: {
           type: billing_account[:billing_account_category][:type],
           description: billing_account[:billing_account_category][:description],
           status: billing_account[:billing_account_category][:status],
           eid: billing_account[:billing_account_category][:eid]
-        }.delete_if{|k,v| v.nil?},
+        },
         paymentTerm: {
           name: billing_account[:payment_term][:name],
           termDays: billing_account[:payment_term][:term_days],
           graceDays: billing_account[:payment_term][:grace_days],
           eid: billing_account[:payment_term][:eid]
-        }.delete_if{|k,v| v.nil?}
+        }
       }
 
-      ba_details.delete_if{|k,v| v.nil?}
+      compact ba_details
     end
 
     def get_query_params(params, options={})
@@ -262,53 +262,92 @@ module GoTransverseTractApi
       }
 
       if entity[:addresses].has_key?(:email_address)
-        email_address = {
-          emailAddress: {
-            purpose: entity[:addresses][:email_address][:purpose],
-            email: entity[:addresses][:email_address][:email],
-          }.delete_if{|k,v| v.nil?}
-        }.delete_if{|k,v| v.nil?}
-
+        email_address = get_email_address(entity[:addresses][:email_address])
         addresses.merge! email_address if email_address.present?
       end
-        
-      if entity[:addresses].has_key?(:postal_address)
-        postal_address = {
-          postalAddress: {
-            purpose: entity[:addresses][:postal_address][:purpose],
-            country: entity[:addresses][:postal_address][:country],
-            city: entity[:addresses][:postal_address][:city],
-            regionOrState: entity[:addresses][:postal_address][:region_or_state],
-            attention: entity[:addresses][:postal_address][:attention],
-            postalCode: entity[:addresses][:postal_address][:postal_code],
-            line1: entity[:addresses][:postal_address][:line1],
-          }.delete_if{|k,v| v.nil?}
-        }.delete_if{|k,v| v.nil?}
 
+      if entity[:addresses].has_key?(:postal_address)
+        postal_address = get_postal_address(entity[:addresses][:postal_address])
         addresses.merge! postal_address if postal_address.present?
       end
 
       if entity[:addresses].has_key?(:telecom_address)
-        tele_address = {
-          telecomAddress: {
-            dialingPrefix: entity[:addresses].try(:[],:telecom_address).try(:[],:dialing_prefix),
-            countryCode: entity[:addresses].try(:[],:telecom_address).try(:[],:country_code),
-            areaCode: entity[:addresses].try(:[],:telecom_address).try(:[],:area_code),
-            number: entity[:addresses].try(:[],:telecom_address).try(:[],:number),
-            extension: entity[:addresses].try(:[],:telecom_address).try(:[],:extension),
-            purpose: entity[:addresses].try(:[],:telecom_address).try(:[],:purpose),
-            eid: entity[:addresses].try(:[],:telecom_address).try(:[],:eid) 
-          }.delete_if{|k,v| v.nil?}
-        }.delete_if{|k,v| v.nil?}
-
+        tele_address = get_telecom_address(entity[:addresses][:telecom_address])
         addresses.merge! tele_address if tele_address.present?
       end
 
-      addresses
+      compact addresses
 
     rescue
       {}
     end
 
+    # Returns {Hash} Postal Address
+    def get_postal_address(entity)
+      postal_address = {
+        postalAddress: {
+          purpose: entity[:purpose],
+          country: entity[:country],
+          city: entity[:city],
+          regionOrState: entity[:region_or_state],
+          attention: entity[:attention],
+          postalCode: entity[:postal_code],
+          line1: entity[:line1]
+        }
+      }
+
+      compact postal_address
+    end
+
+    # Returns {Hash} Email Address
+    def get_email_address(entity)
+      email_address = {
+        emailAddress: {
+          purpose: entity[:purpose],
+          email: entity[:email]
+        }
+      }
+
+      compact email_address
+    end
+
+    # Returns {Hash} Telecom Address
+    def get_telecom_address(entity)
+      tele_address = {
+        telecomAddress: {
+          dialingPrefix: entity.try(:[],:dialing_prefix),
+          countryCode: entity.try(:[],:country_code),
+          areaCode: entity.try(:[],:area_code),
+          number: entity.try(:[],:number),
+          extension: entity.try(:[],:extension),
+          purpose: entity.try(:[],:purpose),
+          eid: entity.try(:[],:eid) 
+        }
+      }
+
+      compact tele_address
+    end
+
+    # Remove all nil elements from hash
+    def compact(h={})
+      h.each do|k,v|
+        if v.nil?
+          h.delete(k)
+        elsif (v.is_a?(Hash) && v.empty?)
+          next
+        end
+
+        compact v if v.is_a?Hash
+      end
+
+      # Remove all empty hashes except first key if it is empty
+      # since that is required for XML root element attributes
+      h.delete_if do|k,v|
+        v.is_a?(Hash) && v.empty? && k != h.keys[0]
+      end
+
+      h
+    end
+
   end
 end

data/lib/gotransverse-tract-api/order/organization.rb

@@ -61,25 +61,18 @@ module GoTransverseTractApi
         end
 
         if (address.has_key?(:postal_address))
-          postal_address = {
-              postalAddress: {
-                  purpose: address[:postal_address][:purpose],
-                  country: address[:postal_address][:country],
-                  city: address[:postal_address][:city],
-                  regionOrState: address[:postal_address][:region_or_state],
-                  attention: address[:postal_address][:attention],
-                  postalCode: address[:postal_address][:postal_code],
-                  line1: address[:postal_address][:line1],
-              }.delete_if{|k,v| v.nil?}
-          }.delete_if{|k,v| v.nil?}
-
-          data.merge!({ postalAddress: postal_address[:postalAddress] })
+          postal_address = GoTransverseTractApi::ApiData.new.get_postal_address(address[:postal_address])
+          data.merge!(postal_address)
         end
+
         if (address.has_key?(:email_address))
-          data.merge!({ emailAddress: address[:email_address] })
+          email_address = GoTransverseTractApi::ApiData.new.get_email_address(address[:email_address])
+          data.merge!(email_address)
         end
+
         if (address.has_key?(:telecom_address))
-          data.merge!({ telecomAddress: address[:telecom_address] })
+          telecom_address = GoTransverseTractApi::ApiData.new.get_telecom_address(address[:telecom_address])
+          data.merge!(telecom_address)
         end
 
         xml_data = GoTransverseTractApi.generateXML(data, 'addAddressToParty')

data/lib/gotransverse-tract-api/order/people.rb

@@ -73,28 +73,6 @@ module GoTransverseTractApi
         GoTransverseTractApi.put_request_for(self, {eid: eid}, xml_data)
       end
 
-      #
-      # @param {Long} eid
-      # @param {Hash} address
-      #
-      def self.add_address eid, address
-        data = {
-          addAddressToParty: {},
-          person: {eid: eid},
-          postalAddress: {
-            purpose: address[:purpose],
-            country: address[:country],
-            city: address[:city],
-            regionOrState: address[:region_or_state],
-            postalCode: address[:postal_code],
-            line1: address[:line1]
-          }
-        }
-
-        xml_data = GoTransverseTractApi.generateXML(data, 'addAddressToParty')
-        GoTransverseTractApi.post_request_for(self, {eid: eid}, xml_data, "addAddress")
-      end
-
     end
 
   end

data/lib/gotransverse-tract-api/usage/rate_table.rb

@@ -6,6 +6,14 @@ module GoTransverseTractApi
 
       class << self
 
+        #
+        # @param {Hash} options
+        #
+        def find_all options={}
+          params ||= GoTransverseTractApi::ApiData.new.get_query_params({}, options)
+          GoTransverseTractApi.get_response_for(self, params)
+        end
+
         #
         # @param {Long} eid
         # @param {Hash} options

data/lib/gotransverse-tract-api/version.rb

@@ -1,6 +1,6 @@
 module GoTransverseTractApi
 
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
   TARGET_API_VERSION = "1.29"
 
 end

data/spec/gotransverse-tract-api/api_data_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+module GoTransverseTractApi
+
+  RSpec.describe ApiData do
+    before(:each) { http_auth }
+
+    describe ".compact" do
+      it "returns a hash by eliminating all nil" do
+        given_hash = {a: {}, c: 'p', s: nil, d: {e: nil, m: nil}, f: {g: {}, x: {n: 'h', i: nil, j: 'l'}}}
+        expected_hash = {:a=>{}, :c=>"p", :f=>{:g=>{}, :x=>{:n=>"h", :j=>"l"}}}
+
+        expect(described_class.new.compact(given_hash)).to eq(expected_hash)
+      end
+    end
+
+  end
+
+end

data/spec/gotransverse-tract-api/order/people_spec.rb

@@ -8,24 +8,6 @@ module GoTransverseTractApi
     let(:eid) { '4096' }
     let(:response)  { {a: 'b', c: 'd'} }
 
-    context ".add_address" do
-      it "adds address for the customer" do
-        eid = '48406'
-
-        data = {
-          city: 'fsfsfs',
-          country: 'USA',
-          line1: 'wefsvgg ggdgdgd',
-          postal_code: '232433',
-          purpose: 'Billing',
-          region_or_state: 'CA'
-        }
-
-        allow(subject).to receive(:add_address).with(eid, data).and_return(response)
-        expect(subject.add_address(eid, data)).to eq(response)
-      end
-    end
-
     context ".update" do
       it "updates a person details" do
         data = { eid: eid, name: 'John Smith', tax_id_number: '124224242' }

data/spec/gotransverse-tract-api/usage/rate_table_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+module GoTransverseTractApi
+
+  RSpec.describe Usage::RateTable do
+    before(:each) { http_auth }
+
+    let(:response) { {a: 'b', c: 'd'} }
+
+    describe ".find_all" do
+      it "returns all rate table entries" do
+        data = described_class.find_all
+        expect(data).to_not be_nil
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotransverse-tract-api
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Julien DeFrance
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -207,6 +207,7 @@ files:
 - lib/gotransverse-tract-api/usage/usage_some.rb
 - lib/gotransverse-tract-api/version.rb
 - spec/auth_helper.rb
+- spec/gotransverse-tract-api/api_data_spec.rb
 - spec/gotransverse-tract-api/billing_account/adjustment_spec.rb
 - spec/gotransverse-tract-api/billing_account/billing_account_spec.rb
 - spec/gotransverse-tract-api/billing_account/counter_spec.rb
@@ -232,6 +233,7 @@ files:
 - spec/gotransverse-tract-api/service/service_spec.rb
 - spec/gotransverse-tract-api/usage/order_item_usage_rule_spec.rb
 - spec/gotransverse-tract-api/usage/product_usage_rule_spec.rb
+- spec/gotransverse-tract-api/usage/rate_table_spec.rb
 - spec/gotransverse-tract-api/usage/usage_event_spec.rb
 - spec/gotransverse-tract-api_spec.rb
 - spec/spec_helper.rb
@@ -262,6 +264,7 @@ summary: A ruby gem allowing developers to conveniently integrate with GoTransve
   TRACT API.
 test_files:
 - spec/auth_helper.rb
+- spec/gotransverse-tract-api/api_data_spec.rb
 - spec/gotransverse-tract-api/billing_account/adjustment_spec.rb
 - spec/gotransverse-tract-api/billing_account/billing_account_spec.rb
 - spec/gotransverse-tract-api/billing_account/counter_spec.rb
@@ -287,6 +290,7 @@ test_files:
 - spec/gotransverse-tract-api/service/service_spec.rb
 - spec/gotransverse-tract-api/usage/order_item_usage_rule_spec.rb
 - spec/gotransverse-tract-api/usage/product_usage_rule_spec.rb
+- spec/gotransverse-tract-api/usage/rate_table_spec.rb
 - spec/gotransverse-tract-api/usage/usage_event_spec.rb
 - spec/gotransverse-tract-api_spec.rb
 - spec/spec_helper.rb