has_tracking 0.1.1 → 0.2.0

data/Rakefile

@@ -33,7 +33,10 @@ begin
     gemspec.authors = ["Erlend Finvåg"]
     gemspec.has_rdoc = false
     gemspec.add_dependency("json", ">= 1.0")
+    gemspec.add_dependency("curb", ">= 0.7.3")
   end
+  Jeweler::GemcutterTasks.new
+  
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/has_tracking.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_tracking}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erlend Finv\303\245g"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-06-01}
   s.description = %q{Adds quick and dirty package tracking for Bring (Posten Norway)}
   s.email = %q{erlend.finvag@gmail.com}
   s.extra_rdoc_files = [
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/zircon/has_tracking}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Package tracking for Bring}
   s.test_files = [
     "test/has_tracking_test.rb",
@@ -47,13 +47,16 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 1.0"])
+      s.add_runtime_dependency(%q<curb>, [">= 0.7.3"])
     else
       s.add_dependency(%q<json>, [">= 1.0"])
+      s.add_dependency(%q<curb>, [">= 0.7.3"])
     end
   else
     s.add_dependency(%q<json>, [">= 1.0"])
+    s.add_dependency(%q<curb>, [">= 0.7.3"])
   end
 end
 

data/init.rb

@@ -1,2 +1 @@
 require "has_tracking"
-require "json"

data/lib/has_tracking.rb

@@ -1,3 +1,6 @@
+require "json"
+require "curb"
+
 module HasTracking
   def self.included(base)
     base.send :extend, ClassMethods
@@ -21,9 +24,10 @@ end
 class Track
   def initialize(number)
     begin
-      require "open-uri"
-      buffer = open("http://sporing.bring.no/sporing.json?q=#{number}").read
-      @result = JSON.parse(buffer)["consignmentSet"][0]["packageSet"][0]
+      buffer = Curl::Easy.new("http://sporing.bring.no/sporing.json?q=#{number}")
+      buffer.headers["User-Agent"] = "Ruby/#{RUBY_VERSION}"
+      buffer.perform
+      @result = JSON.parse(buffer.body_str)["consignmentSet"][0]["packageSet"][0]
       @exists = true
     rescue OpenURI::HTTPError
       @exists = false
@@ -37,7 +41,7 @@ class Track
   
   def received?
     begin
-      if self.events.last["postalcode"].blank?
+      if self.events.last["status"] == "DELIVERED"
         return true
       else
         return false
@@ -55,6 +59,7 @@ class Track
       e["postalcode"] = event["postalCode"]
       e["date"] = DateTime.parse(event["dateIso"])
       e["description"] = event["description"]
+      e["status"] = event["status"]
       events << e
     end
     if events.length == 0

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_tracking
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Erlend Finv\xC3\xA5g"
@@ -9,19 +15,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 +00:00
+date: 2010-06-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: curb
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        - 3
+        version: 0.7.3
+  type: :runtime
+  version_requirements: *id002
 description: Adds quick and dirty package tracking for Bring (Posten Norway)
 email: erlend.finvag@gmail.com
 executables: []
@@ -56,21 +83,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Package tracking for Bring