kelredd-wesabe 0.0.2 → 0.1.0

data/Rakefile

@@ -19,8 +19,7 @@ spec = Gem::Specification.new do |s|
   s.files            = %w(README.rdoc Rakefile) + Dir.glob("{lib,test}/**/*")
   # s.executables    = ['wesabe']
   
-  s.add_dependency('nokogiri', '> 1.2.3')
-  s.add_dependency('rest-client', '> 0.9.2')
+  s.add_dependency('kelredd-resourceful', '>= 0.3.0')
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -34,7 +33,7 @@ Rake::TestTask.new do |t|
 end
 
 desc 'Generate the gemspec to serve this Gem from Github'
-task :github do
+task :gemspec do
   file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
   File.open(file, 'w') {|f| f << spec.to_ruby }
   puts "Created gemspec: #{file}"

data/lib/wesabe/exceptions.rb

@@ -1,8 +1,4 @@
 module Wesabe
   class NotConfigured < StandardError
   end
-  class ResourceAPIError < StandardError
-  end
-  class ResourceParseError < StandardError
-  end
 end

data/lib/wesabe/model/account.rb

@@ -9,21 +9,21 @@ module Wesabe
       def self.find(id)
         case id
         when :all
-          find_collection("/accounts", "//accounts/account")
+          get_collection("/accounts", {}, "//accounts/account")
         else
-          super("/accounts/#{id}", "//account")
+          get("/accounts/#{id}", {}, "//account")
         end
       end
       
-      attribute :id, :integer, :path => "id"
+      attribute :id, :integer
       attribute :key, :string, :path => "guid"
       attribute :number, :string, :path => "account-number"
-      attribute :name, :string, :path => "name"
+      attribute :name, :string
       attribute :account_type, :string, :path => "account-type"
       attribute :balance, :float, :path => "current-balance"
       attribute :last_uploaded_at, :datetime, :path => "last-uploaded-at"
-      attribute :oldest_transaction_on, :date, :path => "oldest-txaction"
-      attribute :newest_transaction_on, :date, :path => "newest-txaction"
+      attribute :oldest_txaction_on, :date, :path => "oldest-txaction"
+      attribute :newest_txaction_on, :date, :path => "newest-txaction"
       
       def institution
         @institution ||= Wesabe::Model::Institution.new(get_node('./financial-institution'))

data/lib/wesabe/model/base.rb

@@ -1,136 +1,31 @@
-%w(rubygems rest_client nokogiri).each do |lib|
-  require lib
-end
-%w(configuration exceptions extensions).each do |file|
-  require File.join(File.dirname(__FILE__), "..", "#{file}.rb")
-end
-
 module Wesabe
   module Model
-
-    class Base
-      @@user = nil
-      @@password = nil
-      @@content_type = Wesabe::API_DEFAULT_CONTENT_TYPE
-      
-      def self.resource
-        RestClient::Resource.new(Wesabe::API_SITE, :user => @@user, :password => @@password, :content_type => @@content_type)
-      end
-      @@api = resource
-      @@api_cache = {}
+    class Base < Resourceful::Model::Xml
       
-      attr_reader :xml
-
       def self.configure(opts={})
-        @@user = opts[:user]
-        @@password = opts[:password]
-        @@content_type = opts[:content_type] if opts[:content_type] && Wesabe::API_CONTENT_TYPES.include?(opts[:content_type])
-        @@api = resource
+        raise Wesabe::NotConfigured, "No user provided to access the Wesabe API" if blank?(opts[:user]) 
+        raise Wesabe::NotConfigured, "No password provided to access the Wesabe API" if blank?(opts[:password]) 
+        agent RestClient::Resource.new('https://www.wesabe.com', :user => opts[:user], :password => opts[:password])
       end
 
-      def self.find(path, xpath)
-        new(get_xml(path).xpath(xpath))
-      end
-      def self.find_collection(path, xpath)
-        get_xml(path).xpath(xpath).collect{|item_xml| new(item_xml)}
-      end
-
-      def initialize(xml)
-        @xml = xml
-      end
-      
       protected
-      
-      def self.get_xml(path)
-        self.resource_xml(:get, path)
-      end
-      def self.resource_xml(verb, path, force=false)
-        summary = "#{verb.to_s.upcase} #{@@api.url}#{path}"
-        key = cache_key(verb, path)
-        begin
-          resp = @@api_cache[key]
-          if resp.nil? || force
-            base_config_check
-            p "** Wesabe API: #{summary}"
-            resp = case verb.to_sym 
-            when :get
-              @@api["#{path}"].get
-            end
-            @@api_cache[key] = resp
-          else
-            p "** Wesabe API: [cache] #{summary}."
-          end
-        rescue Exception => err
-          raise Wesabe::ResourceAPIError, "error with API resource: #{summary}: #{err.message}"
-        end
-        begin
-          xml = Nokogiri::XML(resp.to_s)
-        rescue Exception => err
-          raise Wesabe::ResourceParseError, "error parsing API resource [#{@@content_type}]: #{summary}: #{err.message}: Response: #{resp.to_s}"
-        end
-        xml
-      end
 
-      def self.attribute(name, type, config)
-        raise Wesabe::NotConfigured, "no path provided for selecting the attribute '#{name}'." unless config[:path]
-        content_method = case type.to_sym
-        when :string
-          'to_s'
-        when :integer
-          'to_i'
-        when :float
-          'to_f'
-        when :date
-          'to_date'
-        when :datetime
-          'to_datetime'
-        else 
-          'to_s'
-        end
-        define_method(name) do
-          instance_variable_get("@#{name}") || instance_variable_set("@#{name}", get_node("./#{config[:path]}").content.send(content_method))
-        end
-      end
-      def self.get_node(xml, path)
-        xml.xpath(path.to_s).first
-      end
-      def get_node(path)
-        self.class.get_node(@xml, path)
+      def self.get(resource, params, xpath)
+        raise Wesabe::NotConfigured, "Wesabe not configured to access the API." if blank?(@agent) 
+        super(resource, params, xpath)
       end
 
-      def self.xml_root_name(xml)
-        xml.root.name
-      end
-      def xml_root_name
-        self.class.xml_root_name(@xml)
+      def self.get_collection(resource, params, xpath)
+        raise Wesabe::NotConfigured, "Wesabe not configured to access the API." if blank?(@agent) 
+        super(resource, params, xpath)
       end
 
-      def self.cache_key(path, verb)
-        "#{verb}_#{path}"
-      end
+      private
 
-      def self.clear_cache
-        @@api_cache = {}
-      end
-      
-      def self.base_config_check
-        raise Wesabe::NotConfigured, "No user provided to access the Wesabe API" if blank?(@@user) 
-        raise Wesabe::NotConfigured, "No password provided to access the Wesabe API" if blank?(@@password) 
-        raise Wesabe::NotConfigured, "Wesabe not configured to access the API." if blank?(@@api) 
-      end
-      def base_config_check
-        self.class.base_config_check
-      end
-      
       def self.blank?(value)
         value.nil? || (value.respond_to?('empty?') ? value.empty? : false)
       end
-      def blank?(value)
-        self.class.blank?(value)
-      end
-
 
     end
-
   end
 end

data/lib/wesabe/model/institution.rb

@@ -8,7 +8,7 @@ module Wesabe
     class Institution < Wesabe::Model::Base
       
       attribute :key, :string, :path => "id"
-      attribute :name, :string, :path => "name"
+      attribute :name, :string
      
     end
     

data/lib/wesabe/model/merchant.rb

@@ -8,7 +8,7 @@ module Wesabe
     class Merchant < Wesabe::Model::Base
       
       attribute :key, :string, :path => "id"
-      attribute :name, :string, :path => "name"
+      attribute :name, :string
      
     end
     

data/lib/wesabe/model/txaction.rb

@@ -8,20 +8,18 @@ module Wesabe
 
       def self.find(opts={})
         acct = opts.delete(:account)
-        path = (acct ? "/accounts/#{acct.to_s}.xml" : "/transactions.xml")
-        path += opts.to_http_query_str if opts.respond_to?('to_http_query_str')
-        find_collection(path, "//txactions/txaction")
+        get_collection((acct ? "/accounts/#{acct.to_s}" : "/transactions"), opts, "//txactions/txaction")
       end
       
       attribute :key, :string, :path => "guid"
       attribute :account_id, :string, :path => "account-id"
-      attribute :date, :date, :path => "date"
+      attribute :date, :date
       attribute :original_date, :date, :path => "original-date"
-      attribute :amount, :float, :path => "amount"
+      attribute :amount, :float
       attribute :display_name, :string, :path => "display-name"
       attribute :raw_name, :string, :path => "raw-name"
       attribute :raw_type, :string, :path => "raw-txntype"
-      attribute :memo, :string, :path => "memo"
+      attribute :memo, :string
       attribute :transfer_key, :string, :path => "transfer/guid"
       
       def account

data/lib/wesabe/version.rb

@@ -2,8 +2,8 @@ module Wesabe
   module Version
     
     MAJOR = 0
-    MINOR = 0
-    TINY  = 2
+    MINOR = 1
+    TINY  = 0
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

data/lib/wesabe.rb

@@ -1,4 +1,7 @@
-$:.unshift File.dirname(__FILE__)
-
-require 'wesabe/model'
+%w(rubygems resourceful).each do |lib|
+  require lib
+end
 
+%w(exceptions model).each do |file|
+  require File.join(File.dirname(__FILE__), 'wesabe', "#{file}.rb")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kelredd-wesabe
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,28 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-15 00:00:00 -07:00
+date: 2009-07-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: kelredd-resourceful
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.3.0
     version: 
 description: 
 email: kelly@kelredd.com
@@ -44,9 +34,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/wesabe
-- lib/wesabe/configuration.rb
 - lib/wesabe/exceptions.rb
-- lib/wesabe/extensions.rb
 - lib/wesabe/model
 - lib/wesabe/model/account.rb
 - lib/wesabe/model/base.rb

data/lib/wesabe/configuration.rb

@@ -1,5 +0,0 @@
-module Wesabe
-  API_SITE = 'https://www.wesabe.com'
-  API_CONTENT_TYPES = ['application/xml']
-  API_DEFAULT_CONTENT_TYPE = API_CONTENT_TYPES.first
-end

data/lib/wesabe/extensions.rb

@@ -1,60 +0,0 @@
-require 'cgi'
-
-module Wesabe
-  module Extensions   
-    module String
-      
-      module ClassMethods; end
-      def self.included(klass)
-        klass.extend(ClassMethods) if klass.kind_of?(Class)
-      end
-
-      module ClassMethods
-      end
-
-      def to_datetime
-        DateTime.strptime(self) rescue nil
-      end
-      def to_date
-        Date.strptime(self) rescue nil
-      end
-      
-    end
-  end
-end
-
-module Wesabe
-  module Extensions
-    module Hash
-
-      module ClassMethods; end
-      def self.included(klass)
-        klass.extend(ClassMethods) if klass.kind_of?(Class)
-      end
-
-      module ClassMethods
-      end
-
-      # Returns string formatted for HTTP URL encoded name-value pairs.
-      # For example,
-      #  {:id => 'thomas_hardy'}.to_http_str 
-      #  # => "id=thomas_hardy"
-      #  {:id => 23423, :since => Time.now}.to_http_str
-      #  # => "since=Thu,%2021%20Jun%202007%2012:10:05%20-0500&id=23423"
-      def to_http_query_str(opts = {})
-        opts[:prepend] ||= '?'
-        opts[:append] ||= ''
-        self.empty? ? '' : "#{opts[:prepend]}#{self.collect{|key, val| "#{key.to_s}=#{CGI.escape(val.to_s)}"}.join('&')}#{opts[:append]}"
-      end
-
-    end
-  end
-end
-
-class String
-  include Wesabe::Extensions::String
-end
-
-class Hash
-  include Wesabe::Extensions::Hash
-end