Merge pull request #4 from perkof/master

Merging perkofs awesome Int64 changes.
penguinboy · Oct 24, 2011 · 418a67a · 418a67a
2 parents 8885fa3 + 57f7d87
commit 418a67a
Show file tree

Hide file tree

Showing 18 changed files with 65 additions and 88 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ bin
 *.resharper.user
 *.resharper
 *.suo
-*.cache
+*.cache
+_ReSharper.*
diff --git a/Entities/Attendee.cs b/Entities/Attendee.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace EventbriteNET.Entities
 {
@@ -12,9 +9,9 @@ public enum AttendeeGender
     }
     public class Attendee : EntityBase
     {
-        public int Id;
-        public int EventId;
-        public int? TicketId;
+        public long Id;
+        public long EventId;
+        public long? TicketId;
         public int? Quantity;
         public string Currency;
         public float? AmountPaid;

diff --git a/Entities/EntityBase.cs b/Entities/EntityBase.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace EventbriteNET.Entities
+namespace EventbriteNET.Entities
 {
     public class EntityBase
     {

diff --git a/Entities/Event.cs b/Entities/Event.cs
@@ -1,22 +1,20 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using EventbriteNET.HttpApi;
 
 namespace EventbriteNET.Entities
 {
     public class Event : EntityBase
     {
-        public int Id;
+        public long Id;
         public string Title;
         public string Description;
         public DateTime StartDateTime;
         public DateTime EndDateTime;
         public DateTime Created;
         public DateTime Modified;
 
-        public Dictionary<int, Ticket> Tickets = new Dictionary<int, Ticket>();
+        public Dictionary<long, Ticket> Tickets = new Dictionary<long, Ticket>();
 
         private List<Attendee> attendees;
         public List<Attendee> Attendees

diff --git a/Entities/Organizer.cs b/Entities/Organizer.cs
@@ -1,30 +1,27 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using EventbriteNET.HttpApi;
 
 namespace EventbriteNET.Entities
 {
     public class Organizer : EntityBase
     {
-        private int id;
-        public int Id
+        private long id;
+        public long Id
         {
             get
             {
                 return this.id;
             }
         }
 
-        private Dictionary<int, Event> events;
-        public Dictionary<int, Event> Events
+        private Dictionary<long, Event> events;
+        public Dictionary<long, Event> Events
         {
             get
             {
                 if (events == null)
                 {
-                    events = new Dictionary<int, Event>();
+                    events = new Dictionary<long, Event>();
                     var eventArray = new OrganizerEventsRequest(this.Id, Context).GetResponse();
                     foreach (var eventEntity in eventArray)
                     {
@@ -35,7 +32,7 @@ public Dictionary<int, Event> Events
             }
         }
 
-        public Organizer(int id, EventbriteContext context) : base(context)
+        public Organizer(long id, EventbriteContext context) : base(context)
         {
             this.id = id;
         }

diff --git a/Entities/Ticket.cs b/Entities/Ticket.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace EventbriteNET.Entities
 {
@@ -12,7 +9,7 @@ public enum TicketType
     }
     public class Ticket : EntityBase
     {
-        public int Id;
+        public long Id;
         public string Name;
         public string Description;
         public TicketType Type;

diff --git a/EventbriteContext.cs b/EventbriteContext.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using EventbriteNET.Entities;
+using EventbriteNET.Entities;
 using EventbriteNET.HttpApi;
 
 namespace EventbriteNET

diff --git a/EventbriteNET.sln b/EventbriteNET.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventbriteNET", "EventbriteNET.csproj", "{4CE2247C-4D7E-4C89-954D-AC6E9B5F79A5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4CE2247C-4D7E-4C89-954D-AC6E9B5F79A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CE2247C-4D7E-4C89-954D-AC6E9B5F79A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CE2247C-4D7E-4C89-954D-AC6E9B5F79A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CE2247C-4D7E-4C89-954D-AC6E9B5F79A5}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/HttpApi/EventAttendeesRequest.cs b/HttpApi/EventAttendeesRequest.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using EventbriteNET.Entities;
+using EventbriteNET.Entities;
 using EventbriteNET.Xml;
 
 namespace EventbriteNET.HttpApi
@@ -11,7 +7,7 @@ class EventAttendeesRequest : RequestBase
     {
         const string PATH = "event_list_attendees";
 
-        public EventAttendeesRequest(int eventId, EventbriteContext context)
+        public EventAttendeesRequest(long eventId, EventbriteContext context)
             : base(PATH, context)
         {
             this.AddGet("id", eventId.ToString());

diff --git a/HttpApi/EventRequest.cs b/HttpApi/EventRequest.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using EventbriteNET.Entities;
+using EventbriteNET.Entities;
 using EventbriteNET.Xml;
 
 namespace EventbriteNET.HttpApi
@@ -11,7 +7,7 @@ class EventRequest : RequestBase
     {
         const string PATH = "event_get";
 
-        public EventRequest(int id, EventbriteContext context)
+        public EventRequest(long id, EventbriteContext context)
             : base(PATH, context)
         {
             this.AddGet("id", id.ToString());

diff --git a/HttpApi/OrganizerEventsRequest.cs b/HttpApi/OrganizerEventsRequest.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using EventbriteNET.Entities;
+using EventbriteNET.Entities;
 using EventbriteNET.Xml;
 
 namespace EventbriteNET.HttpApi
@@ -11,7 +7,7 @@ class OrganizerEventsRequest : RequestBase
     {
         const string PATH = "organizer_list_events";
 
-        public OrganizerEventsRequest(int organiserId, EventbriteContext context)
+        public OrganizerEventsRequest(long organiserId, EventbriteContext context)
             : base(PATH, context)
         {
             this.AddGet("id", organiserId.ToString());

diff --git a/HttpApi/RequestBase.cs b/HttpApi/RequestBase.cs
@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using System.Text;
-using System.Configuration;
 using System.Net;
-using System.Runtime.Serialization;
-using System.Xml;
-using System.IO;
 
 namespace EventbriteNET.HttpApi
 {

diff --git a/Xml/AttendeeBuilder.cs b/Xml/AttendeeBuilder.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using EventbriteNET.Entities;
-using System.IO;
 using System.Xml;
 
 namespace EventbriteNET.Xml
@@ -21,9 +17,9 @@ public Attendee Build(string xmlString)
             var doc = new XmlDocument();
             doc.LoadXml(xmlString);
 
-            toReturn.Id = TryGetElementIntValue("id", doc);
-            toReturn.EventId = TryGetElementIntValue("event_id", doc);
-            toReturn.TicketId = TryGetElementNullableIntValue("ticket_id", doc);
+            toReturn.Id = TryGetElementLongValue("id", doc);
+            toReturn.EventId = TryGetElementLongValue("event_id", doc);
+            toReturn.TicketId = TryGetElementNullableLongValue("ticket_id", doc);
             toReturn.Quantity = TryGetElementNullableIntValue("quantity", doc);
             toReturn.Currency = TryGetElementValue("currency", doc);
             toReturn.AmountPaid = TryGetElementNullableFloatValue("amount_paid", doc);

diff --git a/Xml/BuilderBase.cs b/Xml/BuilderBase.cs
@@ -1,10 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Xml;
-using EventbriteNET.Entities;
-using System.IO;
 
 namespace EventbriteNET.Xml
 {
@@ -37,6 +32,21 @@ public string TryGetElementValue(string elementName, XmlDocument doc)
             return null;
         }
 
+        public long TryGetElementLongValue(string elementName, XmlDocument doc)
+        {
+            return long.Parse(TryGetElementValue(elementName, doc));
+        }
+
+        public long? TryGetElementNullableLongValue(string elementName, XmlDocument doc)
+        {
+            var value = TryGetElementValue(elementName, doc);
+            if (value == null)
+            {
+                return null;
+            }
+            return long.Parse(value);
+        }
+
         public int TryGetElementIntValue(string elementName, XmlDocument doc)
         {
             return Int32.Parse(TryGetElementValue(elementName, doc));

diff --git a/Xml/EventAttendeesBuilder.cs b/Xml/EventAttendeesBuilder.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using EventbriteNET.Entities;
 using System.IO;
 using System.Xml;

diff --git a/Xml/EventBuilder.cs b/Xml/EventBuilder.cs
@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Xml;
 using EventbriteNET.Entities;
-using System.IO;
 
 namespace EventbriteNET.Xml
 {
@@ -21,7 +17,7 @@ public Event Build(string xmlString)
             var doc = new XmlDocument();
             doc.LoadXml(xmlString);
 
-            toReturn.Id = Int32.Parse(doc.GetElementsByTagName("id")[0].InnerText);
+            toReturn.Id = long.Parse(doc.GetElementsByTagName("id")[0].InnerText);
             toReturn.Title = doc.GetElementsByTagName("title")[0].InnerText;
             toReturn.Description = doc.GetElementsByTagName("description")[0].InnerText; ;
             toReturn.StartDateTime = DateTime.Parse(doc.GetElementsByTagName("start_date")[0].InnerText);

diff --git a/Xml/OrganizerEventsBuilder.cs b/Xml/OrganizerEventsBuilder.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using EventbriteNET.Entities;
 using System.IO;
 using System.Xml;

diff --git a/Xml/TicketBuilder.cs b/Xml/TicketBuilder.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using EventbriteNET.Entities;
 using System.Xml;
 using System.IO;
@@ -23,7 +20,7 @@ public Ticket Build(string xmlString)
             var doc = new XmlDocument();
             doc.LoadXml(xmlString);
 
-            toReturn.Id = Int32.Parse(doc.GetElementsByTagName("id")[0].InnerText);
+            toReturn.Id = long.Parse(doc.GetElementsByTagName("id")[0].InnerText);
             toReturn.Name = doc.GetElementsByTagName("name")[0].InnerText;
             toReturn.Description = doc.GetElementsByTagName("description")[0].InnerText;
             toReturn.Type = (TicketType)Int32.Parse(doc.GetElementsByTagName("type")[0].InnerText);