activesp 0.0.7 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.1.0-pre

data/lib/activesp/caching.rb

@@ -28,6 +28,20 @@ module ActiveSP
   # @private
   module Caching
     
+    module InstanceMethods
+      
+      # @private
+      def clear_cache_for(name)
+        instance_variable_set("@#{name}", nil) # Make sure it is defined first... Dirty, right?
+        remove_instance_variable("@#{name}")
+      end
+      
+    end
+    
+    def self.extended(o)
+      o.send(:include, ActiveSP::Caching::InstanceMethods)
+    end
+    
   private
     
     def cache(name, options = {})

data/lib/activesp/connection.rb

@@ -132,6 +132,32 @@ module ActiveSP
       end
     end
     
+    def head(url)
+      # TODO: support HTTPS too
+      @open_params ||= begin
+        u = URL(@root_url)
+        [u.host, u.port]
+      end
+      Net::HTTP.start(*@open_params) do |http|
+        request = Net::HTTP::Head.new(URL(url).full_path.gsub(/ /, "%20"))
+        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"])
+        # end
+        # response
+      end
+    end
+    
   end
   
 end

data/lib/activesp/content_type.rb

@@ -98,6 +98,11 @@ module ActiveSP
     end
     cache :fields, :dup => :always
     
+    def fields_by_name
+      fields.inject({}) { |h, f| h[decode_field_name(f.StaticName)] = f ; h }
+    end
+    cache :fields_by_name, :dup => :always
+    
     # See {Base#save}
     # @return [void]
     def save
@@ -130,12 +135,12 @@ module ActiveSP
     
     def internal_attribute_types
       @@internal_attribute_types ||= {
-        "Description" => GhostField.new("ColName", "Text", false, true),
-        "FeatureId" => GhostField.new("ColName", "Text", false, true),
-        "Group" => GhostField.new("ColName", "Text", false, true),
+        "Description" => GhostField.new("Description", "Text", false, true),
+        "FeatureId" => GhostField.new("FeatureId", "Text", false, true),
+        "Group" => GhostField.new("Group", "Text", false, true),
         "Hidden" => GhostField.new("Hidden", "Bool", false, true),
-        "ID" => GhostField.new("ColName", "Text", false, true),
-        "Name" => GhostField.new("ColName", "Text", false, true),
+        "ID" => GhostField.new("ID", "Text", false, true),
+        "Name" => GhostField.new("Name", "Text", false, true),
         "ReadOnly" => GhostField.new("ReadOnly", "Bool", false, true),
         "Sealed" => GhostField.new("Sealed", "Bool", false, true),
         "V2ListTemplateName" => GhostField.new("V2ListTemplateName", "Text", false, true),

data/lib/activesp/file.rb

@@ -44,10 +44,19 @@ module ActiveSP
       @item.list.site.connection.fetch(@url).body
     end
     
+    def content_type
+      head_data["content-type"]
+    end
+    
+    def content_size
+      head_data["content-length"].to_i
+    end
+    
     def destroy
       if @destroyable
         result = call("Lists", "delete_attachment", "listName" => @item.list.id, "listItemID" => @item.ID, "url" => @url)
         if delete_result = result.xpath("//sp:DeleteAttachmentResponse", NS).first
+          @item.clear_cache_for(:attachment_urls)
           self
         else
           raise "file could not be deleted"
@@ -65,6 +74,12 @@ module ActiveSP
     # @private
     alias inspect to_s
     
+  private
+    
+    def head_data
+      @head_data ||= @item.list.site.connection.head(@url)
+    end
+    
   end
   
 end

data/lib/activesp/folder.rb

@@ -34,7 +34,7 @@ module ActiveSP
     end
     
     def is_folder?
-      false
+      true
     end
     
     # Returns the list of items in this folder
@@ -68,7 +68,7 @@ module ActiveSP
     end
     
     def create_document(parameters = {})
-      @list.create_document(parameters.merge(:folder => absolute_url))
+      @list.create_document(parameters.merge(:folder => absolute_url, :folder_object => self))
     end
     
     # Returns the item with the given name

data/lib/activesp/ghost_field.rb

@@ -35,11 +35,11 @@ module ActiveSP
     include Util
     
     # @private
-    attr_reader :Name, :internal_type, :Mult, :ReadOnly
+    attr_reader :Name, :internal_type, :Mult, :ReadOnly, :DisplayName, :Required
     
     # @private
-    def initialize(name, type, mult, read_only)
-      @Name, @internal_type, @Mult, @ReadOnly = name, type, mult, read_only
+    def initialize(name, type, mult, read_only, display_name = name)
+      @Name, @DisplayName, @internal_type, @Mult, @ReadOnly = name, display_name, type, mult, read_only
     end
     
     # @private
@@ -86,7 +86,7 @@ module ActiveSP
     def original_attributes
       @original_attributes ||= {
         "ColName" => @Name,
-        "DisplayName" => @Name,
+        "DisplayName" => @DisplayName,
         "Mult" => @Mult,
         "Name" => @Name,
         "ReadOnly" => @ReadOnly,

data/lib/activesp/group.rb

@@ -97,8 +97,8 @@ module ActiveSP
         "Description" => GhostField.new("Description", "Text", false, true),
         "ID" => GhostField.new("ID", "Text", false, true),
         "Name" => GhostField.new("Name", "Text", false, true),
-        "OwnerID" => GhostField.new("OsnerID", "Integer", false, true),
-        "OwnerIsUser" => GhostField.new("OwnerIsUser", "Bool", false, true)
+        "OwnerID" => GhostField.new("OwnerID", "Integer", false, true, "Owner ID"),
+        "OwnerIsUser" => GhostField.new("OwnerIsUser", "Bool", false, true, "Owner Is User?")
       }
     end
     

data/lib/activesp/item.rb

@@ -258,7 +258,9 @@ module ActiveSP
       if error_code == 0
         @ID = nil
       else
-        raise "cannot create item, error code = #{error_code}"
+        message = create_result.xpath("./sp:ErrorText", NS).first
+        message &&= message.text
+        raise "cannot destroy item, error code = #{error_code}, error description = #{message}"
       end
       self
     end
@@ -306,19 +308,30 @@ module ActiveSP
     cache :original_attributes
     
     def internal_attribute_types
-      list.fields_by_name
+      # list.fields_by_name
+      content_type.fields_by_name
     end
+    cache :internal_attribute_types
     
     def update_attributes_internal(attributes)
       attributes = attributes.dup
       if file_leaf_ref = attributes.delete("FileLeafRef")
         base_name = ::File.basename(file_leaf_ref, ".*")
+        type = ::File.extname(file_leaf_ref).sub(/\A\./, "")
+        if type != original_attributes["File Type"].to_s
+          raise ArgumentError, "Cannot change file type of a document"
+        end
+        file_ref = URI.unescape(original_attributes["EncodedAbsUrl"])
       end
-      updates = Builder::XmlMarkup.new.Batch("OnError" => "Continue", "ListVersion" => 1) do |xml|
+      updates = Builder::XmlMarkup.new.Batch("OnError" => "Continue", "ListVersion" => @list.attribute("Version")) do |xml|
         xml.Method("ID" => 1, "Cmd" => "Update") do
           xml.Field(self.ID, "Name" => "ID")
           construct_xml_for_update_list_items(xml, @list.fields_by_name, attributes)
-          xml.Field(base_name, "Name" => "BaseName") if base_name
+          if file_ref
+            xml.Field(base_name, "Name" => "BaseName")
+            xml.Field(file_ref, "Name" => "FileRef") 
+          end
+          xml.Field("1", "Name" => "FSObjType") if is_folder?
         end
       end
       result = call("Lists", "update_list_items", "listName" => @list.id, "updates" => updates)
@@ -329,7 +342,9 @@ module ActiveSP
         @attributes_before_type_cast = clean_item_attributes(row.attributes)
         reload
       else
-        raise "cannot create item, error code = #{error_code}"
+        message = create_result.xpath("./sp:ErrorText", NS).first
+        message &&= message.text
+        raise "cannot update item, error code = #{error_code}, error description = #{message}"
       end
     end
     

data/lib/activesp/list.rb

@@ -94,7 +94,8 @@ module ActiveSP
       folder = options.delete(:folder)
       # Always include a query because for some reason SP is capable of not finding certain
       # items otherwise.
-      query = { "query" => options.delete(:query) || "<Query><Where></Where></Query>" }
+      # query = { "query" => options.delete(:query) || "<Query><Where></Where></Query>" }
+      query = { "query" => options.delete(:query) || "" }
       no_preload = options.delete(:no_preload)
       options.empty? or raise ArgumentError, "unknown options #{options.keys.map { |k| k.inspect }.join(", ")}"
       query_options = Builder::XmlMarkup.new.QueryOptions do |xml|
@@ -152,6 +153,10 @@ module ActiveSP
     # Returns the item with the given name or nil if there is no item with the given name
     # @return [Item]
     def item(name)
+      __item(name)
+    end
+    
+    def __item(name, options = {})
       query = Builder::XmlMarkup.new.Query do |xml|
         xml.Where do |xml|
           xml.Eq do |xml|
@@ -160,7 +165,7 @@ module ActiveSP
           end
         end
       end
-      items(:query => query).first
+      items(options.merge(:query => query)).first
     end
     
     alias / item
@@ -189,7 +194,11 @@ module ActiveSP
       else
         view_fields = Builder::XmlMarkup.new.ViewFields
       end
-      result = call("Lists", "get_list_item_changes_since_token", "listName" => @id, 'queryOptions' => '<queryOptions xmlns:s="http://schemas.microsoft.com/sharepoint/soap/" ><QueryOptions/></queryOptions>', 'changeToken' => token, 'viewFields' => view_fields)
+      if token
+        result = call("Lists", "get_list_item_changes_since_token", "listName" => @id, 'queryOptions' => '<queryOptions xmlns:s="http://schemas.microsoft.com/sharepoint/soap/" ><QueryOptions/></queryOptions>', 'changeToken' => token, 'viewFields' => view_fields)
+      else
+        result = call("Lists", "get_list_item_changes_since_token", "listName" => @id, 'queryOptions' => '<queryOptions xmlns:s="http://schemas.microsoft.com/sharepoint/soap/" ><QueryOptions/></queryOptions>', 'viewFields' => view_fields)
+      end
       updates = []
       result.xpath("//z:row", NS).each do |row|
         attributes = clean_item_attributes(row.attributes)
@@ -361,66 +370,66 @@ module ActiveSP
     
     def internal_attribute_types
       @@internal_attribute_types ||= {
-        "AllowAnonymousAccess" => GhostField.new("AllowAnonymousAccess", "Bool", false, true),
-        "AllowDeletion" => GhostField.new("AllowDeletion", "Bool", false, true),
-        "AllowMultiResponses" => GhostField.new("AllowMultiResponses", "Bool", false, true),
-        "AnonymousPermMask" => GhostField.new("AnonymousPermMask", "Integer", false, true),
-        "AnonymousViewListItems" => GhostField.new("AnonymousViewListItems", "Bool", false, true),
+        "AllowAnonymousAccess" => GhostField.new("AllowAnonymousAccess", "Bool", false, true, "Allow Anonymous Access?"),
+        "AllowDeletion" => GhostField.new("AllowDeletion", "Bool", false, true, "Allow Deletion?"),
+        "AllowMultiResponses" => GhostField.new("AllowMultiResponses", "Bool", false, true, "Allow Multiple Responses?"),
+        "AnonymousPermMask" => GhostField.new("AnonymousPermMask", "Integer", false, true, "Anonymous Permission Mask"),
+        "AnonymousViewListItems" => GhostField.new("AnonymousViewListItems", "Bool", false, true, "Anonymous Can View List Items?"),
         "Author" => GhostField.new("Author", "InternalUser", false, true),
-        "BaseTemplate" => GhostField.new("BaseTemplate", "Text", false, true),
-        "BaseType" => GhostField.new("BaseType", "Text", false, true),
-        "Created" => GhostField.new("Created", "StandardDateTime", false, true),
-        "DefaultViewUrl" => GhostField.new("DefaultViewUrl", "Text", false, true),
+        "BaseTemplate" => GhostField.new("BaseTemplate", "Text", false, true, "Base Template"),
+        "BaseType" => GhostField.new("BaseType", "Text", false, true, "Base Type"),
+        "Created" => GhostField.new("Created", "StandardDateTime", false, true, "Created"),
+        "DefaultViewUrl" => GhostField.new("DefaultViewUrl", "Text", false, true, "Default View Url"),
         "Description" => GhostField.new("Description", "Text", false, false),
         "Direction" => GhostField.new("Direction", "Text", false, true),
-        "DocTemplateUrl" => GhostField.new("DocTemplateUrl", "Text", false, true),
-        "EmailAlias" => GhostField.new("EmailAlias", "Text", false, true),
-        "EmailInsertsFolder" => GhostField.new("EmailInsertsFolder", "Text", false, true),
-        "EnableAssignedToEmail" => GhostField.new("EnableAssignedToEmail", "Bool", false, true),
-        "EnableAttachments" => GhostField.new("EnableAttachments", "Bool", false, true),
-        "EnableMinorVersion" => GhostField.new("EnableMinorVersion", "Bool", false, true),
-        "EnableModeration" => GhostField.new("EnableModeration", "Bool", false, true),
-        "EnableVersioning" => GhostField.new("EnableVersioning", "Bool", false, true),
-        "EventSinkAssembly" => GhostField.new("EventSinkAssembly", "Text", false, true),
-        "EventSinkClass" => GhostField.new("EventSinkClass", "Text", false, true),
-        "EventSinkData" => GhostField.new("EventSinkData", "Text", false, true),
-        "FeatureId" => GhostField.new("FeatureId", "Text", false, true),
+        "DocTemplateUrl" => GhostField.new("DocTemplateUrl", "Text", false, true, "Document Template URL"),
+        "EmailAlias" => GhostField.new("EmailAlias", "Text", false, true, "Email Alias"),
+        "EmailInsertsFolder" => GhostField.new("EmailInsertsFolder", "Text", false, true, "Email Inserts Folder"),
+        "EnableAssignedToEmail" => GhostField.new("EnableAssignedToEmail", "Bool", false, true, "Enable Assign to Email?"),
+        "EnableAttachments" => GhostField.new("EnableAttachments", "Bool", false, true, "Enable Attachments?"),
+        "EnableMinorVersion" => GhostField.new("EnableMinorVersion", "Bool", false, true, "Enable Minor Versions?"),
+        "EnableModeration" => GhostField.new("EnableModeration", "Bool", false, true, "Enable Moderation?"),
+        "EnableVersioning" => GhostField.new("EnableVersioning", "Bool", false, true, "Enable Versioning?"),
+        "EventSinkAssembly" => GhostField.new("EventSinkAssembly", "Text", false, true, "Event Sink Assembly"),
+        "EventSinkClass" => GhostField.new("EventSinkClass", "Text", false, true, "Event Sink Class"),
+        "EventSinkData" => GhostField.new("EventSinkData", "Text", false, true, "Event Sink Data"),
+        "FeatureId" => GhostField.new("FeatureId", "Text", false, true, "Feature ID"),
         "Flags" => GhostField.new("Flags", "Integer", false, true),
-        "HasUniqueScopes" => GhostField.new("HasUniqueScopes", "Bool", false, true),
+        "HasUniqueScopes" => GhostField.new("HasUniqueScopes", "Bool", false, true, "Has Unique Scopes?"),
         "Hidden" => GhostField.new("Hidden", "Bool", false, true),
         "ID" => GhostField.new("ID", "Text", false, true),
-        "ImageUrl" => GhostField.new("ImageUrl", "Text", false, true),
-        "InheritedSecurity" => GhostField.new("InheritedSecurity", "Bool", false, true),
-        "InternalName" => GhostField.new("InternalName", "Text", false, true),
-        "ItemCount" => GhostField.new("ItemCount", "Integer", false, true),
-        "LastDeleted" => GhostField.new("LastDeleted", "StandardDateTime", false, true),
-        "LastModified" => GhostField.new("LastModified", "XMLDateTime", false, true),
-        "LastModifiedForceRecrawl" => GhostField.new("LastModifiedForceRecrawl", "XMLDateTime", false, true),
-        "MajorVersionLimit" => GhostField.new("MajorVersionLimit", "Integer", false, true),
-        "MajorWithMinorVersionsLimit" => GhostField.new("MajorWithMinorVersionsLimit", "Integer", false, true),
-        "MobileDefaultViewUrl" => GhostField.new("MobileDefaultViewUrl", "Text", false, true),
+        "ImageUrl" => GhostField.new("ImageUrl", "Text", false, true, "Image URL"),
+        "InheritedSecurity" => GhostField.new("InheritedSecurity", "Bool", false, true, "Has Inherited Security?"),
+        "InternalName" => GhostField.new("InternalName", "Text", false, true, "Internal Name"),
+        "ItemCount" => GhostField.new("ItemCount", "Integer", false, true, "Item Count"),
+        "LastDeleted" => GhostField.new("LastDeleted", "StandardDateTime", false, true, "Deleted"),
+        "LastModified" => GhostField.new("LastModified", "XMLDateTime", false, true, "Modified"),
+        "LastModifiedForceRecrawl" => GhostField.new("LastModifiedForceRecrawl", "XMLDateTime", false, true, "Last Modified Force Recrawl"),
+        "MajorVersionLimit" => GhostField.new("MajorVersionLimit", "Integer", false, true, "Major Version Limit"),
+        "MajorWithMinorVersionsLimit" => GhostField.new("MajorWithMinorVersionsLimit", "Integer", false, true, "Major With Minor Versions Limit"),
+        "MobileDefaultViewUrl" => GhostField.new("MobileDefaultViewUrl", "Text", false, true, "Mobile Default View URL"),
         "Modified" => GhostField.new("Modified", "StandardDateTime", false, true),
-        "MultipleDataList" => GhostField.new("MultipleDataList", "Bool", false, true),
+        "MultipleDataList" => GhostField.new("MultipleDataList", "Bool", false, true, "Is Multiple Data List?"),
         "Name" => GhostField.new("Name", "Text", false, true),
         "Ordered" => GhostField.new("Ordered", "Bool", false, true),
         "Permissions" => GhostField.new("Permissions", "Text", false, true),
-        "ReadSecurity" => GhostField.new("ReadSecurity", "Integer", false, true),
-        "RequireCheckout" => GhostField.new("RequireCheckout", "Bool", false, true),
-        "RootFolder" => GhostField.new("RootFolder", "Text", false, true),
-        "ScopeId" => GhostField.new("ScopeId", "Text", false, true),
-        "SendToLocation" => GhostField.new("SendToLocation", "Text", false, true),
-        "ServerTemplate" => GhostField.new("ServerTemplate", "Text", false, true),
-        "ShowUser" => GhostField.new("ShowUser", "Bool", false, true),
-        "ThumbnailSize" => GhostField.new("ThumbnailSize", "Integer", false, true),
+        "ReadSecurity" => GhostField.new("ReadSecurity", "Integer", false, true, "Read Security"),
+        "RequireCheckout" => GhostField.new("RequireCheckout", "Bool", false, true, "Requires Checkout?"),
+        "RootFolder" => GhostField.new("RootFolder", "Text", false, true, "Root Folder"),
+        "ScopeId" => GhostField.new("ScopeId", "Text", false, true, "Scope ID"),
+        "SendToLocation" => GhostField.new("SendToLocation", "Text", false, true, "Send To Location"),
+        "ServerTemplate" => GhostField.new("ServerTemplate", "Text", false, true, "Server Template"),
+        "ShowUser" => GhostField.new("ShowUser", "Bool", false, true, "Shows User?"),
+        "ThumbnailSize" => GhostField.new("ThumbnailSize", "Integer", false, true, "Thumbnail Size"),
         "Title" => GhostField.new("Title", "Text", false, true),
-        "ValidSecurityInfo" => GhostField.new("ValidSecurityInfo", "Bool", false, true),
+        "ValidSecurityInfo" => GhostField.new("ValidSecurityInfo", "Bool", false, true, "Has Valid Security Info?"),
         "Version" => GhostField.new("Version", "Integer", false, true),
-        "WebFullUrl" => GhostField.new("WebFullUrl", "Text", false, true),
-        "WebId" => GhostField.new("WebId", "Text", false, true),
-        "WebImageHeight" => GhostField.new("WebImageHeight", "Integer", false, true),
-        "WebImageWidth" => GhostField.new("WebImageWidth", "Integer", false, true),
-        "WorkFlowId" => GhostField.new("WorkFlowId", "Text", false, true),
-        "WriteSecurity" => GhostField.new("WriteSecurity", "Integer", false, true)
+        "WebFullUrl" => GhostField.new("WebFullUrl", "Text", false, true, "Full Web URL"),
+        "WebId" => GhostField.new("WebId", "Text", false, true, "Web ID"),
+        "WebImageHeight" => GhostField.new("WebImageHeight", "Integer", false, true, "Web Image Height"),
+        "WebImageWidth" => GhostField.new("WebImageWidth", "Integer", false, true, "Web Image Width"),
+        "WorkFlowId" => GhostField.new("WorkFlowId", "Text", false, true, "Work Flow ID"),
+        "WriteSecurity" => GhostField.new("WriteSecurity", "Integer", false, true, "Write Security")
       }
     end
     
@@ -456,9 +465,10 @@ module ActiveSP
       parameters = parameters.dup
       content = parameters.delete(:content) or raise ArgumentError, "Specify the content in the :content parameter"
       folder = parameters.delete(:folder)
+      folder_object = parameters.delete(:folder_object)
       overwrite = parameters.delete(:overwrite)
       file_name = parameters.delete("FileLeafRef") or raise ArgumentError, "Specify the file name in the 'FileLeafRef' parameter"
-      raise ArgumentError, "document with file name #{file_name.inspect} already exists" if item(file_name) && !overwrite
+      raise ArgumentError, "document with file name #{file_name.inspect} already exists" if __item(file_name, :folder => folder_object) && !overwrite
       destination_urls = Builder::XmlMarkup.new.wsdl(:string, URI.escape(::File.join(folder || url, file_name)))
       parameters = type_check_attributes_for_creation(fields_by_name, parameters)
       attributes = untype_cast_attributes(@site, self, fields_by_name, parameters)
@@ -470,13 +480,14 @@ module ActiveSP
       if error_code != "Success"
         raise "#{error_code} : #{copy_result["ErrorMessage"]}"
       else
-        item(file_name)
+        __item(file_name, :folder => folder_object)
       end
     end
     
     def create_list_item(parameters)
       parameters = parameters.dup
       folder = parameters.delete(:folder)
+      folder_object = parameters.delete(:folder_object)
       folder_name = parameters.delete(:folder_name)
       parameters = type_check_attributes_for_creation(fields_by_name, parameters)
       attributes = untype_cast_attributes(@site, self, fields_by_name, parameters)

data/lib/activesp/site.rb

@@ -246,21 +246,21 @@ module ActiveSP
     
     def internal_attribute_types
       @@internal_attribute_types ||= {
-        "AllowAnonymousAccess" => GhostField.new("AllowAnonymousAccess", "Bool", false, true),
-        "AnonymousViewListItems" => GhostField.new("AnonymousViewListItems", "Bool", false, true),
+        "AllowAnonymousAccess" => GhostField.new("AllowAnonymousAccess", "Bool", false, true, "Allow Anonymous Access?"),
+        "AnonymousViewListItems" => GhostField.new("AnonymousViewListItems", "Bool", false, true, "Anonymous Can View List Items?"),
         "Author" => GhostField.new("Author", "InternalUser", false, true),
         "Description" => GhostField.new("Description", "Text", false, true),
-        "ExternalSecurity" => GhostField.new("ExternalSecurity", "Bool", false, true),
-        "InheritedSecurity" => GhostField.new("InheritedSecurity", "Bool", false, true),
-        "IsBucketWeb" => GhostField.new("IsBucketWeb", "Bool", false, true),
+        "ExternalSecurity" => GhostField.new("ExternalSecurity", "Bool", false, true, "Has External Security?"),
+        "InheritedSecurity" => GhostField.new("InheritedSecurity", "Bool", false, true, "Has Inherited Security?"),
+        "IsBucketWeb" => GhostField.new("IsBucketWeb", "Bool", false, true, "Is Bucket Web?"),
         "Language" => GhostField.new("Language", "Integer", false, true),
-        "LastModified" => GhostField.new("LastModified", "XMLDateTime", false, true),
-        "LastModifiedForceRecrawl" => GhostField.new("LastModifiedForceRecrawl", "XMLDateTime", false, true),
+        "LastModified" => GhostField.new("LastModified", "XMLDateTime", false, true, "Modified"),
+        "LastModifiedForceRecrawl" => GhostField.new("LastModifiedForceRecrawl", "XMLDateTime", false, true, "Last Modified Force Recrawl"),
         "Permissions" => GhostField.new("Permissions", "Text", false, true),
         "Title" => GhostField.new("Title", "Text", false, true),
-        "UsedInAutocat" => GhostField.new("UsedInAutocat", "Bool", false, true),
-        "ValidSecurityInfo" => GhostField.new("ValidSecurityInfo", "Bool", false, true),
-        "WebID" => GhostField.new("WebID", "Text", false, true)
+        "UsedInAutocat" => GhostField.new("UsedInAutocat", "Bool", false, true, "Used in Autocat?"),
+        "ValidSecurityInfo" => GhostField.new("ValidSecurityInfo", "Bool", false, true, "Has Valid Security Info?"),
+        "WebID" => GhostField.new("WebID", "Text", false, true, "Web ID")
       }
     end
     

data/lib/activesp/user.rb

@@ -83,9 +83,9 @@ module ActiveSP
       @@internal_attribute_types ||= {
         "Email" => GhostField.new("Email", "Text", false, true),
         "ID" => GhostField.new("ID", "Text", false, true),
-        "IsDomainGroup" => GhostField.new("Email", "Bool", false, true),
-        "IsSiteAdmin" => GhostField.new("IsSiteAdmin", "Bool", false, true),
-        "LoginName" => GhostField.new("LoginName", "Text", false, true),
+        "IsDomainGroup" => GhostField.new("Email", "Bool", false, true, "Is Domain Group?"),
+        "IsSiteAdmin" => GhostField.new("IsSiteAdmin", "Bool", false, true, "Is Site Admin?"),
+        "LoginName" => GhostField.new("LoginName", "Text", false, true, "Login Name"),
         "Name" => GhostField.new("Name", "Text", false, true),
         "Notes" => GhostField.new("Notes", "Text", false, true),
         "Sid" => GhostField.new("Sid", "Text", false, true)

data/lib/activesp/util.rb

@@ -53,7 +53,11 @@ module ActiveSP
           when "DateTime"
             v = Time.parse(v)
           when "XMLDateTime"
-            v = Time.xmlschema(v.sub(/ /, "T"))
+            if v == "0001-01-01T00:00:00"
+              v = nil
+            else
+              v = Time.xmlschema(v.sub(/ /, "T"))
+            end
           when "Computed", "Text", "Guid", "ContentTypeId", "URL"
           when "Integer", "Counter", "Attachments"
             v = v && v != "" ? Integer(v) : nil
@@ -70,9 +74,9 @@ module ActiveSP
           
           when "User"
             d = split_multi(v)
-            v = create_user_or_group(site, d[2])
+            v = create_user_or_group_by_name(site, d[2])
           when "InternalUser"
-            v = create_user_or_group(site, v)
+            v = create_user_or_group_by_name(site, v)
           when "UserMulti"
             d = split_multi(v)
             v = (0...(d.length / 4)).map { |i| create_user_or_group(site, d[4 * i + 2]) }
@@ -118,23 +122,43 @@ module ActiveSP
     end
     
     def create_user_or_group(site, entry)
-      if entry == "System Account"
-        User.new(site.connection.root, "SHAREPOINT\\system")
-      elsif entry[/\\/]
+      if entry[/\\/]
         User.new(site.connection.root, entry)
       else
         Group.new(site.connection.root, entry)
       end
     end
     
+    def create_user_or_group_by_name(site, name)
+      if /\A\d+\z/ === name
+        create_user_or_group_by_id(site, name)
+      else
+        if user = site.connection.users.find { |u| u.attribute("Name") === name }
+          User.new(site.connection.root, user.attribute("LoginName"))
+        elsif group = site.connection.groups.find { |g| g.attribute("Name") === name }
+          Group.new(site.connection.root, name)
+        end
+      end
+    end
+    
+    def create_user_or_group_by_id(site, id)
+      if user = site.connection.users.find { |u| u.attribute("ID") === id }
+        User.new(site.connection.root, user.attribute("LoginName"))
+      elsif group = site.connection.groups.find { |g| g.attribute("ID") === id }
+        Group.new(site.connection.root, group.attribute("Name"))
+      end
+    end
+    
     def type_check_attribute(field, value)
       case field.internal_type
-      when "Text", "File"
+      when "Text", "File", "Note", "URL", "Choice"
         value.to_s
       when "Bool", "Boolean"
         !!value
       when "Integer"
-        Integer(value)
+        Integer(value) if value
+      when "Number"
+        Float(value) if value
       when "StandardDateTime", "XMLDateTime"
         Time === value and value or raise ArgumentError, "wrong type for #{field.Name} attribute"
       when "InternalUser"
@@ -173,6 +197,8 @@ module ActiveSP
         if ::ActiveSP::User === value || field.attributes["UserSelectionMode"] == "PeopleAndGroups" && ::ActiveSP::Group === value
           # TODO: check if the user is in the correct group in case a group is specified
           value
+        elsif value == nil && !field.attributes["Required"]
+          nil
         else
           raise ArgumentError, "wrong type for #{field.Name} attribute"
         end
@@ -190,6 +216,8 @@ module ActiveSP
             raise ArgumentError, "wrong type for #{field.Name} attribute"
           end
         end
+      when "ContentTypeId"
+        value
       else
         raise "not yet #{field.Name}:#{field.internal_type}"
       end
@@ -198,7 +226,7 @@ module ActiveSP
     def type_check_attributes_for_creation(fields, attributes)
       attributes.inject({}) do |h, (k, v)|
         if field = fields[k]
-          if !field.ReadOnly
+          if !field.ReadOnly || field.Name == "ContentType"
             h[k] = type_check_attribute(field, v)
             h
           else
@@ -214,23 +242,26 @@ module ActiveSP
       attributes.inject({}) do |h, (k, v)|
         if field = fields[k]
           case field.internal_type
-          when "Text", "File"
+          when "Text", "File", "Note", "URL", "Choice"
           when "Bool"
             v = v ? "TRUE" : "FALSE"
           when "Boolean"
             v = v ? "1" : "0"
           when "Integer"
             v = v.to_s
+          when "Number"
+            v = v.to_s
           when "DateTime"
             v = v.strftime("%Y-%m-%d %H:%M:%S")
           when "User"
-            v = v.ID
+            v = v.ID if v
           when "UserMulti"
             v = v.map { |ug| ug.ID }.join(";#;#")
           when "Lookup"
-            v = v.ID
+            v = v.ID if v
           when "LookupMulti"
             v = v.map { |i| i.ID }.join(";#;#")
+          when "ContentTypeId"
           else
             raise "don't know type #{field.internal_type.inspect} for #{k}=#{v.inspect} on self"
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activesp
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 7
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors: 
 - Peter Vanbroekhoven
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 +01:00
+date: 2011-05-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,12 +24,15 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 113
         segments: 
         - 0
-        version: "0"
+        - 7
+        - 2
+        - 7
+        version: 0.7.2.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -81,7 +84,7 @@ files:
 - lib/activesp/user.rb
 - lib/activesp/util.rb
 - lib/activesp.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://www.xaop.com/labs/activesp
 licenses: []