doc_juan 1.0.1 → 1.1.0

data/lib/doc_juan/config.rb

@@ -9,7 +9,8 @@ module DocJuan
   end
 
   class Configuration
-    attr_accessor :host, :secret
+    attr_accessor :host, :secret,
+                  :username, :password
   end
 
 end

data/lib/doc_juan/url_generator.rb

@@ -13,6 +13,9 @@ module DocJuan
     def initialize url, filename, options = {}
       @url = url
       @filename = filename.to_s
+
+      options = {} unless options
+      options = options.merge authentication_credentials if has_authentication_credentials?
       @options = Hash[(options || {}).sort]
 
       raise NoSecretGivenError if secret_key == ''
@@ -58,5 +61,16 @@ module DocJuan
     def secret_key
       DocJuan.config.secret.to_s.strip
     end
+
+    def authentication_credentials
+      {
+        username: DocJuan.config.username,
+        password: DocJuan.config.password
+      }
+    end
+
+    def has_authentication_credentials?
+      authentication_credentials.values.compact.any?
+    end
   end
 end

data/lib/doc_juan/version.rb

@@ -1,3 +1,3 @@
 module DocJuan
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/configuration_spec.rb

@@ -3,13 +3,30 @@ require_relative 'spec_helper'
 require_relative '../lib/doc_juan/config.rb'
 
 describe DocJuan::Configuration do
+  after :each do
+    DocJuan.config.secret = nil
+    DocJuan.config.host = nil
+    DocJuan.config.username = nil
+    DocJuan.config.password = nil
+  end
+
+  it 'is configurable' do
+    DocJuan.config.secret = 'very-secret'
+    DocJuan.config.host = 'http://my-doc-juan-host.com'
+    DocJuan.config.username = 'a-username'
+    DocJuan.config.password = 'the-password'
+
+    DocJuan.config.secret.must_equal 'very-secret'
+    DocJuan.config.host.must_equal 'http://my-doc-juan-host.com'
+    DocJuan.config.username.must_equal 'a-username'
+    DocJuan.config.password.must_equal 'the-password'
+  end
+
   it 'is configurable with a block' do
     DocJuan.configure do |config|
       config.secret = 'very-secret'
-      config.host = 'http://my-doc-juan-host.com'
     end
 
     DocJuan.config.secret.must_equal 'very-secret'
-    DocJuan.config.host.must_equal 'http://my-doc-juan-host.com'
   end
 end

data/spec/url_generator_spec.rb

@@ -70,6 +70,36 @@ describe DocJuan::UrlGenerator do
     }.must_raise DocJuan::NoSecretGivenError
   end
 
+  describe '#authentication' do
+    before :each do
+      DocJuan.config.username = 'xkcd'
+      DocJuan.config.password = 'correct horse battery staple'
+    end
+
+    after :each do
+      DocJuan.config.username = nil
+      DocJuan.config.password = nil
+    end
+
+    it 'knows if authentication credentials is added' do
+      subject.has_authentication_credentials?.must_equal true
+    end
+
+    it 'knows if authentication credentials is missing' do
+      DocJuan.config.username = nil
+      DocJuan.config.password = nil
+
+      subject.has_authentication_credentials?.must_equal false
+    end
+
+
+    it 'appends username and password to options if set as config variables' do
+      subject.options[:username].must_equal 'xkcd'
+      subject.options[:password].must_equal 'correct horse battery staple'
+    end
+
+  end
+
   it 'compiles into a seed string for the public key computation' do
     subject.seed_string.must_equal 'filename:file.pdf-options_print_stylesheet:true-options_size:A4-options_title:The Site-url:http://example.com'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doc_juan
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -45,12 +45,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3331118814664929665
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3331118814664929665
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10