Merge branch 'development'

masa21kik · May 30, 2014 · e37fe0b · e37fe0b
2 parents 6bddc9a + 9a273f8
commit e37fe0b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,10 @@
 
 CSV converter to JSON, YAML, LTSV
 
+[![Build Status](https://travis-ci.org/masa21kik/csvconv.png?branch=master)](https://travis-ci.org/masa21kik/csvconv)
+[![Coverage Status](https://coveralls.io/repos/masa21kik/csvconv/badge.png)](https://coveralls.io/r/masa21kik/csvconv)
+[![Code Climate](https://codeclimate.com/github/masa21kik/csvconv.png?branch=master)](https://codeclimate.com/github/masa21kik/csvconv)
+
 ## Installation
 
 Add this line to your application's Gemfile:

diff --git a/spec/fixtures/books.csv b/spec/fixtures/books.csv
@@ -1,6 +1,6 @@
 Title,Author,Price
-The Fault in Our Stars,John Green,$12.99
-City of Heavenly Fire (The Mortal Instruments),Cassandra Clare,$24.99
-"Oh, The Places You'll Go!",Dr. Seuss,$17.99
-Capital in the Twenty-First Century,Thomas Piketty,$39.95
-Skin Game (Dresden Files),Jim Butcher,$27.95
+The Fault in Our Stars,John Green,12.99
+City of Heavenly Fire (The Mortal Instruments),Cassandra Clare,24.99
+"Oh, The Places You'll Go!",Dr. Seuss,17.99
+Capital in the Twenty-First Century,Thomas Piketty,39.95
+Skin Game (Dresden Files),Jim Butcher,27.95
diff --git a/spec/fixtures/books.json b/spec/fixtures/books.json
@@ -1,5 +1,5 @@
-{"Title":"The Fault in Our Stars","Author":"John Green","Price":"$12.99"}
-{"Title":"City of Heavenly Fire (The Mortal Instruments)","Author":"Cassandra Clare","Price":"$24.99"}
-{"Title":"Oh, The Places You'll Go!","Author":"Dr. Seuss","Price":"$17.99"}
-{"Title":"Capital in the Twenty-First Century","Author":"Thomas Piketty","Price":"$39.95"}
-{"Title":"Skin Game (Dresden Files)","Author":"Jim Butcher","Price":"$27.95"}
+{"Title":"The Fault in Our Stars","Author":"John Green","Price":"12.99"}
+{"Title":"City of Heavenly Fire (The Mortal Instruments)","Author":"Cassandra Clare","Price":"24.99"}
+{"Title":"Oh, The Places You'll Go!","Author":"Dr. Seuss","Price":"17.99"}
+{"Title":"Capital in the Twenty-First Century","Author":"Thomas Piketty","Price":"39.95"}
+{"Title":"Skin Game (Dresden Files)","Author":"Jim Butcher","Price":"27.95"}
diff --git a/spec/fixtures/books.ltsv b/spec/fixtures/books.ltsv
@@ -1,5 +1,5 @@
-Title:The Fault in Our Stars	Author:John Green	Price:$12.99
-Title:City of Heavenly Fire (The Mortal Instruments)	Author:Cassandra Clare	Price:$24.99
-Title:Oh, The Places You'll Go!	Author:Dr. Seuss	Price:$17.99
-Title:Capital in the Twenty-First Century	Author:Thomas Piketty	Price:$39.95
-Title:Skin Game (Dresden Files)	Author:Jim Butcher	Price:$27.95
+Title:The Fault in Our Stars	Author:John Green	Price:12.99
+Title:City of Heavenly Fire (The Mortal Instruments)	Author:Cassandra Clare	Price:24.99
+Title:Oh, The Places You'll Go!	Author:Dr. Seuss	Price:17.99
+Title:Capital in the Twenty-First Century	Author:Thomas Piketty	Price:39.95
+Title:Skin Game (Dresden Files)	Author:Jim Butcher	Price:27.95
diff --git a/spec/fixtures/books.yaml b/spec/fixtures/books.yaml
@@ -1,16 +1,16 @@
 ---
 - Title: The Fault in Our Stars
   Author: John Green
-  Price: "$12.99"
+  Price: '12.99'
 - Title: City of Heavenly Fire (The Mortal Instruments)
   Author: Cassandra Clare
-  Price: "$24.99"
+  Price: '24.99'
 - Title: Oh, The Places You'll Go!
   Author: Dr. Seuss
-  Price: "$17.99"
+  Price: '17.99'
 - Title: Capital in the Twenty-First Century
   Author: Thomas Piketty
-  Price: "$39.95"
+  Price: '39.95'
 - Title: Skin Game (Dresden Files)
   Author: Jim Butcher
-  Price: "$27.95"
+  Price: '27.95'