drivenow 1.0.1 → 1.1.0

data/lib/drivenow.rb

@@ -1,3 +1,3 @@
-$KCODE = 'U'
+$KCODE = 'U' if RUBY_VERSION < '1.9.0'
 require 'drivenow/drivenow_car'
 require 'drivenow/drivenow_agent'

data/lib/drivenow/drivenow_agent.rb

@@ -2,7 +2,7 @@ module Drivenow
 	class Agent
 		require 'open-uri'
 		require 'json'
-		$KCODE = "U"
+		$KCODE = "U" if RUBY_VERSION < '1.9.0'
 
 		attr_reader :cars
 
@@ -13,14 +13,14 @@ module Drivenow
 		#--
 		# TODO: Option for the Xpath for cars-array inside the JSON
 		def initialize(options = {})
-			options = { :uri => 'https://www.drive-now.com/php/metropolis/vehicle_filter' }.merge(options)
 			cities = Agent.cities
-			
-			page = open(options[:uri]).read
-			cars = JSON(page)["rec"]["vehicles"]["vehicles"]
 			unless options[:city].nil?
-				cars = cars.select { |item| item["cit"] == cities[options[:city]] }
+				url_params = "cit=#{cities[options[:city]]}"
 			end
+			options = { :uri => "https://www.drive-now.com/php/metropolis/json.vehicle_filter?#{url_params}" }.merge(options)
+
+			page = open(options[:uri]).read
+			cars = JSON(page)["rec"]["vehicles"]["vehicles"]
 			cities = cities.invert
 			cars.each { |item| item["cit"] = cities[item["cit"]] }
 			cars.map! { |item| Car.new(item) }
@@ -35,18 +35,13 @@ module Drivenow
 		#  * Berlin
 		#  * Düsseldorf
 		#  * München
-		#  * Unterhaching (part of M�nchen)
 		# Can easily be overridden if there are more cities available in the future
-		#--
-		# TODO: Unterhaching, Oberding and Korschenbroich are part of other cities... needs to be an array instead of one string
 		def self.cities
 			{
 				:duesseldorf => "1293",
 				:berlin => "6099", 
 				:muenchen => "4604",
-				#:unterhaching => "7590",
-				#:oberding => "7591",
-				#:korschenbroich => "1294"
+				:koeln => "1774"
 			}
 		end
 	end

data/lib/drivenow/version.rb

@@ -1,3 +1,3 @@
 module Drivenow
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,100 +1,76 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: drivenow
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Simon Woker
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &16742440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *16742440
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &16755700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: Wraps the DriveNow JSON to use it nicely in your own environment. You can use this Gem to read all cars that are available.
+  prerelease: false
+  version_requirements: *16755700
+description: Wraps the DriveNow JSON to use it nicely in your own environment. You
+  can use this Gem to read all cars that are available.
 email: stastny@101ideas.cz
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/drivenow.rb
+files:
+- lib/drivenow/drivenow_agent.rb
 - lib/drivenow/drivenow_car.rb
 - lib/drivenow/version.rb
-- lib/drivenow/drivenow_agent.rb
+- lib/drivenow.rb
 - LICENSE
 - CHANGELOG.md
 homepage: https://github.com/swoker/drivenow-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: -1345832249968415927
+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.17
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Wrapper for the DriveNow API
 test_files: []
-