hebrew-time 0.0.1 → 0.1.0

raw patch · 2 files changed

+51/−71 lines, 2 filesdep −data-objectdep −failuredep −safe-failuredep ~timePVP ok

version bump matches the API change (PVP)

Dependencies removed: data-object, failure, safe-failure

Dependency ranges changed: time

API changes (from Hackage documentation)

Files

• Data/Time/Calendar/Hebrew.hs +48/−65
• hebrew-time.cabal +3/−6

@@ -17,10 +17,13 @@ -- --------------------------------------------------------- module Data.Time.Calendar.Hebrew-    ( HebrewDate (..)+    ( -- * Data types+      HebrewDate (..)     , Month (..)+      -- * Conversions     , fromHebrew     , toHebrew+    , monthHebrew       -- * Anniversaries     , anniversaryInYear     , nextAnniversary@@ -30,17 +33,15 @@ #endif     ) where -import Control.Applicative ((<$>))-import Control.Arrow-import Control.Monad-import Data.Time.Calendar (Day (..), fromGregorian)-import Data.Time.Calendar.WeekDate (toWeekDate) import Data.Typeable (Typeable)-import Control.Exception (Exception)-import qualified Safe.Failure as SF-import Control.Failure+import Data.Data (Data)+import Control.Arrow+import Data.Time.Calendar (Day (..))  #if TEST+import Control.Applicative ((<$>))+import Data.Time.Calendar.WeekDate (toWeekDate)+import Data.Time.Calendar (fromGregorian) import Test.Framework (testGroup, Test) import Test.Framework.Providers.HUnit import Test.Framework.Providers.QuickCheck (testProperty)@@ -48,38 +49,31 @@ import Test.QuickCheck #endif -import Data.Object- ------ data definitions data Month = Tishrei | Cheshvan | Kislev | Tevet | Shevat            | Adar | Adar1 | Adar2            | Nissan | Iyar | Sivan | Tammuz | Av | Elul-    deriving (Eq, Ord, Show, Enum, Read)+    deriving (Eq, Ord, Show, Enum, Read, Data, Typeable) data YearType = Chaser | Ksidran | Shlema     deriving (Eq, Ord, Show, Enum) data YearLeap = Leap | NonLeap     deriving (Eq, Ord, Show, Enum) -{- FIXME use some translation package-instance CanTranslate Month where-    tryTranslate x "en" = Just $ convertSuccess $ show x-    tryTranslate Tishrei "he" = Just "תשרי"-    tryTranslate Cheshvan "he" = Just "חשון"-    tryTranslate Kislev "he" = Just "כסלו"-    tryTranslate Tevet "he" = Just "טבת"-    tryTranslate Shevat "he" = Just "שבט"-    tryTranslate Adar "he" = Just "אדר"-    tryTranslate Adar1 "he" = Just "אדר א"-    tryTranslate Adar2 "he" = Just "אדר ב"-    tryTranslate Nissan "he" = Just "ניסן"-    tryTranslate Iyar "he" = Just "אייר"-    tryTranslate Sivan "he" = Just "סיון"-    tryTranslate Tammuz "he" = Just "תמוז"-    tryTranslate Av "he" = Just "אב"-    tryTranslate Elul "he" = Just "אלול"--    defaultTranslate = convertSuccess . show--}+monthHebrew :: Month -> String+monthHebrew Tishrei = "תשרי"+monthHebrew Cheshvan = "חשון"+monthHebrew Kislev = "כסלו"+monthHebrew Tevet = "טבת"+monthHebrew Shevat = "שבט"+monthHebrew Adar = "אדר"+monthHebrew Adar1 = "אדר א"+monthHebrew Adar2 = "אדר ב"+monthHebrew Nissan = "ניסן"+monthHebrew Iyar = "אייר"+monthHebrew Sivan = "סיון"+monthHebrew Tammuz = "תמוז"+monthHebrew Av = "אב"+monthHebrew Elul = "אלול"  ------ newtypes newtype Chalakim = Chalakim Integer@@ -173,6 +167,18 @@                 _ -> NonLeap     in res +monthsTilTishrei :: Years -> Months+monthsTilTishrei (Years i) = Months $ (235 * i - 234) `div` 19++#if TEST+case_monthsTilTishrei :: Assertion+case_monthsTilTishrei = do+    0 @=? monthsTilTishrei 1+    12 @=? monthsTilTishrei 2+    24 @=? monthsTilTishrei 3+    37 @=? monthsTilTishrei 4+    235 @=? monthsTilTishrei 20+ extraMonthCount :: Years -> Months extraMonthCount i =     case i of@@ -197,9 +203,6 @@         18 -> 6         _ -> error $ "extraMonthCount: " ++ show i -monthsTilTishrei :: Years -> Months-monthsTilTishrei (Years i) = Months $ (235 * i - 234) `div` 19- monthsTilTishreiLong :: Years -> Months monthsTilTishreiLong (Years y') =     let (machzorim, y) = (y' - 1) `divMod` 19@@ -207,15 +210,6 @@         extra = extraMonthCount $ Years y      in base + extra -#if TEST-case_monthsTilTishrei :: Assertion-case_monthsTilTishrei = do-    0 @=? monthsTilTishrei 1-    12 @=? monthsTilTishrei 2-    24 @=? monthsTilTishrei 3-    37 @=? monthsTilTishrei 4-    235 @=? monthsTilTishrei 20- prop_monthsTilTishrei :: Years -> Bool prop_monthsTilTishrei y = monthsTilTishrei y == monthsTilTishreiLong y #endif@@ -271,14 +265,6 @@ monthLength _ _ Kislev = 30  ------ conversion functions-julianFromDate :: YearLeap -> YearType -> Month -> Date -> Julian-julianFromDate yl yt m d =-    let ml = monthLength yl yt-        months = case m of-            Tishrei -> []-            _ -> enumFromTo Tishrei (pred m)-     in d + sum (map ml months)- dateFromJulian :: YearLeap -> YearType -> Julian -> (Month, Date) dateFromJulian yl yt j' =     let ml = monthLength yl yt@@ -291,6 +277,14 @@      in helper Tishrei j'  #if TEST+julianFromDate :: YearLeap -> YearType -> Month -> Date -> Julian+julianFromDate yl yt m d =+    let ml = monthLength yl yt+        months = case m of+            Tishrei -> []+            _ -> enumFromTo Tishrei (pred m)+     in d + sum (map ml months)+ prop_dateToFromJulian :: YearLeap -> YearType -> Julian -> Bool prop_dateToFromJulian yl yt j =     j == uncurry (julianFromDate yl yt) (dateFromJulian yl yt j)@@ -326,14 +320,12 @@ #if TEST case_firstRoshHashana :: Assertion case_firstRoshHashana = roshHashana 1 @?= 1-#endif  dayOfWeek :: TotalDays -> Weekday dayOfWeek t =     let (_, w) = weeksFromDays t      in w -#if TEST prop_validRoshHashanaDay :: Years -> Bool prop_validRoshHashanaDay = (`elem` [1, 2, 4, 6]) . dayOfWeek . roshHashana #endif@@ -382,7 +374,7 @@     , month :: Month     , date :: Int     }-    deriving Eq+    deriving (Eq, Data, Typeable) instance Show HebrewDate where     show (HebrewDate y m d) = show d ++ " " ++ show m ++ ", " ++ show y @@ -488,7 +480,7 @@ nextAnniversary :: HebrewDate -- ^ so to say current date                 -> HebrewDate -- ^ date of event                 -> HebrewDate -- ^ first anniversary of event after current-nextAnniversary (HebrewDate cy cm cd) hd@(HebrewDate y m d)+nextAnniversary (HebrewDate cy cm cd) hd@(HebrewDate _y m d)     | cm > m || cm == m && cd > d = anniversaryInYear (cy + 1) hd     | otherwise = anniversaryInYear cy hd @@ -555,12 +547,3 @@         day <- (+ 1) . (`mod` 29) <$> arbitrary         return $! HebrewDate y m day #endif------- Data.Object.Text instances-instance ConvertSuccess Month String where-    convertSuccess = show-instance ConvertAttempt String Month where-    convertAttempt s = wrapFailure (\_ -> InvalidHebrewMonth s) $ SF.read s-data InvalidHebrewMonth = InvalidHebrewMonth String-    deriving (Show, Typeable)-instance Exception InvalidHebrewMonth

@@ -1,5 +1,5 @@ name:            hebrew-time-version:         0.0.1+version:         0.1.0 license:         BSD3 license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>@@ -7,7 +7,7 @@ synopsis:        Hebrew dates and prayer times. description:     Conversion to and from Hebrew dates. category:        Data-stability:       unstable+stability:       stable cabal-version:   >= 1.2 build-type:      Simple homepage:        http://github.com/snoyberg/hebrew-time/tree/master@@ -18,10 +18,7 @@  library     build-depends:   base >= 4 && < 5,-                     time >= 1.1.3 && < 1.2,-                     data-object >= 0.2.0 && < 0.3,-                     failure >= 0.0.0 && < 0.1,-                     safe-failure >= 0.4.0 && < 0.5+                     time >= 1.1.3 && < 1.3     exposed-modules: Data.Time.Calendar.Hebrew     ghc-options:     -Wall