diMLOrb 0.1.1 → 0.2.0

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.8.7@diMLOrb
+rvm use 1.9.2@diMLOrb

data/Gemfile

@@ -12,4 +12,5 @@ group :development do
   gem "rcov", ">= 0"
 end
 
-gem 'nokogiri'
+gem 'nokogiri'
+gem 'httparty'

data/Gemfile.lock

@@ -1,8 +1,11 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    crack (0.1.8)
     diff-lcs (1.1.2)
     git (1.2.5)
+    httparty (0.7.8)
+      crack (= 0.1.8)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
@@ -24,6 +27,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  httparty
   jeweler (~> 1.5.2)
   nokogiri
   rcov

data/README.rdoc

@@ -10,8 +10,10 @@ Currently my little website _diMLOya_ supports only 2 stations of all the networ
 
 Note that this gems depends on the diMLO website which oftenly tends to be down or not responsive.
 
+== Installation
+    gem install diMLOrb
 
-= Example of Usage
+== Example of Usage
     require 'diMLOrb'
     #say I want to go from Pozuelo Oeste station to Colonia Jardín station
     d = DiMLOrb::DiMLOrb.new(:PozueloOeste, :ColoniaJardin)

data/Rakefile

@@ -24,6 +24,7 @@ Jeweler::Tasks.new do |gem|
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
   gem.add_runtime_dependency 'nokogiri'
+  gem.add_runtime_dependency 'httparty'
   gem.add_development_dependency 'rspec', '~> 2.3.0'
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/diMLOrb.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{diMLOrb}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ariera"]
@@ -47,28 +47,34 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
     else
       s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
   end
 end

data/lib/diMLOrb.rb

@@ -1,13 +1,13 @@
 # encoding: UTF-8
-require 'net/http'
-require 'uri'
+require 'httparty'
 require 'nokogiri'
-require 'stations'
+require File.join(File.dirname(__FILE__), 'stations')
 
 module DiMLOrb
+  DIMLO_URI = "http://www.dimlo.es/Informate/calc.aspx"
   class DiMLOrb
-      #STATIONS = {:colonia_jardin => "Colonia Jardín|ECJ|ML2", :somosaguas_sur => "Somosaguas Sur|SSU|ML2"}
-      attr_accessor :uri, :http, :html, :viewstate, :eventvalidation, :proximo, :siguiente, :cookie, :data, :duracion, :from, :to
+      
+      attr_accessor :proximo, :siguiente, :duracion, :from, :to
 
       # DiMLOrb.new receives the Metro Ligero Oeste station you are going from and your desired destination
       # it returns you an object with mainly 3 attributes:
@@ -16,8 +16,6 @@ module DiMLOrb
       # => duraction = how long should it take to go from one station to the other
       def initialize(from = :ColoniaJardin, to = :SomosaguasSur)
           @from, @to = STATIONS[from], STATIONS[to]
-          @uri = URI.parse("http://www.dimlo.es/Informate/calc.aspx")
-          @http = Net::HTTP.new(@uri.host, @uri.port)
           get_validations
           get_times
       end
@@ -25,7 +23,7 @@ module DiMLOrb
       # diMLO website uses cookies and token validations (aka protect from forgery) in its forms
       # *get_validations* grabs this values, namely: cookie, viewstate and eventvalidation
       def get_validations
-          resp = @http.get(@uri.path)
+          resp = HTTParty.get(DIMLO_URI)
           raise "HTTP Error: #{resp.code}" if resp.code.to_i != 200
         
           @cookie = resp.response['set-cookie'].split('; ')[0]
@@ -37,12 +35,8 @@ module DiMLOrb
       # *get_times* asks diMLO website for the next metro timetable and parses the html
       # to grab the values of _proximo_, _siguiente_ and _duracion_
       def get_times
-          #@html = Net::HTTP.post_form(@uri, options)
-          req = Net::HTTP::Post.new(@uri.request_uri)
-          req.form_data = options
-          headers.each{ |k,v| req[k] = v }
-          @html = @http.start {|http| http.request(req) }
-          doc  = Nokogiri::HTML(@html.body)
+          resp = HTTParty.post(DIMLO_URI, {:body => form_options, :headers => headers})
+          doc  = Nokogiri::HTML(resp.body)
           @proximo = doc.css('#ProximoTXT').inner_text
           @siguiente = doc.css('#SiguienteTXT').inner_text
           @duracion = doc.css('#DuracionTXT').inner_text
@@ -51,7 +45,7 @@ module DiMLOrb
       protected
       
       # options needed in the form to get the timetables
-      def options
+      def form_options
           { 
               'origenDDL' => @from, 
               'destinoDDL' => @to,

data/lib/stations.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module DiMLOrb
 
   STATIONS = {

metadata

@@ -1,139 +1,125 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: diMLOrb
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - ariera
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-17 00:00:00 +02:00
+date: 2011-07-17 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2152966260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *2152966260
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: &2152965780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: nokogiri
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152965780
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2152965300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.3.0
-  name: rspec
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *2152965300
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2152964820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  name: bundler
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *2152964820
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2152964340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
-  name: jeweler
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  prerelease: false
+  version_requirements: *2152964340
+- !ruby/object:Gem::Dependency
   name: rcov
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  requirement: &2152963860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *2152963860
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2152963380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *2152963380
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: &2152962900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: nokogiri
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2152962900
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2152962420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.3.0
-  name: rspec
-  version_requirements: *id007
-description: This gem acts as an API to the MLO (Metro Ligero Oeste) public transportation of Madrid, allowing the user get ETAs of the next 2 trains
+  type: :development
+  prerelease: false
+  version_requirements: *2152962420
+description: This gem acts as an API to the MLO (Metro Ligero Oeste) public transportation
+  of Madrid, allowing the user get ETAs of the next 2 trains
 email: ariera@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - .rvmrc
@@ -150,38 +136,33 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/ariera/diMLOrb
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 591139527503701248
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby API for the diMLO web timetable service
-test_files: 
+test_files:
 - spec/diMLOrb_spec.rb
 - spec/spec_helper.rb