confyio 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77ed0ba6c5ab8d60c7c39c315413f72b130f9f7b
-  data.tar.gz: f33fabe1345355b732028fcdcaf8319b06d37d28
+  metadata.gz: 58372fe4871d226c0d4e12fcf1fd39f73be7e15e
+  data.tar.gz: d13686c5f09d80b3174eda687f70dcd050f02785
 SHA512:
-  metadata.gz: 8e588a7f0a687049eacc1b0ee268f4d6ba6d2e198b2c8faecb27acbe7bad8bc27a55c8c4d17543cc7d944763ee91c665df640b5269645955cbcb70dd1901d1c1
-  data.tar.gz: e2133bb0a2fef3a09a08c104dc9336e68f13907c29e498e0febf12819807fd9d029778f52dc32d1f18641811221adb8dfb3974f04a2b3c5bde2cef54d83445e5
+  metadata.gz: 4a738798bdbad4c78b45bc7078fd64780e3d13ec07bbc4a90ca822f2699c95def34d7a2c6f2132c5ee943438138b8c23fba99d617f2e3779c867fbabebabcf57
+  data.tar.gz: fc8bfd25c75d64948749b7b7cf3532348f9e8d9415423f10d0798666964fcff724d8222739a9ab3a19274f0dd4da8581d409d00a378af72f9406ab49a2dd31b5

data/lib/confy/config.rb

@@ -7,27 +7,52 @@ module Confy
 
   class Config
 
-    def self.load(url = {})
-      if url.is_a?(String)
+    def self.match(url)
+       if url.is_a?(String)
         name_regex = '([a-z0-9][a-z0-9-]*[a-z0-9])'
-        path_regex = 'orgs\\/' + name_regex + '\\/projects\\/' + name_regex + '\\/envs\\/' + name_regex
-        url_regex = Regexp.new('(https?:\\/\\/)(.*):(.*)@(.*)\\/(' + path_regex + '|heroku)\\/config', true)
+        token_regex = '([a-f0-9]{40})'
+        path_regex = 'orgs\\/' + name_regex + '(\\/projects\\/' + name_regex + '\\/envs\\/' + name_regex + '\\/config|\\/config\\/' + token_regex + ')'
+        url_regex = Regexp.new('(https?:\\/\\/)((.*):(.*)@)?(.*)\\/(' + path_regex + '|heroku\\/config)', true)
 
         matches = url_regex.match(url)
 
-        raise 'Invalid url' if matches.nil?
+        raise 'Invalid URL' if matches.nil?
 
         url = {
-          :host => matches[1] + matches[4], :path => "/#{matches[5]}/config",
-          :user => matches[2], :pass => matches[3]
+          :host => matches[1] + matches[5],
+          :user => matches[3], :pass => matches[4],
+          :org => matches[7], :project => matches[9], :env => matches[10],
+          :token => matches[11],
+          :heroku => (matches[6] == 'heroku/config')
         }
       end
 
-      raise 'Invalid url' if !url.is_a?(Hash)
+      raise 'Invalid URL' if !url.is_a?(Hash)
+
+      if url[:host] and url[:user] and url[:pass] and url[:heroku]
+        url[:path] = '/heroku/config'
+      elsif url[:host] and url[:token] and url[:org]
+        url[:path] = '/orgs/' + url[:org] + '/config/' + url[:token]
+      elsif url[:host] and url[:user] and url[:pass] and url[:org] and url[:project] and url[:env]
+        url[:path] = '/orgs/' + url[:org] + '/projects/' + url[:project] + '/envs/' + url[:env] + '/config'
+      else
+        raise 'Invalid URL'
+      end
+
+      url
+    end
+
+    def self.load(url = {})
+      url = self.match(url)
+
+      auth = {}
+
+      if url[:user] and url[:pass]
+        auth[:username] = url[:user]
+        auth[:password] = url[:pass]
+      end
 
-      client = Confy::Client.new({
-        :username => url[:user], :password => url[:pass]
-      }, { :base => url[:host] })
+      client = Confy::Client.new(auth, { :base => url[:host] })
 
       body = client.instance_variable_get(:@http_client).get(url[:path]).body
 

data/lib/confy/http_client/auth_handler.rb

@@ -27,8 +27,6 @@ module Confy
           if !flag
             raise StandardError.new "Unable to calculate authorization method. Please check"
           end
-        else
-          raise StandardError.new "Server requires authentication to proceed further. Please check"
         end
 
         @app.call(env)

metadata

@@ -1,53 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: confyio
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Pavan Kumar Sunkara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.7
 description: Official Confy API library client for ruby
@@ -86,19 +86,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Official Confy API library client for ruby
 test_files: []
-has_rdoc: