autoexpreso 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 01f6d8da2466fc73fe50f7afa664348eb4d9dbf0
-  data.tar.gz: 0bcf1883d33c9d26664a9c794075387047388567
+SHA256:
+  metadata.gz: 55498b4536218b4166e414cff6d06db0c6bdb8740c3f64c97b1dae4ad0c55386
+  data.tar.gz: 0e5db18bc018df5caf8d518e2891ca382ceaa0e651541251dc707090621197bf
 SHA512:
-  metadata.gz: 0c38655881d0b332f58ecd7d1605e460d8c1dff38c9fde0292cbac48e4dd4aab8697f2db535436c01757826fc6148be48b55698ad1d02fc2b25f36c6c1ce2144
-  data.tar.gz: 755218ce25bd091e92131a0283d5eed0d5a742929eb50f90ea6a797e3e5411cf534090b4d6f2702e83b25760fdcd3bb915482b0361d9694a950620e87cce8899
+  metadata.gz: df25eaea388b51735ab1471bd3f877ea5dff9dac96da166cab9f40f07913dbaf0a2ee30017f3a3dc396bfac888ea7244aebdb84d1d241250099c688d350fecd0
+  data.tar.gz: 7d98592cd5e477a3003fcfa41b30b731c059220235757e35d635c5756381da0b1ad08e4be2969a5b9f97382e27f51f0cef017d335f73edc8104dc1b715f60ef6

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.1
+ruby-2.7.1

data/Changelog.md

@@ -1,5 +1,14 @@
 # AutoExpreso Changelog
 
+### 2.0.0
+Released July 5, 2020 ([2.0.0](https://github.com/jonahoffline/autoexpreso-cli/tree/v2.0.0)).
+
+* Replace Old AutoExpreso (scraped) API with newly REST endpoints.
+* Replace `mechanize` dependency for `faraday` and `typhoeus`.
+* Replace `awesome_print` dependency to `awesome_print`.
+* Add Typhoeus caching.
+* Update gemspec to require Ruby version >= 2.4
+
 ### 1.0.2
 Released August 5, 2017 ([1.0.2](https://github.com/jonahoffline/autoexpreso-cli/tree/v1.0.2)).
 

data/README.md

@@ -1,9 +1,6 @@
 ## Autoexpreso
-[![Build Status](http://img.shields.io/travis/jonahoffline/autoexpreso-cli.svg?style=flat-square)](https://travis-ci.org/jonahoffline/autoexpreso-cli)
 [![Gem Version](http://img.shields.io/gem/v/autoexpreso.svg?style=flat-square)](http://badge.fury.io/rb/autoexpreso)
-[![Dependency Status](http://img.shields.io/gemnasium/jonahoffline/autoexpreso-cli.svg?style=flat-square)](https://gemnasium.com/jonahoffline/autoexpreso-cli)
-[![Code Climate](http://img.shields.io/codeclimate/github/jonahoffline/autoexpreso-cli.svg?style=flat-square)](https://codeclimate.com/github/jonahoffline/autoexpreso-cli)
-[![security](https://hakiri.io/github/jonahoffline/autoexpreso-cli/master.svg)](https://hakiri.io/github/jonahoffline/autoexpreso-cli/master)
+[![Maintainability](https://api.codeclimate.com/v1/badges/9cde80c2131b5ca913f2/maintainability)](https://codeclimate.com/github/jonahoffline/autoexpreso-cli/maintainability)
 
 A Ruby Gem and Command-Line App for getting your account status from autoexpreso.com
 
@@ -41,30 +38,37 @@ In your terminal:
   **************************************************
             Enter your account details
 
-  Username:  tavin_pumarejo
+  Email:  tavin_pumarejo
   Password:  **************
   Account Details:
-  {
-    "account_name_id": "TAVIN PUMAREJO",
-    "account_balance_id": "$ 17.80",
-    "account_status_id": "Activo",
-    "account_last_payment_id": "$ 20.00",
-    "account_last_payment_date_id": "20/11/2014 05:29:10 p.m.",
+```
+
+```json
+
+{
+    "currentBalance": 13.5500,
+    "firstName": "Tavin",
+    "lastName": "Pumarejo",
+    "email": "tavin@pumarejo.com",
     "transactions": [
-      {
-        "date": "20/11/2014 10:21:44 p.m.",
-        "location": "Toa Baja - 5",
-        "amount": "$ 1.10",
-        "tag_number": "1337"
-      },
-      {
-        "date": "20/11/2014 05:43:17 p.m.",
-        "location": "Buchanan - 21",
-        "amount": "$ 1.10",
-        "tag_number": "1337"
-      }
-    ]
-  }
+        {
+            "transactionDate": "4/27/2020 9:27:34 PM",
+            "plaza": "Buchanan Eb Ort - 8",
+            "amount": 0.7000,
+            "tagNumber": 1337,
+            "location": "Buchanan Eb Ort - 3",
+            "isReplenish": false,
+            "vehicle": {
+                "brand": "Suzuki",
+                "model": "Forsa Tres Potes 800",
+                "year": 1985,
+                "plate": "TP123",
+                "axles": 0,
+                "tagNumber": 0
+            }
+        }
+      ]
+    }
 ```
 
 ### Command-Line Options

data/autoexpreso.gemspec

@@ -6,10 +6,10 @@ require 'autoexpreso/version'
 Gem::Specification.new do |spec|
   spec.name          = 'autoexpreso'
   spec.version       = AutoExpreso::VERSION
-  spec.authors       = ['Axel Rivera','Jonah Ruiz']
-  spec.email         = ['axel@riveralabs.com','jonah@pixelhipsters.com']
-  spec.description   = %q{Scrape autoexpreso.com for your account status}
-  spec.summary       = %q{Scrape autoexpreso.com for your account status and last transactions.}
+  spec.authors       = ['Jonah Ruiz']
+  spec.email         = ['jonah@pixelhipsters.com']
+  spec.description   = %q{Non-official autoexpreso.com Ruby library and CLI application.}
+  spec.summary       = %q{Non-official autoexpreso.com Ruby library and CLI for the service}
   spec.homepage      = 'https://www.github.com/jonahoffline/autoexpreso-cli'
   spec.license       = 'MIT'
 
@@ -17,13 +17,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.2.2'
+  spec.required_ruby_version = '>= 2.4'
 
-  spec.add_dependency 'awesome_print', '~> 1.8'
-  spec.add_dependency 'highline', '~> 1.7.8'
-  spec.add_dependency 'mechanize', '~> 2.7.5'
+  spec.add_dependency 'amazing_print', '~> 1.2.1'
+  spec.add_dependency 'highline', '~> 2.0.3'
+  spec.add_dependency 'faraday', '~> 1.0.1'
+  spec.add_dependency 'typhoeus', '~> 1.4.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 3.6'
+  spec.add_development_dependency 'rspec', '~> 3.9'
 end

data/examples/api/README.md

@@ -18,7 +18,7 @@ $ rackup config.ru
 
 Posting to `/account_details`
 
-`curl -X POST -H "Content-Type: application/json" -d '{"username":"tavi_pumarejo","password":"tututuah-tuah"}' http://autoexpreso-api.herokuapp.com/account_details`
+`curl -X POST -H "Content-Type: application/json" -d '{"email":"tavi_pumarejo","password":"tututuah-tuah"}' http://autoexpreso-api.herokuapp.com/account_details`
 
 
 ## Deploying to Heroku

data/examples/api/autoexpreso_api.rb

@@ -14,7 +14,7 @@ module AutoExpreso
       data = JSON.parse(request.body.read)
 
       ae = AutoExpreso::Client.new
-      ae.login(data['username'], data['password'])
+      ae.login(data['email'], data['password'])
 
       json ae.account_details
     end

data/lib/autoexpreso.rb

@@ -1,7 +1,10 @@
 require 'autoexpreso/version'
 require 'autoexpreso/data_utils'
-require 'mechanize'
-require 'awesome_print'
+require 'autoexpreso/cache'
+require 'faraday'
+require 'typhoeus'
+require 'typhoeus/adapters/faraday'
+require 'amazing_print'
 require 'ostruct'
 require 'json'
 
@@ -9,71 +12,75 @@ module AutoExpreso
   class Client
     include AutoExpreso::DataUtils
 
-    AE_LOGIN   = 'https://www.autoexpreso.com/Login.aspx'
-    AE_ACCOUNT = 'https://www.autoexpreso.com/dynamic/'
+    BASE_URL = 'https://tp-api.autoexpreso.com'
+    USER_AGENT = "AutoExpreso-Rubygem/#{AutoExpreso::VERSION}"
 
-    attr_reader :client, :account, :transactions, :account_page
+    ENDPOINTS = {
+      login: '/api/Auth/Login',
+      account_summary: '/api/Account/GetAccountSummary'
+    }
+
+    attr_reader :account
+    attr_accessor :jwt_header
 
     def initialize(*args)
-      @client       = Mechanize.new
-      @account      = Hash.new
-      @transactions = []
+      @account = Hash.new
     end
 
-    def login(username, password)
-      authenticate(username, password)
-      process_request
+    def login(email, password)
+      authenticate(email, password)
+      account_summary
     end
 
-    def authenticate(username, password)
-      @client.get(AE_LOGIN) do |page|
-        page.form_with(id: form_data.login_form_id) do |form|
-          form[form_data.login_form_username_name] = username
-          form[form_data.login_form_password_name] = password
-        end.click_button
+    def account_details(json: false)
+      if json
+        puts JSON.pretty_generate(account)
+      else
+        ap account
       end
     end
 
-    def process_request
-      process_transactions
-      save_account
-      table_strip
-    end
-
-    def process_transactions
-      @account_page = @client.get(AE_ACCOUNT)
-    end
+    protected
 
-    def save_account
-      attributes.map do |attribute|
-        @account[attribute] = text_strip(form_data.send(attribute))
+      def authorization_header
+        "Bearer #{jwt_header}"
       end
-    end
 
-    def text_strip(field_name)
-      @account_page.search(field_name).text.strip
-    end
+      def default_connection(debug = false)
+        Faraday.new(url: BASE_URL) do |conn|
+          conn.adapter :typhoeus
+          conn.headers[:user_agent] = USER_AGENT
+          conn.headers[:content_type] = 'application/json'
+          conn.headers['Authorization'] = authorization_header if @jwt_header
+          conn.response :logger if debug
+        end
+      end
 
-    def table_data
-      @account_page.search("#{form_data.account_transaction_table_id} tbody tr")
-    end
+      def authenticate(email, password)
+        payload = { email: email, password: password }
 
-    def table_strip
-      table_data.each do |tr|
-        tds = tr.search('td')
-        next unless tds.count == 4
+        response = default_connection.post do |req|
+                     req.url(ENDPOINTS[:login])
+                     req.body = JSON.generate(payload)
+                   end
 
-        save_transactions(tds, @transactions)
+        if response.success?
+          @response_body = JSON.parse(response.body, object_class: OpenStruct)
+          @jwt_header = @response_body.accessToken
+        end
       end
-      @account[:transactions] = @transactions
-    end
 
-    def account_details(json: false)
-      if json
-        puts JSON.pretty_generate(account)
-      else
-        ap account
+      def account_summary
+        response = default_connection.get do |req|
+                     req.url(ENDPOINTS[:account_summary])
+                   end
+
+        if response.success?
+          @response_body = JSON.parse(response.body)
+          @account = @response_body
+        end
       end
-    end
   end
 end
+
+Typhoeus::Config.cache = AutoExpreso::Cache.new

data/lib/autoexpreso/cache.rb

@@ -0,0 +1,15 @@
+module AutoExpreso
+  class Cache
+    def initialize
+      @memory = Hash.new
+    end
+
+    def get(request)
+      @memory[request]
+    end
+
+    def set(request, response)
+      @memory[request] = response
+    end
+  end
+end

data/lib/autoexpreso/cli.rb

@@ -59,11 +59,11 @@ MSG
     def login
       header
 
-      username = ask('Username:  ')
+      email = ask('Email:  ')
       password = ask('Password:  ') { |q| q.echo = '*' }
 
       ae = AutoExpreso::Client.new
-      ae.login(username, password)
+      ae.login(email, password)
       puts "Account Details:"
 
       @json ? ae.account_details(json: true) : ae.account_details

data/lib/autoexpreso/version.rb

@@ -1,3 +1,3 @@
 module AutoExpreso
-  VERSION = '1.0.2'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,58 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: autoexpreso
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
-- Axel Rivera
 - Jonah Ruiz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-06 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: amazing_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.8
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.8
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
-  name: mechanize
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.5
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.5
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,17 +100,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
-description: Scrape autoexpreso.com for your account status
+        version: '3.9'
+description: Non-official autoexpreso.com Ruby library and CLI application.
 email:
-- axel@riveralabs.com
 - jonah@pixelhipsters.com
 executables:
 - autoexpreso
@@ -108,7 +120,6 @@ files:
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Changelog.md
 - Gemfile
 - LICENSE
@@ -124,18 +135,16 @@ files:
 - examples/api/autoexpreso_api.rb
 - examples/api/config.ru
 - lib/autoexpreso.rb
+- lib/autoexpreso/cache.rb
 - lib/autoexpreso/cli.rb
 - lib/autoexpreso/data_utils.rb
 - lib/autoexpreso/version.rb
-- spec/autoexpreso_spec.rb
-- spec/data_utils_spec.rb
 - spec/spec_helper.rb
-- wercker.yml
 homepage: https://www.github.com/jonahoffline/autoexpreso-cli
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,19 +152,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
-summary: Scrape autoexpreso.com for your account status and last transactions.
+summary: Non-official autoexpreso.com Ruby library and CLI for the service
 test_files:
-- spec/autoexpreso_spec.rb
-- spec/data_utils_spec.rb
 - spec/spec_helper.rb

data/.travis.yml

@@ -1,8 +0,0 @@
----
-language: ruby
-rvm:
-  - 2.4.1
-  - 2.3.3
-  - 2.2.6
-  - 2.2.2
-script: bundle exec rake test

data/spec/autoexpreso_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe AutoExpreso::Client do
-  let(:auto) { AutoExpreso::Client.new }
-
-  describe '#client' do
-    it 'returns a new Mechanize instance' do
-      expect(auto.client).to be_kind_of(Mechanize)
-    end
-  end
-
-  describe '#account' do
-    it 'returns a Hash' do
-      expect(auto.account).to be_a(Hash)
-    end
-  end
-
-  describe '#transactions' do
-    it 'returns an array' do
-      expect(auto.transactions).to be_a(Array)
-    end
-  end
-end

data/spec/data_utils_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe AutoExpreso::DataUtils do
-  let(:data_utils) { AutoExpreso::DataUtils }
-
-  describe '#attributes' do
-    it 'returns an array of symbols' do
-      expect(data_utils.attributes)
-      .to match_array [:account_name_id, :account_balance_id, :account_status_id,:account_last_payment_id, :account_last_payment_date_id]
-    end
-  end
-
-  describe '#form_data' do
-    it 'returns an OpenStruct instance' do
-      expect(data_utils.form_data).to be_a(OpenStruct)
-    end
-
-    it 'contains methods' do
-      expect(data_utils.attributes)
-      .to match_array [:account_name_id, :account_balance_id, :account_status_id, :account_last_payment_id, :account_last_payment_date_id]
-    end
-
-    it 'returns html attributes correctly' do
-      expect(data_utils.form_data.login_form_id).to eq('aspnetForm')
-      expect(data_utils.form_data.login_form_username_name).to eq('ctl00$ContentPlaceHolder1$Login1$uxUserNameField')
-      expect(data_utils.form_data.login_form_password_name).to eq('ctl00$ContentPlaceHolder1$Login1$uxPasswordField')
-      expect(data_utils.form_data.account_name_id).to eq('#ctl00_Content_uxLogonAccountName')
-      expect(data_utils.form_data.account_balance_id).to eq('#ctl00_Content_uxLogonBalanceAmount')
-    end
-  end
-end

data/wercker.yml

@@ -1,15 +0,0 @@
-box: wercker/rvm
-build:
-    steps:
-        - rvm-use:
-            version: 2.1.4
-        - bundle-install
-        - script:
-            name: echo ruby information
-            code: |
-                echo "ruby version $(ruby --version) running"
-                echo "from location $(which ruby)"
-                echo -p "gem list: $(gem list)"
-        - script:
-           name: rspec
-           code: rake spec