From 3c52a8b935c3c624fee0a3268caebf94b8adb064 Mon Sep 17 00:00:00 2001 From: Phil Freeman Date: Wed, 12 Dec 2012 08:35:00 -0800 Subject: [PATCH 1/9] Update readme --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 56cb51c..a42526b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,12 @@ -tablestorage-0.1 +tablestorage-0.2 ================ A Haskell wrapper for the Azure Table Storage REST API. -Currently supports table and entity operations, but not pagination and projections. \ No newline at end of file +Currently supports table and entity operations, but not pagination and projections. + +Version History +=============== + +0.2 - Changes by Aaron Friel to support HTTPs and make the request body consistent with the .NET implementation +0.1 - Initial version From 21514f72ec08dc6f7ce8ac9e2ce8a7a6a6fc886a Mon Sep 17 00:00:00 2001 From: Phil Freeman Date: Wed, 12 Dec 2012 08:36:43 -0800 Subject: [PATCH 2/9] Updated copyright --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index ee4481a..4334328 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2012, Phil Freeman +Copyright (c) Phil Freeman, Aaron Friel 2012 All rights reserved. Redistribution and use in source and binary forms, with or without @@ -21,4 +21,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From d8d5314068fe65a029c07c5b1538e21f3d60db76 Mon Sep 17 00:00:00 2001 From: Phil Freeman Date: Wed, 12 Dec 2012 08:40:08 -0800 Subject: [PATCH 3/9] Update cabal file --- tablestorage.cabal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tablestorage.cabal b/tablestorage.cabal index 64e220b..f6a49d8 100644 --- a/tablestorage.cabal +++ b/tablestorage.cabal @@ -1,14 +1,14 @@ name: tablestorage -version: 0.1.1.0 +version: 0.1.2.0 cabal-version: >= 1.2 build-type: Simple -author: Phil Freeman +author: Phil Freeman, Aaron Friel stability: experimental maintainer: Phil Freeman homepage: http://github.com/paf31/tablestorage category: Web, Database, API license: BSD3 -copyright: (c) Phil Freeman 2012 +copyright: (c) Phil Freeman, Aaron Friel 2012 data-files: LICENSE, tablestorage.cabal From 5a4cf43a82ca7fa32241e927cb6ce8af43a22b9d Mon Sep 17 00:00:00 2001 From: Phil Freeman Date: Wed, 12 Dec 2012 08:40:25 -0800 Subject: [PATCH 4/9] Version --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a42526b..96f0cfc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -tablestorage-0.2 -================ +tablestorage-0.1.2 +================== A Haskell wrapper for the Azure Table Storage REST API. From 2c6a4d983586787830168d86bc2d53efd93b05f7 Mon Sep 17 00:00:00 2001 From: Phil Freeman Date: Wed, 12 Dec 2012 08:41:31 -0800 Subject: [PATCH 5/9] version history --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 96f0cfc..6cce187 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,6 @@ Currently supports table and entity operations, but not pagination and projectio Version History =============== -0.2 - Changes by Aaron Friel to support HTTPs and make the request body consistent with the .NET implementation -0.1 - Initial version +0.1.2 - Aaron Friel: HTTPS support, request format now consistent with the .NET implementation +0.1.1 - Updated error handling mechanism, tidied exports +0.1.0 - Initial version From bd6bae60db85a7e143656ff346e8b24d572e6cbd Mon Sep 17 00:00:00 2001 From: Phil Freeman Date: Wed, 12 Dec 2012 08:41:46 -0800 Subject: [PATCH 6/9] markdown --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6cce187..3151e97 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,6 @@ Currently supports table and entity operations, but not pagination and projectio Version History =============== -0.1.2 - Aaron Friel: HTTPS support, request format now consistent with the .NET implementation -0.1.1 - Updated error handling mechanism, tidied exports -0.1.0 - Initial version +- 0.1.2 - Aaron Friel: HTTPS support, request format now consistent with the .NET implementation +- 0.1.1 - Updated error handling mechanism, tidied exports +- 0.1.0 - Initial version From a8a2791a8617030ab57a77bb2c2a3fc2225b46c2 Mon Sep 17 00:00:00 2001 From: Aaron Friel Date: Fri, 14 Dec 2012 16:15:11 -0600 Subject: [PATCH 7/9] tablestorage.cabal fixes for clean install auth.hs uses set-uri only in http-conduit >= 1.8.5 auth.hs uses Crypto.Classes exported by crpyto-api request.hs uses Network.HTTP.Base exported by HTTP {#-LANGUAGE OverloadedStrings #-} needed in api.hs to use overloaded strings for Header, Method types These issues were hidden by some combination of cabal-dev and/or testing in GHCi. --- src/Network/TableStorage/API.hs | 1 + tablestorage.cabal | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Network/TableStorage/API.hs b/src/Network/TableStorage/API.hs index 4eb5e85..2d8c071 100644 --- a/src/Network/TableStorage/API.hs +++ b/src/Network/TableStorage/API.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE OverloadedStrings #-} -- | -- This module provides functions wrapping the Azure REST API web methods. diff --git a/tablestorage.cabal b/tablestorage.cabal index f6a49d8..af1bd38 100644 --- a/tablestorage.cabal +++ b/tablestorage.cabal @@ -28,7 +28,7 @@ library bytestring, utf8-string, base64-bytestring, - http-conduit, + http-conduit >= 1.8.5, conduit, http-types, pureMD5, @@ -36,7 +36,9 @@ library time, xml, old-locale, - mtl + mtl, + crypto-api, + http ghc-options: -Wall exposed-modules: Network.TableStorage, From cef0aa6f8668be01be8c79d0bbd3e96726affebb Mon Sep 17 00:00:00 2001 From: Aaron Friel Date: Fri, 14 Dec 2012 16:24:43 -0600 Subject: [PATCH 8/9] packages are case sensitive.... question mark? --- tablestorage.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tablestorage.cabal b/tablestorage.cabal index af1bd38..7007204 100644 --- a/tablestorage.cabal +++ b/tablestorage.cabal @@ -38,7 +38,7 @@ library old-locale, mtl, crypto-api, - http + HTTP ghc-options: -Wall exposed-modules: Network.TableStorage, From 921fea44ab8f59885187bee6726245528112c38c Mon Sep 17 00:00:00 2001 From: Aaron Friel Date: Fri, 14 Dec 2012 16:32:45 -0600 Subject: [PATCH 9/9] Fix dev account scheme to include colon This is just a quirk of switching to http-conduit --- src/Network/TableStorage/Development.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Network/TableStorage/Development.hs b/src/Network/TableStorage/Development.hs index bce8187..2b9a0f0 100644 --- a/src/Network/TableStorage/Development.hs +++ b/src/Network/TableStorage/Development.hs @@ -13,7 +13,7 @@ import Network.TableStorage.Types -- An account for the storage emulator -- developmentAccount :: Account -developmentAccount = Account { accountScheme = "http", +developmentAccount = Account { accountScheme = "http:", accountHost = "127.0.0.1" , accountName = "devstoreaccount1", accountPort = 10002,