rail-locator-api 1.0.21 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc1c377fe9719da985f224959f006d358b76d0bc85aab6e9737de9a097e81450
-  data.tar.gz: 917cdfc733017888b4829aa3007da9de5555a3116e48deffc2f9802a53da8bb1
+  metadata.gz: 8bd00871ef27b6d49f125af92cd42cc3a9962f36f0df2a40cba25edebfea0ba9
+  data.tar.gz: 0e4cdf61f4bbd87eed4ea3e5f75404b86dc3625a7319658ad23a1145f26b3737
 SHA512:
-  metadata.gz: fcce3b114dbc2c91cbdb0ffb27f35c21e0822825bedde860d13f79a991d25cb481b46a57e0c3bce72c4b9870124aa376adbfc5ef6dd2d89fbf04c4f6c8cebc61
-  data.tar.gz: 4dee6a39a4bcb85826412de25a0733e55661a0922cd45e7fb37e4ada3dc79b1b700437d1316a73a270386f2aa623bc48431f09d770492c223ed4aeaa74ddb5f6
+  metadata.gz: 91dbeb069e8f2a59d21df3efcef7d3ba0de201d6cb24928ea869aa5705d6e932a9aad8039ecdcadf52f817bbe0f64883c5921b44a6e60fade91376e9316edcd0
+  data.tar.gz: 1c10769ea83bdd40651bfcc8728a521f00a14dfe8f3b83fc179dd9efbef93999b82bed9a5574824427d03a50f5611a2fc8e34757734494d3602a983a5983fd32

data/lib/generators/rail_locator_api/install/templates/rail_locator_api.yml

@@ -1,7 +1,8 @@
 defaults: &defaults
   API_ENDPOINT: "https://rail-scan.com"
   UNION_ENDPOINT: "http://192.168.88.38:8000"
-
+  NOTIFY_ENDPOINT: "http://192.168.1.153:3003"
+  
   API_AUTH_METHOD: "api_key"
   API_KEY: "***"
 
@@ -16,6 +17,7 @@ defaults: &defaults
 production:
   <<: *defaults
   UNION_ENDPOINT: "http://192.168.1.88:3500"
+  NOTIFY_ENDPOINT: "http://192.168.1.153:3003"
 development:
   <<: *defaults
 test:

data/lib/rail-locator-api/api_request.rb

@@ -8,13 +8,21 @@ module RailLocatorApi
     def post(params: nil, headers: nil, format: nil, body: {})
       validate_api_key
       begin
-        response = self.rest_client(format).post do |request|
-          configure_request(request: request, params: params, headers: headers, body: body)
-        end
-        if [nil, 'json'].include?(format)
-          parse_response(response)
+        if is_multipart?(body)
+          url = URI("#{self.api_url}#{format.present? ? ".#{format}": ""}")
+          http = Net::HTTP.new(url.host, url.port);
+          request = Net::HTTP::Post.new(url)
+          request.set_form body.to_params, 'multipart/form-data'
+          http.request(request)
         else
-          response
+          response = self.rest_client(format).post do |request|
+            configure_request(request: request, params: params, headers: headers, body: body)
+          end
+          if [nil, 'json'].include?(format)
+            parse_response(response)
+          else
+            response
+          end
         end
       rescue => e
         handle_error(e)
@@ -126,6 +134,10 @@ module RailLocatorApi
       @request_builder.union_endpoint
     end
 
+    def notify_endpoint
+      @request_builder.notify_endpoint
+    end
+
     def timeout
       @request_builder.timeout
     end
@@ -217,12 +229,31 @@ module RailLocatorApi
           request.headers['X-Is-Allow-Access-To-Coordinates'] = "true"
         end
         request.headers.merge!(headers) if headers
-        request.body = MultiJson.dump(body) if body
+
+        request.body = MultiJson.dump(body) if body && request.headers['Content-Type'] == 'application/json'
+
         request.options.timeout = self.timeout
         request.options.open_timeout = self.open_timeout
       end
     end
 
+    def is_multipart?(body, result=false)
+      if body.is_a?(Hash)
+        body.inject({}) do |acc, kv|
+          result = is_multipart?(kv.last, result)
+        end
+      elsif body.is_a?(Array)
+        body.map do |item|
+          result = is_multipart?(item, result)
+        end
+        result
+      elsif body.is_a?(ActionDispatch::Http::UploadedFile)
+        return true
+      else
+        result || false
+      end
+    end
+
     def rest_client(format=nil)
       client = Faraday.new("#{self.api_url}#{format.present? ? ".#{format}": ""}", proxy: self.proxy,
                            ssl: self.ssl_options) do |faraday|
@@ -308,7 +339,45 @@ module RailLocatorApi
     end
 
     def notify_api_url
-      "http://192.168.1.153:3003/"
+      "#{RailLocatorApi.notify_endpoint}/"
+    end
+  end
+end
+
+class Hash
+  def to_params(namespace = nil)
+    query = []
+    each do |key, value|
+      if value.present?
+        if value.is_a?(Hash) || value.is_a?(Array)
+          query += value.to_params(namespace ? "#{namespace}[#{key}]" : key)
+        else
+          query << value.to_params(namespace ? "#{namespace}[#{key}]" : key)
+        end
+      end
     end
+    query
   end
 end
+
+class Object
+  def to_params(key)
+    if self.is_a? ActionDispatch::Http::UploadedFile
+      [key.to_param, File.open(self.path)]
+    else
+      [key.to_param, to_param.to_s]
+    end
+  end
+end
+
+class Array
+  def to_params(key)
+    prefix = "#{key}[]"
+
+    if empty?
+      nil.to_params(prefix)
+    else
+      collect { |value| value.to_params(prefix) }
+    end
+  end
+end

data/lib/rail-locator-api/request.rb

@@ -1,7 +1,7 @@
 module RailLocatorApi
   class Request
     attr_accessor :access_token, :refresh_token, :api_user_id, :api_key, :api_user_email, :api_user_password,
-                  :api_auth_method, :api_endpoint, :union_endpoint,
+                  :api_auth_method, :api_endpoint, :union_endpoint, :notify_endpoint,
                   :timeout, :open_timeout, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys, :debug, :debug_options,
                   :without_ratelimit, :is_allow_access_to_coordinates, :logger, :test, :language
 
@@ -135,7 +135,8 @@ module RailLocatorApi
 
     class << self
       attr_accessor :access_token, :refresh_token, :api_user_id, :api_key, :api_user_email, :api_user_password, :api_auth_method,
-                    :timeout, :open_timeout, :api_endpoint, :union_endpoint, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys,
+                    :timeout, :open_timeout, :api_endpoint, :union_endpoint, :notify_endpoint,
+                    :proxy, :ssl_options, :faraday_adapter, :symbolize_keys,
                     :debug, :debug_options, :without_ratelimit, :is_allow_access_to_coordinates, :logger, :test, :language
 
       def method_missing(sym, *args, &block)

data/lib/rail-locator-api/version.rb

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "1.0.21"
+  VERSION = "1.0.24"
 end

data/lib/rail-locator-api.rb

@@ -1,5 +1,6 @@
 require 'faraday'
 require 'faraday/gzip'
+require 'net/http/post/multipart'
 require 'multi_json'
 require 'rail-locator-api/version'
 require 'rail-locator-api/rail_locator_api_error'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rail-locator-api
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.24
 platform: ruby
 authors:
 - Pavel Osetrov
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email: pavel.osetrov@me.com
 executables: []