elliottcable-jello 2 → 3

data/.manifest

@@ -4,9 +4,9 @@ lib/jello/logger.rb
 lib/jello/mould.rb
 lib/jello/pasteboard.rb
 lib/jello.rb
-moulds/grabup.rb
+moulds/grabup_fixer.rb
 moulds/say.rb
-moulds/shorten.rb
+moulds/shortener.rb
 Rakefile.rb
 README.markdown
 spec/jello_spec.rb

data/README.markdown

@@ -23,7 +23,7 @@ the long URL with the shortened one, write a short mould like the following:
     
     Jello::Mould.new do |paste|
     
-      if paste =~ %r{}^http://.*}
+      if paste =~ %r{^http://.*}
         uri = $&
         uri.gsub! /#/, '%23'
         unless uri =~ %r{^http://bit.ly}

data/Rakefile.rb

@@ -132,7 +132,7 @@ end
 
 desc 'Check everything over before commiting'
 task :aok => [:'documentation:generate', :'documentation:open',
-              :'package:manifest',
+              :'package:manifest', :'package:gemspec',
               :'coverage:run', :'coverage:verify', :'coverage:open']
 
 task :ci => [:'documentation:generate', :'coverage:run', :'coverage:verify']

data/bin/jello

@@ -4,11 +4,41 @@
 
 options = Hash.new
 OptionParser.new do |opts|
-  opts.banner = "Usage: jello [options] <mould> (<mould> …)"
+  opts.banner = "\
+= Jello =
+
+Moulds may be any string that matches a part of a path of a Ruby file relative\
+to one of the entries in the Jello search path:
+ - ~/.jello
+ - /etc/jello
+ - <`gem contents jello`>/moulds
+
+If a file matches earlier in the search path, later ones that also match will\
+be ignored.
+
+A directory may match, in which case all Ruby files in that directory will be\
+utilized.
+
+The follow moulds are included for your enjoyment:
+ - jello say
+ - jello grabup
+ - jello shorten
+
+== Usage ==
+`jello [options] <mould> (<mould> <mould> …)`
+"
   
   opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
     options[:verbose] = v
   end
+  
+  opts.on("-f", "--[no-]feedback", "Feedback on successful process") do |f|
+    options[:feedback] = f
+  end
+  
+  opts.on("-p", "--period PERIOD", "Period over which to cycle watcher process") do |p|
+    options[:period] = p
+  end
 end.parse!
 
 ARGV.each do |mould|

data/jello.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Jello-2
+# Gem::Specification for Jello-3
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: jello
 version: !ruby/object:Gem::Version 
-  version: "2"
+  version: "3"
 platform: ruby
 authors: 
 - elliottcable
 autorequire: 
 bindir: bin
 
-date: 2008-09-29 00:00:00 -08:00
+date: 2008-10-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,9 +87,9 @@ files:
 - lib/jello/mould.rb
 - lib/jello/pasteboard.rb
 - lib/jello.rb
-- moulds/grabup.rb
+- moulds/grabup_fixer.rb
 - moulds/say.rb
-- moulds/shorten.rb
+- moulds/shortener.rb
 - Rakefile.rb
 - README.markdown
 - spec/jello_spec.rb

data/lib/jello.rb

@@ -3,10 +3,13 @@ require 'jello/pasteboard'
 require 'jello/mould'
 
 module Jello
-  Version = 2
+  Version = 3
   
   def self.start! options = {}
     options = {:verbose => false, :period => 0.5}.merge(options)
+    raise ArgumentError, 'period must be capable of becoming a Numeric Float' unless
+      options[:period].respond_to? :to_f
+    options[:period] = options[:period].to_f
     
     forever do
       
@@ -16,11 +19,13 @@ module Jello
           
           puts "#{pasteboard.board} received: [#{initial_paste}]" if options[:verbose]
           moulds.each do |mould|
-            paste = mould.on_paste[paste]
+            modified = mould.on_paste[paste]
+            paste = modified if modified.is_a?(String)
           end
           
           if paste.is_a?(String) and paste != initial_paste
             puts " --> [#{paste}]" if options[:verbose]
+            print "\a" if options[:feedback]
             pasteboard.puts paste 
           end
         end

data/moulds/grabup_fixer.rb

@@ -0,0 +1,13 @@
+require 'uri'
+
+Jello::Mould.new do |paste|
+  if paste =~ %r{^http://.*}
+    uri = URI.parse paste
+    
+    if uri.host =~ /grabup/
+      uri.host = 'grabup.com'
+      uri.query = 'direct'
+      uri.to_s
+    else; nil; end
+  end
+end

data/moulds/shortener.rb

@@ -0,0 +1,58 @@
+require 'cgi'
+require 'rubygems'
+require 'open-uri'
+require 'JSON'
+
+Paths = {
+  'google' => :search,
+  /my-site\.name/ => %r{^http://my-site\.name/(.+)\.xhtml$}
+}
+
+Jello::Mould.new do |paste, board|
+  
+  if paste =~ %r{^http://.*}
+    uri = URI.parse $&
+    unless paste =~ %r{^http://tr.im}
+      # We're going to add the main part of the domain to the end of the URI
+      # as a bullshit parameter, to give visitors some indication of what
+      # their destination is. If you're in a character-limited location, such
+      # as twitter or a text message, feel free to simply delete this section
+      # of the URL by hand after pasting. (⌥⌫ is helpful!)
+      # 
+      # We also check if the URI matches a key of the Paths constant, and
+      # process the URI based on the value matched to that key if it matches.
+      # Keys can be stringish or regexish, in the latter case, it will run it
+      # matches. Values can be stringish or regexish, in the latter case,
+      # the last matching group will be used as the parameter.
+      base = nil
+      matcher = Paths.select {|matcher,baser| uri.to_s =~ (matcher.is_a?(Regexp) ? matcher : /#{matcher}/) } .first
+      if matcher
+        base = uri.to_s.match( matcher[1] )
+      end
+      
+      unless base and (base = base[1])
+        base = uri.host.match( /(?:[\w\d\.]+\.)?([\w\d]+)\.[\w]{2,4}/ )[1]
+      end
+      
+      base = URI::unescape(base).gsub(/\s/, '_')
+      uri = CGI::escape uri.to_s
+      
+      shortener = URI.parse 'http://tr.im/api/trim_url.json'
+      
+      # Feel free to copy this Mould to your ~/.jello directory and hardcode
+      # in your username and password, if you don't feel like having your
+      # username and password in your shell history.
+      params = {}
+      params[:username] = ENV['TRIM_USERNAME'] if ENV['TRIM_USERNAME']
+      params[:password] = ENV['TRIM_PASSWORD'] if ENV['TRIM_PASSWORD']
+      params[:url] = uri
+      
+      shortener.query = params.to_a.map {|a| a.join '=' }.join('&')
+      
+      reply = open(shortener).read
+      short = JSON.parse reply
+      [short['url'], base].join('?')
+    end
+  end
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: elliottcable-jello
 version: !ruby/object:Gem::Version 
-  version: "2"
+  version: "3"
 platform: ruby
 authors: 
 - elliottcable
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2008-09-29 01:00:00 -07:00
+date: 2008-10-09 01:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,9 +83,9 @@ files:
 - lib/jello/mould.rb
 - lib/jello/pasteboard.rb
 - lib/jello.rb
-- moulds/grabup.rb
+- moulds/grabup_fixer.rb
 - moulds/say.rb
-- moulds/shorten.rb
+- moulds/shortener.rb
 - Rakefile.rb
 - README.markdown
 - spec/jello_spec.rb

data/moulds/grabup.rb

@@ -1,8 +0,0 @@
-require 'open-uri'
-
-Jello::Mould.new do |paste|
-  if paste =~ %r{^http://www\.grabup\.com/uploads/[0-9a-z]{32}\.png$}
-    paste.gsub!(%r{^http://www\.}, 'http://')
-    paste += '?direct'
-  end
-end

data/moulds/shorten.rb

@@ -1,19 +0,0 @@
-require 'rubygems'
-require 'JSON'
-
-Jello::Mould.new do |paste, board|
-  
-  if paste =~ %r{^http://.*}
-    uri = $&
-    unless paste =~ %r{^http://tr.im}
-      uri.gsub! /#/, '%23' # Fix anchors
-      
-      shortener = 'http://tr.im/api/trim_url.json?url=' + uri
-      
-      reply = open(shortener).read
-      short = JSON.parse reply
-      short['url']
-    end
-  end
-  
-end