Support CoreTweet 0.3.3

Author: azyobuzin

CoreTweetSupplement.nuspec

@@ -12,7 +12,7 @@
         <copyright>(c) 2014 azyobuzin</copyright>
         <tags>Twitter</tags>
         <dependencies>
-            <dependency id="CoreTweet" version="(, 0.3.2]" />
+            <dependency id="CoreTweet" version="0.3.3" />
             <dependency id="Newtonsoft.Json" version="4.5.11" />
         </dependencies>
     </metadata>

CoreTweetSupplement/CoreTweetSupplement.cs

@@ -3,7 +3,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
-using CoreTweet.Core;
 
 namespace CoreTweet
 {
@@ -98,16 +97,16 @@ private class TextPart : ITextPart
             internal int End { get; set; }
             public string RawText { get; set; }
             public string Text { get; set; }
-            public CoreBase Entity { get; set; }
+            public Entity Entity { get; set; }
         }
 
         /// <summary>
         /// Enumerates parts split into Tweet Entities.
         /// </summary>
         /// <param name="text">The text such as <see cref="CoreTweet.Status.Text"/>, <see cref="CoreTweet.DirectMessage.Text"/> and <see cref="CoreTweet.User.Description"/>.</param>
-        /// <param name="entities">The <see cref="CoreTweet.Entity"/> instance.</param>
+        /// <param name="entities">The <see cref="CoreTweet.Entities"/> instance.</param>
         /// <returns>An <see cref="T:System.Collections.Generic.IEnumerable{CoreTweet.ITextPart}"/> whose elements are parts of <paramref name="text"/>.</returns>
-        public static IEnumerable<ITextPart> EnumerateTextParts(string text, Entity entities)
+        public static IEnumerable<ITextPart> EnumerateTextParts(string text, Entities entities)
         {
             if (entities == null)
             {
@@ -120,7 +119,7 @@ public static IEnumerable<ITextPart> EnumerateTextParts(string text, Entity enti
             }
 
             var list = new LinkedList<TextPart>(
-                (entities.HashTags ?? Enumerable.Empty<HashTag>())
+                (entities.HashTags ?? Enumerable.Empty<SymbolEntity>())
                     .Select(e => new TextPart()
                     {
                         Type = TextPartType.Hashtag,
@@ -131,31 +130,32 @@ public static IEnumerable<ITextPart> EnumerateTextParts(string text, Entity enti
                         Entity = e
                     })
                     .Concat(
-                        (entities.Media ?? Enumerable.Empty<Media>())
+                        (entities.Symbols ?? Enumerable.Empty<SymbolEntity>())
                             .Select(e => new TextPart()
                             {
-                                Type = TextPartType.Url,
+                                Type = TextPartType.Cashtag,
                                 Start = e.Indices[0],
                                 End = e.Indices[1],
-                                RawText = e.Url.ToString(),
-                                Text = e.DisplayUrl,
+                                RawText = "$" + e.Text,
+                                Text = "$" + e.Text,
                                 Entity = e
                             })
                     )
                     .Concat(
-                        (entities.Urls ?? Enumerable.Empty<Url>())
+                        (entities.Urls ?? Enumerable.Empty<UrlEntity>())
+                            .Concat(entities.Media ?? Enumerable.Empty<UrlEntity>())
                             .Select(e => new TextPart()
                             {
                                 Type = TextPartType.Url,
                                 Start = e.Indices[0],
                                 End = e.Indices[1],
-                                RawText = e.Uri.ToString(),
+                                RawText = e.Url.ToString(),
                                 Text = e.DisplayUrl,
                                 Entity = e
                             })
                     )
                     .Concat(
-                        (entities.UserMentions ?? Enumerable.Empty<UserMention>())
+                        (entities.UserMentions ?? Enumerable.Empty<UserMentionEntity>())
                             .Select(e => new TextPart()
                             {
                                 Type = TextPartType.UserMention,
@@ -264,19 +264,25 @@ public enum TextPartType
 
         /// <summary>
         /// Hashtag.
-        /// <see cref="CoreTweet.ITextPart.Entity"/> will be a <see cref="CoreTweet.HashTag" /> instance.
+        /// <see cref="CoreTweet.ITextPart.Entity"/> will be a <see cref="CoreTweet.SymbolEntity" /> instance.
         /// </summary>
         Hashtag,
 
+        /// <summary>
+        /// Cashtag.
+        /// <see cref="CoreTweet.ITextPart.Entity"/> will be a <see cref="CoreTweet.SymbolEntity" /> instance.
+        /// </summary>
+        Cashtag,
+
         /// <summary>
         /// URL.
-        /// <see cref="CoreTweet.ITextPart.Entity"/> will be a <see cref="CoreTweet.Url" /> instance.
+        /// <see cref="CoreTweet.ITextPart.Entity"/> will be a <see cref="CoreTweet.UrlEntity" /> instance.
         /// </summary>
         Url,
 
         /// <summary>
         /// User mention.
-        /// <see cref="CoreTweet.ITextPart.Entity"/> will be a <see cref="CoreTweet.UserMention" /> instance.
+        /// <see cref="CoreTweet.ITextPart.Entity"/> will be a <see cref="CoreTweet.UserMentionEntity" /> instance.
         /// </summary>
         UserMention
     }
@@ -304,6 +310,6 @@ public interface ITextPart
         /// <summary>
         /// The base entity information.
         /// </summary>
-        CoreBase Entity { get; }
+        Entity Entity { get; }
     }
 }

CoreTweetSupplement/CoreTweetSupplement.csproj

@@ -47,7 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="CoreTweet">
-      <HintPath>..\packages\CoreTweet.0.3.2\lib\portable-net4+sl5+wp8+win8+MonoAndroid+MonoTouch\CoreTweet.dll</HintPath>
+      <HintPath>..\packages\CoreTweet.0.3.3\lib\portable-net4+sl5+wp8+win8+wpa81+MonoAndroid+MonoTouch\CoreTweet.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\portable-net40+sl4+wp7+win8\Newtonsoft.Json.dll</HintPath>

CoreTweetSupplement/packages.config

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="CoreTweet" version="0.3.3" targetFramework="portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10" />
   <package id="Newtonsoft.Json" version="6.0.3" targetFramework="portable-net40+sl4+wp7+win8" />
-  <package id="CoreTweet" version="0.3.2" targetFramework="portable-net4+sl5+wp8+win8+MonoAndroid+MonoTouch" />
 </packages>

CoreTweetSupplementTest/CoreTweetSupplementTest.csproj

@@ -42,7 +42,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CoreTweet">
-      <HintPath>..\packages\CoreTweet.0.3.2\lib\net45\CoreTweet.dll</HintPath>
+      <HintPath>..\packages\CoreTweet.0.3.3\lib\net45\CoreTweet.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

CoreTweetSupplementTest/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ChainingAssertion" version="1.7.1.0" targetFramework="net45" />
-  <package id="CoreTweet" version="0.3.2" targetFramework="net45" />
+  <package id="CoreTweet" version="0.3.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
 </packages>