google-dictionary 0.1.0.0 → 0.1.0.1

raw patch · 3 files changed

+33/−29 lines, 3 files

Files

• Network/API/GoogleDictionary.hs +32/−7
• Network/API/GoogleDictionary/Internal.hs +0/−21
• google-dictionary.cabal +1/−1

@@ -1,19 +1,25 @@ {-# LANGUAGE TemplateHaskell #-}  module Network.API.GoogleDictionary-    ( Entry(..)+    ( Definition+    , Entry(..)+    , PartOfSpeech     , lookupWord+    , getResponse     , module Network.API.GoogleDictionary.Types     ) where -import Data.Maybe  (catMaybes)-import Data.Monoid (First(..), mconcat)+import           Data.Aeson                 (eitherDecode)+import qualified Data.ByteString.Lazy.Char8 as BS+import           Data.List                  (dropWhileEnd)+import           Data.Maybe                 (catMaybes)+import           Data.Monoid                (First(..), mconcat)  import Network.API.GoogleDictionary.Internal import Network.API.GoogleDictionary.Types  type PartOfSpeech = String-type Definition = String+type Definition   = String  data Entry = Entry     { entryWord :: !String@@ -30,8 +36,10 @@ lookupWord :: String -> IO (Maybe Entry) lookupWord word = lookupWord' (const Nothing) (Just . makeEntry word) word +{- lookupWordDebug :: String -> IO (Either String Entry) lookupWordDebug word = lookupWord' Left (Right . makeEntry word) word+-}  lookupWord' :: (String -> a) -> (Response -> a) -> String -> IO a lookupWord' left right = fmap (either left right) . getResponse@@ -44,10 +52,10 @@   where     step :: Primary -> Entry -> Entry     step (Primary pentries terms _) =-        let pos = primaryTermsToPartOfSpeech terms+        let pos  = primaryTermsToPartOfSpeech terms             defs = pentriesToDefinitions pentries-            s = [(pos,d) | d <- defs]-        in (\(Entry w dat) -> Entry w (dat++s))+            s    = [(pos,d) | d <- defs]+        in (\(Entry w dat) -> Entry w (s++dat))  primaryTermsToPartOfSpeech :: [Term] -> PartOfSpeech primaryTermsToPartOfSpeech = maybe (error "primaryTermsToPartOfSpeech: no part of speech found") id . f@@ -82,3 +90,20 @@     f :: Term -> Maybe Definition     f (Term _ _ def TText) = Just def     f _ = Nothing++getResponse :: String -> IO (Either String Response)+getResponse word = do+    let url = "http://www.google.com/dictionary/json?callback=a&sl=en&tl=en&q=" ++ word+    fmap (decodeHex . trimResponse) (getJson url) >>= maybe badContents goodContents+  where+    -- | Trim off the boiler plate callback characters, because JSONP is returned.+    -- Hard-code "2" because "callback=a" is also hard-coded, so the first two+    -- characters are "a("+    trimResponse :: String -> String+    trimResponse = dropWhileEnd (/= '}') . drop 2++    badContents :: IO (Either String Response)+    badContents = return (Left "invalid hex code encountered")++    goodContents :: String -> IO (Either String Response)+    goodContents = return . eitherDecode . BS.pack

@@ -1,31 +1,10 @@ module Network.API.GoogleDictionary.Internal where  import           Control.Applicative-import           Data.Aeson                 (eitherDecode) import           Data.Char                  (chr) import           Data.List                  (dropWhileEnd) import           Network.HTTP               (getRequest, getResponseBody, simpleHTTP) import           Numeric                    (readHex)-import qualified Data.ByteString.Lazy.Char8 as BS--import Network.API.GoogleDictionary.Types--getResponse :: String -> IO (Either String Response)-getResponse word = do-    let url = "http://www.google.com/dictionary/json?callback=a&sl=en&tl=en&q=" ++ word-    fmap (decodeHex . trimResponse) (getJson url) >>= maybe badContents goodContents-  where-    -- | Trim off the boiler plate callback characters, because JSONP is returned.-    -- Hard-code "2" because "callback=a" is also hard-coded, so the first two-    -- characters are "a("-    trimResponse :: String -> String-    trimResponse = dropWhileEnd (/= '}') . drop 2--    badContents :: IO (Either String Response)-    badContents = return (Left "invalid hex code encountered")--    goodContents :: String -> IO (Either String Response)-    goodContents = return . eitherDecode . BS.pack  getJson :: String -> IO String getJson url = simpleHTTP (getRequest url) >>= getResponseBody

@@ -1,5 +1,5 @@ name:                google-dictionary-version:             0.1.0.0+version:             0.1.0.1 synopsis:            Simple interface to the google.com/dictionary API homepage:            https://github.com/mitchellwrosen/google-dictionary-api license:             BSD3