fishbowl 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5de36e305db8f0ee23f26a5e54347bf31200326a
+  data.tar.gz: 9c43fd84b6929bd7013cbb1f9080247d243370fd
+SHA512:
+  metadata.gz: 1e234e842add2ce0df6a7204b792a16033f94f6a728a30768993512defbb76bbcba66b1cb85ec099245e5b2ecec82b72918462e3e6b711d406e1dce2b7b9e992
+  data.tar.gz: 3a54c1b6b70b52c8df8654a89d5d143716b77e065496ef3c61b8d42503c5457e0df90adda68744ff3554053472dfd4a91b06ddbeeb3d2760fe6429e60d95024b

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea/

data/Gemfile

@@ -4,15 +4,8 @@ gemspec
 
 gem 'rake'
 gem 'rspec'
-
 gem 'equivalent-xml'
 
 group :localtest do
-  gem 'simplecov'
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'growl'
-  gem 'rb-fsevent'
-  gem 'spork'
-  gem 'guard-spork'
+  gem 'pry'
 end

data/fishbowl.gemspec

@@ -6,11 +6,11 @@ require 'fishbowl/version'
 Gem::Specification.new do |gem|
   gem.name          = "fishbowl"
   gem.version       = Fishbowl::VERSION
-  gem.authors       = ["James Thompson"]
-  gem.email         = ["james@plainprograms.com"]
-  gem.description   = %q{Provides an interface to the Fishbowl Inventory API.}
+  gem.authors       = ["James Thompson, Simeon Berns"]
+  gem.email         = ["james@plainprograms.com, simeonberns@gmail.com"]
+  gem.description   = %q{Provides an interface to the Fishbowl Inventory API}
   gem.summary       = %q{Fishbowl Inventory API}
-  gem.homepage      = "https://github.com/readyproject/fishbowl"
+  gem.homepage      = "https://github.com/flameofzion/fishbowl"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/fishbowl.rb

@@ -10,99 +10,18 @@ require 'fishbowl/version'
 require 'fishbowl/errors'
 require 'fishbowl/requests'
 require 'fishbowl/objects'
+require 'fishbowl/connection'
+require 'fishbowl/configuration'
 
 module Fishbowl # :nodoc:
-  class Connection
-    include Singleton
 
-    def self.connect(options = {})
-      raise Fishbowl::Errors::MissingHost if options[:host].nil?
-
-      @host = options[:host]
-      @port = options[:port].nil? ? 28192 : options[:port]
-
-      @connection = TCPSocket.new @host, @port
-
-      self.instance
-    end
-
-    def self.login(options = {})
-      raise Fishbowl::Errors::ConnectionNotEstablished if @connection.nil?
-      raise Fishbowl::Errors::MissingUsername if options[:username].nil?
-      raise Fishbowl::Errors::MissingPassword if options[:password].nil?
-
-      @username, @password = options[:username], options[:password]
-
-      code, message, _ = Fishbowl::Objects::BaseObject.new.send_request(login_request, 'LoginRs')
-
-      Fishbowl::Errors.confirm_success_or_raise(code, message)
-
-      self.instance
-    end
-
-    def self.host
-      @host
-    end
-
-    def self.port
-      @port
-    end
-
-    def self.username
-      @username
-    end
-
-    def self.password
-      @password
-    end
-
-    def self.send(request, expected_response = 'FbiMsgRs')
-      write(request)
-      get_response(expected_response)
-    end
-
-    def self.close
-      @connection.close
-      @connection = nil
-    end
-
-  private
-
-    def self.login_request
-      Nokogiri::XML::Builder.new do |xml|
-        xml.request {
-          xml.LoginRq {
-            xml.IAID          "fishbowl-ruby"
-            xml.IAName        "Fishbowl Ruby Gem"
-            xml.IADescription "Fishbowl Ruby Gem"
-            xml.UserName      @username
-            xml.UserPassword  encoded_password
-          }
-        }
-      end
-    end
-
-    def self.encoded_password
-      Base64.encode64(@password)
-    end
-
-    def self.write(request)
-      body = request.to_xml
-      size = [body.size].pack("L>")
-
-      @connection.write(size)
-      @connection.write(body)
-    end
-
-    def self.get_response(expectation)
-      length = @connection.recv(3).unpack('L>').join('').to_i
-      response = Nokogiri::XML.parse(@connection.recv(length))
-
-      status_code = response.xpath("//#{expectation}/@statusCode").first.value
-      status_message = response.xpath("//#{expectation}/@statusMessage").first.value
-
-      [status_code, status_message, response]
-    end
+  class << self
+    attr_accessor :configuration
+  end
 
+  def self.configure
+    self.configuration ||= Configuration.new
+    yield(configuration)
   end
+
 end

data/lib/fishbowl/configuration.rb

@@ -0,0 +1,9 @@
+module Fishbowl
+  class Configuration
+    attr_accessor :username, :password, :host, :port, :app_id, :app_name, :app_description, :debug
+
+    def initialize
+      @debug = false
+    end
+  end
+end

data/lib/fishbowl/connection.rb

@@ -0,0 +1,99 @@
+module Fishbowl
+  class Connection
+    include Singleton
+
+    def self.connect()
+      raise Fishbowl::Errors::MissingHost if Fishbowl.configuration.host.nil?
+
+      @host = Fishbowl.configuration.host
+      @port = Fishbowl.configuration.port.nil? ? 28192 : Fishbowl.configuration.port
+
+      @connection = TCPSocket.new @host, @port
+
+      self.instance
+    end
+
+    def self.login()
+      raise Fishbowl::Errors::ConnectionNotEstablished if @connection.nil?
+      raise Fishbowl::Errors::MissingUsername if Fishbowl.configuration.host.nil?
+      raise Fishbowl::Errors::MissingPassword if Fishbowl.configuration.host.nil?
+
+      @username = Fishbowl.configuration.username
+      @password = Fishbowl.configuration.password
+
+      code, _ = Fishbowl::Objects::BaseObject.new.send_request(login_request)
+      Fishbowl::Errors.confirm_success_or_raise(code)
+
+      self.instance
+    end
+
+    def self.host
+      @host
+    end
+
+    def self.port
+      @port
+    end
+
+    def self.username
+      @username
+    end
+
+    def self.password
+      @password
+    end
+
+    def self.send(request, expected_response = 'FbiMsgsRs')
+      puts 'opening connection...' if Fishbowl.configuration.debug.eql? true
+      puts request if Fishbowl.configuration.debug.eql? true
+      puts 'waiting for response...' if Fishbowl.configuration.debug.eql? true
+      write(request)
+      get_response(expected_response)
+    end
+
+    def self.close
+      @connection.close
+      @connection = nil
+    end
+
+    private
+
+    def self.login_request
+      Nokogiri::XML::Builder.new do |xml|
+        xml.request {
+          xml.LoginRq {
+            xml.IAID          Fishbowl.configuration.app_id
+            xml.IAName        Fishbowl.configuration.app_name
+            xml.IADescription Fishbowl.configuration.app_description
+            xml.UserName      Fishbowl.configuration.username
+            xml.UserPassword  encoded_password
+          }
+        }
+      end
+    end
+
+    def self.encoded_password
+      Digest::MD5.base64digest(@password)
+    end
+
+    def self.write(request)
+      body = request.to_xml
+      size = [body.size].pack("L>")
+      @connection.write(size)
+      @connection.write(body)
+    end
+
+    def self.get_response(expectation)
+      length = @connection.recv(4).unpack('L>').join('').to_i
+      response = Nokogiri::XML.parse(@connection.recv(length))
+
+      puts "Looking for '#{expectation}' node in: " if Fishbowl.configuration.debug.eql? true
+      puts response if Fishbowl.configuration.debug.eql? true
+
+      status_code = response.xpath("/FbiXml/#{expectation}").attr("statusCode").value
+
+      [status_code, response]
+    end
+
+  end
+end

data/lib/fishbowl/errors.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Fishbowl::Errors
   class ConnectionNotEstablished < RuntimeError; end;
   class MissingHost < ArgumentError; end;
@@ -6,7 +8,12 @@ module Fishbowl::Errors
 
   class StatusError < RuntimeError; end;
 
-  def self.confirm_success_or_raise(code, message)
-    code.to_i == 1000 ? true : raise(StatusError, message)
+  def self.confirm_success_or_raise(code)
+    code.to_i == 1000 ? true : raise(StatusError, get_status(code.to_i))
+  end
+
+  def self.get_status(code)
+    status_codes = YAML.load_file('./lib/status_codes.yml')['codes']
+    status_codes[code]['message']
   end
 end

data/lib/fishbowl/objects/account.rb

@@ -11,31 +11,5 @@ module Fishbowl::Objects
       parse_attributes
       self
     end
-
-    def self.get_list
-      _, _, response = BaseObject.new.send_request("GetAccountListRq", "GetAccountListRs")
-
-      results = []
-
-      response.xpath("//Account").each do |account_xml|
-        results << Account.new(account_xml)
-      end
-
-      results
-    end
-
-    def self.get_balance(account)
-      builder = Nokogiri::XML::Builder.new do |xml|
-        xml.request {
-          xml.GetAccountBalanceRq {
-            xml.Account (account.is_a?(Account) ? account.name : account)
-          }
-        }
-      end
-
-      _, _, response = BaseObject.new.send_request(builder, "GetAccountBalanceRs")
-
-      response.xpath("//Account/Balance").first.inner_text
-    end
   end
 end

data/lib/fishbowl/objects/base_object.rb

@@ -1,11 +1,25 @@
 module Fishbowl::Objects
   class BaseObject
-    attr_accessor :ticket
+    @@ticket = nil
 
-    def send_request(request, expected_response = 'FbiMsgRs')
-      code, message, response = Fishbowl::Connection.send(build_request(request), expected_response)
-      Fishbowl::Errors.confirm_success_or_raise(code, message)
-      [code, message, response]
+    def send_request(request, expected_response = 'FbiMsgsRs')
+      result = nil
+      5.times do |i|
+        puts "REQUEST ATTEMPT: #{i}" if Fishbowl.configuration.debug.eql? true
+        begin
+          code, response = Fishbowl::Connection.send(build_request(request), expected_response)
+          raise "No response" if response.nil?
+          Fishbowl::Errors.confirm_success_or_raise(code)
+          @@ticket = response.css("FbiXml Ticket Key").text
+          puts 'RESPONSE SUCCEEDED' if Fishbowl.configuration.debug.eql? true
+          result = [code, nil, response]
+          break
+        rescue NoMethodError => nme
+          puts 'FAILED TO GET RESPONSE' if Fishbowl.configuration.debug.eql? true
+          sleep 1
+        end
+      end
+      return result
     end
 
   protected
@@ -35,12 +49,14 @@ module Fishbowl::Objects
   private
 
     def build_request(request)
-      Nokogiri::XML::Builder.new do |xml|
+      new_req = Nokogiri::XML::Builder.new do |xml|
         xml.FbiXml {
-          if @ticket.nil?
+          if @@ticket.nil?
             xml.Ticket
           else
-            xml.Ticket @ticket
+            xml.Ticket {
+              xml.Key @@ticket
+            }
           end
 
           xml.FbiMsgsRq {
@@ -52,6 +68,7 @@ module Fishbowl::Objects
           }
         }
       end
+      Nokogiri::XML(new_req.to_xml).root
     end
 
   end

data/lib/fishbowl/requests.rb

@@ -1,6 +1,5 @@
 module Fishbowl; module Requests; end; end
 
-require 'fishbowl/requests/add_inventory'
-require 'fishbowl/requests/add_sales_order_item'
-require 'fishbowl/requests/adjust_inventory'
-require 'fishbowl/requests/get_carrier_list'
+Dir.glob(File.join(File.expand_path("../requests/", __FILE__), "**.rb")).each do |file|
+  require file
+end

data/lib/fishbowl/requests/get_account_balance.rb

@@ -0,0 +1,15 @@
+module Fishbowl::Requests
+  def self.get_account_balance(account_name)
+    builder = Nokogiri::XML::Builder.new do |xml|
+      xml.request {
+        xml.GetAccountBalanceRq {
+          xml.Account (account.is_a?(Account) ? account.name : account)
+        }
+      }
+    end
+
+    _, _, response = Fishbowl::Objects::BaseObject.new.send_request(builder, "GetAccountBalanceRs")
+
+    response.xpath("//Account/Balance").first.inner_text
+  end
+end

data/lib/fishbowl/requests/get_account_list.rb

@@ -0,0 +1,13 @@
+module Fishbowl::Requests
+  def self.get_account_list
+    _, _, response = Fishbowl::Objects::BaseObject.new.send_request('GetAccountListRq', 'GetAccountListRs')
+
+    results = []
+
+    response.xpath("//Account").each do |account_xml|
+      results << Account.new(account_xml)
+    end
+
+    results
+  end
+end

data/lib/fishbowl/requests/get_carrier_list.rb

@@ -1,9 +1,10 @@
 module Fishbowl::Requests
   def self.get_carrier_list
-    _, _, response = Fishbowl::Objects::BaseObject.new.send_request('CarrierListRq', 'CarrierListRs')
+    _, _, response = Fishbowl::Objects::BaseObject.new.send_request('CarrierListRq', 'FbiMsgsRs/CarrierListRs')
 
     results = []
-    response.xpath("//Carrier").each do |carrier_xml|
+
+    response.xpath("//Carriers/Name").each do |carrier_xml|
       results << Fishbowl::Objects::Carrier.new(carrier_xml)
     end
 

data/lib/fishbowl/requests/get_customer_list.rb

@@ -0,0 +1,12 @@
+module Fishbowl::Requests
+  def self.get_customer_list
+    _, _, response = Fishbowl::Objects::BaseObject.new.send_request('CustomerListRq', 'CustomerListRs')
+
+    results = []
+    response.xpath("//Customer").each do |customer_xml|
+      results << Fishbowl::Objects::Customer.new(customer_xml)
+    end
+
+    results
+  end
+end