lib/columnlog/apps/last_fm.rb
vendor/flickr
@@ -1,3 +1,6 @@
[submodule "sinatra"]
path = vendor/sinatra
url = git://github.com/bmizerany/sinatra.git
+[submodule "vendor/flickr"]
+ path = vendor/flickr
+ url = git://github.com/ctagg/flickr.git
.gitmodules
@@ -18,6 +18,7 @@ end
apps/tumblr
apps/gist
apps/rss
+ apps/last_fm
}.each do |file|
require File.join('columnlog', file)
end
lib/columnlog.rb
@@ -49,6 +49,10 @@ module Columnlog
"#{name}_#{with}/#{Time.now.to_i / cache_for.to_i}"
end
+ def cache_for
+ @attributes['cache_for'] || self.class.cache_for
+ end
+
def get(howmany = 10)
cache.fetch(cache_key(howmany)) do
app.get(howmany)
lib/columnlog/column.rb
@@ -31,4 +31,7 @@ gem_dependency 'twitter'
gem_dependency 'nokogiri'
gem_dependency 'xml'
-missing_gems?
\ No newline at end of file
+gem_dependency 'vendor/flickr/lib/flickr'
+
+missing_gems?
+
lib/gems.rb
@@ -46,24 +46,26 @@ a:hover {
min-width: 300px;
margin: 0px;
/* margin-bottom: 30000px;*/
- border-right: 2px solid: #333;
+ border-top: 1px solid #13171E;
+ border-right: 2px solid #666;
float:left;
height: 100%;
}
.post {
- padding: 0px 10px 20px;
+ padding: 10px;
line-height: 140%;
+ border-bottom: 1px solid #666;
}
.post h3 {
font-size: 16px;
+ line-height: 140%;
+ padding: 0px;
+ margin: 0px;
color:#B6B6B6;
}
-#column_twitter .post_body {
- font-size: 16px;
-}
.post .meta_info {
font-size: 11px;
- color: #E1E1E1;
+ color: #9E9E9E;
}
.clear {
@@ -73,7 +75,7 @@ a:hover {
}
.column h2 {
padding: 0px 10px;
- margin: -5px 0px 10px 0px;
+ margin: -5px 0px 0px 0px;
font-size: 40px;
height: 30px;
/* text-shadow: #333 2px 2px 5px;*/
@@ -88,6 +90,10 @@ a:hover {
#column_twitter h2 a:link, #column_twitter h2 a:visited {
color: #0C2A47;
}
+#column_twitter .post_body {
+ font-size: 20px;
+ font-family: Georgia, Times, serif;
+}
#column_rss {
background:#22455E;
}
@@ -107,4 +113,14 @@ a:hover {
}
#column_tumblr h2 a:link, #column_tumblr h2 a:visited {
color: #13323A;
-}
\ No newline at end of file
+}
+#column_last_fm {
+ background: #51373D;
+}
+#column_last_fm h2 {
+ background: #B6D7F0;
+ display:block;
+}
+#column_last_fm h2 a:link, #column_last_fm h2 a:visited {
+ color: #51373D;
+}
public/stylesheets/quirkey.css
@@ -33,7 +33,6 @@ class TestPost < Test::Unit::TestCase
end
end
-
context "with a shortcut in the body" do
setup do
@post = Post.new(:body => '*tw tweeting my life away')
test/test_post.rb
@@ -1,6 +1,7 @@
<div id="columns">
-<% Columnlog::Column.all.reject {|c| c.updated_at.nil? }.sort_by {|c| c.updated_at }.reverse.each do |column| %>
-<div class="column" id="column_<%= column.app_type.underscore %>" style="width: <%= 100 / Columnlog::Column.count %>%;">
+<% columns = Columnlog::Column.all.reject {|c| c.updated_at.nil? } %>
+<% columns.sort_by {|c| c.updated_at }.reverse.each do |column| %>
+<div class="column" id="column_<%= column.app_type.underscore %>" style="width: <%= 100 / columns.length %>%;">
<h2><%= link_to column.title, column.url %></h2>
<div class="posts">
<% column.get.each do |post| %>
views/quirkey/index.erb
5be5978d7351810f043d5f317f632907d753d5b0
Aaron Quint
aaron@quirkey.com
http://github.com/quirkey/columnlog/commit/8e648e752becb180f478d0de5649630ad2588190
8e648e752becb180f478d0de5649630ad2588190
2008-12-02T19:39:20-08:00
2008-12-02T19:39:20-08:00
Subclassed a specific Last.FM app (using inheritince for its true purpose)
Added flickr submodule
More css cleanup
86794b58bd89a689fae99baaa37753f6e797ae98
Aaron Quint
aaron@quirkey.com