sarnesjo-twhere 0.0.5 → 0.0.7

data/README.rdoc

@@ -1,6 +1,36 @@
-= twhere
+= Twhere
 
-Description goes here.
+Twhere is a Twitter/Google Maps mashup that uses hashtags to put your tweets on
+the map.
+
+== Installation
+
+Install via RubyGems:
+
+    gem sources -a http://gems.github.com
+    sudo gem install sarnesjo-twhere
+
+Copy and edit example files and do a test run:
+
+    twhere -c config.yml >test.html
+
+Put something like this in your crontab:
+
+    */5 * * * * /usr/bin/twhere -c /path/to/config.yml >/path/to/index.html 2>>/path/to/err.log
+
+== Configuration
+
+=== Locations file
+
+=== Template file
+
+=== Tweets file
+
+=== Twitter
+
+=== Google Maps
+
+== Usage
 
 == Copyright
 

data/bin/twhere

@@ -4,12 +4,13 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'twhere'
 require 'optparse'
 
-options = {}
+config_file = nil
+
 OptionParser.new do |opts|
   opts.banner = 'usage: twhere.rb [options]'
 
   opts.on('-c', '--config FILE', 'specify config file') do |c|
-    options[:config_file] = c
+    config_file = c
   end
 
   opts.on_tail('-h', '--help', 'show this message') do
@@ -24,4 +25,25 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-Twhere.new(options[:config_file]).run
+# load config
+config = YAML::load(File.open(config_file))
+
+# load known locations
+locations = YAML::load(File.open(config[:twhere][:locations_file]))
+
+# load template
+template = File.read(config[:twhere][:template_file])
+
+# load saved tweets (or don't)
+tweets = []
+begin
+  tweets = YAML::load(File.open(config[:twhere][:tweets_file])) if config[:twhere][:tweets_file]
+rescue Errno::ENOENT
+end
+
+# create Twhere instance and puts result
+twhere = Twhere.new(locations, template, config[:twitter][:username], config[:twitter][:password], config[:google_maps][:api_key], tweets)
+puts twhere.result
+
+# save tweets to file
+File.open(config[:twhere][:tweets_file], 'w') { |f| f.puts tweets.to_yaml } if config[:twhere][:tweets_file]

data/lib/twhere.rb

@@ -2,57 +2,47 @@ require 'rubygems'
 require 'erb'
 require 'twitter'
 
+module TwhereHelperMethods
+  def hashtag(str)
+    md = str.match(/#([^#\s]+)/) and md[1]
+  end
+end
+
 class Twhere
-  def initialize(config_file)
-    config = YAML::load(File.open(config_file))
-    @locations_file       = config[:twhere][:locations_file]
-    @template_file        = config[:twhere][:template_file]
-    @tweets_file          = config[:twhere][:tweets_file]
-    @twitter_username     = config[:twitter][:username]
-    @twitter_password     = config[:twitter][:password]
-    @google_maps_api_key  = config[:google_maps][:api_key]
+  include TwhereHelperMethods
+
+  def initialize(locations, template, twitter_username, twitter_password, google_maps_api_key, tweets = nil)
+    @locations           = locations
+    @template            = template
+    @twitter_username    = twitter_username
+    @twitter_password    = twitter_password
+    @google_maps_api_key = google_maps_api_key
+    @tweets              = tweets || []
   end
 
   def result
-    # load known locations
-    @locations = YAML::load(File.open(@locations_file))
-
     # create Twitter proxy object
     twitter = Twitter::Base.new(Twitter::HTTPAuth.new(@twitter_username, @twitter_password))
 
-    # load saved tweets (or don't)
-    tweets = []
-    begin
-      tweets = YAML::load(File.open(@tweets_file)) if @tweets_file
-    rescue Errno::ENOENT
-    end
-
     # add new tweets to collection
     twitter.user_timeline.each do |t|
       # we only care about these variables
       h = {:twitter_id => t.id, :text => t.text, :created_at => t.created_at}
       # this appears to be necessary since neither Array#| nor Array#uniq works as expected
-      tweets << h unless tweets.include? h
+      @tweets << h unless @tweets.include? h
     end
 
-    # save tweets to file
-    File.open(@tweets_file, 'w') { |f| f.puts tweets.to_yaml } if @tweets_file
-
     # group tweets by location
     @located_tweets = {}
-    tweets.each do |t|
-      md = t[:text].match(/#([a-z]+)/)
-      if md and @locations.keys.include? md[1]
-        @located_tweets[md[1]] ||= []
-        @located_tweets[md[1]] << t
+    @tweets.each do |t|
+      ht = hashtag(t[:text])
+      if ht and @locations.keys.include? ht
+        @located_tweets[ht] ||= []
+        @located_tweets[ht] << t
       end
     end
 
     # open template file and process with ERB
-    ERB.new(File.read(@template_file)).result(binding)
-  end
-
-  def run
-    puts self.result
+    ERB.new(@template).result(binding)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sarnesjo-twhere
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors: 
 - "Jesper S\xC3\xA4rnesj\xC3\xB6"