camaras_valencia_es 0.0.1 → 0.0.2

data/camaras_valencia_es.gemspec

@@ -21,5 +21,7 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "httparty"
-  s.add_runtime_dependency "active_support"
+  s.add_runtime_dependency "therubyracer"
+  s.add_runtime_dependency "proj4rb"
+  s.add_runtime_dependency "active_support", ">= 3.0"
 end

data/lib/camaras_valencia_es.rb

@@ -1,7 +1,5 @@
 require 'camaras_valencia_es/version'
+require 'camaras_valencia_es/util/v8_unescaper'
+require 'camaras_valencia_es/util/lat_lon_converter'
 require 'camaras_valencia_es/surveillance_post'
 require 'camaras_valencia_es/surveillance_camera'
-
-module CamarasValenciaEs
-  # Your code goes here...
-end

data/lib/camaras_valencia_es/surveillance_camera.rb

@@ -2,26 +2,30 @@ require 'httparty'
 
 module CamarasValenciaEs
   class SurveillanceCamera
+    include CamarasValenciaEs::Util::V8Unescaper
+    include CamarasValenciaEs::Util::LatLonConverter
+
     attr_accessor :id, :target, :address, :x, :y, :source, :type, :icon_type
 
     def initialize(id, x, y, target, source, address, type, icon_type)
       @id, @x, @y, @target, @source, @address, @type, @icon_type = id, x, y, target, source, address, type, icon_type
+      convert_to_lat_long
     end
 
     # TODO: DRY. Check SurveillancePost.parse
     def self.parse(json)
       defuck_coords = ->(v) {
-        CGI.unescape(v).gsub(/,/,".").to_f
+        unescape(v).gsub(/,/,".").to_f
       }
 
       serializable = JSON.parse(json)
       # This JSON structure is fucking weird just for representing
-      # a simple array of objects. An Array of Hashe would have been more than enough.
-      # What they call latitude, and longitude is in fact UTM X/Y.
+      # a simple array of objects. An Array of Hashes would have been more than enough.
+      # What they call latitude, and longitude is in fact EPSG 23030 - ed50 / utm zone 30n.
       attrs = serializable['datos']
       attrs['idcamara'].collect.with_index { |idgrupo, i|
-        x, y = defuck_coords.call(attrs['latitud'][i]), defuck_coords.call(attrs['longitud'][i])
-        target, source, address = CGI.unescape(attrs['destino'][i]), CGI.unescape(attrs['origen'][i]), CGI.unescape(attrs['direccion'][i])
+        x, y = defuck_coords.call(attrs['longitud'][i]), defuck_coords.call(attrs['latitud'][i])
+        target, source, address = unescape(attrs['destino'][i]), unescape(attrs['origen'][i]), unescape(attrs['direccion'][i])
         self.new(attrs['idcamara'][i], x, y, target, source, address, attrs['tipo'][i], attrs['tipoicono'][i])
       }
     end
@@ -35,8 +39,26 @@ module CamarasValenciaEs
       self.parse SurveillanceCamera.get('/infocamaras.asp', query: { idgrupo: post_id}).body
     end
 
-    def image
-      CGI.unescape SurveillanceCamera.get('/imagen.asp', query: { idcamara: self.id}).body
+    def filename
+      @flags_and_filename ||= unescape(SurveillanceCamera.get('/imagen.asp', query: { idcamara: self.id}).body).split(';')
+      @flags_and_filename[1]
+    end
+
+    def media
+      @flags_and_filename ||= unescape(SurveillanceCamera.get('/imagen.asp', query: { idcamara: self.id}).body).split(';')
+      (@flags_and_filename[0] == '0')? :image : :video
+    end
+
+    # TODO
+    def to_attributes
+      {
+        location: [self.latlon.y, self.latlon.x],
+        remote_id: self.id,
+        media: self.media,
+        filename: self.filename,
+        recording_source: self.source,
+        recording_target: self.target
+      }
     end
   end
 end

data/lib/camaras_valencia_es/surveillance_post.rb

@@ -3,12 +3,17 @@ require 'httparty'
 require 'cgi'
 require 'json'
 
+
 module CamarasValenciaEs
   class SurveillancePost
+    include CamarasValenciaEs::Util::V8Unescaper
+    include CamarasValenciaEs::Util::LatLonConverter
+
     attr_accessor :id, :x, :y, :icon_type, :street_name, :camera_count, :neighbourhood
 
     def initialize(id, x, y, icon_type)
       @id, @x, @y, @icon_type = id, x, y, icon_type
+      convert_to_lat_long
     end
 
     #attribute :id,        type: String,        match: 'idgrupo'
@@ -16,7 +21,7 @@ module CamarasValenciaEs
     #attribute :y,         type: defuck_coords, match: 'longitud'
     #attribute :icon_type, type: String,        match: 'tipoicono'
     #
-    #parser WhyDidntTheyUseProperJSONParser
+    #parser WhyDidntTheyUseProperJSON
 
     def self.parse(json)
       defuck_coords = ->(v) {
@@ -24,12 +29,12 @@ module CamarasValenciaEs
       }
 
       serializable = JSON.parse(json)
-      # This JSON structure is fucking weird just for representing
+      # This JSON structure is fucking weird just to implement
       # a simple array of objects. An Array of Hashe would have been more than enough.
       # What they call latitude, and longitude is in fact UTM X/Y.
       attrs = serializable['datos']
       attrs['idgrupo'].collect.with_index { |idgrupo, i|
-        x, y = defuck_coords.call(attrs['latitud'][i]), defuck_coords.call(attrs['longitud'][i])
+        x, y = defuck_coords.call(attrs['longitud'][i]), defuck_coords.call(attrs['latitud'][i])
         self.new(attrs['idgrupo'][i], x, y, attrs['tipoicono'][i])
       }
     end
@@ -43,23 +48,43 @@ module CamarasValenciaEs
       self.parse(response_body)
     end
 
-    def find_street_name_and_neighbourhood_and_camera_count
+    def load_attributes
       response_body      = SurveillancePost.get('/infogrupo.asp', query: {idgrupo: id}).body
-      response_body      = response_body.split(/,/)
-      self.camera_count  = response_body.pop.to_i
-      response_body      = response_body.first.split(/-/)
-      self.neighbourhood = CGI.unescape response_body.pop || ""
-      self.street_name   = CGI.unescape response_body.pop || ""
+      body_parts         = response_body.split(/,/)
+      self.camera_count  = body_parts.pop.to_i
+      body_parts         = body_parts.first.split(/-/)
+
+      self.neighbourhood = unescape(body_parts.pop)
+      self.street_name   = unescape(body_parts.pop)
+
+      response_body
     end
 
     def cameras
       @cameras ||= SurveillanceCamera.all(self.id)
     end
 
-    protected
-    def self.query_params(bbox)
-      return {} unless bbox.present?
-      {lat1: bbox[0], long1: bbox[1], lat2: bbox[2], long2: bbox[3]}
+    def to_attributes
+      {
+        remote_id: self.id,
+        location: [self.latlon.y, self.latlon.x],
+        address:
+        {
+          street_name:        (self.street_name || "").strip,
+          neighbourhood_name: (self.neighbourhood || "").strip
+        },
+        surveillance_cameras: self.cameras_to_attributes
+      }
+    end
+
+    def cameras_to_attributes
+      self.cameras.map(&:to_attributes)
     end
+
+    protected
+      def self.query_params(bbox)
+        return {} unless bbox.present?
+        {lat1: bbox[0], long1: bbox[1], lat2: bbox[2], long2: bbox[3]}
+      end
   end
 end

data/lib/camaras_valencia_es/util/lat_lon_converter.rb

@@ -0,0 +1,21 @@
+require 'proj4'
+
+module CamarasValenciaEs
+  module Util
+    module LatLonConverter
+      extend ActiveSupport::Concern
+
+      included do
+        attr_accessor :latlon
+      end
+
+      protected
+        def convert_to_lat_long
+          # http://spatialreference.org/ref/epsg/23030/proj4/
+          @utm ||= Proj4::Projection.new proj: "utm", zone: "30N", units: "m", ellps: 'intl'
+          @point  = Proj4::Point.new self.x, self.y
+          self.latlon = @utm.inverseDeg @point
+        end
+    end
+  end
+end

data/lib/camaras_valencia_es/util/v8_unescaper.rb

@@ -0,0 +1,29 @@
+require 'v8'
+
+module CamarasValenciaEs
+  module Util
+    module V8Unescaper
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def unescape(string)
+          unescape_helper string
+        end
+
+        protected
+          def unescape_helper(string)
+            @ctx ||= V8::Context.new
+            @ctx.eval(js_unescape(string))
+          end
+
+          def js_unescape(string)
+            "unescape('#{string}')"
+          end
+      end
+
+      def unescape(string)
+        self.class.unescape string
+      end
+    end
+  end
+end

data/lib/camaras_valencia_es/version.rb

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

data/spec/fixtures/imagen_1.json

@@ -0,0 +1 @@
+1%3B0480220120226.flv%3B0%3B

data/spec/fixtures/imagen_2.json

@@ -0,0 +1 @@
+0%3B0420420120226.jpg%3B0%3B

data/spec/fixtures/infocaramas.json

@@ -0,0 +1 @@
+{"datos": {"idcamara": ["04802","04803","04804","04805"],"origen": ["AV.%20CID","PUENTE%20DE%20XIRIVELLA","V-30","V-30"],"destino": ["NUEVE%20DE%20OCTUBRE","A-3%20%28AUTOV%CDA%20DE%20MADRID%29","PUENTE%20DE%20XIRIVELLA","A-7%20E-15%20%28CIRCUNVALACI%D3N%29"],"direccion": ["85%2C857047","278%2C174671","18%2C731315","164%2C916169"],"latitud": ["4372215%2C133316","4372215%2C133316","4372215%2C133316","4372215%2C133316"],"longitud": ["722081%2C372995","722081%2C372995","722081%2C372995","722081%2C372995"],"tipo": [2,2,2,2],"tipoicono": ["1","1","1","1"]}}

data/spec/fixtures/infogrupo.json

@@ -0,0 +1 @@
+MAESTRO%20RODRIGO%20-%20CAMP%20DEL%20TURIA,3

data/spec/fixtures/infogrupos.json

@@ -0,0 +1 @@
+{"datos": {"idgrupo": ["001","002","003","004","005","006","007","008","009","010","011","012","013","014","015","016","017","018","019","020","021","022","023","024","025","026","027","028","029","030","031","032","033","034","035","036","037","038","039","040","041","042","043","044","045","046","047","048","049","050","051","052","053","054","055","056","057","058","059","060","061","062","063","064","065","066","067","068","069","070","071","072","073","074","075","076","077","078","079","080","081","082","083","084","085","086","087","088","089","090","091","092","093","094","095","096","097","098","099","100","101","102","103","108","109","110","111","112","113","114","115","116","117","118","119","120","121","122","123","124","125","126","127","128","129","130","131","132","133","134","135","136","137","140","141","142","143","144","145","146","147","148","149","150","151","152","153","154","155","156","157","158","159","160","161","162","163","169","171","172","243","244","245","255","256","257","258"],"latitud": ["4371877%2C3","4372054%2C26","4372155%2C288984","4372082%2C819854","4373730%2C818054","4371930%2C4865","4372107%2C38","4372302%2C927471","4372226%2C576425","4372140%2C740677","4372273%2C691468","4372338%2C848792","4372477%2C288347","4372204%2C954819","4372105%2C386876","4373072%2C555509","4373487%2C664822","4372448%2C605721","4372336%2C58837","4372646%2C944154","4373230%2C877979","4372952%2C26129","4371059%2C767622","4371552%2C04721","4372329%2C915962","4373085%2C209063","4372108%2C267675","4372351%2C26","4372026%2C430752","4372075%2C219696","4371763%2C576003","4372948%2C046848","4374466%2C280192","4374438%2C192976","4374880%2C6","4373997%2C544775","4373850%2C183328","4373917%2C552499","4373183%2C325255","4373396%2C655853","4373328%2C778575","4373213%2C040678","4373218%2C386123","4371635%2C513854","4371663%2C744294","4370979%2C784556","4370278%2C878365","4373048%2C660022","4373685%2C761636","4373559%2C738203","4373225%2C590064","4372922%2C865367","4372652%2C868193","4372941%2C715577","4372501%2C811219","4371989%2C377145","4372010%2C975286","4371789%2C015077","4371634%2C070327","4371319%2C4","4371766%2C02","4371238%2C124991","4370980%2C064898","4370982%2C982994","4371713%2C239789","4371040%2C037524","4372880%2C782677","4370712%2C437094","4374765%2C824729","4372215%2C133316","4370237%2C539428","4374129%2C913956","4373526%2C755223","4373725%2C02283","4372084%2C762093","4372523%2C916444","4371610%2C96099","4371609%2C13","4370896%2C456595","4370923%2C965041","4370985%2C554792","4373249%2C31313","4373716%2C212932","4371825%2C504459","4372342%2C548076","4372537%2C245512","4372213%2C951892","4371624%2C497485","4373267%2C697052","4373649%2C686988","4373362%2C374031","4371639%2C593852","4375101%2C676712","4375224%2C813475","4375438%2C758016","4370645%2C475992","4374616%2C6634","4373832%2C962966","4373743%2C169754","4371522%2C897756","4370961%2C07","4371181%2C456327","4371354%2C432517","4372704%2C15","4372682%2C121226","4372490%2C002923","4372603%2C289729","4373597%2C044334","4374663%2C285078","4375462%2C325352","4375483%2C061738","4373821%2C667979","4373574%2C575975","4370137%2C786248","4369869%2C933849","4369789%2C646181","4374812%2C857705","4374329%2C369791","4369707%2C096161","4369800%2C02128","4374155%2C260959","4374039%2C280598","4374499%2C923437","4371432%2C367011","4375171%2C506601","4375565%2C19419","4375596%2C552059","4370910%2C886982","4371364%2C777553","4371767%2C89","4371806%2C724134","4371432%2C338203","4370627%2C472178","4372822%2C89","4372299%2C69","4372339%2C93","4371870%2C39","4373898%2C38","4374338%2C85","4373775%2C39","4373493%2C67","4372326%2C52","4373466%2C84","4371749%2C65","4371796%2C74","4374350%2C93","4374647%2C4","4371088%2C76","4370408%2C09","4375869%2C45","4376297%2C52","4375442%2C16","4375629%2C11","4375201%2C79","4375776%2C2","4369656%2C41","4372443%2C83","4374848%2C64","4372541%2C17","4373279%2C02","4370781%2C79","4370581%2C48","4373839%2C74","4373661%2C64","4372343%2C48","4372343%2C48","4371585%2C92"],"longitud": ["726045%2C72","726348%2C5","727516%2C848891","727512%2C063188","725878%2C128173","725362%2C194554","725283%2C02","725119%2C555785","725507%2C247155","725793%2C805457","725382%2C446489","726169%2C653464","726310%2C502146","726033%2C660805","725932%2C867344","726359%2C878118","725799%2C237306","725054%2C297205","724655%2C714786","724918%2C240463","724607%2C159861","724766%2C062944","725224%2C740135","724930%2C10782","727143%2C721917","727838%2C93163","724411%2C137495","723300%2C34","723284%2C7345","723221%2C070054","724810%2C700963","724108%2C113063","724597%2C89088","724492%2C027393","725939%2C12","726927%2C628343","726872%2C635602","726769%2C036194","727559%2C139305","727032%2C864566","727007%2C533822","726966%2C881443","727338%2C333375","727000%2C873109","726831%2C24743","725890%2C291062","722903%2C974104","725117%2C439348","725426%2C475013","725188%2C889223","726559%2C37014","726862%2C930513","727689%2C835631","728245%2C648152","728116%2C558934","727970%2C822951","727837%2C190666","728444%2C400583","727869%2C458531","727812%2C27","727401%2C41","727402%2C270737","727589%2C134771","726968%2C753447","724129%2C343259","723594%2C615273","723243%2C362476","727134%2C735195","725547%2C380372","722081%2C372995","726328%2C912354","724036%2C915589","727444%2C340295","727198%2C289588","729350%2C632111","729400%2C224464","729071%2C029601","728791%2C58","724634%2C213686","724845%2C17857","724915%2C596427","729477%2C281264","729557%2C253092","727112%2C199471","726862%2C378127","726745%2C481018","726622%2C826637","722374%2C611994","723164%2C0182","724338%2C451458","723859%2C059833","723301%2C125141","723476%2C240845","723678%2C033025","723278%2C549551","727951%2C917475","723775%2C302898","725271%2C532307","725081%2C751871","727479%2C80845","728319%2C51","728258%2C928913","728764%2C732375","726330%2C84","726474%2C917098","726001%2C399229","726147%2C603969","728441%2C544067","725239%2C131965","724839%2C403176","724998%2C310491","723588%2C527473","723128%2C699816","724277%2C225209","724718%2C57789","725016%2C895905","722993%2C61837","723264%2C955498","725556%2C192915","726520%2C171647","725562%2C462689","724923%2C735472","727752%2C464329","729587%2C250607","727332%2C954599","726218%2C197751","725282%2C299103","729836%2C868294","729588%2C62233","729863%2C73","730248%2C956518","727858%2C998088","729423%2C770459","723873%2C49","723596%2C1","723017%2C18","724802%2C17","724194%2C31","724006%2C16","725296%2C66","725115%2C74","725429%2C32","724778%2C04","725851%2C45","725425%2C98","724400%2C47","725163%2C99","727496%2C07","728179%2C16","721128%2C66","721883%2C48","726602%2C38","726033%2C96","725417%2C17","725273%2C49","726267%2C52","725788%2C36","725670%2C54","725863%2C51","724319%2C74","728803%2C5","728585%2C8","727932%2C73","727852%2C36","729989%2C82","729767%2C17","722939%2C15"],"tipoicono": ["1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","1","2","2","2","2","2","2","2","2","2","2","2","2","2","2","2","2","2","2","2","2","2","2","2","1","2","1","2","1","1","1","1","1","1","1"]}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: camaras_valencia_es
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70328969763020 !ruby/object:Gem::Requirement
+  requirement: &70194219471640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328969763020
+  version_requirements: *70194219471640
 - !ruby/object:Gem::Dependency
-  name: active_support
-  requirement: &70328969762460 !ruby/object:Gem::Requirement
+  name: therubyracer
+  requirement: &70194219470840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70194219470840
+- !ruby/object:Gem::Dependency
+  name: proj4rb
+  requirement: &70194219470000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +43,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328969762460
+  version_requirements: *70194219470000
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: &70194219469420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70194219469420
 description: A RESTful wrapper to the RESTful-like API at http://camaras.valencia.es
   to access traffic CCTV information.
 email:
@@ -50,7 +72,14 @@ files:
 - lib/camaras_valencia_es.rb
 - lib/camaras_valencia_es/surveillance_camera.rb
 - lib/camaras_valencia_es/surveillance_post.rb
+- lib/camaras_valencia_es/util/lat_lon_converter.rb
+- lib/camaras_valencia_es/util/v8_unescaper.rb
 - lib/camaras_valencia_es/version.rb
+- spec/fixtures/imagen_1.json
+- spec/fixtures/imagen_2.json
+- spec/fixtures/infocaramas.json
+- spec/fixtures/infogrupo.json
+- spec/fixtures/infogrupos.json
 homepage: http://github.com/vicentereig/camaras_valencia_es
 licenses: []
 post_install_message: 
@@ -75,4 +104,9 @@ rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: A client to access http://camaras.valencia.es traffic CCTV information.
-test_files: []
+test_files:
+- spec/fixtures/imagen_1.json
+- spec/fixtures/imagen_2.json
+- spec/fixtures/infocaramas.json
+- spec/fixtures/infogrupo.json
+- spec/fixtures/infogrupos.json