controller/account.rb
view/account/login.haml
view/spam/list_spammy.haml
view/spam/search.haml
@@ -11,8 +11,9 @@ class PasteController < Ramaze::Controller
engine :Haml
layout :layout
+ # Creating new paste
def index
- @syntaxes = $rapaste[:syntaxes]
+ @syntaxes = $rapaste_syntaxes
if @fork = request[:fork]
@paste = paste_for(@fork, digest = nil, redirect = false)
@@ -21,12 +22,39 @@ class PasteController < Ramaze::Controller
@paste ||= Paste.new
end
+ # TODO: choose a faster hashing method?
+ def save
+ syntax, text, private = request[:syntax, :text, :private]
+ private = !!private # force to boolean for sequel
+
+ if request.post? and text and $rapaste_syntaxes[syntax]
+ paste = Paste.create(:text => text, :syntax => syntax,
+ :private => private, :ip => request.ip)
+
+ redirect paste.link(:href)
+ end
+
+ redirect_referrer
+ end
+
+ # Listing pastes
+
def list
@pastes = paste_list
@pager = paginate(@pastes, :limit => $rapaste[:pager])
- @total = @pastes.count
+ @title = "Listing #{@pager.count} of #{@pastes.count} pastes"
end
+ def search
+ return unless @needle = request['substring'] and not @needle.empty?
+ @pastes = paste_list.filter(:text.like("%#{@needle}%"))
+ limit = $rapaste[:pager]
+ @pager = paginate(@pastes, :limit => limit)
+ @title = "Listing #{@pager.count} of #{@pastes.count} results for '#{h(@needle)}'"
+ end
+
+ # Operations on single paste
+
def view(id, digest = nil)
@paste, @digest = paste_for(id, digest)
end
@@ -39,51 +67,19 @@ class PasteController < Ramaze::Controller
respond paste_for(id, digest).text, 200, 'Content-Type' => 'text/html'
end
- # TODO: choose a faster hashing method?
- def save
- syntax, text, private = request[:syntax, :text, :private]
- private = !!private # force to boolean for sequel
-
- if request.post? and text and $rapaste[:syntaxes][syntax]
- paste = Paste.create(
- :category => BAYES.classify(text),
- :created => Time.now,
- :private => private,
- :syntax => syntax,
- :digest => Digest::SHA1.hexdigest(text),
- :text => text,
- :ip => request.ip
- )
-
- session[:pastes] ||= Set.new
- session[:pastes] << paste.id
-
- redirect paste.link(:href)
- end
-
- redirect_referrer
- end
-
-
# TODO: the behaviour of forking a private paste isn't implemented yet,
# suggestions welcome
def fork(id, digest = nil)
redirect Rs(:fork => id, :digest => digest)
end
- # TODO: implement this using the session[:pastes]
+ # TODO: implement this using something like session[:pastes]
def delete(id, digest = nil)
redirect_referrer unless request.post?
paste = paste_for(id, digest)
end
- def search
- return unless @needle = request['substring'] and not @needle.empty?
- needle = "%#{@needle}%"
- @pastes = Paste.filter(:text.like(needle) & ({:archive => true, :private => false, :category => 'ham'} | {:ip => request.ip}))
- @total = @pastes.count
- @pager = paginate(@pastes, :limit => $rapaste[:pager])
- end
+ # Utility methods
def paste_list
Paste.order(:id.desc).filter({:archive => true, :private => false, :category => 'ham'} | {:ip => request.ip})
controller/paste.rb
@@ -4,15 +4,13 @@ class SpamController < Ramaze::Controller
engine :Haml
layout '/layout'
- def list_pending
- @pastes = Paste.filter({:private => false, :approved => nil} & ({:category => 'spam'} | {:category => nil}))
- @pager = paginate(@pastes, :limit => $rapaste[:pager])
- @count = @pastes.count
+ before_all do
+ redirect_referrer unless session[:openid]
end
- def list_spammy
- @pastes = Paste.filter(:private => false, :spammy => true)
- @pager = paginate(@pastes, :limit => $rapaste[:pager])
+ def list_pending
+ @pastes = Paste.filter({:private => false, :approved => nil} & ({:category => 'spam'} | {:category => nil}))
+ @pager = paginate(@pastes, :limit => ($rapaste[:pager] * 3))
@count = @pastes.count
end
@@ -53,4 +51,24 @@ class SpamController < Ramaze::Controller
redirect_referrer
end
+
+ def search
+ query = request[:q]
+
+ @pastes = Paste.filter({:private => false, :approved => nil} & ({:category => 'spam'} | {:category => nil}) & :text.like("%#{query}%"))
+ @pager = paginate(@pastes, :limit => ($rapaste[:pager] * 3))
+ @count = @pastes.count
+ end
+
+ def list_spammy
+ query = request[:q]
+
+ suspect = Paste.filter({:private => false, :approved => nil} & {:category => nil})
+ spammy = []
+ suspect.each{|paste| paste.categorize! }
+
+ @pastes = Paste.filter({:private => false, :approved => nil} & ({:category => 'spam'}))
+ @pager = paginate(@pastes, :limit => ($rapaste[:pager] * 3))
+ @count = @pastes.count
+ end
end
controller/spam.rb
@@ -1,16 +1,43 @@
$rapaste = {
- :engine => :coderay, # :uv or :coderay
- :fragment => 10, # how many lines to show per paste in preview
- :pager => 9, # how many pastes to show in the list view on one page
- :priority => %w[ ruby plain_text plaintext html css javascript java_script yaml diff ],
- :theme => 'iplastic', # only used by uv
- :title => 'RaPaste', # title of page
- :admins => { # hash of username and password for spamhunters
- 'manveru' => 'letmein'
- },
+ # Use :uv or :coderay for highlighting
+ :engine => :coderay,
+
+ # How many pastes to show in the list view on one page
+ :pager => 12,
+
+ # How many lines to show per paste in preview
+ :fragment => 10,
+
+ # Priority of syntaxes listed in the drop-down menu
+ # Note that highlighting engines usually differ in the names, see the readme
+ # for more details.
+ :priority => %w[
+ ruby
+ plain_text plaintext
+ html
+ css
+ javascript java_script
+ yaml
+ diff
+ ],
+
+ # only used by uv
+ :theme => 'iplastic',
+
+ # title of page
+ :title => 'RaPaste',
+
+ # list of openids that may login
+ :users => [
+ 'http://manveru.myopenid.com',
+ ],
# You might want to edit start.rb directly.
- :ramaze => { :port => 7000, :host => '0.0.0.0' }
+ :ramaze => {
+ :port => 7000,
+ :host => '0.0.0.0',
+ :adapter => :thin
+ }
}
DB = Sequel.sqlite(__DIR__/'db/rapaste.db') #, :logger => Ramaze::Log)
env.rb
@@ -15,6 +15,21 @@ class Paste < Sequel::Model
boolean :approved # should be listed and ain't spam
end
+ validations.clear
+ validates do
+ presence_of :text, :syntax, :ip
+ format_of :text, :with => /\A.*\S+.*\Z/m, :message => 'is empty'
+ format_of :syntax, :with => /\A.*\S+.*\Z/m, :message => 'is empty'
+ end
+
+ hooks.clear
+ before_create{
+ self.created = Time.now
+ self.digest = self.hashify
+ self.category = self.categorize
+ }
+# after_create{}
+
def text_fragment
Highlight.new.fragment(self)
end
@@ -24,7 +39,8 @@ class Paste < Sequel::Model
end
def syntax_description
- $rapaste[:syntaxes][syntax]
+ p $rapaste_syntaxes
+ p syntax => $rapaste_syntaxes[syntax]
end
include Ramaze::Helper::Link
@@ -45,6 +61,12 @@ class Paste < Sequel::Model
end
end
+ def hashify
+ Digest::SHA1.hexdigest(text)
+ end
+
+ # Interaction with Bayesian filter
+
def classify
BAYES.classify(text)
end
@@ -66,9 +88,13 @@ class Paste < Sequel::Model
end
def categorize!
- self.category = BAYES.classify(text).to_s
+ categorize
save
end
+ def categorize
+ self.category = BAYES.classify(text).to_s
+ end
+
create_table unless table_exists?
end
model/paste.rb
@@ -14,6 +14,7 @@ require 'model/paste'
require 'controller/css'
require 'controller/paste'
require 'controller/spam'
+require 'controller/account'
class Highlight
def default_options
@@ -23,7 +24,7 @@ class Highlight
mod = EXTEND[$rapaste[:engine]]
mod.setup(__DIR__)
- $rapaste[:syntaxes] = mod.syntaxes($rapaste[:priority])
+ $rapaste_syntaxes = mod.syntaxes($rapaste[:priority])
end
# The Bayes database contains information about the ham and spam rating of
start.rb
@@ -120,12 +120,6 @@ class Highlight
options
end
- def self.setup(dir = nil)
- puts "Initializing Coderay"
- require 'coderay'
- return self
- end
-
STYLE_NAME = {
'c' => 'C',
'css' => 'CSS',
@@ -137,6 +131,7 @@ class Highlight
'json' => 'JSON',
'nitro_xhtml' => 'Nitro XHTML',
'plaintext' => 'Plain Text',
+ 'plain_text' => 'Plain Text',
'rhtml' => 'ERB',
'ruby' => 'Ruby',
'scheme' => 'Scheme',
@@ -144,6 +139,15 @@ class Highlight
'xml' => 'XML',
}
+ def self.setup(dir = nil)
+ puts "Initializing Coderay"
+ require 'coderay'
+
+ # commonly used, but UV and CodeRay have different names for it
+ CodeRay::Scanners.map :plain_text => :plaintext
+ return self
+ end
+
# TODO: generate automatically
def self.syntaxes(priority = [])
dict = Ramaze::Dictionary.new
@@ -157,4 +161,177 @@ class Highlight
return dict
end
end
+
+ # This is a dump of:
+ #
+ # require 'uv'
+ # Uv.init_syntaxes
+ # syntaxes = Uv.instance_variable_get('@syntaxes')
+ # hash = Hash[*syntaxes.map{|k,v| [k, v.name] }.flatten]
+ # puts hash.sort_by{|k,v| k }.map{|k,v| "%-34p => %-p," % [k, v] }
+ #
+ # We put this here to be able to display the correct name of a syntax in case
+ # an engine is used that doesn't support all.
+
+ SYNTAX_NAME = {
+ "actionscript" => "ActionScript",
+ "active4d" => "Active4D",
+ "active4d_html" => "HTML (Active4D)",
+ "active4d_ini" => "Active4D Config",
+ "active4d_library" => "Active4D Library",
+ "ada" => "Ada",
+ "antlr" => "ANTLR",
+ "apache" => "Apache",
+ "applescript" => "AppleScript",
+ "asp" => "ASP",
+ "asp_vb.net" => "ASP vb.NET",
+ "bibtex" => "BibTeX",
+ "blog_html" => "Blog \342\200\224 HTML",
+ "blog_markdown" => "Blog \342\200\224 Markdown",
+ "blog_text" => "Blog \342\200\224 Text",
+ "blog_textile" => "Blog \342\200\224 Textile",
+ "build" => "NAnt Build File",
+ "bulletin_board" => "Bulletin Board",
+ "c" => "C",
+ "c++" => "C++",
+ "cake" => "Cake",
+ "camlp4" => "camlp4",
+ "cm" => "CM",
+ "coldfusion" => "ColdFusion",
+ "context_free" => "Context Free",
+ "cs" => "C#",
+ "css" => "CSS",
+ "css_experimental" => "CSS v3 beta",
+ "csv" => "CSV",
+ "d" => "D",
+ "diff" => "Diff",
+ "dokuwiki" => "DokuWiki",
+ "dot" => "Graphviz (DOT)",
+ "doxygen" => "Doxygen",
+ "dylan" => "Dylan",
+ "eiffel" => "Eiffel",
+ "erlang" => "Erlang",
+ "f-script" => "F-Script",
+ "fortran" => "Fortran",
+ "fxscript" => "FXScript",
+ "greasemonkey" => "Greasemonkey",
+ "gri" => "Gri",
+ "groovy" => "Groovy",
+ "gtd" => "GTD",
+ "gtdalt" => "GTDalt",
+ "haml" => "Haml",
+ "haskell" => "Haskell",
+ "html" => "HTML",
+ "html-asp" => "HTML (ASP)",
+ "html_django" => "HTML (Django)",
+ "html_for_asp.net" => "HTML (ASP.net)",
+ "html_mason" => "HTML (Mason)",
+ "html_rails" => "HTML (Rails)",
+ "html_tcl" => "HTML (Tcl)",
+ "icalendar" => "iCalendar",
+ "inform" => "Inform",
+ "ini" => "Ini",
+ "installer_distribution_script" => "Installer Distribution Script",
+ "io" => "Io",
+ "java" => "Java",
+ "javaproperties" => "Java Properties",
+ "javascript" => "JavaScript",
+ "javascript_+_prototype" => "Prototype & Script.aculo.us (JavaScript)",
+ "javascript_+_prototype_bracketed" => "Prototype & Script.aculo.us (JavaScript) Bracketed",
+ "jquery_javascript" => "jQuery (JavaScript)",
+ "json" => "JSON",
+ "languagedefinition" => "Language Grammar",
+ "latex" => "LaTeX",
+ "latex_beamer" => "LaTeX Beamer",
+ "latex_log" => "LaTeX Log",
+ "latex_memoir" => "LaTeX Memoir",
+ "lexflex" => "Lex/Flex",
+ "lighttpd" => "Lighttpd",
+ "lilypond" => "Lilypond",
+ "lisp" => "Lisp",
+ "literate_haskell" => "Literate Haskell",
+ "logo" => "Logo",
+ "logtalk" => "Logtalk",
+ "lua" => "Lua",
+ "m" => "MATLAB",
+ "macports_portfile" => "MacPorts Portfile",
+ "mail" => "Mail",
+ "makefile" => "Makefile",
+ "man" => "Man",
+ "markdown" => "Markdown",
+ "mediawiki" => "Mediawiki",
+ "mel" => "MEL",
+ "mips" => "MIPS Assembler",
+ "mod_perl" => "mod_perl",
+ "modula-3" => "Modula-3",
+ "moinmoin" => "MoinMoin",
+ "mootools" => "MooTools",
+ "movable_type" => "Movable Type",
+ "multimarkdown" => "MultiMarkdown",
+ "objective-c" => "Objective-C",
+ "objective-c++" => "Objective-C++",
+ "ocaml" => "OCaml",
+ "ocamllex" => "OCamllex",
+ "ocamlyacc" => "OCamlyacc",
+ "opengl" => "OpenGL",
+ "pascal" => "Pascal",
+ "perl" => "Perl",
+ "php" => "PHP",
+ "plain_text" => "Plain Text",
+ "pmwiki" => "PmWiki",
+ "postscript" => "Postscript",
+ "processing" => "Processing",
+ "prolog" => "Prolog",
+ "property_list" => "Property List",
+ "python" => "Python",
+ "python_django" => "Python (Django)",
+ "qmake_project" => "qmake Project file",
+ "qt_c++" => "Qt C++",
+ "quake3_config" => "Quake Style .cfg",
+ "r" => "R",
+ "r_console" => "R Console",
+ "ragel" => "Ragel",
+ "rd_r_documentation" => "Rd (R Documentation)",
+ "regexp" => "Regular Expression",
+ "regular_expressions_oniguruma" => "Regular Expressions (Oniguruma)",
+ "regular_expressions_python" => "Regular Expressions (Python)",
+ "release_notes" => "Release Notes",
+ "remind" => "Remind",
+ "restructuredtext" => "reStructuredText",
+ "rez" => "Rez",
+ "ruby" => "Ruby",
+ "ruby_experimental" => "Ruby Experimental",
+ "ruby_on_rails" => "Ruby on Rails",
+ "s5" => "S5 Slide Show",
+ "scheme" => "Scheme",
+ "scilab" => "Scilab",
+ "setext" => "Setext",
+ "shell-unix-generic" => "Shell Script (Bash)",
+ "slate" => "Slate",
+ "smarty" => "Smarty",
+ "sql" => "SQL",
+ "sql_rails" => "SQL (Rails)",
+ "ssh-config" => "SSH Config",
+ "standard_ml" => "Standard ML",
+ "strings_file" => "Strings File",
+ "subversion_commit_message" => "svn-commit.tmp",
+ "sweave" => "SWeave",
+ "swig" => "SWIG",
+ "tcl" => "Tcl",
+ "template_toolkit" => "Template Toolkit",
+ "tex" => "TeX",
+ "tex_math" => "TeX Math",
+ "textile" => "Textile",
+ "tsv" => "TSV",
+ "twiki" => "Twiki",
+ "txt2tags" => "Txt2tags",
+ "vectorscript" => "Vectorscript",
+ "xhtml_1.0" => "XHTML 1.0 Strict",
+ "xml" => "XML",
+ "xml_strict" => "XML strict",
+ "xsl" => "XSL",
+ "yaml" => "YAML",
+ "yui_javascript" => "Javascript YUI",
+}
+
end
vendor/highlight.rb
@@ -1,22 +1,21 @@
body
- :background #fff
+ :background #000
*
:padding 0
:margin 0
a
- :color #33f
+ :color #fa3
a:visited
- :color #66f
+ :color #fa3
a:hover, a:active, a:focus
- :color #00f
// Layout
#head
:background #339
- :height 2.2em
+ :height 2.4em
:color #fa3
#logo
:float left
@@ -30,16 +29,13 @@ a:hover, a:active, a:focus
:margin 0
:line-height 1em
a
- :color #fa3
:text-decoration none
:background #117
:padding 0.2em
:margin 0.2em
- :line-height 2em
- a:visited
- :color #e92
+ :line-height 2.2em
+ :font-size 1.2em
a:hover, a:active, a:focus
- :color #fa3
:background #228
:text-decoration underline
@@ -53,6 +49,36 @@ a:hover, a:active, a:focus
:color #fa3
:border 1px solid #000
+#content
+ :color #fff
+
+#footer
+ :text-align center
+ :clear both
+ :font-size 0.8em
+ :margin-top 1em
+ :color #fff
+ a
+ // :color #fff
+ :font-weight bold
+ :text-decoration none
+
+.sub_menu
+ :clear both
+ :margin-bottom 0.5em
+ :text-align center
+ a
+ :color #fa3
+ :text-decoration none
+ :background #117
+ :padding 0.2em
+ :font-size 1.1em
+
+.warning
+ :color #f00
+ :padding 0.5em
+ :text-align center
+
.pager
:clear both
:text-align center
@@ -66,18 +92,6 @@ a:hover, a:active, a:focus
.grey
:color #aaa
-#footer
- :text-align center
- :clear both
- :font-size 0.8em
- :margin-top 1em
- :background #aaf
- :color #fff
- a
- :color #fff
- :font-weight bold
- :text-decoration none
-
// New
#new_paste
@@ -90,25 +104,15 @@ a:hover, a:active, a:focus
:clear both
:width 100%
:height 35em
+ :margin-bottom 1em
// View
-#paste_menu
- :clear both
- :background #339
- :margin-bottom 0.5em
- :text-align center
- a
- :color #fa3
- :text-decoration none
- :background #117
- :padding 0.2em
-
-#paste_date
+.paste_date
:text-align center
:padding-right 0.5em
-#paste_body
+.paste_body
:clear both
:padding 0.5em
pre
@@ -125,7 +129,7 @@ a:hover, a:active, a:focus
:background #339
.item
:float left
- :width 30%
+ :width 31%
:overflow hidden
:margin 1%
.item_meta, .more
@@ -155,11 +159,35 @@ pre
:font-family "Courier New", "Terminal", monospace
:font-size 10pt
-.foobar
- :text-align left
- :margin 0.25em
- :border 1px solid #00f
- :float left
- :width 45%
- :overflow hidden
- :background #fff
+.login
+ :margin-left auto
+ :margin-right auto
+ :text-align center
+ :min-height 30em
+ :width 33em
+ :font-family "Times New Roman"
+ form
+ :text-align center
+ fieldset
+ :border 1px solid #eee
+ :background #fff
+ legend
+ :font-size 1.5em
+ label
+ input
+ :font-family "Times New Roman"
+ :font-size 1.5em
+ :width 80%
+ :background #fafafa
+ :border 2px solid #eee
+ :margin 0.2em
+ :padding 0.2em
+ :color #000
+ :text-align center
+ input.submit
+ :text-align center
+ // :background #111
+ // :color #fff
+ :margin 1em
+ :border 1px outset #333
+ :width 40%
view/css/screen.sass
@@ -19,6 +19,8 @@
%input{:type => :text, :name => :substring}
%a{:href => '/'} New
%a{:href => '/list'} List
+ %a{:href => R(AccountController, :login)} Login
+ #flash= flashbox
#content= @content
#footer
©
view/layout.haml
@@ -1,6 +1,6 @@
-= @pager.navigation
+.sub_menu= @pager.navigation
-.list_head= "Pastes total: #@total"
+.list_head= @title
.list
- @pager.each do |paste|
view/list.haml
@@ -1,6 +1,6 @@
-= @pager.navigation
+.sub_menu= @pager.navigation
-.list_head= "Results for '#{h(@needle)}' total: #@total"
+.list_head= @title
.list
- @pager.each do |paste|
view/search.haml
@@ -3,6 +3,11 @@
.flashbox= flashbox
= "There are #@count unapproved pastes"
+%a{:href => Rs(:list_spammy)} Search for obvious spam (slow)
+
+%form{:method => :GET, :action => Rs(:search)}
+ Search this list:
+ %input{:type => :input, :name => :q}
%form{:method => :POST, :action => Rs(:mark)}
%table{:style => 'margin-left: auto; margin-right: auto;'}
@@ -10,13 +15,13 @@
%td Spam
%td Ham
- / %td Category
- / %td [Spam | Ham | Delta]
+ %td Category
+ %td [Spam | Ham | Delta]
%td Paste
- @pager.each do |paste|
- rating, classification = BAYES.classify_info(paste.text)
- - is_spam = rating == 'spam'
+ - is_spam = rating == :spam
- color = is_spam ? '#faa' : '#afa'
- spam_name, ham_name = "spam[#{paste.id}]", "ham[#{paste.id}]"
%tr{:style => "background: #{color};"}
@@ -30,9 +35,9 @@
%input{:type => :radio, :name => paste.id, :value => :ham}
- else
%input{:style => 'display: block;', :type => :radio, :name => paste.id, :value => :ham, :checked => :checked}
- / %td= rating
- / - spammy, hammy = classification[:spam].to_f, classification[:ham].to_f
- / %td= "%.2f | %.2f | %.2f" % [spammy, hammy, (spammy - hammy).abs]
+ %td= rating
+ - spammy, hammy = classification[:spam].to_f, classification[:ham].to_f
+ %td= "%.2f | %.2f | %.2f" % [spammy, hammy, (spammy - hammy).abs]
%td{:style => 'width: 92%'}
%pre{:style => 'width: 80em; overflow: auto;'}= paste.text_fragment
%input{:type => :submit, :value => 'Categorize this list'}
view/spam/list_pending.haml
@@ -1,12 +1,13 @@
-#paste
- #paste_menu
- = @paste.link(:fork)
- = @paste.link(:html)
- = @paste.link(:txt)
- = @paste.link(:rb)
- - if session[:pastes] and session[:pastes].include?(@paste.id)
- = @paste.link(:delete)
- #paste_date
- Created:
- = @paste.created.utc
- %pre#paste_body~ @paste.text_full
+.sub_menu
+ = @paste.link(:fork)
+ = @paste.link(:html)
+ = @paste.link(:txt)
+ = @paste.link(:rb)
+ - if session[:pastes] and session[:pastes].include?(@paste.id)
+ = @paste.link(:delete)
+.paste_date
+ Created:
+ = @paste.created.utc
+- if @paste.category == 'spam'
+ .warning This paste is considered spam, watch out
+%pre.paste_body~ @paste.text_full
view/view.haml
643cfd0ce0f75c817eb6481af08160ea2be5599d
Michael Fellinger
m.fellinger@gmail.com
http://github.com/manveru/rapaste/commit/840c13350ded0814349450e6a14a196f5b8d73fd
840c13350ded0814349450e6a14a196f5b8d73fd
2008-10-29T02:40:16-07:00
2008-10-29T02:40:16-07:00
New checkpoint, almost done integrating new spam fighting interface
81bf1986218df4c87a024e9e36ace1b74d15a6e5
Michael Fellinger
m.fellinger@gmail.com