Merge pull request #2 from slamdata/0.7-updates

Updates for 0.7

Author: jdegoes

.gitignore

@@ -1,9 +1,6 @@
-bower_components
-coverage
-dist
-node_modules
-public
-.psci
-.psci_modules
-.publish
-site/psc.js
+/.*
+!/.gitignore
+!/.travis.yml
+/bower_components/
+/node_modules/
+/output/

.travis.yml

@@ -0,0 +1,15 @@
+language: node_js
+sudo: false
+node_js:
+  - 0.10
+env:
+  - TAG=v0.7.0 PATH=$HOME/bin:$PATH
+install:
+  - mkdir $HOME/bin
+  - wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
+  - tar zxvf $HOME/purescript.tar.gz -C $HOME/bin purescript/psc{,i,-docs,-bundle,-publish} --strip-components=1
+  - chmod a+x $HOME/bin/psc{,i,-docs,-bundle,-publish}
+  - npm install bower gulp -g
+  - npm install && bower install
+script:
+  - gulp

bower.json

@@ -1,6 +1,5 @@
 {
   "name": "purescript-css",
-  "version": "0.0.0",
   "authors": [
     "Brian McKenna <[email protected]>"
   ],
@@ -18,15 +17,13 @@
     "tests"
   ],
   "dependencies": {
-    "purescript-math": "~0.1.1",
-    "purescript-nonempty-arrays": "~0.2.0",
-    "purescript-profunctor": "~0.2.1",
-    "purescript-strings": "~0.4.5",
-    "purescript-these": "~0.2.0",
-    "purescript-transformers": "~0.5.4"
+    "purescript-nonempty-arrays": "garyb/purescript-nonempty-array#0.7-updates",
+    "purescript-profunctor": "^0.3.0",
+    "purescript-strings": "^0.5.2",
+    "purescript-these": "^0.3.0",
+    "purescript-transformers": "^0.6.1"
   },
   "devDependencies": {
-    "purescript-exceptions": "~0.2.3",
-    "purescript-dom": "~0.1.2"
+    "purescript-exceptions": "^0.3.0"
   }
 }

gulpfile.js

@@ -1,18 +1,34 @@
-var gulp = require('gulp')
-  , browserify  = require('gulp-browserify')
-  , purescript  = require('gulp-purescript')
-  , ghPages = require('gulp-gh-pages');
+/* jshint node: true */
+"use strict";
 
-require("mandragora-bucket")(gulp);
+var gulp = require("gulp");
+var purescript = require("gulp-purescript");
+var run = require("gulp-run");
 
-gulp.task('site', function() {
-  return gulp.src(['site/Main.purs', 'src/**/*.purs', 'bower_components/purescript-*/src/**/*.purs']).pipe(purescript.psc({
-    main: 'Site',
-    modules: ['Site']
-  })).pipe(browserify({})).pipe(gulp.dest('site'));
+var sources = [
+  "src/**/*.purs",
+  "bower_components/purescript-*/src/**/*.purs",
+  "test/**/*.purs"
+];
+
+var foreigns = [
+  "src/**/*.js",
+  "bower_components/purescript-*/src/**/*.js",
+  "test/**/*.js"
+];
+
+gulp.task("make", function() {
+  return purescript.psc({ src: sources, ffi: foreigns });
 });
 
-gulp.task('deploy', ['site'], function() {
-  return gulp.src('site/**/*')
-    .pipe(ghPages());
+gulp.task("test", ["make"], function() {
+  return purescript.pscBundle({ src: "output/**/*.js", main: "Test.Main" })
+    .pipe(run("node"));
 });
+
+gulp.task("dotpsci", function () {
+  return purescript.psci({ src: sources, ffi: foreigns })
+    .pipe(gulp.dest("."));
+});
+
+gulp.task("default", ["test", "dotpsci"]);

package.json

@@ -1,11 +1,10 @@
 {
-  "dependencies": {
-    "gulp": "^3.8.11",
-    "mandragora-bucket": "^0.2.3"
-  },
+  "private": true,
   "devDependencies": {
-    "gulp-browserify": "^0.5.1",
-    "gulp-gh-pages": "^0.5.0",
-    "gulp-purescript": "^0.3.1"
+    "gulp": "^3.8.11",
+    "gulp-jscs": "^1.6.0",
+    "gulp-jshint": "^1.11.2",
+    "gulp-purescript": "^0.5.0",
+    "gulp-run": "^1.6.8"
   }
 }

src/Css/Animation.purs

@@ -1,5 +1,6 @@
 module Css.Animation where
 
+import Prelude
 import Css.Property
 import Css.String
 import Css.Stylesheet

src/Css/Background.purs

@@ -1,5 +1,6 @@
 module Css.Background where
 
+import Prelude
 import Css.Color
 import Css.Property
 import Css.String

src/Css/Border.purs

@@ -1,5 +1,6 @@
 module Css.Border where
 
+import Prelude
 import Css.Color
 import Css.Property
 import Css.Size

src/Css/Color.purs

@@ -1,11 +1,11 @@
 module Css.Color where
 
+import Prelude
 import Css.Property
 import Css.String
 import Data.Foldable
-import Math hiding (tan)
 
-data Color = Rgba Number Number Number Number
+data Color = Rgba Int Int Int Int
            | Hsla Number Number Number Number
            | Other Value
 
@@ -17,14 +17,14 @@ instance valColor :: Val Color where
   value (Rgba r g b a) = Value <<< fromString $ "rgba(" <> intercalate ", " [show r, show g, show b, show a] <> ")"
   value (Other v) = v
 
-rgba :: Number -> Number -> Number -> Number -> Color
+rgba :: Int -> Int -> Int -> Int -> Color
 rgba = Rgba
 
-rgb :: Number -> Number -> Number -> Color
+rgb :: Int -> Int -> Int -> Color
 rgb r g b = Rgba r g b 255
 
-clamp :: Number -> Number
-clamp = max 0 <<< min 255
+clamp :: Int -> Int
+clamp n = if n < 0 then 0 else if n > 255 then 255 else n
 
 aliceblue            = rgb 240 248 255
 antiquewhite         = rgb 250 235 215

src/Css/Display.purs

@@ -1,5 +1,6 @@
 module Css.Display where
 
+import Prelude
 import Css.Property
 import Css.String
 import Css.Stylesheet