m1_api 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34ca6f636fcd6b356996c136c0e7542f73486f96ee4661c847fd239390fdbf0a
-  data.tar.gz: 467fa010dbf774620ad8ee142e76e2a2fa12ab7bc559edc63720944fc92bb191
+  metadata.gz: 880305cc13e0cde33cdabd9c30e1d4b8dff25a337cb6363bbb574deff09fd656
+  data.tar.gz: 03c84cca83c77623a41fe1715bcad2b5396fc440a3e0fccb0d2494017e81fa7f
 SHA512:
-  metadata.gz: a452994654dd37d26dc655ceaa9023894d783632a26dd121b7e03fd1c347600874dbd6d7d372257e1931ef8119c0ed8a391e20ca08f8cfdc6276ce471630c67a
-  data.tar.gz: 74e5c46bf7fcd29c301c332812ed78cd6d163ff7f8a2c10b5846c5630acd6042531e50d118d5b2ed8f6c5c3b85eb5f86a5f46fb51e346c620247f769372f3459
+  metadata.gz: 518a8c44b1dedba1c6790d4383bf22102588c1c45208c733c38c5520cb5da97b7e89a715df7346ee1c1a5b115da48a5f2ac241b22c7e73936de703479eaad47e
+  data.tar.gz: 61ad53f7ddac12bf53d60fe9eb4c6f78158f366ea45fd9ba8525746106bdb7f1f1e45ac81d32b00b27bf438f80329065818f5bcede0608cdf22a9507cb0b9fb7

data/lib/m1_api.rb

@@ -1,127 +1,45 @@
-require 'rest-client'
-require 'json'
-require 'yaml'
-require 'erb'
+require_relative './m1_api/yaml_helpers.rb'
 
-###
-### change it to just authenticate once and use the same token
-
-
-module M1API
+class M1API
 #  autoload :CLI, 'm1_api/cli'
   autoload :VERSION, 'm1_api/version'
 
-  class << self
-
-    @@api_config_file = "#{__dir__}/m1_api/api_configs.yml"
+  attr_accessor :api_config_file, :token
 
-    def define_custom_api_file(path)
-      @@api_config_file = path
-    end
-
-    def read_credentials(credentials_file=nil)
-      if credentials_file
-        credentials = load_yaml(credentials_file)
-        { username: credentials[:M1_USERNAME], password: credentials[:M1_PASSWORD] }
-      else
-        {username: ENV['M1_USERNAME'], password: ENV['M1_PASSWORD']}
-      end
-    end
+  api_config_file = "#{__dir__}/m1_api/api_configs.yml"
 
-    def load_yaml(file_path)
-      YAML.load(ERB.new(File.read(file_path)).result) || {}
-    rescue SystemCallError
-      raise "Could not load file: '#{file_path}"
-    end
-
-    def call_api(api_configs_file, api)
-      raise 'nyi'
-      api_config = load_yaml(api_configs_file)[api]
-      raise "No api '#{api}' defined in '#{api_configs_file}'" unless api_config
-      params = parse_api_config(api_config)
-      JSON.parse(RestClient.send(params['method'], params['url']), params['body'], params['headers'])
-    end
-
-    # might have to convert everything to sym first
-    def replace_dynamic_string(string, context)
-      raise 'input is not a string' unless string.is_a?(String)
-      replace_targets = string.split('>>>').map { |target| target.match(/<<<.*/).to_s }
-      replace_targets.each do |target|
-        key = target.match(/<<<(.*)/)
-        if key
-          temp_value = context
-          key[1].split(' ').each do |current_key|
-            raise "no value '#{current_key}' defined in  context" unless temp_value.key?(current_key.to_sym)
-            temp_value = temp_value[current_key.to_sym]
-          end
-          string = string.gsub("#{target}>>>", temp_value)
-        end
-      end
-      string
-    end
-
-    # need something to deal with uri encode
-    def replace_dynamic_array(array, context)
-      raise 'input is not a array' unless array.is_a?(Array)
-      dup = array.clone
-      dup.each_with_index do |value, index|
-        dup[index] = replace_dynamic_string(value, context)
-      end
-      dup.join
-    end
-
-    def replace_dynamic_hash(hash, context = hash)
-      raise 'input is not a hash' unless hash.is_a?(Hash)
-      hash.each do |key, value|
-        if value.is_a?(String)
-          hash[key] = replace_dynamic_string(value, context)
-        elsif value.is_a?(Array)
-          hash[key] = replace_dynamic_array(value, context)
-        elsif value.is_a?(Hash)
-          hash[key] = replace_dynamic_hash(value, context)
-        end
-      end
-      hash
-    end
+  def initialize(username, password, api_config_file = nil)
+    @api_config_file = api_config_file || "#{__dir__}/m1_api/api_configs.yml"
+    credentials = { username: username, password: password }
+    res = YamlHelpers.call_api_from_yml(@api_config_file, 'authenticate', credentials)
+    raise "failed to authenticate:\n\t#{res}" unless res[:code] == 200 && res[:body]['data']['authenticate']['result']['didSucceed']
+    @token = res[:body]['data']['authenticate']['accessToken'] 
+  end
 
-    def call_api_from_yml(config_file, api, data = {})
-      config = load_yaml(config_file)[api.to_sym]
-      raise "no api defined for #{api}" unless config
-      context = config.merge data
-      parsed_config = replace_dynamic_hash(context)
-      params = [parsed_config[:method], parsed_config[:url], parsed_config[:body], parsed_config[:headers]]
-      params.delete(nil)
-      res = RestClient.send(*params)
-      { code: res.code, body: JSON.parse(res.body) }
-    rescue Exception => e
-      return { code: res.code, body: res.body } if res
-      puts "failed to call api for api #{api}: #{e}"
-    end
-    
-    def authenticate(credentials_file = nil)
-      credentials = read_credentials(credentials_file)
-      res = call_api_from_yml(@@api_config_file, 'authenticate', credentials)
-      raise "failed to authenticate:\n\t#{res}" unless res[:code] == 200 && res[:body]['data']['authenticate']['result']['didSucceed']
-      res[:body]['data']['authenticate']['accessToken']
+  def self.read_credentials(credentials_file=nil)
+    if credentials_file
+      credentials = YamlHelpers.load_yaml(credentials_file)
+      { username: credentials[:M1_USERNAME], password: credentials[:M1_PASSWORD] }
+    else
+      {username: ENV['M1_USERNAME'], password: ENV['M1_PASSWORD']}
     end
+  end
 
-    def check_status(token)
-      token = { token: token }
-      res = call_api_from_yml(@@api_config_file, 'check_status', token)
-      puts res.inspect
-    end
+  def check_status
+    res = call_api_from_yml(@@api_config_file, 'check_status', token)
+    puts res.inspect
+  end
 
-    def query_accounts(token)
-      accounts = {}
-      data = { token: token }
-      id_res = call_api_from_yml(@@api_config_file, 'list_account_ids', data)
-      ids = id_res[:body]['data']['viewer']['_accounts1NFCow']['edges'].map { |account| account['node']['id'] }
-      ids.each do |id|
-        data[:account_id] = id
-        account_res = call_api_from_yml(@@api_config_file, 'query_account', data)
-        accounts[id] = account_res[:body]['data']['node']
-      end
-      accounts
-    end
+  def query_accounts
+    accounts = {}
+    data = { token: @token }
+    id_res = YamlHelpers.call_api_from_yml(@api_config_file, 'list_account_ids', data)
+    ids = id_res[:body]['data']['viewer']['_accounts1NFCow']['edges'].map { |account| account['node']['id'] }
+    ids.each do |id|
+      data[:account_id] = id
+      account_res = YamlHelpers.call_api_from_yml(@api_config_file, 'query_account', data)
+      accounts[id] = account_res[:body]['data']['node']
+    end
+    accounts
   end
 end

data/lib/m1_api/version.rb

@@ -1,3 +1,3 @@
-module M1API
-    VERSION = Version = '0.0.3'
-  end
+class M1API
+  VERSION = Version = '0.0.4'
+end

data/lib/m1_api/yaml_helpers.rb

@@ -0,0 +1,70 @@
+require 'yaml'
+require 'erb'
+require 'rest-client'
+require 'json'
+
+module YamlHelpers
+  module_function
+
+  def load_yaml(file_path)
+    YAML.load(ERB.new(File.read(file_path)).result) || {}
+  rescue SystemCallError
+    raise "Could not load file: '#{file_path}"
+  end
+
+    # might have to convert everything to sym first
+    def replace_dynamic_string(string, context)
+      raise 'input is not a string' unless string.is_a?(String)
+      replace_targets = string.split('>>>').map { |target| target.match(/<<<.*/).to_s }
+      replace_targets.each do |target|
+        key = target.match(/<<<(.*)/)
+        if key
+          temp_value = context
+          key[1].split(' ').each do |current_key|
+            raise "no value '#{current_key}' defined in  context" unless temp_value.key?(current_key.to_sym)
+            temp_value = temp_value[current_key.to_sym]
+          end
+          string = string.gsub("#{target}>>>", temp_value)
+        end
+      end
+      string
+    end
+
+    # need something to deal with uri encode
+    def replace_dynamic_array(array, context)
+      raise 'input is not a array' unless array.is_a?(Array)
+      dup = array.clone
+      dup.each_with_index do |value, index|
+        dup[index] = replace_dynamic_string(value, context)
+      end
+      dup.join
+    end
+
+    def replace_dynamic_hash(hash, context = hash)
+      raise 'input is not a hash' unless hash.is_a?(Hash)
+      hash.each do |key, value|
+        if value.is_a?(String)
+          hash[key] = replace_dynamic_string(value, context)
+        elsif value.is_a?(Array)
+          hash[key] = replace_dynamic_array(value, context)
+        elsif value.is_a?(Hash)
+          hash[key] = replace_dynamic_hash(value, context)
+        end
+      end
+      hash
+    end
+
+    def call_api_from_yml(config_file, api, data = {})
+      config = load_yaml(config_file)[api.to_sym]
+      raise "no api defined for #{api}" unless config
+      context = config.merge data
+      parsed_config = replace_dynamic_hash(context)
+      params = [parsed_config[:method], parsed_config[:url], parsed_config[:body], parsed_config[:headers]]
+      params.delete(nil)
+      res = RestClient.send(*params)
+      { code: res.code, body: JSON.parse(res.body) }
+    rescue Exception => e
+      return { code: res.code, body: res.body } if res
+      puts "failed to call api for api #{api}: #{e}"
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: m1_api
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yuan Feng
@@ -48,6 +48,7 @@ files:
 - lib/m1_api.rb
 - lib/m1_api/api_configs.yml
 - lib/m1_api/version.rb
+- lib/m1_api/yaml_helpers.rb
 homepage: http://github.com/ynotgnef/m1_api
 licenses:
 - MIT