weer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25092b01a78355aed6966fa35c67d29c01649efa
-  data.tar.gz: 1677fd4f5c120df9869dd4a1cc0918c1eec7d194
+  metadata.gz: 39ba03cfb5acbdb5f0c3d906a81f2f2c30c61de4
+  data.tar.gz: 1518c689b6ec15a967d07608dd63398ee0c382a6
 SHA512:
-  metadata.gz: 40dbcc727b28077f8a4e62de549603ac59e083dbbcf1c113493195d9a6b104a2e97590f011a5f8aee09e8b8e416a5ccb76301192baf3064b7bfb5b58ececa98c
-  data.tar.gz: 2dc64cf0dd3c48f22626736ded173f951189ff7840ea4890bcd93c14b4adf700433ea83f77ea311053ad27a2797de8f3cb3fefad31dab411deb8b4cfd4167b08
+  metadata.gz: a2f854a55055c5c1755ecd8461d3f1212e3ad4b26a47415deb7bf5d607d039795767a2097c3e40f1c3474881d3e97a5259bcc1c26905fdc5c721ab6c66d95ce1
+  data.tar.gz: d171493dc11a20253bb2de2698ae6654d37083df4dae0e685ec46cf8c6ce1089cb7636924cef06f96df123172499498ef26c76cb1a136c3eb9eacb493b72168e

data/lib/weer.rb

@@ -1,6 +1,6 @@
 require 'weer/version'
 require 'weer/cli'
-require 'weer/error'
+require 'weer/invalid_city'
 
 module Weer
   # Your code goes here

data/lib/weer/cli/weather.rb

@@ -21,23 +21,23 @@ module Weer
         wetter = Wetter.new options[:city]
         response = wetter.connect
 
-        raise FakeURLInvalid if response['query']['results'].nil?
+        raise InvalidCity, "Oops, hey man! looks like your city is wrong" if response['query']['results'].nil?
         forecasts = wetter.forecast response
 
-        puts Rainbow("============= The forecast(#{options[:temperature]}) of #{options[:city].upcase!} in the next coming days =============").green
+        puts Rainbow(" The forecast(#{options[:temperature]}) of #{options[:city].upcase!} in the next coming days ".center(80, '=')).green
         puts Rainbow(wetter.parse_forecast forecasts, temperature).orange
 
         if options[:all]
           wind = wetter.wind response
 
           puts "\n"
-          puts Rainbow("========================= The wind power of #{Date.today.to_s} =========================").green
+          puts Rainbow(" The wind power of #{Date.today.to_s} ".center(80, '=')).green
           puts Rainbow(wetter.parse_wind wind).orange
 
           atmosphere = wetter.atmosphere response
 
           puts "\n"
-          puts Rainbow("========================= The atmosphere of #{Date.today.to_s} =========================").green
+          puts Rainbow(" The atmosphere of #{Date.today.to_s} ".center(80, '=')).green
           puts Rainbow(wetter.parse_atmosphere atmosphere).orange
         end
       end

data/lib/weer/invalid_city.rb

@@ -0,0 +1 @@
+class InvalidCity < StandardError; end

data/lib/weer/lib/wetter.rb

@@ -3,11 +3,13 @@ require 'terminal-table'
 
 class Wetter
   # Set attributes reader
-  attr_reader :city
+  attr_reader :options
+
+  # include HTTParty
+  include HTTParty
 
   # Instance variable
-  BASE_URL = 'https://query.yahooapis.com/v1/public/yql?q='
-  FORMAT_RESPONSE = '&format=json&env=store://datatables.org/alltableswithkeys'
+  base_uri 'query.yahooapis.com'
 
   # Create constructor Wetter object
   #
@@ -19,7 +21,7 @@ class Wetter
   #
   # Returns nothing
   def initialize(city)
-    @city = city.downcase
+    @options = { query: { q: yql_city(city), format: 'json', env: 'store://datatables.org/alltableswithkeys' } }
   end
 
   # Make an http request to Yahoo Weather API
@@ -31,9 +33,8 @@ class Wetter
   #
   # Returns the Hash response
   def connect
-    url = URI.parse(URI.encode((BASE_URL + yql_city + FORMAT_RESPONSE).strip))
-    request = HTTParty.get(url)
-    request.code == 200 ? JSON.parse(request.body) : nil
+    response = self.class.get('/v1/public/yql', options)
+    response.code == 200 ? JSON.parse(response.body) : nil
   end
 
   # Parse the forecasts to table
@@ -166,7 +167,7 @@ class Wetter
   #   # => "select * from weather.forecast where woeid in (select woeid from geo.places(1) where text=\"Da Nang\")"
   #
   # Returns an query
-  def yql_city
+  def yql_city(city)
     "select * from weather.forecast where woeid in (select woeid from geo.places(1) where text=\"#{city}\")"
   end
 

data/lib/weer/version.rb

@@ -1,3 +1,3 @@
 module Weer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Vinh Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +150,7 @@ files:
 - lib/weer.rb
 - lib/weer/cli.rb
 - lib/weer/cli/weather.rb
-- lib/weer/error.rb
+- lib/weer/invalid_city.rb
 - lib/weer/lib/wetter.rb
 - lib/weer/version.rb
 homepage: http://todayifoundout.net

data/lib/weer/error.rb

@@ -1 +0,0 @@
-class FakeURLInvalid < StandardError; end