sp_2010 0.0.5 → 0.0.6

data/lib/file.rb

@@ -1,3 +1,5 @@
+require 'domainatrix'
+
 module Sp2010
   class File
     attr_reader :xml
@@ -8,8 +10,8 @@ module Sp2010
       
       @name = dav_prop_at("./DAV:displayname").content
       @url = @xml.at_xpath("./DAV:href", webdav_namespace).content
-      @uri = URI.parse(URI.escape(@url))
-      @path = Pathname.new URI.unescape uri.path
+      @uri = Domainatrix.parse(@url)
+      @path = @uri.path
       
       @is_aspx = name[-5..-1] == ".aspx"
       

data/lib/sp_2010.rb

@@ -4,22 +4,63 @@ require 'json'
 require 'net/http'
 require 'uri'
 require 'file'
-require 'files_response'
+require 'nokogiri'
+require 'ntlm/http'
 
 module Sp2010
   class Client
     include HTTParty
     
-    def self.get_files(host, user, password)
+    def self.get_files(options={})
+      host = options[:host]
+      domain = options[:domain]
+      user = options[:user]
+      password = options[:password]
       uri = URI.parse(host)
       http = Net::HTTP.new(uri.host, uri.port)
+      
+      if (use_ssl?(host))
+        http.use_ssl = true
+      end
+      
       req = Net::HTTP::Propfind.new(uri.request_uri)
-      req.basic_auth(user, password)
+      
+      if domain
+        req.ntlm_auth(user, domain, password)
+      else
+        req.basic_auth(user, password)
+      end
       
       res = http.request(req)
       
       FilesResponse.new(res)
     end
     
+    def self.use_ssl?(host)
+      x = URI.split(host)
+      false if x.count == 0
+      x[0] == "https"
+    end
+    
+  end
+  
+  class FilesResponse
+    attr :files, :error_message
+    
+    def initialize(response)      
+      if response.code == "401"
+        @error_message = "Unauthorized access. Check your username and password."
+        @files = []
+      elsif response.code == "207"
+        @error_message = ""
+        xml= ::Nokogiri::XML(response.body)
+        @files = (xml).xpath("./D:multistatus/D:response").map {|node| File.new(node) }        
+      end 
+    end
+    
+    def valid?
+      @error_message.empty?
+    end
+    
   end
 end

data/lib/sp_2010/version.rb

@@ -1,3 +1,3 @@
 module Sp2010
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/sp_2010.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "httparty"
   s.add_development_dependency "json"
   s.add_development_dependency "nokogiri"
+  s.add_development_dependency "ruby-ntlm"
+  s.add_development_dependency "domainatrix"  
   
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/get_files_spec.rb

@@ -4,7 +4,11 @@ describe "Get Files" do
   
   context "invalid login" do
     before(:each) do
-      @result = Sp2010::Client.get_files(ENV["SP_2010_HOST"], ENV["SP_2010_USERNAME"], "badpassword")
+      @result = Sp2010::Client.get_files({
+        :host => ENV["SP_2010_HOST"], 
+        :user => ENV["SP_2010_USERNAME"], 
+        :password => "badpassword"
+        })      
     end
     it { @result.should_not be_valid }
     it { @result.files.count.should == 0 }
@@ -12,10 +16,36 @@ describe "Get Files" do
   
   context "valid" do
     before(:each) do
-      @result = Sp2010::Client.get_files(ENV["SP_2010_HOST"], ENV["SP_2010_USERNAME"], ENV["SP_2010_PASSWORD"])
+      @result = Sp2010::Client.get_files({
+        :host => ENV["SP_2010_HOST"], 
+        :user => ENV["SP_2010_USERNAME"], 
+        :password => ENV["SP_2010_PASSWORD"]
+        })      
     end
-    it { @result.should_not be_nil }
     it { @result.files.count.should > 0 }
   end
   
+  context "valid scenario 2" do
+    before(:each) do
+      @result = Sp2010::Client.get_files({
+        :host => ENV["SP_2010_HOST_2"], 
+        :domain => ENV["SP_2010_DOMAIN_2"],
+        :user => ENV["SP_2010_USERNAME_2"], 
+        :password => ENV["SP_2010_PASSWORD_2"]
+        })
+    end
+    it { @result.files.count.should > 0 }
+  end  
+  
+  context "valid scenario 3" do
+    before(:each) do
+      @result = Sp2010::Client.get_files({
+        :host => ENV["SP_2010_HOST_3"], 
+        :user => ENV["SP_2010_USERNAME_3"], 
+        :password => ENV["SP_2010_PASSWORD_3"]
+        })
+    end
+    it { @result.files.count.should > 0 }
+  end 
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: sp_2010
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jonathan Birkholz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-28 00:00:00 Z
+date: 2011-12-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -56,6 +56,28 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: ruby-ntlm
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: domainatrix
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: Ruby gem for accessing files on Sharepoint 2010
 email: 
 - rookieone@gmail.com
@@ -70,7 +92,6 @@ files:
 - Gemfile
 - Rakefile
 - lib/file.rb
-- lib/files_response.rb
 - lib/sp_2010.rb
 - lib/sp_2010/version.rb
 - sp_2010.gemspec

data/lib/files_response.rb

@@ -1,21 +0,0 @@
-module Sp2010
-  class FilesResponse
-    attr :files, :error_message
-    
-    def initialize(response)      
-      if response.code == "401"
-        @error_message = "Unauthorized access. Check your username and password."
-        @files = []
-      elsif response.code == "207"
-        @error_message = ""
-        xml= Nokogiri::XML(response.body)
-        @files = (xml).xpath("./D:multistatus/D:response").map {|node| File.new(node) }        
-      end 
-    end
-    
-    def valid?
-      @error_message.empty?
-    end
-    
-  end
-end