db_url_helper 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce8ac1006a849ae462276769374d15a117acf63b
-  data.tar.gz: be22c369bd0e893cfad93f19d250786048094d36
+  metadata.gz: 5ce9ced9955df0d9fdd09c19df685bda96aa2040
+  data.tar.gz: 41d6076c84546e804a465377d6931a52d632938d
 SHA512:
-  metadata.gz: dae19432b37074126b24c8c01018a1020b2b6be1b7a664eb9f558f2bb9837dc5d94449af4ae09d862cb17b80404d20df14ee16d0e79b5bb20823931f07e9e37d
-  data.tar.gz: d1d9574e1d8b3a6666ea5825c6c8ea2f9e133d49cfc3ef6cd8238b8ef0af43666d76483c080b7e8e92f09b009fd2a08d3444596bcea28e6caacf82049b55ffb4
+  metadata.gz: 5623bb586c62f0bb5bcf4291b7a68875f210b1e1941f8db990cc6cf79fca7b51d8bb55010582d4a1236c7a735ba961b9b0d19b0f38a5b85d40cc7ef36cca5a2b
+  data.tar.gz: f59c8acdae049846d229c5e107439176d260ed94dc958fe662d5f0b6fd9f996463cf92fcdeaeedda0034488bdf3fa589474af88cc84b67e64913d83fe6e8ed4b

data/lib/db_url_helper/adapter/generic.rb

@@ -1,3 +1,5 @@
+require "db_url_helper/credentials/credential"
+
 module DbUrlHelper
   module Adapter
     class Generic
@@ -5,6 +7,9 @@ module DbUrlHelper
         def scheme 
           self.const_get :SCHEME
         end
+        def priority
+          self.const_get :PRIORITY
+        end
         def get element
           self.send element
         end
@@ -15,6 +20,18 @@ module DbUrlHelper
           @lookup = lookup
           self
         end
+        def user
+          credential.user
+        end
+        def password
+          credential.password
+        end
+        private
+        def credential
+          @credential ||= DbUrlHelper::Credentials.all do |provider|
+            provider.new(:postgresql,filters:[Rails.env]).load
+          end.sort!.last
+        end
       end
     end
   end

data/lib/db_url_helper/adapter/postgresql.rb

@@ -7,13 +7,16 @@ module DbUrlHelper
       include Registerable
       class << self
         def user
-          Rails.application.class.parent_name.underscore
+          @user   = super
+          @user ||= Rails.application.class.parent_name.underscore
         end
         def password
-          ENV['DB_PASSWORD'] || ""
+          @password   = super
+          @password ||= ENV['DB_PASSWORD']
+          @password ||= ""
         end
         def database
-          "#{Rails.application.class.parent_name.underscore}_#{Rails.env}"
+          @database ||= "#{Rails.application.class.parent_name.underscore}_#{Rails.env}"
         end
         private
         def method_missing property

data/lib/db_url_helper/credentials.rb

@@ -11,8 +11,7 @@ module DbUrlHelper
         providers.select do |provider|
           provider.testable?
         end.collect do |provider|
-          yield provider if block_given?
-          provider
+          block_given? ? yield(provider) : provider
         end
       end
     end
@@ -20,4 +19,6 @@ module DbUrlHelper
 end
 
 require "db_url_helper/credentials/generic"
-require "db_url_helper/credentials/credentialias"
+require "db_url_helper/credentials/credentialias"
+require "db_url_helper/credentials/environment"
+require "db_url_helper/credentials/null"

data/lib/db_url_helper/credentials/credential.rb

@@ -0,0 +1,16 @@
+module DbUrlHelper
+  module Credentials
+    class Credential
+      attr_accessor :user,:password,:weight,:provider
+      def initialize user="",password="",weight=-1,provider=nil
+        @user     = user
+        @password = password
+        @weight   = weight
+        @provider = provider
+      end
+      def <=> right
+        weight <=> right.weight
+      end
+    end
+  end
+end

data/lib/db_url_helper/credentials/{credentialials.rb → credentialias.rb}

@@ -1,16 +1,18 @@
+
 module DbUrlHelper
   module Credentials
     class Credentialias < Generic
       DEPENDS = "Credentialias::Helper"
+      WEIGHT = 10
       include Registerable
-      def load
-        @credential = ::Credentialias::Helper.load @service, tags: @filters
-      end
       def user
-        @credential.user
+        credential.user
       end
       def password
-        @credential.password
+        credential.password
+      end
+      def credential
+        @credential ||= ::Credentialias::Helper.load(service, tags: filters) rescue super
       end
     end
   end

data/lib/db_url_helper/credentials/environment.rb

@@ -0,0 +1,15 @@
+module DbUrlHelper
+  module Credentials
+    class Environment < Generic
+      DEPENDS = "ENV"
+      WEIGHT  = 1
+      include Registerable
+      def user
+        ENV['DB_USER']
+      end
+      def password
+        ENV['DB_PASSWORD']
+      end
+    end
+  end
+end

data/lib/db_url_helper/credentials/generic.rb

@@ -1,14 +1,40 @@
+require "ostruct"
+require "db_url_helper/credentials/credential"
+
 module DbUrlHelper
   module Credentials
     class Generic
-      def initialize service:
+
+      def self.weight
+        self::WEIGHT
+      end
+
+      attr_reader :service
+      def initialize service, filters:[]
         @service = service
+        @filters = filters
       end
-      def filters
+      def filters= filters
         @filters = filters
       end
+      def filters
+        @filters ||= []
+      end
+      def weight
+        return 0 if user.nil? and password.nil?
+        self.class::WEIGHT
+      end
+      def user
+        credential.user
+      end
+      def password
+        credential.password
+      end
+      def credential
+        OpenStruct.new(user:nil,password:nil)
+      end
       def load
-        raise NotImplementedError
+        Credential.new user,password,weight,self
       end
     end
   end

data/lib/db_url_helper/credentials/null.rb

@@ -0,0 +1,9 @@
+module DbUrlHelper
+  module Credentials
+    class Null < Generic
+      DEPENDS = "Object"
+      WEIGHT  = 0
+      include Registerable
+    end
+  end
+end

data/lib/db_url_helper/version.rb

@@ -1,3 +1,3 @@
 module DbUrlHelper
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db_url_helper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Mathias Kaufmann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,8 +61,11 @@ files:
 - lib/db_url_helper/adapter/postgresql.rb
 - lib/db_url_helper/adapter/set.rb
 - lib/db_url_helper/credentials.rb
-- lib/db_url_helper/credentials/credentialials.rb
+- lib/db_url_helper/credentials/credential.rb
+- lib/db_url_helper/credentials/credentialias.rb
+- lib/db_url_helper/credentials/environment.rb
 - lib/db_url_helper/credentials/generic.rb
+- lib/db_url_helper/credentials/null.rb
 - lib/db_url_helper/helper.rb
 - lib/db_url_helper/lookup.rb
 - lib/db_url_helper/lookup/boutons.rb