summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichaelSnoyman <>2016-07-07 15:34:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2016-07-07 15:34:00 (GMT)
commit3d0613a0e6cba4a536c71d76ea595c34ff263b7b (patch)
treeddcfc776be29d25ecb441400d43b3920826fbded
parent86217ab134f0d8a76bab6757334b5ab08b7eefe7 (diff)
version 0.1.2.20.1.2.2
-rw-r--r--ChangeLog.md3
-rw-r--r--LICENSE39
-rw-r--r--README.md1
-rw-r--r--css-text.cabal8
-rw-r--r--runtests.hs7
5 files changed, 31 insertions, 27 deletions
diff --git a/ChangeLog.md b/ChangeLog.md
new file mode 100644
index 0000000..3619eb2
--- /dev/null
+++ b/ChangeLog.md
@@ -0,0 +1,3 @@
+## 0.1.2.2
+
+* Clarified MIT license
diff --git a/LICENSE b/LICENSE
index 8643e5d..d326dd8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,25 +1,20 @@
-The following license covers this documentation, and the source code, except
-where otherwise indicated.
+Copyright (c) 2010 Michael Snoyman, http://www.yesodweb.com/
-Copyright 2010, Michael Snoyman. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
-* Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 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.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..72e4657
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+a haskell css parser
diff --git a/css-text.cabal b/css-text.cabal
index 917b142..cd10659 100644
--- a/css-text.cabal
+++ b/css-text.cabal
@@ -1,6 +1,6 @@
name: css-text
-version: 0.1.2.1
-license: BSD3
+version: 0.1.2.2
+license: MIT
license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com>
maintainer: Michael Snoyman <michael@snoyman.com>, Greg Weber <greg@gregweber.info>
@@ -10,7 +10,7 @@ stability: Stable
cabal-version: >= 1.8
build-type: Simple
homepage: http://www.yesodweb.com/
-extra-source-files: runtests.hs
+extra-source-files: runtests.hs README.md ChangeLog.md
library
build-depends: base >= 4 && < 5
@@ -31,4 +31,4 @@ test-suite runtests
source-repository head
type: git
- location: git://github.com/yesodweb/css-text.git
+ location: https://github.com/yesodweb/css-text.git
diff --git a/runtests.hs b/runtests.hs
index d0b494a..1f41f14 100644
--- a/runtests.hs
+++ b/runtests.hs
@@ -69,7 +69,12 @@ newtype Blocks = Blocks { unBlocks :: [(Text, [(Text, Text)])] }
deriving (Show, Eq)
instance Arbitrary NestedBlock where
- arbitrary = (LeafBlock . unBlock) `liftM` arbitrary
+ arbitrary = frequency
+ [ (80, (LeafBlock . unBlock) `liftM` arbitrary)
+ , (10, do mediatype <- elements ["print", "screen", "(min-width:768px)"]
+ contents <- arbitrary
+ return (NestedBlock mediatype contents))
+ ]
instance Arbitrary Blocks where
arbitrary = fmap (Blocks . map unBlock) arbitrary