aemet 0.0.1 → 0.0.2

data/README.md

@@ -22,22 +22,36 @@ Or install it yourself as:
 
 Extracts AEMET data url for city:
 
-    city = Aemet::Crawler.new("A Coruña")
+    # Inialize the crawler
+    searcher = Aemet.search("A Coruña")   # Aemet::Crawler.new("A Coruña")
 
     # When initialized the crawler searchs for the city and initializes it.
-    city.aemet_id   # => "15030"
+    searcher.aemet_id                     # => "15030"
 
-    # XML url is constructed with `aemet_id`
-    city.xml_url    # => http://www.aemet.es/xml/municipios/localidad_15030.xml
+    # It provides an Aemet::City object
+    city = searcher.city                  # Aemet::City.new("15030")
+
+    # On the city XML url is constructed with `aemet_id`. Now this method is
+    # private, just to compare with previous versions.
+    city.send(:xml_url)                   # => http://www.aemet.es/xml/municipios/localidad_15030.xml
 
     # Get current Weather data
-    city.weather
+    city.weather                          # => { :prediccion => { :dia => { [ ...] }}
 
     # Get the city page url (from xml response)
-    city.weather.origen.enlace # => http://www.aemet.es/es/eltiempo/prediccion/municipios/coruna-a-id15030
+    city.weather.origen.enlace            # => http://www.aemet.es/es/eltiempo/prediccion/municipios/coruna-a-id15030
 
     # The actual weather forecast
-    city.weather.prediccion.dia # => [ { "fecha" => "2013-03-23", "viento" => [] ...}, { "fecha" => ...} ]
+    city.weather.prediccion.dia           # => [ { "fecha" => "2013-03-23", "viento" => [] ...}, { "fecha" => ...} ]
+
+If you have the city AEMET id stored in database you can initialize the city
+and even search for weather conidtions directly:
+
+    # Initialize a city with aemet_id
+    Aemet.city("15030")
+
+    # Get weather forecast based on aemet_id
+    Aemet.weather("15030")
 
 
 ## Contributing

data/lib/aemet.rb

@@ -1,7 +1,18 @@
-require "active_support/all"
+require "active_support/core_ext"
 require "aemet/crawler"
+require "aemet/city"
 require "aemet/version"
 
 module Aemet
-  # Your code goes here...
+  def self.search(city)
+    Crawler.new(city)
+  end
+
+  def self.city(aemet_id)
+    City.new(aemet_id)
+  end
+
+  def self.weather(aemet_id)
+    city(aemet_id).weather
+  end
 end

data/lib/aemet/city.rb

@@ -0,0 +1,28 @@
+module Aemet
+  class City
+    attr_reader :aemet_id
+
+    def initialize(aemet_id)
+      @aemet_id = aemet_id
+    end
+
+    def weather
+      @weather ||= get_weather
+    end
+
+    private
+
+    def weather_response
+      @weather_response ||= HTTParty.get(xml_url)
+    end
+
+    def get_weather
+      @weather = Hashie::Mash.new(weather_response).root
+    end
+
+    def xml_url
+      "#{BASE_URL}/xml/municipios/localidad_#{aemet_id}.xml"
+    end
+
+  end
+end

data/lib/aemet/crawler.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+
+require 'cgi' unless defined?(CGI)
 require 'httparty'
 require 'nokogiri'
 require 'hashie'
@@ -7,14 +10,16 @@ module Aemet
 
   class Crawler
 
-    attr_reader :city
-    attr_accessor :aemet_id
+    attr_reader :search
+    attr_accessor :aemet_id, :city
 
-    def initialize(city)
-      @city = CGI.escape(city.parameterize(" "))
+    def initialize(search)
+      @search = CGI.escape(search.parameterize(" "))
       search_city
     end
 
+    private
+
     def search_city
       city_pattern = ".resultados_busqueda li a:contains('Predicción por Municipios')"
 
@@ -26,23 +31,14 @@ module Aemet
         first_result[:href] =~ /-id(.*)\Z/
 
         self.aemet_id = $1
-
-        OpenStruct.new(:aemet_xml_url => xml_url)
+        self.city = City.new(aemet_id)
       else
         raise "Not found"
       end
     end
 
-    def weather
-      @prediction ||= Hashie::Mash.new(HTTParty.get(xml_url)).root
-    end
-
-    def xml_url
-      "#{BASE_URL}/xml/municipios/localidad_#{aemet_id}.xml"
-    end
-
     def search_url
-      "#{BASE_URL}/es/buscador?modo=and&orden=n&tipo=sta&str=#{city}"
+      "#{BASE_URL}/es/buscador?modo=and&orden=n&tipo=sta&str=#{search}"
     end
   end
 end

data/lib/aemet/version.rb

@@ -1,3 +1,3 @@
 module Aemet
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/aemet/city_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Aemet::City do
+  let(:aemet_id) { "08022" }
+  subject(:city) { Aemet::City.new(aemet_id) }
+
+  describe "#weather" do
+    let(:weather) { city.weather  }
+
+    it "returns the city weather" do
+      weather.should be_kind_of Hashie::Mash
+      weather.prediccion.dia.should be_instance_of Array
+    end
+  end
+end

data/spec/aemet/crawler_spec.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+describe Aemet::Crawler do
+
+  subject(:crawler) { Aemet::Crawler.new(search_city) }
+
+  describe "when searching for Berga" do
+    let(:search_city) { "Berga" }
+
+    its(:city) { should be_instance_of Aemet::City }
+    its(:aemet_id) { should == "08022" }
+  end
+
+  xit 'finds the result for cities that match province' do
+    crawler = Aemet::Crawler.new("Girona")
+    result  = crawler.result
+
+    result.aemet_page_url.should == "http://www.aemet.es/es/eltiempo/prediccion/municipios/girona-id17079"
+    result.aemet_xml_url.should ==  "http://www.aemet.es/xml/municipios/localidad_17079.xml"
+  end
+
+end

data/spec/aemet_spec.rb

@@ -5,7 +5,30 @@ describe Aemet do
     Aemet::VERSION.should_not be_nil
   end
 
-  it 'should do something useful' do
-    false.should be_true
+  describe "#search" do
+    let(:search) { Aemet.search("Berga") }
+
+    it "returns the weather for a city" do
+      search.should be_instance_of Aemet::Crawler
+      search.aemet_id.should == "08022"
+    end
+  end
+
+  describe "#city" do
+    let(:city) { Aemet.city("08022") }
+
+    it "returns the correct city" do
+      city.should be_instance_of Aemet::City
+      city.aemet_id.should == "08022"
+    end
+  end
+
+  describe "#weather" do
+    let(:weather) { Aemet.weather("08022") }
+
+    it "returns the weather for a city" do
+      weather.should be_kind_of Hashie::Mash
+      weather.prediccion.dia.should be_instance_of Array
+    end
   end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: aemet
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Joaquin Rivera Padron
@@ -10,67 +11,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,6 +88,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -85,29 +96,33 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Extracts information from http://www.aemet.es
@@ -130,38 +145,43 @@ files:
 - aemet.gemspec
 - bin/aemet
 - lib/aemet.rb
+- lib/aemet/city.rb
 - lib/aemet/crawler.rb
-- lib/aemet/parser.rb
 - lib/aemet/version.rb
 - lib/tasks/.keep
 - lib/tasks/aemet.rake
+- spec/aemet/city_spec.rb
+- spec/aemet/crawler_spec.rb
 - spec/aemet_spec.rb
 - spec/spec_helper.rb
 homepage: http://para.glid.es
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Extracts information from http://www.aemet.es
 test_files:
+- spec/aemet/city_spec.rb
+- spec/aemet/crawler_spec.rb
 - spec/aemet_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 112ccf8efb06966833b07d716884902bc51f0c2a
-  data.tar.gz: 4bc953d1d5785cbff2731bdd688f7e7d464b6a7e
-SHA512:
-  metadata.gz: cef7edef28068eb771778dc95ddebcbe34b4f63f74de1d59cd2776133be2ee9f12186c8354cfe100d1dd72f5145bee3272c939f23127f41e00a89fb810f22f34
-  data.tar.gz: ff00b94ce17f6137ba8ea072a3fe41409b6cb7cb3535aca473cef7e9430bd0af2a5a6842e986b6916429a022a6f01a947b7d6532b64e505ee922d89d709da06b

data/lib/aemet/parser.rb

@@ -1,37 +0,0 @@
-module Aemet
-  class Parser
-    attr_reader :document
-
-    def initialize(document)
-      @document = document
-    end
-
-    def result(date)
-      day = document.css("prediccion>dia[fecha='#{date}']")
-
-      results = {}
-
-      day.css('estado_cielo').each do |e|
-        period = e[:periodo]
-        results[period] ||= {}
-        results[period][:sky] = e.text
-      end
-
-      day.css('viento').each do |v|
-        period = v[:periodo]
-        results[period] ||= {}
-        results[period][:wind] ||= {}
-        results[period][:wind][:velocity]  = v.css('velocidad').text
-        results[period][:wind][:direction] = v.css('direccion').text
-      end
-
-      day.css('prob_precipitacion').each do |p|
-        period = p[:periodo]
-        results[period] ||= {}
-        results[period][:rain] = p.text
-      end
-
-      results
-    end
-  end
-end