proxied 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3225511d5ca688c62c4c41138f7dfa135b766a1ca22de15f638c76a4bc805e6
-  data.tar.gz: ddaa33c4df250b5b868eb98262b0c87dc3c0ad099fd9343989f77c18e16a8d74
+  metadata.gz: fb6b1d839edb6a86acc7e15c72ae74e4e94e61d6302fe12d11378c18edadea36
+  data.tar.gz: ee71b159f7d46d703a9c819c6d52a79060262ae984999d3083b6fa72d2581371
 SHA512:
-  metadata.gz: 107c196e83c9a87d27674c89cb6f6384b5c69a689e3c2c0d818f0241bddec129180bbc39e0e16599abc15e1eb10e76e308e5aa038c13478fd2e74b5ba57b435d
-  data.tar.gz: 9d5d1cfed81dad98ec888d571e2e1cfcac30cc8e0d6898e60c4edad01538eada8936621363c016b6e0c75998d714771cd8e3bcd6a864794f332c1659a025063f
+  metadata.gz: 7115524c83549e66f528dc1764a029e79ea43c9c38f006657b17ae5ef8ba24fc6eaff7abd33756a1122c1d0cd6bb11947ad5322d215032cdab437c2c56d18648
+  data.tar.gz: 1ec14f18413f2168f3e437c544d6389171ab5567c0c74375f96bf110b4a41408aa957f84ff3c11cd122c572e2eddab7ca8fb21daaa51c9ec6dad2c3c0ddede96

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    proxied (0.1.0)
+    proxied (0.1.3)
       faraday (>= 0.14)
       net-ssh (>= 4.0)
 

data/README.md

@@ -28,10 +28,14 @@ Generate the initializer for your Rails app:
 
     $ rails generate proxied:install MODEL
 
-Generate the migration and model:
+If you're using ActiveRecord, generate the migration and model:
 
     $ rails generate proxied MODEL
 
+If you're using Mongoid, generate the model using the following command:
+
+    $ rails generate proxied MODEL --orm=mongoid
+
 ## Features
 
 Features:

data/lib/proxied.rb

@@ -28,6 +28,7 @@ require "proxied/version"
 
 require "proxied/configuration"
 require "proxied/logger"
+require "proxied/utilities"
 
 require "proxied/shared"
 require "proxied/sql/proxy_methods" if defined?(ActiveRecord)

data/lib/proxied/shared.rb

@@ -10,43 +10,31 @@ module Proxied
         return proxies
       end
 
-      def format_proxy_address(proxy_host, proxy_port = 80, include_http = false)
-        proxy_address = "#{proxy_host}:#{proxy_port}"
-        proxy_address.insert(0, "http://") if (include_http && !proxy_address.start_with?("http://"))
-        return proxy_address
+      # Keep these for compatibility for now, they just wrap the utility functions
+      def format_proxy_address(host, port = 80, include_http = false)
+        ::Proxied::Utilities.format_proxy_address(host: host, port: port, include_http: include_http)
       end
 
       def format_proxy_credentials(username, password)
-        return "#{username}:#{password}"
+        ::Proxied::Utilities.format_proxy_credentials(username, password)
       end
     end
 
     module InstanceMethods
-      def proxy_address(include_http = false)
-        return self.class.format_proxy_address(self.host, self.port, include_http)
+      def proxy_address(include_http: false)
+        ::Proxied::Utilities.format_proxy_address(host: self.host, port: self.port, include_http: include_http)
       end
 
       def proxy_credentials
-        return self.class.format_proxy_credentials(self.username, self.password)
+        ::Proxied::Utilities.format_proxy_credentials(self.username, self.password)
       end
 
       def socks_proxy_credentials
-        credentials               =   {}
-        
-        credentials[:user]        =   self.username if !self.username.to_s.empty?
-        credentials[:password]    =   self.password if !self.password.to_s.empty?
-
-        return credentials
+        ::Proxied::Utilities.socks_proxy_credentials(username: self.username, password: self.password)
       end
       
       def proxy_options_for_faraday
-        proxy_options             =   {}
-    
-        proxy_options[:uri]       =   self.class.format_proxy_address(self.host, self.port, true)
-        proxy_options[:user]      =   self.username if !self.username.to_s.empty?
-        proxy_options[:password]  =   self.password if !self.password.to_s.empty?
-    
-        return proxy_options
+        ::Proxied::Utilities.proxy_options_for_faraday(host: self.host, port: self.port, username: self.username, password: self.password)
       end
     end
         

data/lib/proxied/utilities.rb

@@ -0,0 +1,39 @@
+module Proxied
+  class Utilities
+    
+    class << self
+      
+      def format_proxy_address(host:, port: 80, include_http: false)
+        address                   =   "#{host}:#{port}"
+        address                   =   "http://#{address}" if include_http && !address.start_with?("http://")
+        
+        return address
+      end
+
+      def format_proxy_credentials(username, password)
+        return "#{username}:#{password}"
+      end
+      
+      def socks_proxy_credentials(username: nil, password: nil)
+        credentials               =   {}
+        
+        credentials[:user]        =   username if !username.to_s.empty?
+        credentials[:password]    =   password if !password.to_s.empty?
+
+        return credentials
+      end
+      
+      def proxy_options_for_faraday(host:, port:, username: nil, password: nil)
+        proxy_options             =   {}
+    
+        proxy_options[:uri]       =   format_proxy_address(host: host, port: port, include_http: true)
+        proxy_options[:user]      =   username if !username.to_s.empty?
+        proxy_options[:password]  =   password if !password.to_s.empty?
+    
+        return proxy_options
+      end
+      
+    end
+    
+  end
+end

data/lib/proxied/version.rb

@@ -1,3 +1,3 @@
 module Proxied
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxied
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sebastian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-01 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -299,6 +299,7 @@ files:
 - lib/proxied/railtie.rb
 - lib/proxied/shared.rb
 - lib/proxied/sql/proxy_methods.rb
+- lib/proxied/utilities.rb
 - lib/proxied/version.rb
 - lib/tasks/tasks.rake
 - proxied.gemspec