multicity 1.0.0 → 1.1.0

data/lib/multicity/multicity_agent.rb

@@ -5,17 +5,37 @@ module Multicity
 			:url_list => 'https://kunden.multicity-carsharing.de/kundenbuchung/hal2ajax_process.php?zoom=10&lng1=&lat1=&lng2=&lat2=&stadtCache=&mapstation_id=&mapstadt_id=&verwaltungfirma=&centerLng=13.382322739257802&centerLat=52.50734843957503&searchmode=buchanfrage&with_staedte=false&buchungsanfrage=N&lat=52.50734843957503&lng=13.382322739257802&instant_access=J&open_end=J&objectname=multicitymarker&ignore_virtual_stations=J&before=null&after=null&ajxmod=hal2map&callee=getMarker',
 			:url_area => 'https://www.multicity-carsharing.de/wp-content/plugins/multicity_map/geschaeftsbereich.kml'
 		}
-						
-		def get_cars
-			agent = Mechanize.new
-						
-			data = agent.get(@@options[:url_list], headers).body
+		
+		def initialize
+			@agent = Mechanize.new
+		end
+		
+		# Gets all cars in Berlin
+		# Returns an array of Multicity:Car
+		def get_cars	
+			data = @agent.get(@@options[:url_list], headers).body
 			marker = data.scan(/"marker":\[(.*?)\],"/).first
 			marker = marker.to_s.gsub(' ', ' ')
 			marker = JSON.parse("[#{marker}]")
 			marker.map { |item| Car.new(item) }
 		end
 		
+		# Gets the Operation Area for Berlin
+		# Returns an Array of coordinate-Arrays that creates a Polygon
+		# Example: [ [13.405852,52.464874], [13.425508,52.466625], ... ]
+		def get_operation_area
+			data = @agent.get(@@options[:url_area], headers).body
+			data = XmlSimple.xml_in(data)
+			coordinates = data["Document"].first["Placemark"].first["Polygon"].first["outerBoundaryIs"].first["LinearRing"].first["coordinates"].first
+			coords = []
+			coordinates.strip.split("\n").each do |coordinate|
+				coordinate = coordinate.split ","
+				coords << [ coordinate[0].to_f, coordinate[1].to_f ]
+			end
+			
+			coords
+		end
+		
 		private
 		
 		def headers

data/lib/multicity/multicity_car.rb

@@ -1,25 +1,55 @@
 module Multicity
+	# Multicity Car represents a has these attributes
+	#  * position: Hash with Keys :lat and :lon with the coordinates
+	#  * license_plate: License plate, e.g. B-MC 1234
+	#  * id: internal id
+	#  * model: normally "Citroen C-Zero"
 	class Car	
 		attr_reader :json
 		attr_accessor :position, :license_plate, :id, :model
 		
+		# Creates a new Car object. The hash can be set to a value from the Multicity-API.
+		# If the hash is nil, the car will not have any data
 		# Example hash
-		# {"lat"=>"52.5359483", "hal2option"=>{"mouseout"=>"hideToolTip", "maxZoom"=>"", "clustername"=>"multicitycluster", "click"=>"showMarkerInfos", "id"=>"284964", "minZoom"=>"4", "tooltip"=>"'Citroën C-Zero  (B-MC 1694)'", "bende"=>"1359122400", "StationInfoTyp"=>"HM_AUTO_INFO", "rclick"=>false, "dblclick"=>false, "objecttyp"=>"carpos", "objectname"=>"multicitymarker", "draggable"=>false, "mouseover"=>"showToolTip", "openinfo"=>"showMarkerInfos", "banfang"=>"1359118800"}, "iconName"=>"carIcon", "iconNameSelected"=>"carIconSelected", "lng"=>"13.4432250"}		
-		def initialize hash
+		# {
+		#    "lat" => "52.5359483",
+		#    "iconName" => "carIcon",
+		#    "iconNameSelected" => "carIconSelected",
+		#    "lng" => "13.4432250",
+		#    "hal2option" => {
+		#       "mouseout" => "hideToolTip",
+		#       "maxZoom" => "",
+		#       "clustername" => "multicitycluster",
+		#       "click" => "showMarkerInfos",
+		#       "id" => "284964",
+		#       "minZoom" => "4",
+		#       "tooltip" => "'Citroën C-Zero  (B-MC 1694)'",
+		#       "bende" => "1359122400",
+		#       "StationInfoTyp" => "HM_AUTO_INFO",
+		#       "rclick" => false,
+		#       "dblclick" => false,
+		#       "objecttyp" => "carpos",
+		#       "objectname" => "multicitymarker",
+		#       "draggable" => false,
+		#       "mouseover" => "showToolTip",
+		#       "openinfo" => "showMarkerInfos",
+		#       "banfang" => "1359118800"
+		#    }
+		# }
+		def initialize hash = nil
 			@json = hash
-			
-			tooltip = json["hal2option"]["tooltip"].gsub "'", ""
-			if tooltip != "false"
-				self.position = { :lat => json["lat"], :lon => json["lng"] }
-				self.id = json["hal2option"]["id"]
-				tips = tooltip.split("  ")
-				if (tips.count == 2)
-					self.model = tips[0]
-					self.license_plate = tips[1].to_s.gsub("(", "").gsub(")", "")
-				else
-					self.model = "Citroën C-Zero"
+			unless hash.nil?
+				tooltip = json["hal2option"]["tooltip"].gsub "'", ""
+				if tooltip != "false"
+					self.position = { :lat => json["lat"], :lon => json["lng"] }
+					self.id = json["hal2option"]["id"]
+					tips = tooltip.split("  ")
+					if (tips.count == 2)
+						self.model = tips[0]
+						self.license_plate = tips[1].to_s.gsub("(", "").gsub(")", "")
+					end
 				end
-			end			
+			end
 		end
 	end
 end

data/lib/multicity/version.rb

@@ -1,3 +1,3 @@
 module Multicity
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/multicity.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'mechanize'
 require 'json'
+require 'xmlsimple'
 
 require 'multicity/multicity_car'
 require 'multicity/multicity_agent'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multicity
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Simon Woker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-25 00:00:00 Z
+date: 2013-01-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -48,7 +48,7 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rake
+  name: xml-simple
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,6 +59,20 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rake
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
   type: :development
 description: Wraps the Multicity JSON to use it nicely in your own environment. You can use this Gem to read all cars that are available.
 email: github@simonwoker.de