Merge pull request #9 from 23prime/develop

Release v1.0.9

.github/workflows/test.yml

@@ -34,8 +34,8 @@ jobs:
         plan:
           - ghc: 9.4.8
             resolver: lts-21.25
-          - ghc: 9.6.5
-            resolver: lts-22.25
+          - ghc: 9.6.6
+            resolver: lts-22.40
           - ghc: 9.8.2
             resolver: nightly
           - ghc: latest

oeis2.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           oeis2
-version:        1.0.8
+version:        1.0.9
 synopsis:       Interface for Online Encyclopedia of Integer Sequences (OEIS).
 description:    Release notes are here https://github.com/23prime/oeis2/releases
 category:       Math
@@ -36,7 +36,7 @@ library
   build-depends:
       aeson ==2.*
     , base >=4.17 && <5
-    , containers >=0.5 && <0.7
+    , containers >=0.5 && <0.8
     , http-conduit >=2.2 && <3
     , lens >=4.15 && <6
     , lens-aeson >=1.2 && <2
@@ -56,7 +56,7 @@ test-suite oeis2-test
       QuickCheck
     , aeson ==2.*
     , base >=4.17 && <5
-    , containers >=0.5 && <0.7
+    , containers >=0.5 && <0.8
     , hspec
     , http-conduit >=2.2 && <3
     , lens >=4.15 && <6

package.yaml

@@ -1,5 +1,5 @@
 name:                oeis2
-version:             1.0.8
+version:             1.0.9
 github:              "23prime/oeis2"
 license:             BSD3
 author:              "Taisuke Hikawa"
@@ -19,7 +19,7 @@ dependencies:
 - text         >= 2     && < 3
 - vector       >= 0.13  && < 0.14
 - aeson        >= 2     && < 3
-- containers   >= 0.5   && < 0.7
+- containers   >= 0.5   && < 0.8
 - lens         >= 4.15  && < 6
 - lens-aeson   >= 1.2   && < 2
 - http-conduit >= 2.2   && < 3

src/Math/OEIS/Internal.hs

@@ -3,10 +3,11 @@
 
 module Math.OEIS.Internal where
 
-import           Control.Lens        ((^?), (^?!))
+import           Control.Lens        ((^?!), (^?))
 import           Control.Monad       (when)
-import           Data.Aeson.Lens
+import           Data.Aeson          (decodeStrict)
 import           Data.Aeson.Key      (fromText)
+import           Data.Aeson.Lens
 import           Data.Aeson.Types
 import           Data.Char
 import           Data.Functor
@@ -86,7 +87,7 @@ getResults :: SearchStatus -> Int -> Int -> V.Vector Value -> IO (V.Vector Value
 getResults ss start bound vs = do
   when (bound < 0) $ fail "Upper-bound number of search results mast be non-negative."
   jsn <- getJSON ss start
-  let results' = jsn ^? key "results" . _Array
+  let results' = decodeStrict $ T.encodeUtf8 jsn :: Maybe Array
       results = case results' of
         Nothing  -> return []
         Just vs' ->

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-22.25
+resolver: lts-22.40
 
 packages:
 - '.'

test/Spec.hs

@@ -38,14 +38,14 @@ specLookupSeq = describe "Test for lookupSeq" $ do
     maple <$> lookupSeq (ID "A000027") `shouldBe`
     Just ["A000027 := n->n; seq(A000027(n), n=1..100);"]
   it "No search results" $
-    lookupSeq (SubSeq [1,3,4,5,4,3,6]) `shouldBe` Nothing
+    lookupSeq (SubSeq [1,3,4,5,4,3,6,10000000]) `shouldBe` Nothing
 
 specGetSeqData :: Spec
 specGetSeqData = describe "Test for getSeqData" $ do
   it "Get SeqData" $
     getSeqData (ID "A000027")`shouldBe` Just [1..77]
   it "No SeqData" $
-    getSeqData (SubSeq [1,3,4,5,4,3,6]) `shouldBe` Nothing
+    getSeqData (SubSeq [1,3,4,5,4,3,6,10000000]) `shouldBe` Nothing
 
 specExtendSeq :: Spec
 specExtendSeq = describe "Test for extendSeq" $ do
@@ -55,5 +55,4 @@ specExtendSeq = describe "Test for extendSeq" $ do
         seq = extendSeq rs
     in rs `isInfixOf` seq
   it "No extension" $
-    extendSeq [1,3,4,5,4,3,6] `shouldBe` [1,3,4,5,4,3,6]
-
+    extendSeq [1,3,4,5,4,3,6,10000000] `shouldBe` [1,3,4,5,4,3,6,10000000]