simonreed-lyrebird 0.1.0.2.2 → 0.1.0.2.3

data/bin/lyre_bird

@@ -1,13 +1,10 @@
 require 'rubygems'
-require 'lyre_bird'
+require 'lib/lyre_bird'
 
-routes = [ { 'str' => "Do you have a :item for me" } ]
-
-@lb = LyreBird::Base.new(
-	:username => 'username', 
-	:password => 'password', 
-	:routes => routes, 
-	:since_filename => File.dirname(__FILE__) + '/listenSince.txt')
+routes = [ 
+		  { 'str' => "Do you have a :item for me" },
+		  { 'str' => ":item near :location" },		  
+]
 
 $no_responses = []
 
@@ -19,16 +16,19 @@ end
 puts 
 puts "LyreBird Interface"
 puts    
-debug = ask('DEBUG? (y/n)')
-DEBUG = ( debug.match(/^(Y|y|yes|Yes|YES)/)) ? true : false 
-CONSOLE = true    
+debug = ask('Run in debug mode? (y/n)')
+$lyre_debug = ( debug.match(/^(Y|y|yes|Yes|YES)/)) ? true : false 
+
+puts if $lyre_debug 
+puts "Running in debug mode" if $lyre_debug
 
-puts if DEBUG 
-puts "Running in DEBUG mode" if DEBUG
+@lb = LyreBird::Base.new(:username => 'username', :password => 'password', :routes => routes, :since_filename => File.dirname(__FILE__) + '/listenSince.txt')
     
 while true
+  puts  
   msg = ask('What do you want to ask?')    
-  while msg.nil?
+  puts
+  while msg !~ /[A-Za-z]/
       msg = ask('No really, what do you want to ask?') 
   end
   

data/lib/lyre_bird/request.rb

@@ -6,7 +6,8 @@ module LyreBird
   
     def initialize(options={})
       self.tweet = options[:tweet]
-      self.response = self.respond(:text => self.tweet['text'].gsub(/\@nicetripper /,''))
+      puts "@#{$lyrebird_username} "
+      self.response = self.respond(:text => self.tweet['text'].gsub("@#{$lyrebird_username} ",''))
     end  
   
     def respond(options={})

data/lib/lyre_bird/response.rb

@@ -18,24 +18,24 @@ module LyreBird
 
       history = $responses[self.to]   
         
-      klass = self.params['class'] || 'LyresController'
-      method = self.params['method'] || 'hot' 
+      klass = self.params['class'] || $lyrebird_default_class
+      method = self.params['method'] || $lyrebird_default_method
 
-      self.text = klass.constantize.new.send method.to_sym, self, history, self.params
+      klass_obj = eval '::' + klass + '.new'
+      self.text = klass_obj.send method.to_sym, self, history, self.params
         
     end  
   
     def register_response(params)    
-        $responses[self.to] = params        
+        $responses[self.to] = {} if $responses[self.to].nil?     
+        $responses[self.to] = $responses[self.to].merge(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
+      if $lyre_debug
         puts "-" * 50
         puts 
         puts "From @#{self.request_tweet['user']['screen_name']} - \"#{self.request_tweet['text']}\""    
@@ -61,8 +61,8 @@ module LyreBird
         puts
         puts "-" * 50  
         puts
-                  
-        if DEBUG
+        
+        if $lyre_debug
           puts      
           puts "Params - #{self.params.inspect}" 
           puts      

data/lib/lyre_bird/route.rb

@@ -7,29 +7,27 @@ module LyreBird
     def self.route(str='', debug=false)
     
   		successes = []
-  		puts "Parsing '#{str}'" if DEBUG
+  		puts "Parsing '#{str}'" if $lyre_debug
       $lyrebird_routes.each do | r |
   			route = r['str']
   			clear = r['clear']			
-  		  puts "- Trying '#{route}'" if DEBUG
+  		  puts "- Trying '#{route}'" if $lyre_debug
   			regex = {}
   			regex[:vars] = route.gsub(/(:[a-z]*)/, '(:[a-z]*)')
-  		  puts "- REGEX VARS '#{regex[:vars]}'" if DEBUG
+  		  puts "- REGEX VARS '#{regex[:vars]}'" if $lyre_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 "- NO VARS '#{vars.inspect}'" if DEBUG and vars.nil?
+  		  puts "- NO VARS '#{vars.inspect}'" if $lyre_debug and vars.nil?
   			next if vars.nil?
 			
   			regex[:values] = regex[:vars].gsub(/\:\[a\-z\]/, '.')
-  		  puts "- Trying '#{regex[:values]}'" if DEBUG
+  		  puts "- Trying '#{regex[:values]}'" if $lyre_debug
   			values = str.match(regex[:values])
 
   			next if values.nil?
 
   			params = {}.merge(r)
+  			params.delete('str')
 
   			i = 1;
 			
@@ -39,7 +37,7 @@ module LyreBird
   				i += 1
   			end
   			params = (str.match(/good|ok|pretty good/).nil?) ? params : params.merge({:sort => :rating})
-  		  puts "-- PASS '#{route}' got #{params.inspect}" if DEBUG			
+  		  puts "-- PASS '#{route}' got #{params.inspect}" if $lyre_debug			
   			successes.unshift(params)	
   		end
   		return successes.last

data/lib/lyre_bird.rb

@@ -1,3 +1,5 @@
+$:.unshift(File.join(File.dirname(__FILE__), "/../lib"))
+
 require 'lyre_bird/response'
 require 'lyre_bird/request'
 require 'lyre_bird/route'
@@ -10,12 +12,16 @@ module LyreBird
     attr_accessor :password
     attr_accessor :since_filename
   
-    def initialize(options={})
+    def initialize(username=nil,password=nil,options={})
       $responses = {}
-      self.username = options[:username] || 'username'
-      self.password = options[:password] || 'password'    
+      $no_responses = []      
+      self.username = username || 'username'
+      $lyrebird_username = self.username
+      self.password = password || 'password'    
       self.since_filename = options[:since_filename] || "lyre_bird_listen_since.txt"
       $lyrebird_routes =  options[:routes] || []
+      $lyrebird_default_class = (options[:defaults] and options[:defaults][:class]) ? options[:defaults][:class] : 'LyresController'
+      $lyrebird_default_method = (options[:defaults] and options[:defaults][:method]) ? options[:defaults][:method] : 'index'      
     end
   
     def listen(options={})
@@ -62,7 +68,7 @@ module LyreBird
 
       mentions = mentions.sort {|a,b| a['id']<=>b['id']}
       mentions.each do | tweet |
-        puts "Tweet - #{tweet.keys.to_yaml}" if DEBUG
+        puts "Tweet - #{tweet.keys.to_yaml}" if $lyre_debug
         req = LyreBird::Request.new(:tweet => tweet)
         if options[:post]
           req.response.post(options[:live])

metadata

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