multicity 1.1.3 → 1.2.0

data/README.md

@@ -0,0 +1,29 @@
+Installation
+=
+    gem install 'multicity'
+
+Example
+=
+	require 'multicity'
+
+	# Get all cars
+	agent = Multicity::Agent.new
+	cars = agent.get_cars
+	cars.each do |car| 
+		puts car.id # => "1234"
+		puts car.license_plate # => "B-MC 1694"
+		puts car.model # => "Citroën C-Zero"
+		puts car.position # => {:lat => '52.5359483', :lon => '13.4432250'}
+	end
+	
+	# get the price
+	Multicity::Agent.price 25 # => {:unit => 'EUR', :price => 7.50, :rate => :starter}
+	Multicity::Agent.price 25, :vielnutzer # => {:unit => 'EUR', :price => 6.00, :rate => :vielnutzer}
+	
+	# get operation area
+	agent.get_operation_area # => array of lat/lon coordinates "[[52.464874, 13.405852], [52.466625, 13.425508], [52.467854, 13.435678],...]"
+
+	
+Contribute
+=
+	Fork, implement, create tests and a pullrequest :)

data/lib/multicity/multicity_agent.rb

@@ -20,7 +20,7 @@ module Multicity
 		# Returns an array of Multicity:Car
 		def get_cars	
 			data = @agent.get(@@options[:url_list], headers).body
-			marker = data.scan(/"marker":\[(.*?)\],"/).first
+			marker = data.scan(/"marker":\[(.*?)\],"/).first.join
 			marker = marker.to_s.gsub(' ', ' ')
 			marker = JSON.parse("[#{marker}]")
 			marker.map! { |item| Car.new(item) }
@@ -37,12 +37,25 @@ module Multicity
 			coords = []
 			coordinates.strip.split("\n").each do |coordinate|
 				coordinate = coordinate.split ","
-				coords << [ coordinate[0].to_f, coordinate[1].to_f ]
+				coords << [ coordinate[1].to_f, coordinate[0].to_f ]
 			end
 			
 			coords
 		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
+			else
+				price = (duration / 10.0).ceil * rate
+			end
+			
+			{:price => price.round(2), :unit => 'EUR', :rate => rate }
+		end
+		
 		private
 		
 		def headers

data/lib/multicity/version.rb

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

data/lib/multicity.rb

@@ -4,8 +4,4 @@ require 'json'
 require 'xmlsimple'
 
 require 'multicity/multicity_car'
-require 'multicity/multicity_agent'
-	
-module Multicity
-	$KCODE = "U"
-end
+require 'multicity/multicity_agent'

metadata

@@ -1,129 +1,99 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: multicity
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 3
-  version: 1.1.3
 platform: ruby
-authors: 
+authors:
 - Simon Woker
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2013-02-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &12702200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
-  requirement: *id001
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :runtime
-  name: json
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
   prerelease: false
-  type: :runtime
+  version_requirements: *12702200
+- !ruby/object:Gem::Dependency
   name: mechanize
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &12701580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
+  prerelease: false
+  version_requirements: *12701580
+- !ruby/object:Gem::Dependency
   name: xml-simple
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &12700960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
+  version_requirements: *12700960
+- !ruby/object:Gem::Dependency
   name: rake
-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.
+  requirement: &12700260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *12700260
+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
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/multicity/agent_multicity.rb
+files:
 - lib/multicity/multicity_agent.rb
 - lib/multicity/multicity_car.rb
 - lib/multicity/version.rb
 - lib/multicity.rb
 - LICENSE
 - CHANGELOG.md
+- README.md
 homepage: https://github.com/swoker/multicity-ruby
 licenses: []
-
 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: 442724271180259983
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Wrapper for the Multicity API
 test_files: []
-

data/lib/multicity/agent_multicity.rb

@@ -1,11 +0,0 @@
-class AgentMulticity
-	def load_all
-		agent = Multicity::Agent.new
-		cars = agent.get_cars
-		Sharable.transaction do 
-			Sharable.delete_all :type_id => Tramobi::VALID_AGENTS["Multicity"], :city => "Berlin"
-			cars.each { |car| Sharable.from_multicity(car).save! }
-		end
-		cars.count
-	end
-end