running_track 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b907c613d034e27bfb6ebd608be9e4d9b138cbc3
-  data.tar.gz: b3defbf16fad3aa13c039aa7cce8d8a1e456b4a0
+  metadata.gz: cdd0326722779420f2e50e8eac5bca59061a8072
+  data.tar.gz: 62c43e136f2296111b6e4ead9027f7f5b6159fbb
 SHA512:
-  metadata.gz: 5041cb6201770c0444b57a693bd42c81fdbc6ef3318c465d9e4472d20eaea897556e4c2669277f6c5babf339a767817e47b8fc03b646585bf00f35dba2067859
-  data.tar.gz: b109edf81c1c178a1f9b49c6b5f6bb914711ede52f006448f0166204363d30dec05c2f0d1f7550eed6de1db97701efb3b66b0c47378f95db80c91130410a5f2b
+  metadata.gz: 32da896e080dc9ab17d28d522aba7e4d613f18efde57d3f725cf20c87003fe4638d5e221cbfdb961cf99f796066c1b938942a4b688279857f0c7e7b84c86f31c
+  data.tar.gz: 7b515a4732a94260360199d59d5dc00bfe0f52aea4480a3cb796a0c9ebefc4a2886c7be99f133a86510b42b7c33f5a10d69f9438468e0c44579e010ccd91e2ec

data/lib/running_track.rb

@@ -1,42 +1,13 @@
 require_relative 'running_track/data'
 require_relative 'running_track/table'
 
-
 module RunningTrack
 
-  # @cache = {}
-
-  # # def self.headers
-  # # end
-
-  def self.print type = :web
-    # data(type).print
-    data(type).print
-  #   @cache[type].print
-  end
-
-  # def self.show_cache
-  #   @cache
-  # end
-
-  # def self.drop_cache!
-  #   @cache = {}
-  # end
-
-
-  private
-
-  def self.data type
-    data = Data.import type
-    Table.new data
-  #   @cache[type] ||= Table.new data
+  def self.print
+    data = Data.import
+    Table.new(data).print
   end
 
 end
 
-# puts RunningTrack.print(:file)
-# RunningTrack.drop_cache!
-# RunningTrack.print :file
-# p RunningTrack.show_cache.keys
-
-
+# RunningTrack.print

data/lib/running_track/data.rb

@@ -1,18 +1,13 @@
-# encoding: utf-8
-
 require 'open-uri'
 
 module RunningTrack
   module Data
 
-    DATA_PATH = File.expand_path '../../data/Беговые дорожки.csv', __FILE__
-    DATA_URL = "http://data.mos.ru/datasets/download/899"
+    DATA_URL = "http://api.data.mos.ru/v1/datasets/899/rows"
 
-    def self.import source
-      path = source == :web ? DATA_URL : DATA_PATH
-      open path
+    def self.import
+      open DATA_URL
     end
 
   end
-end
-
+end

data/lib/running_track/table.rb

@@ -1,34 +1,33 @@
+require 'json'
+require 'active_support/core_ext/hash/slice'
 require 'terminal-table'
 
 module RunningTrack
   class Table
 
-    SPLITTER = ';'
-
-    attr_reader :rows
+    HEADINGS = ["District", "Address", "HelpPhone", "ObjectHasWifi"]
 
     def initialize data
-      puts "[RunningTrack::Table]: Create running track table"
       @rows = prepare data
     end
 
     def print
-      @table ||= create_table
-    #   puts @table
+        @table ||= create_table
+        puts @table
     end
 
 
-    # private
+    private
 
     def prepare data
-      data.map{ |line| line.split(SPLITTER) }
+      JSON.parse(data.read).map! do |row|
+        row['Cells'].slice(*HEADINGS).values
+      end
     end
 
     def create_table
-      puts "[RunningTrack::Table]: Create terminal table"
-      headings = @rows.shift
       sep_rows = @rows.zip(Array.new(@rows.count - 1){ :separator }).flatten(1).compact
-      Terminal::Table.new headings: headings, rows: sep_rows
+      Terminal::Table.new rows: sep_rows, headings: HEADINGS
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: running_track
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Evgeniy Fateev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table