tenkijp 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d87cb241e6124d2c3e7ae9141f2f6ee9493aa7b
-  data.tar.gz: a169bebf9209ef26a13a5bdb568813772b42834d
+  metadata.gz: 26bd9e8781c571c5276ebe0ac730b56f22b9d520
+  data.tar.gz: 5fbca8ccb2668ff26217992699d9b44f199507e5
 SHA512:
-  metadata.gz: 8aef633bcfd1e6d4631023901146028bcadd12bf9aeb3e488e9b4d4431bb9c1a47f70705450bc9417c618ddf614382daa65a5d6b3155f67fdce5f5767ea746d0
-  data.tar.gz: 7c418c068d3c22edbb9c22b606e3f950e79eea08fee4d4defc294153dc0c2273e843a2c1d6c9594892953d6732890758afed288f333f69745aeee4e9627c1aba
+  metadata.gz: 9a5f9ef505ac4fbc959bba52aa52f69b668c2b8bc69d1b72200a06b02e912704f131c406374dbd352448bf5ef3f35922d8b81aaed85340207b6e417dbf8693c5
+  data.tar.gz: 255b22f6582d35c1929dfb3620023317a745abd06c25e88eb895218b5666507a03193b01ce848885f8a439c4c1787c65a13243cf01c140598d5924538a87e259

data/lib/tenkijp.rb

@@ -13,10 +13,10 @@ module TenkiJp
 
     def to_s
       return <<EOB
-#{@location.full}の天気
-#{two_days.map(&:to_s).join("\n")}
-
+■ #{@location.full}の天気
 #{week.to_s}
+
+#{two_days.map(&:index).join("\n")}
 EOB
     end
 
@@ -27,7 +27,7 @@ EOB
     end
 
     def week
-      Data::Week.new @data['tenweek']['entries']
+      Data::Week.new(@data['days']['entries'], @data['tenweek']['entries'])
     end
   end
 end

data/lib/tenkijp/data.rb

@@ -2,16 +2,18 @@ module TenkiJp
   class Data
 
     class Week
-      def initialize(data)
-        @d = data
+      def initialize(days, tenweek)
+        @days    = days
+        @tenweek = tenweek
       end
 
       def to_s
-        str = "   日付   |   天気   | 降水 | 最低 | 最高\n"
-        str << '-' * 41 + "\n"
-        @d.map { |d|
+        str = "     日付      |     天気     | 最低 | 最高 | 降水 (0時, 6時, 12時, 18時)\n"
+        str << '-' * 74 + "\n"
+        @days.each { |d| str << Day.new(d).to_s }
+        @tenweek.each { |d|
           str << <<EOB
-#{d['dt']}(#{d['dy']}) | #{wh(d['wh'])} |  #{d['p_day']}% |  #{d['min_t']} |  #{d['max_t']}
+#{d['dt']}(#{d['dy']}) | #{wh(d['wh'])} |  #{d['min_t']}  |  #{d['max_t']}  |  #{"%2s" % d['p_day']}%
 EOB
         }
         str
@@ -86,13 +88,19 @@ EOB
       end
 
       def to_s
-        return <<EOB
-■ #{@d['ds']} #{@d['dt']}(#{@d['dy']}) 「#{@d['wt']}」 降水確率: #{@d['p_day']}%
-#{@d['index_str']}
-[気温] 最低: #{@d['min_t']} (#{@d['min_t_d']}), 最高: #{@d['max_t']} (#{@d['max_t_d']})
-[降水確率] 0時: #{@d['p_zero']}%, 6時: #{@d['p_six']}%, 12時: #{@d['p_twelve']}%, 18時: #{@d['p_eighteen']}%
+        w = <<EOB
+#{@d['dt']}(#{@d['dy']}) | #{spaced_wt} |  #{@d['min_t']}  |  #{@d['max_t']}  |  #{"%2s" % @d['p_day']}% (#{@d['p_zero']}%, #{@d['p_six']}%, #{@d['p_twelve']}%, #{@d['p_eighteen']}%)
 EOB
       end
+
+      def spaced_wt
+        wt = @d['wt']
+        wt + (4-wt.size).times.map{'　'}.join
+      end
+
+      def index
+        "#{@d['ds']}は、#{@d['index_str']}。"
+      end
     end
   end
 end

data/lib/tenkijp/version.rb

@@ -1,3 +1,3 @@
 module TenkiJp
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenkijp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - cnosuke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jisx0402
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Get weather informations of Japan