weatherzone 0.7.2 → 0.8.0

data/Manifest.txt

@@ -36,13 +36,6 @@ lib/weatherzone/resources/snow_report.rb
 lib/weatherzone/resources/surf_report.rb
 lib/weatherzone/resources/warning.rb
 lib/weatherzone/resources/weather.rb
-lib/vendor/openuri_memcached/History.txt
-lib/vendor/openuri_memcached/License.txt
-lib/vendor/openuri_memcached/README.markdown
-lib/vendor/openuri_memcached/lib/openuri_memcached.rb
-lib/vendor/openuri_memcached/lib/openuri/common.rb
-lib/vendor/openuri_memcached/lib/openuri/memcached.rb
-lib/vendor/openuri_memcached/lib/openuri/rails-cache.rb
 lib/tzinfo/definitions/Australia/CDT.rb
 lib/tzinfo/definitions/Australia/CST.rb
 lib/tzinfo/definitions/Australia/EDT.rb

data/lib/weatherzone/connection.rb

@@ -30,6 +30,7 @@ module Weatherzone
       @keygen        = keygen
       @logger        = options[:logger]
       @timeout_after = options[:timeout_after] || DEFAULT_TIMEOUT_AFTER
+      @http          = Net::HTTP::Persistent.new
     end
     
     def self.settings
@@ -53,11 +54,11 @@ module Weatherzone
     end
     
     def request(params)
-      url = wz_url_for(params)
-      info("GET #{url}")
+      uri = URI.parse(wz_url_for(params))
+      info("GET #{uri}")
       timeout(self.timeout_after) do
-        response = OpenURI::open(url)
-        response.read
+        response = @http.request(uri)
+        response.body
       end
     rescue Timeout::Error, SocketError => e
       error("webservice connection failed #{e}")

data/lib/weatherzone.rb

@@ -8,20 +8,7 @@ require 'timeout'
 require 'nokogiri'
 require 'sax-machine'
 require 'tzinfo'
-
-begin
-  $LOAD_PATH << File.join(File.dirname(__FILE__), *%w[vendor openuri_memcached lib])
-  if defined? Rails
-    require 'openuri/rails-cache'
-  else
-    require 'openuri/memcached'
-    # Cache for 10 minutes. The web service caches for the same period, so this ensures we've always got
-    # the freshest data and the speediest response.
-    OpenURI::Cache.expiry = 600
-  end
-rescue LoadError
-  require 'open-uri'
-end
+require 'net/http/persistent'
 
 unless defined?(ActiveSupport)
   require 'ext/class'
@@ -35,5 +22,5 @@ require 'weatherzone/helpers/date_parser'
 require 'weatherzone/helpers/units'
 
 module Weatherzone
-  VERSION = '0.7.2'
+  VERSION = '0.8.0'
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 2
-  version: 0.7.2
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Ben Askins
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 +10:00
+date: 2010-05-10 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,8 +42,6 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-- lib/vendor/openuri_memcached/History.txt
-- lib/vendor/openuri_memcached/License.txt
 files: 
 - History.txt
 - Manifest.txt
@@ -83,13 +81,6 @@ files:
 - lib/weatherzone/resources/surf_report.rb
 - lib/weatherzone/resources/warning.rb
 - lib/weatherzone/resources/weather.rb
-- lib/vendor/openuri_memcached/History.txt
-- lib/vendor/openuri_memcached/License.txt
-- lib/vendor/openuri_memcached/README.markdown
-- lib/vendor/openuri_memcached/lib/openuri_memcached.rb
-- lib/vendor/openuri_memcached/lib/openuri/common.rb
-- lib/vendor/openuri_memcached/lib/openuri/memcached.rb
-- lib/vendor/openuri_memcached/lib/openuri/rails-cache.rb
 - lib/tzinfo/definitions/Australia/CDT.rb
 - lib/tzinfo/definitions/Australia/CST.rb
 - lib/tzinfo/definitions/Australia/EDT.rb

data/lib/vendor/openuri_memcached/History.txt

@@ -1,18 +0,0 @@
-== 0.2.0 2009-01-23
-* Include support for Rails.cache
-
-== 0.1.0 2008-04-17
-* Included Evan Weaver's Memcached C wrapper for a healthy speed improvement
-
-== 0.0.3 2008-01-18
-* Caches are now stored by the uri as the key like they originally were
-
-== 0.0.2 2008-01-15
-* Some moron forgot to write the dependency list correctly for 0.0.1
-
-
-== 0.0.1 2008-01-14
-
-* Inital release:
-  * Proof of concept come used library for a personal project
-  

data/lib/vendor/openuri_memcached/License.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2008-2009 Ben Schwarz
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/vendor/openuri_memcached/README.markdown

@@ -1,48 +0,0 @@
-# OpenURI with caching
-
-Carelessly make OpenURI requests without getting hate mail.
-
-## Running with MemCached
-
-Require the library
-
-    require 'openuri/memcached'
-  
-Start memcached server
-  
-    ben@Spinners ~/ Ϟ memcached -d
-
-Set your memcached host/s (defaults to 127.0.0.1:11211)
-  
-    OpenURI::Cache.host = ['10.1.1.10:11211', '10.1.1.11:11211']
-
-The default expiry is 15 minutes, this can be changed using the `expiry` method
-    
-    # Ten long minutes
-    OpenURI::Cache.expiry = 600
-    
-## Running using Rails cache
-
-You can also cache your OpenURI calls using Rails cache. 
-require the library using `require openuri/rails-cache`
-  
-### Execution
-Use exactly the same as you would OpenURI, only.. enable it.
-
-    OpenURI::Cache.enable!
-    # As slow a wet week
-    open("http://ab-c.com.au").read 
-  
-Quit your app (leave memcached running) and re-run the same request, It will come from cache.
-
-### Requirements
-
-* Ruby
-* MemCached 
-* memcache (gem)
-  * You will need to ensure that you have [corresponding version](http://blog.evanweaver.com/files/doc/fauna/memcached/files/COMPATIBILITY.html) of libmemcached to the memcached gem installed for installation to go by breezy
-
-### Contributors
-
-* [Ben Askins](http://github.com/benaskins)
-* [Rick Olson](http://github.com/technoweenie)

data/lib/vendor/openuri_memcached/lib/openuri/common.rb

@@ -1,117 +0,0 @@
-require 'open-uri'
-
-module Kernel
-  private 
-  alias openuri_original_open open
-  def open(name, *rest, &block)
-    if name.respond_to?(:open)
-      name.open(*rest, &block)
-    elsif name.respond_to?(:to_str) &&
-          %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ name &&
-          (uri = URI.parse(name)).respond_to?(:open)
-      OpenURI::open(name, *rest, &block)
-    else
-      open_uri_original_open(name, *rest, &block)
-    end
-  end
-  module_function :open, :openuri_original_open
-end
-
-module OpenURI
-  alias original_open open #:nodoc:
-  def self.open(uri, *rest, &block)
-    if Cache.enabled?
-      response = Cache.get(Cache.key_for(uri))
-    end
-    
-    unless response
-      response = openuri_original_open(uri, *rest).read
-      Cache.set(Cache.key_for(uri), response) if Cache.enabled?
-    end
-
-    response = StringIO.new(response)
-
-    if block_given?
-      begin
-        yield response
-      ensure
-        response.close
-      end
-    else
-      response
-    end
-  end
-  
-  class Cache
-
-    class KeyHash
-      def self.enable!
-        @hash_keys = true
-      end
-      
-      def self.disable!
-        @hash_keys = false
-      end
-
-      def self.enabled?
-        @hash_keys
-      end
-      
-      def self.disabled?
-        !@hash_keys
-      end
-      
-      def self.generate(uri)
-        Digest::MD5.hexdigest(uri)
-      end
-    end
-    
-    # Cache is not enabled by default
-    @cache_enabled = false
-    
-    class << self
-      attr_writer :expiry, :host
-      
-      # Is the cache enabled?
-      def enabled?
-        @cache_enabled
-      end
-      
-      # Enable caching
-      def enable!
-        raise NotImplementedError
-      end
-      
-      # Disable caching - all queries will be run directly 
-      # using the standard OpenURI `open` method.
-      def disable!
-        @cache_enabled = false
-      end
-
-      def disabled?
-        !@cache_enabled
-      end
-      
-      def get(key)
-        raise NotImplementedError
-      end
-      
-      def set(key, value)
-        raise NotImplementedError
-      end
-            
-      def key_for(uri)
-        Cache::KeyHash.enabled? ? Cache::KeyHash.generate(uri.to_s) : uri.to_s
-      end      
-      
-      # How long your caches will be kept for (in seconds)
-      def expiry
-        @expiry ||= 60 * 10
-      end
-      
-      def host
-        @host ||= "127.0.0.1:11211"
-      end
-    end
-  end
-end

data/lib/vendor/openuri_memcached/lib/openuri/memcached.rb

@@ -1,36 +0,0 @@
-require 'openuri/common'
-
-begin
-  require 'minigems'
-rescue LoadError
-  require 'rubygems'
-end
-
-gem "memcached", ">= 0.10"
-require 'memcached'
-
-module OpenURI
-  class Cache
-    class << self
-      # Enable caching
-      def enable!
-        @cache ||= Memcached.new(host, {
-          :namespace => 'openuri', 
-          :no_block => true,
-          :buffer_requests => true
-        })
-        @cache_enabled = true
-      end
-      
-      def get(key)
-        @cache.get(key)
-      rescue Memcached::NotFound
-        false
-      end
-      
-      def set(key, value)
-        @cache.set(key, value, expiry)
-      end
-    end
-  end
-end

data/lib/vendor/openuri_memcached/lib/openuri/rails-cache.rb

@@ -1,21 +0,0 @@
-require 'openuri/common'
-
-module OpenURI
-  class Cache
-    class << self
-      # Enable caching
-      def enable!
-        @cache = Rails.cache
-        @cache_enabled = true
-      end
-      
-      def get(key)
-        @cache.read(key)
-      end
-      
-      def set(key, value)
-        @cache.write(key, value, :expires_in => expiry)
-      end
-    end
-  end
-end

data/lib/vendor/openuri_memcached/lib/openuri_memcached.rb

@@ -1 +0,0 @@
-require 'openuri/memcached'