centaman 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4d80df14fdcdad6ee4ad5602bfa88ecd65be2c3
-  data.tar.gz: 738b8b2fb153a62aeb233232abd323fc42240f7f
+  metadata.gz: a4bf3e4c569f27b72696e95c7b5777f82b49598f
+  data.tar.gz: 7bce54d011cd6aa3367a05449556dce6de4c9dc7
 SHA512:
-  metadata.gz: c46064bb84a4d0737aa342bdf0c5fce614651c9f69b192cbe7e7682b0ec8911659cac84db2f491bda4822b3f3e7fe66121d69488d72d2abb4902b9d10df56ce8
-  data.tar.gz: bb5c3539b3f5845ed12012f4e23c27844619acd4418a98a16a42558ce6e04959aa1775d197a1b1a70b5ada368300a6d06288836b5b47aa808e95f2e0886f9d3f
+  metadata.gz: 69993197b61360d3dbffc891413480b02c523c0928f31cf56e998d2738cb4f60d537fc4f1d51a45cc0cd12e06bba501615164c5d22023f55c76650a59e00cf2e
+  data.tar.gz: 3859b49ecbebf8e4d91fe347b16cf4f578e677edaf5cea3e6f171a87620af3a3c7995eed3d089fdbb5d2adda57389446b5a38fd129efd6b5db5265edadfa5587

data/README.md

@@ -28,9 +28,9 @@ TODO: Write usage instructions here
 
 This gem assumes the following environment variables are defined by the application
 
-- CENTAMAN_API (Centaman API endpoint, ex: https://taxi.centaman.net/CentamanAPI)
-- API_USERNAME (Centaman API username)
-- API_PASSWORD (Centaman API password)
+- CENTAMAN_API_URL (Centaman API endpoint, ex: https://taxi.centaman.net/CentamanAPI)
+- CENTAMAN_API_USERNAME (Centaman API username)
+- CENTAMAN_API_PASSWORD (Centaman API password)
 - FIXIE_URL (Optional. Used with FIXIE proxy to route outbound requests through a set of static IP addresses)
 
 ## Development

data/lib/centaman.rb

@@ -1,3 +1,4 @@
+require 'httparty'
 require 'centaman/version'
 require 'centaman/wrapper'
 require 'centaman/service'
@@ -24,7 +25,6 @@ require 'centaman/object/extra'
 require 'centaman/object/gift_ticket'
 require 'centaman/object/purchased_ticket'
 require 'centaman/object/ticket_type'
-require 'httparty'
 
 module Centaman
 end

data/lib/centaman/version.rb

@@ -1,3 +1,3 @@
 module Centaman
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/centaman/wrapper.rb

@@ -8,21 +8,22 @@ module Centaman
       http_proxy FIXIE.host, FIXIE.port, FIXIE.user, FIXIE.password
     end
     
-    attr_reader :api_username, :api_password
+    attr_reader :api_username, :api_password, :api_token
 
     def initialize(args = {})
-      @api_username = ENV['API_USERNAME']
-      @api_password = ENV['API_PASSWORD']
-      self.class.base_uri ENV['CENTAMAN_API']
+      @api_username = ENV['CENTAMAN_API_USERNAME']
+      @api_password = ENV['CENTAMAN_API_PASSWORD']      
+      @api_token = ENV.fetch('CENTAMAN_API_TOKEN', generate_token)
+      self.class.base_uri ENV['CENTAMAN_API_URL']
       after_init(args)
     end
 
     def headers
-      { 'authorization' => "Basic #{encoded_string}", 'Content-Type' => 'application/json' }
+      { 'authorization' => "Basic #{api_token}", 'Content-Type' => 'application/json' }
     end
 
-    def encoded_string
-      @encoded_string ||= Base64.encode64("#{api_username}:#{api_password}")
+    def generate_token
+      Base64.encode64("#{api_username}:#{api_password}")
     end
 
     def options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centaman
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - francirp
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Wrapper for the Centaman Ticketing API