activesp 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/activesp/connection.rb

@@ -43,10 +43,11 @@ module ActiveSP
     
     # @private
     # TODO: create profile
-    attr_reader :login, :password, :root_url, :trace
+    attr_reader :login, :password, :auth_type, :root_url, :trace
     
     # @param [Hash] options The connection options
     # @option options [String] :root The URL of the root site
+    # @option options [String] :auth_type (:ntlm) The authentication type, can be :basic or :ntlm.
     # @option options [String] :login (nil) The login
     # @option options [String] :password (nil) The password associated with the given login. Is mandatory if the login is specified. Also can't be "password" as that is inherently insafe. We don't explicitly check for this, but it can't be that.
     def initialize(options = {})
@@ -54,6 +55,7 @@ module ActiveSP
       @root_url = options.delete(:root) or raise ArgumentError, "missing :root option"
       @login = options.delete(:login)
       @password = options.delete(:password)
+      @auth_type = options.delete(:auth_type) || :ntlm
       @trace = options.delete(:trace)
       options.empty? or raise ArgumentError, "unknown options #{options.keys.map { |k| k.inspect }.join(", ")}"
       cache = nil
@@ -112,7 +114,16 @@ module ActiveSP
       end
       Net::HTTP.start(*@open_params) do |http|
         request = Net::HTTP::Get.new(URL(url).full_path.gsub(/ /, "%20"))
-        request.ntlm_auth(@login, @password) if @login
+        if @login
+          case auth_type
+          when :ntlm
+            request.ntlm_auth(@login, @password)
+          when :basic
+            request.basic_auth(@login, @password)
+          else
+            raise ArgumentError, "Unknown authentication type #{auth_type.inspect}"
+          end
+        end
         response = http.request(request)
         # if Net::HTTPFound === response
         #   response = fetch(response["location"])

data/lib/activesp/site.rb

@@ -279,7 +279,16 @@ module ActiveSP
       def initialize(site, name)
         @site, @name = site, name
         @client = Savon::Client.new(::File.join(URI.escape(site.url), "_vti_bin", name + ".asmx?WSDL"))
-        @client.request.ntlm_auth(site.connection.login, site.connection.password) if site.connection.login
+        if site.connection.login
+          case site.connection.auth_type
+          when :ntlm
+            @client.request.ntlm_auth(site.connection.login, site.connection.password)
+          when :basic
+            @client.request.basic_auth(site.connection.login, site.connection.password)
+          else
+            raise ArgumentError, "Unknown authentication type #{site.connection.auth_type.inspect}"
+          end
+        end
       end
       
       def call(m, *args)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activesp
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Peter Vanbroekhoven
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +01:00
+date: 2011-01-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,15 +24,12 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 117
+        hash: 3
         segments: 
         - 0
-        - 7
-        - 2
-        - 5
-        version: 0.7.2.5
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency