lolitado 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7215273662a496c04cf7766edd94711a0b7597b9b9aecd4e5986551617a65fc2
-  data.tar.gz: e41b90e0441c6ef8433b4d08608c18fb5782d51d411087cad69c7e536fb4c1b0
+  metadata.gz: 8721d993ba93fa0b093f43e66f0ee2ee2274245dae9f887875bc4fbf3cc8cdcb
+  data.tar.gz: bac8a6a0683605087651cad5b68ad7980a3333806f4b28f9ba442445e8b71ec0
 SHA512:
-  metadata.gz: 742ac304a6247c677d2cc71b443a86cef94a0cd16ee8880f5cb1634a44f66f9cd99bf092dbf6b69ccd4de57114b6990e5887ca14e05c29820e486676471911d9
-  data.tar.gz: 64581f1c3e9871efdfa1eeaf2109766a4acc77f4e34fefe130fc275589ee43d5603fa91a403173664965f451fd57d64cd8bd613fea2a6782938578f2596f9382
+  metadata.gz: a34d032214ac441f52cdf393e13ad85f67215d3031c3264a43e858c40470f3b5703053d151d3bc277ae5412df843b1a0cf9319032035e559d494f4eac3716ff4
+  data.tar.gz: 521d296bbcd6d0d0028b241e6f951150f73b001a32d8701bd12825f090664731ee6078fce497cee10f467537986e9942b7903685312e4da158ea03aa092d6620

data/lib/lolitado/api.rb

@@ -10,7 +10,9 @@ module Lolitado
     # @param msecs [Float] benchmark for api response time
     #
     def self.format_response response, msecs
-      return {:response => response, :message => response.parsed_response, :status => response.code, :duration => msecs}
+      new_response = {:response => response, :message => response.parsed_response, :status => response.code, :duration => msecs}
+      response_with_hash_key = JSON.parse(JSON[new_response], symbolize_names: true)
+      return response_with_hash_key
     end
     
     #
@@ -37,6 +39,7 @@ module Lolitado
       end
       finish = Time.now
       msecs = (finish - start) * 1000.0
+      clear_headers
       # puts "RESPONSE - #{msecs}"
       return self.format_response(response, msecs)
     end 
@@ -58,6 +61,13 @@ module Lolitado
     def self.new_headers
       return @new_headers
     end
+
+    #
+    # clear headers
+    #
+    def self.clear_headers
+      API.new_headers.clear unless API.new_headers.nil?
+    end
   end
 
   class Graph < API
@@ -71,7 +81,7 @@ module Lolitado
     # @param variables [String] input variables for graph query using
     #
     def self.request query, variables = false
-      super(:post, '/', generate_body(query, variables))
+      super(:post, '', generate_body(query, variables))
     end
 
     #
@@ -90,7 +100,9 @@ module Lolitado
       else
         message = {'errors'=>response.parsed_response}
       end
-      return {:response => response, :message => message, :status => response.code, :duration => msecs}
+      new_response =  {:response => response, :message => message, :status => response.code, :duration => msecs}
+      response_with_hash_key = JSON.parse(JSON[new_response], symbolize_names: true)
+      return response_with_hash_key
     end
 
     # 
@@ -103,7 +115,8 @@ module Lolitado
       body = {}
       body['query'] = query
       if variables
-        if query.include?('$input')
+        variable_indices = query.enum_for(:scan, /(?=\$.*:)/).map { Regexp.last_match.offset(0).first }
+        if query.include?('$input') && variable_indices.to_a.length == 1
           body['variables'] = {'input'=>variables}
         else
           body['variables'] = variables

data/lib/lolitado/version.rb

@@ -1,3 +1,3 @@
 module Lolitado
-  VERSION = "0.1.0"
+  VERSION = "0.1.4"
 end

data/lib/lolitado.rb

@@ -19,8 +19,7 @@ require 'lolitado/box'
 #     end
 
 #     def get_details_of_a_city city_slug, locale
-#       add_headers({'Accept-Language' => locale})
-#       request('get', "/cities/#{city_slug}")
+#       request('get', "/cities/#{city_slug}", locale)
 #     end
 #   end
 #
@@ -33,7 +32,6 @@ require 'lolitado/box'
 #     end
 
 #     def user_login payload
-#       add_headers({'Content-Type' => "application/json"})
 #       query = "mutation login($input: UserLoginInput!) {userLogin(input:$input) {authToken}}"
 #       graph_request(query, payload)
 #     end
@@ -45,9 +43,13 @@ module Lolitado
   # 
   # @param method [String] http request method
   # @param endpoint [String] http request endpoint
+  # @param token [String] authorization token if query needed
+  # @param locale [String] locale if query needed
   # @param body [String] http request body
   #
-  def request method, endpoint, body=false
+  def request method, endpoint, token = false, locale = false, body=false
+    add_headers({'Authorization' => "Bearer #{token}"}) if token
+    add_headers({'Accept-Language' => locale}) if locale
     API.request(method, endpoint, body)
   end
 
@@ -55,9 +57,14 @@ module Lolitado
   # forward graph_request method from Graph class to Graph.request method
   #
   # @param query [String] graph query
+  # @param token [String] authorization token if query needed
+  # @param locale [String] locale if query needed
   # @param variables [String] input variables for graph query using
   #
-  def graph_request query, variables = false
+  def graph_request query, token = false, locale = false, variables = false
+    add_headers({'Content-Type' => "application/json"})
+    add_headers({'Authorization' => "Bearer #{token}"}) if token
+    add_headers({'Accept-Language' => locale}) if locale
     Graph.request(query, variables)
   end
   

data/lolitado.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.license = 'MIT'
   s.require_paths = ["lib"]
-  s.add_dependency "sequel", "~> 4.37"
+  s.add_dependency "sequel", "~> 5.49.0"
   s.add_dependency "net-ssh-gateway", "~> 1.2"
   s.add_dependency "httparty", "~> 0.14"
   s.add_dependency "rbnacl-libsodium", "~> 1.0.10"

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: lolitado
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Dolores Zhang
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2018-12-14 00:00:00.000000000 Z
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.37'
+        version: 5.49.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.37'
+        version: 5.49.0
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +88,7 @@ homepage: http://github.com/doloreszhang/lolitado
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,9 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Lolitado DSL for database process
 test_files: []