regentanz 0.2.0 → 0.3.3

data/.rvmrc

@@ -0,0 +1,4 @@
+# vim: ft=bash
+# rvm use 1.9.3-p374
+rvm use 1.8.7-p249
+rvm --create gemset use $(basename $(pwd))

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 == CHANGELOG
 
+=== v0.3.3 // 2013-06-09
+* Remove ActionMailer dependency
+* Gem functionality is defunct as Google shut down their API
+
 === v0.1.4 // 2011-10-14
 * Fixed bug that caused forecast to have the current day only
 * present? now properly returns its true state (as opposed to always false)

data/README.rdoc

@@ -2,16 +2,15 @@
 *Regentanz* (German: <i>rain dance</i>) is a Ruby library to connect to Google's
 innofficial (ie. undocumented and unsupported) weather API.
 
-=== Installation
-The gem is not published yet and can be installed from github:
- git clone git://github.com/kaupertmedia/regentanz.git
- cd regentanz
- gem build regentanz.gemspec
- gem install regentanz-<gemversion>.gem
 
-Much easier using bundler:
+=== Discontinued Weather API
+*Notice*: Google has discontinued their weather service.
+The Gem is currently *not* able to return weather data.
+
+=== Installation
+The gem is available from rubygems, so using bundler "installation" would be:
  # Gemfile
- gem 'regentanz', :git => "git://github.com/carpodaster/regentanz"
+ gem 'regentanz'
 
 === Usage
 Supply a location and a language to retrieve weather:
@@ -23,6 +22,10 @@ It uses <b>file-based caching</b> by default, other cache backends will follow.
 See {Regentanz::Cache::Base}[https://github.com/carpodaster/regentanz/blob/master/lib/regentanz/cache/base.rb]
 for details (and if you want to create your own backend).
 
+=== Handling API-Errors
+
+*TODO* wainting for callbacks
+
 === Configuration
 *Regentanz* can either be configured through a configure block or directly via
 its configuration object. It uses sane defaults so there should be no need for
@@ -41,6 +44,11 @@ Direct configuration:
 See {Regentanz::Configuration}[https://github.com/carpodaster/regentanz/blob/master/lib/regentanz/configuration.rb]
 for a full list of configurable options.
 
+=== TODO
+* Implement OpenWeatherMap as new backend
+* Finalise callback hooks
+* Make tests pass on Ruby 1.9
+
 === Credits
 *Regentanz* is based upon and extracted from a standalone Ruby class made for
-{berlin.kauperts.de}[http://berlin.kauperts.de] by {kaupert media gmbh}[http://kaupertmedia.de].
+{berlin.kauperts.de}[http://berlin.kauperts.de] by {kaupert media gmbh}[http://kaupertmedia.de].

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test

data/lib/regentanz/google_weather.rb

@@ -1,9 +1,10 @@
+require 'cgi'
+require 'net/http'
+require 'rexml/document'
+require 'ostruct'
+
 module Regentanz
   class GoogleWeather
-    require 'net/http'
-    require 'rexml/document'
-    require 'ostruct'
-
     include Astronomy
     include Callbacks
 
@@ -135,15 +136,14 @@ module Regentanz
     def retry_after_incorrect_api_reply
       if !waiting_for_retry? and @cache
         # We are run for the first time, create the marker file
-        # TODO remove dependency to SupportMailer class
         api_failure_detected # callback
-        SupportMailer.deliver_weather_retry_marker_notification!(self, :set)
+        # TODO execute custom callback
         @cache.set_retry_state!
       elsif @cache and @cache.unset_retry_state!
         # Marker file is old enough, delete the (invalid) cache file and remove the marker_file
         @cache.expire!(@cache_id)
         api_failure_resumed # callback
-        SupportMailer.deliver_weather_retry_marker_notification!(self, :unset)
+        # TODO execute custom callback
       end
     end
 

data/lib/regentanz/version.rb

@@ -1,4 +1,4 @@
 module Regentanz
-  VERSION = "0.2.0"
+  VERSION = "0.3.3"
 end
 

data/lib/regentanz.rb

@@ -1,6 +1,5 @@
 require 'active_support'
 require 'active_support/core_ext'
-require 'action_mailer'
 require 'regentanz/version'
 require 'regentanz/cache'
 require 'regentanz/configuration'

data/regentanz.gemspec

@@ -19,13 +19,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'actionmailer', '~> 3.0.10'
-  s.add_dependency 'activesupport', '~> 3.0.10'
+  s.add_dependency 'activesupport', '~> 3.0'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'bundler'
-  s.add_development_dependency 'redgreen'
-  s.add_development_dependency 'factory_girl'
+  s.add_development_dependency 'factory_girl', '~> 2.0'
+  s.add_development_dependency 'rdoc', '~> 2.4'
 
 end

data/test/factories.rb

@@ -1,8 +1,6 @@
-module Regentanz
-  module Test
-    Factory.define :google_weather, :class => Regentanz::GoogleWeather, :default_strategy => :build do |f|
-      f.location "Testhausen"
-      f.cache_id "test"
-    end
+FactoryGirl.define do
+  factory :google_weather, :class => Regentanz::GoogleWeather, :default_strategy => :build do |f|
+    f.location "Testhausen"
+    f.cache_id "test"
   end
 end

data/test/test_helper.rb

@@ -1,18 +1,14 @@
-require "rubygems"
+require 'rubygems'
 require "bundler/setup"
 
 require "test/unit"
 require "active_support/test_case"
-require 'action_mailer/test_helper'
 Bundler.require(:default, :development)
 require 'test/factories'
 
-# FIXME move SupportMailer into callbacks
-require File.join(File.dirname(__FILE__), 'support', 'support_mailer')
-
 # Configure for test mode
 require 'regentanz/test_helper'
 setup_regentanz_test_configuration! do |config|
   config.cache_dir    = File.expand_path(File.join(File.dirname(__FILE__), '', 'support', 'tmp'))
   config.retry_marker = File.expand_path(File.join(File.dirname(__FILE__), 'support', 'tmp', 'test_api_retry.txt'))
-end
+end

data/test/unit/google_weather_test.rb

@@ -5,8 +5,6 @@ class GoogleWeatherTest < ActiveSupport::TestCase
   TEST_CACHE_FILE_NAME = File.join(Regentanz.configuration.cache_dir, "regentanz_test.xml")
 
   def setup
-    # FIXME Remove ActionMailer
-    ActionMailer::Base.deliveries.clear
     setup_regentanz_test_configuration!
   end
 
@@ -35,7 +33,7 @@ class GoogleWeatherTest < ActiveSupport::TestCase
     assert_kind_of Regentanz.configuration.cache_backend, obj.cache
   end
 
-  test "should enter retry state and send email if invalid xml file has been found" do
+  test "should enter retry state if invalid xml file has been found" do
     stub_valid_xml_api_response!
     Regentanz::GoogleWeather.any_instance.expects(:api_failure_detected) # callback
 
@@ -43,10 +41,8 @@ class GoogleWeatherTest < ActiveSupport::TestCase
     assert !weather.waiting_for_retry?
     create_invalid_xml_response(TEST_CACHE_FILE_NAME)
 
-    assert_difference "ActionMailer::Base.deliveries.size" do
-      weather.get_weather!
-      assert weather.waiting_for_retry?
-    end
+    weather.get_weather!
+    assert weather.waiting_for_retry?
   end
 
   test "should leave retry state remove invalid cache file when retry_ttl waittime is over" do
@@ -58,10 +54,8 @@ class GoogleWeatherTest < ActiveSupport::TestCase
     create_invalid_xml_response(TEST_CACHE_FILE_NAME)
     weather = Factory(:google_weather)
 
-    assert_difference "ActionMailer::Base.deliveries.size" do
-      weather.get_weather!
-      assert !weather.waiting_for_retry?
-    end
+    weather.get_weather!
+    assert !weather.waiting_for_retry?
   end
 
   test "should have lang option" do

metadata

@@ -1,136 +1,121 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: regentanz
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.3.3
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Carsten Zimmermann
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-30 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: actionmailer
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-06-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 0
-        - 10
-        version: 3.0.10
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 0
-        - 10
-        version: 3.0.10
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !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: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !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: *id005
-- !ruby/object:Gem::Dependency 
-  name: redgreen
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
 description: Library to access the Google Weather API
-email: 
+email:
 - cz@aegisnet.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .rvmrc
 - CHANGELOG.rdoc
 - Gemfile
 - LICENSE
@@ -155,7 +140,6 @@ files:
 - lib/regentanz/version.rb
 - regentanz.gemspec
 - test/factories.rb
-- test/support/support_mailer.rb
 - test/support/tmp/.gitignore
 - test/support/valid_response.xml.erb
 - test/test_helper.rb
@@ -168,43 +152,38 @@ files:
 - test/unit/forecast_condition_test.rb
 - test/unit/google_weather_test.rb
 - test/unit/parser/google_weather_parser_test.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 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: -3677000706019098419
+required_rubygems_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"
+      hash: -3677000706019098419
 requirements: []
-
 rubyforge_project: regentanz
-rubygems_version: 1.4.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Library to access the Google Weather API
-test_files: 
+test_files:
 - test/factories.rb
-- test/support/support_mailer.rb
 - test/support/tmp/.gitignore
 - test/support/valid_response.xml.erb
 - test/test_helper.rb

data/test/support/support_mailer.rb

@@ -1,7 +0,0 @@
-class SupportMailer
-
-  def self.deliver_weather_retry_marker_notification!(weather_obj, mode)
-    ActionMailer::Base.deliveries << "fake mail"
-  end
-  
-end