simonreed-lyrebird 0.1.0.2.1 → 0.1.0.2.2

data/README.rdoc

@@ -14,7 +14,7 @@ Twitter Gateway, allows your app to respond to natural language questions from T
 			{ 'str' => "Do you have a :item for me" }
 			]
 
-  lyre = LyreBird.new(:username => 'username', :password => 'password', :routes => routes)
+  lyre = LyreBird::Base.new(:username => 'username', :password => 'password', :routes => routes)
   lyre.check() # Check for new messages.
 
 == Install

data/bin/lyre_bird

@@ -3,7 +3,7 @@ require 'lyre_bird'
 
 routes = [ { 'str' => "Do you have a :item for me" } ]
 
-@lb = LyreBird.new(
+@lb = LyreBird::Base.new(
 	:username => 'username', 
 	:password => 'password', 
 	:routes => routes, 

data/lib/lyre_bird/request.rb

@@ -1,15 +1,17 @@
-class LyreBird::Request
+module LyreBird
+  class Request
   
-  attr_accessor :tweet
-  attr_accessor :response
+    attr_accessor :tweet
+    attr_accessor :response
   
-  def initialize(options={})
-    self.tweet = options[:tweet]
-    self.response = self.respond(:text => self.tweet['text'].gsub(/\@nicetripper /,''))
-  end  
+    def initialize(options={})
+      self.tweet = options[:tweet]
+      self.response = self.respond(:text => self.tweet['text'].gsub(/\@nicetripper /,''))
+    end  
   
-  def respond(options={})
-    params = LyreBird::Route.route(options[:text])
-    LyreBird::Response.new(:params => params,:to => self.tweet['user']['screen_name'], :request_tweet => self.tweet)
+    def respond(options={})
+      params = LyreBird::Route.route(options[:text])
+      LyreBird::Response.new(:params => params,:to => self.tweet['user']['screen_name'], :request_tweet => self.tweet)
+    end
   end
 end

data/lib/lyre_bird/response.rb

@@ -1,78 +1,80 @@
-class LyreBird::Response
+module LyreBird
+  class Response
   
-  attr_accessor :to
-  attr_accessor :text
-  attr_accessor :params
-  attr_accessor :request_tweet
+    attr_accessor :to
+    attr_accessor :text
+    attr_accessor :params
+    attr_accessor :request_tweet
   
-  def initialize(options={})
-    self.params = options[:params]
-    self.to = options[:to]   
-    self.request_tweet = options[:request_tweet] 
+    def initialize(options={})
+      self.params = options[:params]
+      self.to = options[:to]   
+      self.request_tweet = options[:request_tweet] 
      
-    if self.params.nil?
-      error 
-      return
-    end        
+      if self.params.nil?
+        error 
+        return
+      end        
 
-    history = $responses[self.to]   
+      history = $responses[self.to]   
         
-    klass = self.params['class'] || 'LyresController'
-    method = self.params['method'] || 'hot' 
+      klass = self.params['class'] || 'LyresController'
+      method = self.params['method'] || 'hot' 
 
-    self.text = klass.constantize.new.send method.to_sym, self, history, self.params
+      self.text = klass.constantize.new.send method.to_sym, self, history, self.params
         
-  end  
+    end  
   
-  def register_response(params)    
-      $responses[self.to] = params        
-  end
+    def register_response(params)    
+        $responses[self.to] = params        
+    end
   
-  def error
-    puts "LyreBird::Response.error"
-    $no_responses.push(self.request_tweet)
-    msg =  "Don't know what you're asking for" 
-    self.text = msg
-    puts "LyreBird::Response.error self.text #{self.text}"    
-    if DEBUG
-      puts "-" * 50
-      puts 
-      puts "From @#{self.request_tweet['user']['screen_name']} - \"#{self.request_tweet['text']}\""    
-      puts      
-      puts "POSTING Don't get it  - \"#{msg}\""
-      puts    
-      puts "-" * 50    
+    def error
+      puts "LyreBird::Response.error"
+      $no_responses.push(self.request_tweet)
+      msg =  "Don't know what you're asking for" 
+      self.text = msg
+      puts "LyreBird::Response.error self.text #{self.text}"    
+      if DEBUG
+        puts "-" * 50
+        puts 
+        puts "From @#{self.request_tweet['user']['screen_name']} - \"#{self.request_tweet['text']}\""    
+        puts      
+        puts "POSTING Don't get it  - \"#{msg}\""
+        puts    
+        puts "-" * 50    
+      end
     end
-  end
   
-  def post(live=false)    
+    def post(live=false)    
     
-    history = $responses[self.to]   
+      history = $responses[self.to]   
     
-    msg = self.text
+      msg = self.text
     
-      puts
-      puts "-" * 50
-      puts 
-      puts "From @#{self.request_tweet['user']['screen_name']} - \"#{self.request_tweet['text']}\""
-      puts      
-      puts "Reply - \"#{msg}\""
-      puts
-      puts "-" * 50  
-      puts
-                  
-      if DEBUG
-        puts      
-        puts "Params - #{self.params.inspect}" 
+        puts
+        puts "-" * 50
+        puts 
+        puts "From @#{self.request_tweet['user']['screen_name']} - \"#{self.request_tweet['text']}\""
         puts      
-        puts "History - #{history.inspect}"
-        puts    
-        puts "-" * 50   
-      end
+        puts "Reply - \"#{msg}\""
+        puts
+        puts "-" * 50  
+        puts
+                  
+        if DEBUG
+          puts      
+          puts "Params - #{self.params.inspect}" 
+          puts      
+          puts "History - #{history.inspect}"
+          puts    
+          puts "-" * 50   
+        end
     
     
-      if live
-        $twitter.post(msg) 
-      end
-  end  
+        if live
+          $twitter.post(msg) 
+        end
+    end  
+  end
 end

data/lib/lyre_bird/route.rb

@@ -1,46 +1,48 @@
-class LyreBird::Route
-  def initialize(options={})
+module LyreBird
+  class Route
+    def initialize(options={})
     
-  end  
+    end  
   
-  def self.route(str='', debug=false)
+    def self.route(str='', debug=false)
     
-		successes = []
-		puts "Parsing '#{str}'" if DEBUG
-    $lyrebird_routes.each do | r |
-			route = r['str']
-			clear = r['clear']			
-		  puts "- Trying '#{route}'" if DEBUG
-			regex = {}
-			regex[:vars] = route.gsub(/(:[a-z]*)/, '(:[a-z]*)')
-		  puts "- REGEX VARS '#{regex[:vars]}'" if DEBUG
-			vars = route.match(regex[:vars])
+  		successes = []
+  		puts "Parsing '#{str}'" if DEBUG
+      $lyrebird_routes.each do | r |
+  			route = r['str']
+  			clear = r['clear']			
+  		  puts "- Trying '#{route}'" if DEBUG
+  			regex = {}
+  			regex[:vars] = route.gsub(/(:[a-z]*)/, '(:[a-z]*)')
+  		  puts "- REGEX VARS '#{regex[:vars]}'" if DEBUG
+  			vars = route.match(regex[:vars])
 			
-			puts "str = '#{str}'" if CONSOLE and vars.nil?
-			puts "str.match(/#{regex[:vars]}/)" if CONSOLE and vars.nil?
+  			puts "str = '#{str}'" if CONSOLE and vars.nil?
+  			puts "str.match(/#{regex[:vars]}/)" if CONSOLE and vars.nil?
 			
-		  puts "- NO VARS '#{vars.inspect}'" if DEBUG and vars.nil?
-			next if vars.nil?
+  		  puts "- NO VARS '#{vars.inspect}'" if DEBUG and vars.nil?
+  			next if vars.nil?
 			
-			regex[:values] = regex[:vars].gsub(/\:\[a\-z\]/, '.')
-		  puts "- Trying '#{regex[:values]}'" if DEBUG
-			values = str.match(regex[:values])
+  			regex[:values] = regex[:vars].gsub(/\:\[a\-z\]/, '.')
+  		  puts "- Trying '#{regex[:values]}'" if DEBUG
+  			values = str.match(regex[:values])
 
-			next if values.nil?
+  			next if values.nil?
 
-			params = {}.merge(r)
+  			params = {}.merge(r)
 
-			i = 1;
+  			i = 1;
 			
-			vars[1,vars.size].each do | var |
-				clean_name = var.gsub(/:/,'')
-				params[clean_name.to_sym] = values[i]
-				i += 1
-			end
-			params = (str.match(/good|ok|pretty good/).nil?) ? params : params.merge({:sort => :rating})
-		  puts "-- PASS '#{route}' got #{params.inspect}" if DEBUG			
-			successes.unshift(params)	
-		end
-		return successes.last
-  end  
+  			vars[1,vars.size].each do | var |
+  				clean_name = var.gsub(/:/,'')
+  				params[clean_name.to_sym] = values[i]
+  				i += 1
+  			end
+  			params = (str.match(/good|ok|pretty good/).nil?) ? params : params.merge({:sort => :rating})
+  		  puts "-- PASS '#{route}' got #{params.inspect}" if DEBUG			
+  			successes.unshift(params)	
+  		end
+  		return successes.last
+    end  
+  end
 end

data/lib/lyre_bird/twitter.rb

@@ -1,34 +1,36 @@
 require 'httparty'
 
-class LyreBird::Twitter
-  include HTTParty
-  base_uri 'twitter.com'
+module LyreBird
+  class Twitter
+    include HTTParty
+    base_uri 'twitter.com'
   
-  def initialize(u, p)
-    @auth = {:username => u, :password => p}
-  end
+    def initialize(u, p)
+      @auth = {:username => u, :password => p}
+    end
 
-  # which can be :friends, :user or :public
-  # options[:query] can be things like since, since_id, count, etc.
-  def mentions(which=:mentions, options={})
-    since_id = options[:since_id]
-    options = {}
-    options.merge!({:basic_auth => @auth})
-    url =  "/statuses/#{which}.json?"
-    url += "since_id=#{since_id}" unless since_id.nil?
-    puts "Requesting #{url} from Twitter API"
-    self.class.get(url, options)
-  end
+    # which can be :friends, :user or :public
+    # options[:query] can be things like since, since_id, count, etc.
+    def mentions(which=:mentions, options={})
+      since_id = options[:since_id]
+      options = {}
+      options.merge!({:basic_auth => @auth})
+      url =  "/statuses/#{which}.json?"
+      url += "since_id=#{since_id}" unless since_id.nil?
+      puts "Requesting #{url} from Twitter API"
+      self.class.get(url, options)
+    end
   
-  # which can be :friends, :user or :public
-  # options[:query] can be things like since, since_id, count, etc.
-  def timeline(which=:friends, options={})
-    options.merge!({:basic_auth => @auth})
-    self.class.get("/statuses/#{which}_timeline.json", options)
-  end
+    # which can be :friends, :user or :public
+    # options[:query] can be things like since, since_id, count, etc.
+    def timeline(which=:friends, options={})
+      options.merge!({:basic_auth => @auth})
+      self.class.get("/statuses/#{which}_timeline.json", options)
+    end
   
-  def post(text)
-    options = { :query => {:status => text}, :basic_auth => @auth }
-    self.class.post('/statuses/update.json', options)
+    def post(text)
+      options = { :query => {:status => text}, :basic_auth => @auth }
+      self.class.post('/statuses/update.json', options)
+    end
   end
 end

data/lib/lyre_bird.rb

@@ -3,74 +3,76 @@ require 'lyre_bird/request'
 require 'lyre_bird/route'
 require 'lyre_bird/twitter'
 
-class LyreBird
+module LyreBird
+  class Base
   
-  attr_accessor :username
-  attr_accessor :password
-  attr_accessor :since_filename
+    attr_accessor :username
+    attr_accessor :password
+    attr_accessor :since_filename
   
-  def initialize(options={})
-    $responses = {}
-    self.username = options[:username] || 'username'
-    self.password = options[:password] || 'password'    
-    self.since_filename = options[:since_filename] || "lyre_bird_listen_since.txt"
-    $lyrebird_routes =  options[:routes] || []
-  end
+    def initialize(options={})
+      $responses = {}
+      self.username = options[:username] || 'username'
+      self.password = options[:password] || 'password'    
+      self.since_filename = options[:since_filename] || "lyre_bird_listen_since.txt"
+      $lyrebird_routes =  options[:routes] || []
+    end
   
-  def listen(options={})
-    options = { :limit => 1, :sleep=> 5}.merge(options)
+    def listen(options={})
+      options = { :limit => 1, :sleep=> 5}.merge(options)
     
-    responses = []
-    :limit.to_i.times do 
-      responses.push(self.check(:post => true))
+      responses = []
+      :limit.to_i.times do 
+        responses.push(self.check(:post => true))
+      end
+      responses
     end
-    responses
-  end
   
-  def get_since
-    since = 0;
-    if File.exists?(self.since_filename)
-      File.open(self.since_filename).each { |line|
-          since = line
-      }
-      return since      
-    else
-      return nil
+    def get_since
+      since = 0;
+      if File.exists?(self.since_filename)
+        File.open(self.since_filename).each { |line|
+            since = line
+        }
+        return since      
+      else
+        return nil
+      end
     end
-  end
   
-  def set_since(since_id)
-    puts "Modified SINCE_ID to - #{since_id}"
-    since = File.open(self.since_filename, 'w') {|f| f.write(since_id) }
-    since
-  end
+    def set_since(since_id)
+      puts "Modified SINCE_ID to - #{since_id}"
+      since = File.open(self.since_filename, 'w') {|f| f.write(since_id) }
+      since
+    end
   
-  def check(options={})
+    def check(options={})
     
-    options = {:live=>true}.merge(options)
-    responses = []
+      options = {:live=>true}.merge(options)
+      responses = []
     
-    if options[:messages]
-      puts "DOING AN OFFLINE LYREBIRD CHECK"
-      mentions = options[:messages]
-    else
-      $twitter = LyreBird::Twitter.new(self.username,self.password)
-      since = options[:since] || get_since()   
-      mentions = $twitter.mentions(:mentions,{ :since_id => since })      
-    end
+      if options[:messages]
+        puts "DOING AN OFFLINE LYREBIRD CHECK"
+        mentions = options[:messages]
+      else
+        $twitter = LyreBird::Twitter.new(self.username,self.password)
+        since = options[:since] || get_since()   
+        mentions = $twitter.mentions(:mentions,{ :since_id => since })      
+      end
 
-    mentions = mentions.sort {|a,b| a['id']<=>b['id']}
-    mentions.each do | tweet |
-      puts "Tweet - #{tweet.keys.to_yaml}" if DEBUG
-      req = LyreBird::Request.new(:tweet => tweet)
-      if options[:post]
-        req.response.post(options[:live])
+      mentions = mentions.sort {|a,b| a['id']<=>b['id']}
+      mentions.each do | tweet |
+        puts "Tweet - #{tweet.keys.to_yaml}" if DEBUG
+        req = LyreBird::Request.new(:tweet => tweet)
+        if options[:post]
+          req.response.post(options[:live])
+        end
+        responses.push(req.response)
       end
-      responses.push(req.response)
-    end
     
-    puts "NO NEW TWEETS @ #{Time.now}" unless mentions.size > 0
-    set_since(mentions.last['id']) unless mentions.size == 0
-  end
+      puts "NO NEW TWEETS @ #{Time.now}" unless mentions.size > 0
+      set_since(mentions.last['id']) unless mentions.size == 0
+    end
   
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simonreed-lyrebird
 version: !ruby/object:Gem::Version 
-  version: 0.1.0.2.1
+  version: 0.1.0.2.2
 platform: ruby
 authors: 
 - Simon Reed