Merge pull request #32 from palf/update-dependencies

updating dependencies and using generalised `unwrap`

Author: joneshf

.travis.yml

@@ -3,10 +3,9 @@ sudo: false
 node_js:
   - 0.10
 install:
-  - npm install -g bower gulp
+  - npm install -g bower
   - npm install
   - bower install --production
 script:
-  - gulp psc
-  - bower install
-  - gulp test
+  - npm run build
+  - npm run test

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "purescript-lens",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "PureScript implementation of Lens.",
   "license": "MIT",
   "homepage": "https://github.com/joneshf/purescript-lens",
@@ -24,12 +24,11 @@
     "tests"
   ],
   "dependencies": {
-    "purescript-const": "^1.0.0",
-    "purescript-distributive": "^1.0.0",
-    "purescript-profunctor": "^1.0.0"
+    "purescript-const": "^2.0.0",
+    "purescript-distributive": "^2.0.0",
+    "purescript-profunctor": "^2.0.0"
   },
   "devDependencies": {
-    "purescript-psci-support": "^1.0.0",
-    "purescript-console": "^1.0.0"
+    "purescript-console": "^2.0.0"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "purescript-lens",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "PureScript implementation of Lens",
   "license": "MIT",
   "homepage": "https://github.com/joneshf/purescript-lens",

src/Optic/Getter.purs

@@ -5,9 +5,10 @@ module Optic.Getter
   , weiv
   ) where
 
-  import Data.Const (getConst, Const(..))
+  import Data.Const (Const(..))
   import Data.Functor.Contravariant (class Contravariant, coerce)
   import Data.Profunctor (class Profunctor, dimap)
+  import Data.Newtype (unwrap)
 
   import Optic.Types (Getting())
 
@@ -19,7 +20,7 @@ module Optic.Getter
   to s2a = dimap s2a coerce
 
   view :: forall s a. Getting a s a -> s -> a
-  view asa s = getConst (asa Const s)
+  view asa s = unwrap (asa Const s)
 
   weiv :: forall s a. s -> Getting a s a -> a
   weiv = flip view

src/Optic/Internal/Setter.purs

@@ -1,7 +1,8 @@
 module Optic.Internal.Setter where
 
   import Data.Distributive (class Distributive)
-  import Data.Identity (runIdentity, Identity(..))
+  import Data.Identity (Identity(..))
+  import Data.Newtype (unwrap)
   import Data.Profunctor (rmap, class Profunctor)
   import Data.Traversable (class Traversable)
 
@@ -14,5 +15,5 @@ module Optic.Internal.Setter where
 
   instance settableIdentity :: Settable Identity where
     untainted (Identity x) = x
-    untaintedDot = rmap runIdentity
+    untaintedDot = rmap unwrap
     taintedDot = rmap Identity

src/Optic/Prism.purs

@@ -11,8 +11,9 @@ module Optic.Prism
   ) where
 
   import Data.Either (either, Either(..))
-  import Data.Identity (runIdentity, Identity(..))
+  import Data.Identity (Identity(..))
   import Data.Maybe (maybe, Maybe(..))
+  import Data.Newtype (unwrap)
   import Data.Profunctor (dimap)
   import Data.Profunctor.Choice (right, class Choice)
 
@@ -55,4 +56,4 @@ module Optic.Prism
 
   withPrism :: forall b r a t s. APrism s t a b -> ((b -> t) -> (s -> Either t a) -> r) -> r
   withPrism stab f = case stab (Market Identity Right) of
-    Market b2t s2Eta -> f (runIdentity <<< b2t) (s2Eta >>> either (runIdentity >>> Left) Right)
+    Market b2t s2Eta -> f (unwrap <<< b2t) (s2Eta >>> either (unwrap >>> Left) Right)

src/Optic/Setter.purs

@@ -18,8 +18,9 @@ module Optic.Setter
   ) where
 
   import Data.Functor.Contravariant ((>$<), class Contravariant)
-  import Data.Identity (runIdentity, Identity(..))
+  import Data.Identity (Identity(..))
   import Data.Maybe (Maybe(..))
+  import Data.Newtype (unwrap)
   import Data.Profunctor (lmap, rmap, class Profunctor)
 
   import Optic.Internal.Setter (taintedDot, untaintedDot, class Settable)
@@ -52,13 +53,13 @@ module Optic.Setter
   mapped = sets (<$>)
 
   over :: forall p s t a b. Profunctor p => Setting p s t a b -> p a b -> s -> t
-  over pstab pab = runIdentity <<< pstab (rmap Identity pab)
+  over pstab pab = unwrap <<< pstab (rmap Identity pab)
 
   set :: forall s t a b. ASetter s t a b -> b -> s -> t
-  set stab b = runIdentity <<< stab (Identity <<< const b)
+  set stab b = unwrap <<< stab (Identity <<< const b)
 
   set' :: forall s a. ASetter' s a -> a -> s -> s
-  set' sa a = runIdentity <<< sa (Identity <<< const a)
+  set' sa a = unwrap <<< sa (Identity <<< const a)
 
   sets :: forall p q f s t a b. (Profunctor p, Profunctor q, Settable f) => (p a b -> q s t) -> Optical p q f s t a b
   sets pab2qst = untaintedDot >>> pab2qst >>> taintedDot