@@ -2,3 +2,5 @@ config/database.yml
tmp/*
log/*
public/cache
+public/index.html
+public/page
.gitignore
@@ -1,7 +1,7 @@
class Entries < Application
provides :xml, :js, :yaml, :text
before :authenticate, :only => [:edit, :update, :destroy]
- # cache_action :index
+
cache :index
def index
@@ -17,15 +17,22 @@ class Entries < Application
conditions = 'status != "hidden"'
#@entries = Entry.find(:all, :order => 'created_at DESC', :limit => @limit, :offset => @offset, :conditions => 'status != "hidden"')
# conditions = "status = 'confirmed' OR status = 'pending'"
- @entries = Entry.find(:all, :order => 'created_at ASC', :limit => @limit, :offset => @offset, :conditions => conditions, :include => [:flags])
+ @entries = Entry.find(:all, :order => 'created_at ASC', :limit => @limit, :offset => @offset, :conditions => conditions)
end
+
#Flag.find(:all, :conditions => "entry_id in (#{@entries.map_by_id.join(',')})")
display @entries
end
- def xml # FIXME should be raw XML, use .rss
+ def blacklist
+ @entries = Entry.find_all_by_status('confirmed')
+ render :template => 'entries/index.text'
+ end
+
+ def rss # FIXME should be raw XML, use .rss
@entries = Entry.find(:all, :order => 'updated_at DESC', :limit => 12)
- display @xml
+ # display @xml
+ render :template => 'entries/index.xml'
end
@@ -197,7 +204,10 @@ class Entries < Application
# TODO: should actually be in a FlagsController yo
def flags_for_ip
only_provides :js
+
+ params[:ip] ||= request.remote_ip
flags = Flag.find_all_by_ip(params[:ip]).map(&:entry_id)
+
render "var flags = [#{flags.join(',')}];", :layout => false
end
app/controllers/entries.rb
@@ -6,8 +6,13 @@ class Entry < ActiveRecord::Base
validates_uniqueness_of :url, :on => :create, :message => "must be unique"
# interesting bits
- def confirmations; flags.select { |u| u.name == 'confirm:true' }; end
- def disputes; flags.select { |u| u.name == 'confirm:false' }; end
+ def confirmations
+ Flag.count(:conditions => "entry_id = #{self.id} AND name = 'confirm:true'")
+ end
+
+ def disputes
+ Flag.count(:conditions => "entry_id = #{self.id} AND name = 'confirm:false'")
+ end
# % of votes needed before it is confirmed (rounded down)
def confirmation_threshold
@@ -17,8 +22,9 @@ class Entry < ActiveRecord::Base
12
end
def confirmed?
- if flags.length >= minimum_vote_count and status != 'hidden'
- return confirmations.length > (flags.length * confirmation_threshold).floor
+ flag_count = flags.count
+ if flag_count >= minimum_vote_count and status != 'hidden'
+ return confirmations > (flag_count * confirmation_threshold).floor
else
return false
end
@@ -37,9 +43,9 @@ class Entry < ActiveRecord::Base
# how disputed is this entry?
def controversy
- if disputes.length != confirmations.length
- ratio = disputes.length.to_f/flags.length.to_f
- ratio = 1.0 if ratio.to_f.nan? or confirmations.length == 0 # exceptions, not proper
+ if disputes != confirmations
+ ratio = disputes.to_f/flags.count.to_f
+ ratio = 1.0 if ratio.to_f.nan? or confirmations == 0 # exceptions, not proper
else
ratio = 0.5
end
app/models/entry.rb
@@ -1,4 +1,23 @@
class Flag < ActiveRecord::Base
belongs_to :entry
belongs_to :user
+
+ def confirmation?
+ self.name == 'confirm:true'
+ end
+
+ def dispute?
+ self.name == 'confirm:false'
+ end
+
+ # after_create :update_entry_counters
+ # def update_entry_counters
+ # if self.confirmation?
+ # entry.confirm_count += 1
+ # else
+ # entry.dispute_count += 1
+ # end
+ # entry.save!
+ # end
+
end
\ No newline at end of file
app/models/flag.rb
@@ -44,7 +44,7 @@
<% else %>
<strong>confirmations:</strong>
<% end %>
- <strong class="count"><%= entry.confirmations.length %></strong>
+ <strong class="count"><%= entry.confirmations %></strong>
</span>
<span class="dispute"><code>-</code>
<% if new_voter %>
@@ -52,7 +52,7 @@
<% else %>
<strong>disputes:</strong>
<% end %>
- <strong class="count"><%= entry.disputes.length %></strong>
+ <strong class="count"><%= entry.disputes %></strong>
</span>
<br class="clear" />
</div> <!-- /.flags -->
@@ -66,7 +66,7 @@
<div class="stats">
- <% confirms = entry.confirmations.length; disputes = entry.disputes.length %>
+ <% confirms = entry.confirmations; disputes = entry.disputes %>
<% width = 300; height = 10 #FIXME %>
<div style="float: right; display: inline; width: <%= width - 1%>px; height: 3px; background-color: #aaa;"> </div>
<div style="background-color: #fbb; float: right; clear: right; display: inline; width: <%= (entry.controversy * width).to_i %>px; height: <%= height %>px;"> <%#= ("%.2f" % entry.controversy) %></div>
app/views/entries/index.html.erb
@@ -14,7 +14,7 @@ content = RSS::Maker.make("2.0") { |m|
i.link = entry_url(entry)
last_flag = entry.flags.last
i.description =
- "#{entry.confirmations.length} confirmations, #{entry.disputes.length} disputes <br />
+ "#{entry.confirmations} confirmations, #{entry.disputes} disputes <br />
blacklisted? #{entry.confirmed? ? 'yep' : 'nope'}
<p>#{link_to '» Comments <br /> <img src="'+entry.thumbnail+'" alt="" title="" />', entry_url(entry)}</p>"
# i.date = last_flag.timestamp rescue Time.now
app/views/entries/index.xml.erb
@@ -23,7 +23,8 @@
<script src="/javascripts/jquery.dimensions.js" type="text/javascript" charset="utf-8"></script>
<!--<script src="/javascripts/jquery.pagination.js" type="text/javascript" charset="utf-8"></script>-->
<script src="/javascripts/rickblock.js" type="text/javascript" charset="utf-8"></script>
- <script src="/flags.js" type="text/javascript" charset="utf-8"></script>
+
+ <!-- <script src="/flags.js" type="text/javascript" charset="utf-8"></script> -->
</head>
<body>
app/views/layout/application.html.erb
@@ -7,9 +7,18 @@ Merb::Config.use { |c|
c[:log_auto_flush ] = true
}
+# dev
Merb::BootLoader.after_app_loads do
Merb::Cache.setup do
register(:default, Merb::Cache::AdhocStore.new)
end
end
+# prod
+# Merb::BootLoader.after_app_loads do
+# Merb::Cache.setup do
+# register(:page_store, Merb::Cache::PageStore[Merb::Cache::FileStore], :dir => Merb.root / "public")
+# register(:action_store, Merb::Cache::ActionStore[Merb::Cache::FileStore], :dir => Merb.root / "tmp")
+# register(:default, Merb::Cache::AdhocStore[:page_store, :action_store])
+# end
+# end
\ No newline at end of file
config/environments/development.rb
@@ -32,10 +32,12 @@ Merb::Router.prepare do |r|
end
r.match('/page/:page').to(:controller => 'entries', :action =>'index')
- # specific routes
- r.match('/ricklist.txt').to(:controller => 'entries', :action => 'index', :format => 'text')
- r.match('/rickblock.txt').to(:controller => 'entries', :action => 'index', :format => 'text', :rickblock => 'true')
- r.match(/\/(rss|atom|feed)/).to(:controller => 'entries', :action => 'index', :format => 'xml')
+ # specific routes
+ # FIXME: merb-cache interfering with .xml/.txt... AGH
+ # r.match(/\/(rss|atom|feed)(\.xml)?/).to(:controller => 'entries', :action => 'rss', :format => 'xml')
+ r.match('/feed.xml').to(:controller => 'entries', :action => 'rss', :format => 'xml')
+ r.match('/blacklist.txt').to(:controller => 'entries', :action => 'blacklist', :format => 'text')
+
# JSON version of all of a user's flags
r.match('/flags.js').to(:controller => 'entries', :action => 'flags_for_ip', :format => 'js')
config/router.rb
1c151a1d3961ee77e8a802935638ff3ff8f11a13
Jamie Wilkinson
jamie@tramchase.com
http://github.com/jamiew/rickrolldb/commit/2404bdeb3f7ff8437b0a63d241efb470c26d6673
2404bdeb3f7ff8437b0a63d241efb470c26d6673
2009-05-15T08:00:53-07:00
2009-05-15T08:00:53-07:00
caching hacks -- merb-cache doesn't respect formats. quickly broke RSS & .txt rendering into different controller methods. also refactor Flag counting into actual counting -- was getting whole objects before. doing it in n+1 queries but +caching should help speed substantially.
9e8c4f0a68a190ad5e91d0b20c9eb855b2b3f5ef
Jamie Wilkinson
jamie@tramchase.com