chinacity 0.0.1 → 0.1.0

data/lib/chinacity.rb

@@ -19,6 +19,14 @@ parser = OptionParser.new do |opts|
   opts.on('-c', '--csv', 'Output CSV format') do
     options[:format] = :csv
   end
+
+  opts.on('-m', '--minimize', 'Trim spaces to minimize JSON data') do
+    options[:minimize] = true
+  end
+
+  opts.on('-H', '--headless', 'Skip outputing head line for CSV') do
+    options[:headless] = true
+  end
 end
 
 parser.parse!

data/lib/chinacity/cli.rb

@@ -3,6 +3,7 @@ require 'nokogiri'
 require 'chinese_pinyin'
 require 'json'
 require 'httparty'
+require 'csv'
 
 module Chinacity
   HOST = 'http://www.stats.gov.cn'
@@ -11,8 +12,10 @@ module Chinacity
 
   class Cli
     def initialize options
-      @short = options[:short]
-      @foramt = options[:format]
+      @short    = options[:short]
+      @foramt   = options[:format]
+      @minimize = options[:minimize]
+      @headless = options[:headless]
     end
 
     def start
@@ -21,7 +24,7 @@ module Chinacity
 
       add_short_name if @short
 
-      output (@foramt == :json ? to_json : to_csv)
+      @foramt == :json ? output_json : output_csv
     end
 
     private
@@ -74,34 +77,35 @@ module Chinacity
         pretty
       end
 
-      def to_json
-        JSON.pretty_generate(nested_cities)
+      def output_json
+        if @minimize
+          STDOUT.write JSON.generate(nested_cities)
+        else
+          STDOUT.write JSON.pretty_generate(nested_cities)
+        end
       end
 
-      def to_csv
-        list = @short ? [ "id, 名称, 缩写, 层级" ] : ["id, 名称, 层级"]
-
-        list += @cities.map do |city|
-          level = if city[:id].end_with? '0000'
-            1
-          elsif city[:id].end_with? '00'
-            2
-          else
-            3
+      def output_csv
+        CSV do |csv_out|
+          unless @headless
+            list = @short ? ["id", "名称", "缩写", "层级"] : ["id", "名称", "层级"]
+            csv_out << list
           end
 
-          if @short
-            "#{city[:id]}, #{city[:text]}, #{city[:short]}, #{level}"
-          else
-            "#{city[:id]}, #{city[:text]}, #{level}"
-          end
-        end
+          @cities.map do |city|
+            level = if city[:id].end_with? '0000'
+              1
+            elsif city[:id].end_with? '00'
+              2
+            else
+              3
+            end
 
-        list.join("\n")
-      end
+            list = @short ? [city[:id], city[:text], city[:short], level] : [city[:id], city[:text], level]
 
-      def output data
-        STDOUT.write data.to_s
+            csv_out << list
+          end
+        end
       end
   end
 end

data/lib/chinacity/version.rb

@@ -1,3 +1,3 @@
 module Chinacity
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chinacity
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryan Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chinese_pinyin