Merge branch 'master' of https://github.com/pubnub/pubnub-api

pubnub · Dec 18, 2012 · c2fc18f · c2fc18f
2 parents 052b350 + bd28e1f
commit c2fc18f
Show file tree

Hide file tree

Showing 16 changed files with 2,950 additions and 389 deletions.
diff --git a/csharp/3.3.0.1/NugetPkg/Pubnub.3.3.0.1-release-12-17-12-1.nupkg b/csharp/3.3.0.1/NugetPkg/Pubnub.3.3.0.1-release-12-17-12-1.nupkg
diff --git a/csharp/3.3.0.1/PubNub-Messaging.Tests/PubNub-Messaging.Tests.csproj b/csharp/3.3.0.1/PubNub-Messaging.Tests/PubNub-Messaging.Tests.csproj
@@ -55,7 +55,7 @@
         <Reference Include="System.Core" />
       </ItemGroup>
     </When>
-    <When Condition=" '$(TargetFrameworkVersion.Replace(&quot;v&quot;,&quot;&quot;))' == '4.0' ">
+    <When Condition=" '$(TargetFrameworkVersion.Replace(&quot;v&quot;,&quot;&quot;))' == '4.0' Or '$(TargetFrameworkVersion.Replace(&quot;v&quot;,&quot;&quot;))' == '4.5' ">
       <PropertyGroup>
         <ConfigTemplate>
           <Configuration>

diff --git a/csharp/3.3.0.1/PubNub-Messaging/PubNub-Messaging.csproj b/csharp/3.3.0.1/PubNub-Messaging/PubNub-Messaging.csproj
@@ -54,7 +54,7 @@
     <StartupObject>PubNub_Messaging.Pubnub_Example</StartupObject>
   </PropertyGroup>
   <Choose>
-    <When Condition=" '$(TargetFrameworkVersion.Replace(&quot;v&quot;,&quot;&quot;))' == '4.0' ">
+    <When Condition=" '$(TargetFrameworkVersion.Replace(&quot;v&quot;,&quot;&quot;))' == '4.0' Or '$(TargetFrameworkVersion.Replace(&quot;v&quot;,&quot;&quot;))' == '4.5' ">
       <PropertyGroup>
         <ConfigTemplate>
           <Configuration>

diff --git a/csharp/3.3.0.1/PubNub-Messaging/Pubnub.cs b/csharp/3.3.0.1/PubNub-Messaging/Pubnub.cs
diff --git a/csharp/3.3.0.1/PubNub-Messaging/Pubnub_Example.cs b/csharp/3.3.0.1/PubNub-Messaging/Pubnub_Example.cs
@@ -90,7 +90,40 @@ static public void Main()
                         Console.WriteLine("Running publish()");
                         Console.WriteLine("Enter the message for publish. To exit loop, enter QUIT");
                         string publishMsg = Console.ReadLine();
-                        pubnub.publish<string>(channel, publishMsg, DisplayReturnMessage);
+                        double doubleData;
+                        int intData;
+                        if (int.TryParse(publishMsg, out intData))
+                        {
+                            pubnub.publish<string>(channel, intData, DisplayReturnMessage);
+                        }
+                        else if (double.TryParse(publishMsg, out doubleData))
+                        {
+                            pubnub.publish<string>(channel, doubleData, DisplayReturnMessage);
+                        }
+                        else
+                        {
+                            //check whether any numeric is sent in double quotes
+                            if (publishMsg.IndexOf("\"") == 0 && publishMsg.LastIndexOf("\"") == publishMsg.Length - 1)
+                            {
+                                string strMsg = publishMsg.Substring(1, publishMsg.Length - 2);
+                                if (int.TryParse(strMsg, out intData))
+                                {
+                                    pubnub.publish<string>(channel, strMsg, DisplayReturnMessage);
+                                }
+                                else if (double.TryParse(strMsg, out doubleData))
+                                {
+                                    pubnub.publish<string>(channel, strMsg, DisplayReturnMessage);
+                                }
+                                else
+                                {
+                                    pubnub.publish<string>(channel, publishMsg, DisplayReturnMessage);
+                                }
+                            }
+                            else
+                            {
+                                pubnub.publish<string>(channel, publishMsg, DisplayReturnMessage);
+                            }
+                        }
                         break;
                     case "3":
                         Console.WriteLine("Running presence()");

diff --git a/csharp/3.3.0.1/PubNub-Messaging/app.config b/csharp/3.3.0.1/PubNub-Messaging/app.config
@@ -3,6 +3,7 @@
   <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
   <appSettings>
     <add key="OverrideTcpKeepAlive" value="false"/>
+    <add key="LogLevel" value="1"/>
   </appSettings>
   <system.diagnostics>
     <trace autoflush="true" indentsize="4">

diff --git a/csharp/3.3.0.1/PubNub.suo b/csharp/3.3.0.1/PubNub.suo
diff --git a/javascript/3.4/README.md b/javascript/3.4/README.md