multicity 1.2.0 → 1.3.0

data/lib/multicity/multicity_agent.rb

@@ -3,7 +3,8 @@ module Multicity
 		
 		@@options = {
 			: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'
+			:url_area => 'https://www.multicity-carsharing.de/wp-content/plugins/multicity_map/geschaeftsbereich.kml',
+			:url_load_stations => 'https://www.multicity-carsharing.de/rwe/json.php'
 		}
 		
 		# Set the user agent
@@ -43,17 +44,24 @@ module Multicity
 			coords
 		end
 		
+		def get_loading_spots
+			data = @agent.get(@@options[:url_load_stations]).body
+			data = encode data
+			marker = JSON.parse(data)
+			marker["marker"].map! {|item| Spot.new(item)}
+		end
+		
 		def self.price duration, rate = :starter
 			duration = duration.to_f
 			rate = rate == :vielnutzer ? 2.0 : 2.5
 			if duration > 1440.0
 				price = (duration / 1440.0).floor * 39.00
-				price += (duration % 1440.0) / 10 * rate
+				price += (duration % 1440.0) / 10.0 * rate
 			else
 				price = (duration / 10.0).ceil * rate
 			end
 			
-			{:price => price.round(2), :unit => 'EUR', :rate => rate }
+			{:price => price.to_f.round(2), :unit => 'EUR', :rate => rate }
 		end
 		
 		private
@@ -64,5 +72,17 @@ module Multicity
 				"accept-charset" => "utf-8" 
 			}
 		end
+		
+		#######################################################
+		private
+		#######################################################
+		
+		def encode str
+			if str.respond_to? :encode
+				str.force_encoding("iso-8859-1").encode("utf-8")
+			else
+				Iconv.conv("utf-8", "iso-8859-1", str)
+			end
+		end		
 	end
 end

data/lib/multicity/multicity_spot.rb

@@ -0,0 +1,18 @@
+module Multicity
+	class Spot
+		attr_accessor :lat, :lon, :name, :address, :city, :capacity, :free
+		
+		def initialize json={}
+			self.lat = json["lat"]
+			self.lon = json["lng"]
+			info = json["hal2option"]["markerInfo"] || {"address" => {}}
+			self.name = info["name"]
+			self.capacity = info["capacity"]
+			self.free = info["free"]
+			addr = info["address"]
+			self.city = addr["city"]
+			self.address = "#{addr['streetName']} #{addr['houseNumber']}, #{addr['postalCode']} #{addr['city']}"
+			self.address += " #{addr['freeText']}" unless addr['freeText'].to_s.empty?
+		end
+	end
+end

data/lib/multicity/version.rb

@@ -1,3 +1,3 @@
 module Multicity
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/multicity.rb

@@ -4,4 +4,5 @@ require 'json'
 require 'xmlsimple'
 
 require 'multicity/multicity_car'
+require 'multicity/multicity_spot'
 require 'multicity/multicity_agent'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multicity
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &12702200 !ruby/object:Gem::Requirement
+  requirement: &13282000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *12702200
+  version_requirements: *13282000
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &12701580 !ruby/object:Gem::Requirement
+  requirement: &13281620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12701580
+  version_requirements: *13281620
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &12700960 !ruby/object:Gem::Requirement
+  requirement: &13281160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12700960
+  version_requirements: *13281160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12700260 !ruby/object:Gem::Requirement
+  requirement: &13280640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12700260
+  version_requirements: *13280640
 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
@@ -64,6 +64,7 @@ extra_rdoc_files: []
 files:
 - lib/multicity/multicity_agent.rb
 - lib/multicity/multicity_car.rb
+- lib/multicity/multicity_spot.rb
 - lib/multicity/version.rb
 - lib/multicity.rb
 - LICENSE
@@ -83,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 442724271180259983
+      hash: -1799344324344999223
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: