typo 5.5 → 6.0.4

data/themes/typographic/views/articles/_article.html.erb

@@ -1,51 +0,0 @@
-<div class="atomentry" id="article-<%= article.id %>">
-  <div class="title">
-    <h2 class="title"><%= (controller.action_name.include? 'permalink') ? article.title : link_to_permalink(article,article.title) %></h2>
-    <div class="meta">
-      <%= _("Posted by") %> <cite><%= author_link(article) %></cite> <abbr class="published" title="<%= article.published_at.xmlschema %>"><%= js_distance_of_time_in_words_to_now article.published_at %></abbr>
-    </div>
-  </div>
-  <div class="content">
-    <% if article.password.nil? or article.password.empty? %>
-      <% unless controller.action_name == 'redirect' %>
-        <% if article.excerpt? %>
-          <%= article.excerpt %>
-        <% else %>
-          <%= article.html(:body) %>
-          <% if article.extended? %>
-            <div class="extended">
-              <p><%= link_to_permalink article,"Continue reading..." %></p>
-            </div>
-          <% end %>
-        <% end %>
-      <% else %>
-        <%= article.html(:body) %>
-        <div class="extended">
-          <%= article.html(:extended) %>
-        </div>
-      <% end %>
-    <% else %>
-      <%= render :partial => 'articles/password_form', :locals => { :article => article } %>
-    <% end %>
-  </div>
-  <% if controller.controller_name == "articles" and controller.action_name == "redirect" %>
-  <div class="meta">
-    <p class="infos"><small>
-      <%= _("This entry was posted on %s", content_tag(:abbr, js_distance_of_time_in_words_to_now(@article.published_at), {:class => 'published', :title => @article.published_at.xmlschema})) %>
-      <%= _("and %s", category_links(@article)) unless @article.categories.empty? %>. 
-      <%= _("You can follow any any response to this entry through the %s", link_to(_("Atom feed"), @auto_discovery_url_atom)) %>. 
-      <%= _("You can leave a %s", link_to_permalink(article, _('comment'), 'comments')) unless @article.comments_closed? %> 
-      <%= _("or a %s from your own site", link_to_permalink(@article, _('trackback'), 'trackbacks')) if @article.allow_pings? %>.
-    </small></p>
-    <p class="tags">
-      <%= tag_links(@article) unless @article.tags.empty? %>
-    </p>
-  </div>    
-  <% else %>
-	<p class="links">
-		<%= link_to_permalink(article, _("Read full article"), nil, 'more') if controller.action_name != 'permalink' %>
-		<%= link_to_permalink(article,pluralize(article.published_comments.size, _('no comments') , _('1 comment'), __('%d comments')),'comments', 'comments') %>
-	</p>    
-  <% end %>
-  <br style="clear: left;" />
-</div>

data/themes/typographic/views/articles/_article_content.html.erb

@@ -1 +0,0 @@
-<%= @article.html(:all) %>

data/themes/typographic/views/articles/_comment.html.erb

@@ -1,14 +0,0 @@
-<li class="comment" id="comment-<%= comment.id %>">
-  <div class="author">
-    <%= content_tag(:div, gravatar_tag(comment.email)) if this_blog.use_gravatar and comment.email %>
-    <cite><%= (comment.url.blank?) ? h(comment.author) : link_to(h(comment.author), comment.url) %></cite>
-    <abbr title="<%= comment.created_at.xmlschema %>"><%= distance_of_time_in_words comment.article.published_at, comment.created_at %> <%= _("later")%>:</abbr>
-  </div>
-  <div class="commentContent">
-    <%= comment.html %>
-  </div>
-  <% unless comment.published -%>
-  <div class="spamwarning"><%= _("This comment has been flagged for moderator approval.") %></div>
-  <% end -%>
-</li>
-

data/themes/typographic/views/articles/_comment_form.html.erb

@@ -1,48 +0,0 @@
-<% form_remote_tag :url      => @article.comment_url,
-                    :position => :bottom,
-                    :update   => {:success => 'commentList'},
-                    :loading  => "loading()",
-                    :complete => "complete(request)",
-                    :failure  => "failure(request)",
-                    :html     => {:id => 'commentform', :class => 'comments' } \
-    do %>
-
-<div id="preview" style="display:none"></div>
-
-<h2 id="formComments-title"><%= _("Leave a comment")%></h2>
-<div id="respond" class="post">
-  <p>
-		<label for="comment_author"><%= _("Name %s", content_tag(:small, '('+_('required')+')' ))%></label>
-		<%= text_field "comment", "author" %> 
-  </p>
-
-  <p>
-		<label for="comment_email"><%= _("Email")%> <%= content_tag('small', "(#{link_to('gravatar', 'http://gravatar.com')} "+ _("enabled") + ")") if this_blog.use_gravatar %> <small>(<%= _("never displayed") %>)</small></label>
-		<%= text_field "comment", "email" %>
-	</p>
-	<p>
-		<label><%= _("Website")%></label>
-		<%= text_field "comment", "url" %>
-	</p>
-
-  <p>
-    <label>
-      <%= _("Comments")%>:
-      <%= content_tag('small', link_to(_("Textile enabled"), "http://hobix.com/textile/")) if this_blog.comment_text_filter.include? 'textile' %>
-      <%= content_tag('small', link_to(_("Markdown enabled"), "http://daringfireball.net/projects/markdown/")) if this_blog.comment_text_filter.include? 'markdown' %>
-      <br />
-    </label>
-    <%= text_area 'comment', 'body', :rows => 10 %>
-  </p>
-
-  <p class="buttons">
-    <%= submit_to_remote('preview', _('Preview') + '!',
-                         :update => 'preview',
-                         :complete => "Element.show('preview')",
-                         :url    => @article.preview_comment_url,
-												 :html => {:class => 'submit', :id => 'form-preview-button'}) %>
-    <%= submit_tag _('Submit'), :id => 'form-submit-button', :class => 'submit', :onclick => "$('commentform').onsubmit();this.disabled=true;Element.hide('preview');return false;" %>
-    <%= image_tag 'theme/spinner.gif', :id => 'comment_loading', :style => 'display:none' %>
-  </p>
-</div>
-<% end %>

data/themes/typographic/views/articles/_comment_list.html.erb

@@ -1,7 +0,0 @@
-<ol id="commentList" class="comments">
-  <% if @article.published_comments.any? -%>
-    <%= render(:partial => "/articles/comment", :collection => @article.published_comments) %>
-  <% else -%>
-    <li class="dummy_comment" style="display:none"><%= _("No comments")%></li>
-  <% end -%>
-</ol>

data/themes/typographic/views/articles/_password_form.html.erb

@@ -1,10 +0,0 @@
-<div id='content-<%= article.id %>'>
-  <p>This post is password protected. Please fill in your password or login to view the content</p>
-  <% remote_form_for :articles, article, :url => { :action => 'check_password'}, :update => "content-#{article.id}" do |f| %>
-    <%= password_field(:article, :password) %>
-    <input type='hidden' name='article[id]' value='<%= article.id %>' />
-    <%= submit_to_remote('check_password', _('Submit') + '!',
-                         :update => "content-#{article.id}",
-                         :url    => {:action => 'check_password'}) %>
-  <% end %>
-</div>

data/themes/typographic/views/articles/_trackback.html.erb

@@ -1,9 +0,0 @@
-<li class="trackback" id="trackback-<%= trackback.id %>">
-  <div class="author">
-    <a href="<%= trackback.url %>" rel="nofollow"><%= trackback.title %></a>
-    <abbr><%_("From")%> <cite><%= trackback.blog_name %></cite></abbr>
-  </div>
-  <div class="content">
-    <%= trackback.excerpt %>
-  </div>
-</li>

data/themes/typographic/views/articles/comment_preview.html.erb

@@ -1,10 +0,0 @@
-<div class="comment preview">
-  <div class="author">
-    <%= content_tag(:div, gravatar_tag(@comment.email)) if this_blog.use_gravatar and @comment.email %>
-    <cite><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></cite>
-    <abbr><%= _("is about to say")%></abbr>
-  </div>
-  <div class="content">
-    <%= @comment.html %>
-  </div>
-</div>

data/themes/typographic/views/articles/index.html.erb

@@ -1,3 +0,0 @@
-<%= render :partial => 'articles/article', :collection => @articles %>
-
-<%= will_paginate @articles %>

data/themes/typographic/views/articles/read.html.erb

@@ -1,46 +0,0 @@
-<!--
-<rdf:RDF
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
-  xmlns:dc="http://purl.org/dc/elements/1.1/">
-<rdf:Description
-  rdf:about=""
-  trackback:ping="<%= @article.trackback_url %>"
-  dc:title="<%=h @article.title.gsub(/-+/, '-') %>"
-  dc:identifier="<%= @article.permalink_url %>"
-  dc:description="<%=h (@article.html.strip_html[0..255]).gsub(/-+/, '-') %>"
-  dc:creator="<%= h @article.author %>"
-  dc:date="<%= @article.updated_at.xmlschema %>" />
-</rdf:RDF>
--->
-
-<%= render :partial => '/articles/article', :object => @article %>
-
-
-<% if @article.allow_pings? -%>
-  <h2 id="trackbacks-title"><a id="trackbacks"><%= _("Trackbacks")%></a></h2>
-  <p class="trackbackurl">
-    <%= _("Use the following link to trackback from your own site")%>:<br />
-    <%= @article.trackback_url %>
-  </p>
-
-  <% unless @article.published_trackbacks.blank? -%>
-  <ol id="trackbacks" class="comments">
-    <%= render(:partial => "/articles/trackback", :collection => @article.published_trackbacks) %>
-  </ol>
-  <% end -%>
-<% end -%>
-
-<% if @article.allow_comments? or @article.published_comments.size > 0 -%>
-
-
-  <% unless @article.comments_closed? and @article.published_comments.size == 0 %>
-    <h2 id="comments-title"><a id="comments"><%= _("Comments")%></a></h2>
-  <% end -%>
-
-  <div id="comments_div">
-    <%= render :partial => "/articles/comment_list" %>
-  </div>
-<% end -%>
-
-<%= render :partial => '/articles/comment_form' unless @article.comments_closed? %>

data/themes/typographic/views/theme/static_view_test.html.erb

@@ -1 +0,0 @@
-<!-- Static View Test from typographic -->

data/vendor/akismet/akismet.rb

@@ -1,168 +0,0 @@
-# Akismet
-#
-# Author:: David Czarnecki
-# Copyright:: Copyright (c) 2005 - David Czarnecki
-# License:: BSD
-#
-# Heavily modified for Typo by Scott Laird
-#
-class Akismet
-  require 'net/http'
-  require 'uri'
-  require 'timeout'
-  
-  STANDARD_HEADERS = {
-    'User-Agent' => "Typo/#{TYPO_VERSION} | Akismet Ruby API/1.0",
-    'Content-Type' => 'application/x-www-form-urlencoded'
-  }
-  
-  # Instance variables
-  @apiKey
-  @blog
-  @verifiedKey
-  @proxyPort = nil
-  @proxyHost = nil
-
-  # Create a new instance of the Akismet class
-  #
-  # apiKey 
-  #   Your Akismet API key
-  # blog 
-  #   The blog associated with your api key
-  def initialize(apiKey, blog)
-    @apiKey = apiKey
-    @blog = blog
-    @verifiedKey = false
-  end
-  
-  # Set proxy information 
-  #
-  # proxyHost
-  #   Hostname for the proxy to use
-  # proxyPort
-  #   Port for the proxy
-  def setProxy(proxyHost, proxyPort) 
-    @proxyPort = proxyPort
-    @proxyHost = proxyHost
-  end
-    
-  # Call to check and verify your API key. You may then call the #hasVerifiedKey method to see if your key has been validated.
-  def verifyAPIKey()
-    http = Net::HTTP.new('rest.akismet.com', 80, @proxyHost, @proxyPort)
-    path = '/1.1/verify-key'
-    
-    data="key=#{@apiKey}&blog=#{@blog}"
-    
-    resp, data = http.post(path, data, STANDARD_HEADERS)
-    @verifiedKey = (data == "valid")
-  end
- 
-  # Returns <tt>true</tt> if the API key has been verified, <tt>false</tt> otherwise
-  def hasVerifiedKey()
-    return @verifiedKey
-  end
-  
-  # Internal call to Akismet. Prepares the data for posting to the Akismet service.
-  #
-  # akismet_function
-  #   The Akismet function that should be called
-  # user_ip (required)
-  #    IP address of the comment submitter.
-  # user_agent (required)
-  #    User agent information.
-  # referrer (note spelling)
-  #    The content of the HTTP_REFERER header should be sent here.
-  # permalink
-  #    The permanent location of the entry the comment was submitted to.
-  # comment_type
-  #    May be blank, comment, trackback, pingback, or a made up value like "registration".
-  # comment_author
-  #    Submitted name with the comment
-  # comment_author_email
-  #    Submitted email address
-  # comment_author_url
-  #    Commenter URL.
-  # comment_content
-  #    The content that was submitted.
-  # Other server enviroment variables
-  #    In PHP there is an array of enviroment variables called $_SERVER which contains information about the web server itself as well as a key/value for every HTTP header sent with the request. This data is highly useful to Akismet as how the submited content interacts with the server can be very telling, so please include as much information as possible.  
-  #options[:user_ip] = user_ip
-  #options[:user_agent] = user_agent
-  #options[:referrer] = referrer
-  #options[:permalink] = permalink
-  #options[:comment_type] = comment_type
-  #options[:comment_author] = comment_author
-  #options[:comment_author_email] = comment_author_email
-  #options[:comment_author_url] = comment_author_url
-  #options[:comment_content] = comment_content
-  
-  def callAkismet(akismet_function, options = {})
-    result = false
-    begin
-      Timeout.timeout(5) do
-        http = Net::HTTP.new("#{@apiKey}.rest.akismet.com", 80, @proxyHost, @proxyPort)
-        path = "/1.1/#{akismet_function}"
-    
-        options[:blog] = @blog
-        params=[]
-    
-        options.each_key do |key|
-          params.push "#{key}=#{CGI.escape(options[key].to_s)}"
-        end
-    
-        data = params.join('&')
-        resp, data = http.post(path, data, STANDARD_HEADERS)
-    
-        unless data == 'true' or data == 'false' or data == ''
-          STDERR.puts "AKISMET error: #{data}"
-        end
-
-        result = (data == "true" or data == '')
-      end
-    rescue => err
-      STDERR.puts "AKISMET exception: #{err}"
-    end
-    
-    return result
-  end
-  
-  protected :callAkismet
-
-  # This is basically the core of everything. This call takes a number of arguments and characteristics about the submitted content and then returns a thumbs up or thumbs down. Almost everything is optional, but performance can drop dramatically if you exclude certain elements.
-  #
-  # user_ip (required)
-  #    IP address of the comment submitter.
-  # user_agent (required)
-  #    User agent information.
-  # referrer (note spelling)
-  #    The content of the HTTP_REFERER header should be sent here.
-  # permalink
-  #    The permanent location of the entry the comment was submitted to.
-  # comment_type
-  #    May be blank, comment, trackback, pingback, or a made up value like "registration".
-  # comment_author
-  #    Submitted name with the comment
-  # comment_author_email
-  #    Submitted email address
-  # comment_author_url
-  #    Commenter URL.
-  # comment_content
-  #    The content that was submitted.
-  # Other server enviroment variables
-  #    In PHP there is an array of enviroment variables called $_SERVER which contains information about the web server itself as well as a key/value for every HTTP header sent with the request. This data is highly useful to Akismet as how the submited content interacts with the server can be very telling, so please include as much information as possible.
-  def commentCheck(options = {})
-    return callAkismet('comment-check', options)
-  end
-  
-  # This call is for submitting comments that weren't marked as spam but should have been. It takes identical arguments as comment check.
-  # The call parameters are the same as for the #commentCheck method.
-  def submitSpam(options = {})
-    callAkismet('submit-spam', options)
-  end
-  
-  # This call is intended for the marking of false positives, things that were incorrectly marked as spam. It takes identical arguments as comment check and submit spam.
-  # The call parameters are the same as for the #commentCheck method.
-  def submitHam(options = {})
-    callAkismet('submit-ham', options)
-  end
-end

data/vendor/flickr/Rakefile

@@ -1,36 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'rubygems'
-
-task :default => [ :test, :gem, :rdoc ]
-
-Rake::TestTask.new("test") { |t|
-  t.test_files = FileList['test*.rb']
-}
-
-Rake::RDocTask.new { |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.rdoc_files.include('flickr.rb')
-}
-
-spec = Gem::Specification.new do |s|
-  s.add_dependency('xml-simple', '>= 1.0.7')
-  s.name = 'flickr'
-  s.version = "1.0.0"
-  s.platform = Gem::Platform::RUBY
-  s.summary = "An insanely easy interface to the Flickr photo-sharing service. By Scott Raymond."
-  s.requirements << 'Flickr developers API key'
-  s.files = Dir.glob("*").delete_if { |item| item.include?("svn") }
-  s.require_path = '.'
-  s.autorequire = 'flickr'
-  s.author = "Scott Raymond"
-  s.email = "sco@redgreenblu.com"
-  s.rubyforge_project = "flickr"
-  s.homepage = "http://redgreenblu.com/flickr/"
-end
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-end

data/vendor/flickr/flickr.rb

@@ -1,490 +0,0 @@
-# = Flickr
-#   An insanely easy interface to the Flickr photo-sharing service. By Scott Raymond.
-#   
-# Author::    Scott Raymond <sco@redgreenblu.com>
-# Copyright:: Copyright (c) 2005 Scott Raymond <sco@redgreenblu.com>
-# License::   MIT <http://www.opensource.org/licenses/mit-license.php>
-#
-# USAGE:
-#  require 'flickr'
-#  flickr = Flickr.new                           # create a flickr client
-#  user = flickr.users('sco@scottraymond.net')   # lookup a user
-#  user.getInfo.name                             # get the user's name
-#  user.location                                 # and location
-#  user.photos                                   # grab their collection of Photo objects...
-#  user.groups                                   # ...the groups they're in...
-#  user.contacts                                 # ...their contacts...
-#  user.favorites                                # ...favorite photos...
-#  user.photosets                                # ...their photo sets...
-#  user.tags                                     # ...and their tags
-#  recentphotos = flickr.photos                  # get the 100 most recent public photos
-#  photo = recent.first                          # or very most recent one
-#  photo.getInfo.url                             # see its URL,
-#  photo.title                                   # title,
-#  photo.description                             # and description,
-#  photo.owner                                   # and its owner.
-#  File.open(photo.filename, 'w') do |file|
-#    file.puts p.file                            # save the photo to a local file
-#  end
-#  flickr.photos.each do |p|                     # get the last 100 public photos...
-#    File.open(p.filename, 'w') do |f|
-#      f.puts p.file('Square')                   # ...and save a local copy of their square thumbnail
-#    end
-#  end
-
-# TODO:
-#  - convert dates to ruby Dates
-#  - investigate xmlsimple caching
-#  - make to_s methods automatic?
-
-#  - complete tests
-#  - in tests, implement a MockFlickr object that has stored responses. automate the getting of the responses?
-
-#  - test on a few platforms
-#  - seek feedback from somebody
-#  - make a kickass demo, including autocompleting-ajax photo lookup ala http://mir.aculo.us/images/autocomplete1.mov
-
-require 'cgi'
-require 'open-uri'
-
-# Flickr client class. Requires an API key, and optionally takes an email and password for authentication
-class Flickr
-
-  attr_accessor :user
-
-  # Replace this API key with your own (see http://www.flickr.com/services/api/misc.api_keys.html)
-  def initialize(api_key=FLICKR_KEY, email=nil, password=nil)
-    @api_key = api_key
-    @host = 'http://flickr.com'
-    @api = '/services/rest'
-    login(email, password) if email and password
-  end
-
-  # Takes a Flickr API method name and set of parameters; returns an XmlSimple object with the response
-  def request(method, *params)
-    response = XmlSimple.xml_in(http_get(request_url(method, params)), { 'ForceArray' => false })
-    raise response['err']['msg'] if response['stat'] != 'ok'
-    response
-  end
-  
-  # Takes a Flickr API method name and set of parameters; returns the correct URL for the REST API.
-  # If @email and @password are present, authentication information is included
-  def request_url(method, *params)
-    url = "#{@host}#{@api}/?api_key=#{@api_key}&method=flickr.#{method}"
-    params[0][0].each_key do |key| url += "&#{key}=" + CGI::escape(params[0][0][key].to_s) end if params[0][0]
-    url += "&email=#{@email}&password=#{@password}" if @email and @password
-    url
-  end
-  
-  # Does an HTTP GET on a given URL and returns the response body
-  def http_get(url)
-    open(URI.parse(url)) {|h| h.read }
-  end
-
-  # Stores authentication credentials to use on all subsequent calls.
-  # If authentication succeeds, returns a User object
-  def login(email='', password='')
-    @email = email
-    @password = password
-    user = request('test.login')['user'] rescue fail
-    @user = User.new(user['id'])
-  end
-  
-  # Implements flickr.urls.lookupGroup and flickr.urls.lookupUser
-  def find_by_url(url)
-    response = urls_lookupUser('url'=>url) rescue urls_lookupGroup('url'=>url) rescue nil
-    (response['user']) ? User.new(response['user']['id']) : Group.new(response['group']['id']) unless response.nil?
-  end
-
-  # Implements flickr.photos.getRecent and flickr.photos.search
-  def photos(*criteria)
-    photos = (criteria[0]) ? photos_search(criteria[0]) : photos_getRecent
-    photos['photos']['photo'].collect { |photo| Photo.new(photo['id']) }
-  end
-
-  # Gets public photos with a given tag
-  def tag(tag)
-    photos('tags'=>tag)
-  end
-  
-  # Implements flickr.people.getOnlineList, flickr.people.findByEmail, and flickr.people.findByUsername
-  def users(lookup=nil)
-    if(lookup)
-      user = people_findByEmail('find_email'=>lookup)['user'] rescue people_findByUsername('username'=>lookup)['user']
-      return User.new(user['nsid'])
-    else
-      return people_getOnlineList['online']['user'].collect { |person| User.new(person['nsid']) }
-    end
-  end
-
-  # Implements flickr.groups.getActiveList
-  def groups
-    groups_getActiveList['activegroups']['group'].collect { |group| Group.new(group['nsid']) }
-  end
-  
-  # Implements flickr.tags.getRelated
-  def related_tags(tag)
-    tags_getRelated('tag_id'=>tag)['tags']['tag']
-  end
-  
-  # Implements flickr.photos.licenses.getInfo
-  def licenses
-    photos_licenses_getInfo['licenses']['license']
-  end
-  
-  # Implements everything else.
-  # Any method not defined explicitly will be passed on to the Flickr API,
-  # and return an XmlSimple document. For example, Flickr#test_echo is not defined,
-  # so it will pass the call to the flickr.test.echo method.
-  # e.g., Flickr#test_echo['stat'] should == 'ok'
-  def method_missing(method_id, *params)
-    request(method_id.id2name.gsub(/_/, '.'), params[0])
-  end
-
-  # Todo:
-  # logged_in?
-  # if logged in:
-  # flickr.blogs.getList
-  # flickr.favorites.add
-  # flickr.favorites.remove
-  # flickr.groups.browse
-  # flickr.photos.getCounts
-  # flickr.photos.getNotInSet
-  # flickr.photos.getUntagged
-  # flickr.photosets.create
-  # flickr.photosets.orderSets
-  # flickr.tags.getListUserPopular
-  # flickr.test.login
-  # uploading
-  class User
-    
-    attr_reader :client, :id, :name, :location, :photos_url, :url, :count, :firstdate, :firstdatetaken
-
-    def initialize(id=nil, username=nil, email=nil, password=nil)
-      @id = id
-      @username = username
-      @email = email
-      @password = password
-      @client = Flickr.new
-      @client.login(email, password) if email and password
-    end
-
-    def username
-      @username.nil? ? getInfo.username : @username
-    end
-    def name
-      @name.nil? ? getInfo.name : @name
-    end
-    def location
-      @location.nil? ? getInfo.location : @location
-    end
-    def count
-      @count.nil? ? getInfo.count : @count
-    end
-    def firstdate
-      @firstdate.nil? ? getInfo.firstdate : @firstdate
-    end
-    def firstdatetaken
-      @firstdatetaken.nil? ? getInfo.firstdatetaken : @firstdatetaken
-    end
-    def photos_url
-      @photos_url.nil? ? getInfo.photos_url : @photos_url
-    end
-    def url
-      @url.nil? ? getInfo.url : @url
-    end
-        
-    # Implements flickr.people.getPublicGroups
-    def groups
-      @client.people_getPublicGroups('user_id'=>@id)['groups']['group'].collect { |group| Group.new(group['nsid']) }
-    end
-    
-    # Implements flickr.people.getPublicPhotos
-    def photos
-      @client.people_getPublicPhotos('user_id'=>@id)['photos']['photo'].collect { |photo| Photo.new(photo['id']) }
-      # what about non-public photos?
-    end
-
-    # Gets photos with a given tag
-    def tag(tag)
-      @client.photos('user_id'=>@id, 'tags'=>tag)
-    end
-
-    # Implements flickr.contacts.getPublicList and flickr.contacts.getList
-    def contacts
-      @client.contacts_getPublicList('user_id'=>@id)['contacts']['contact'].collect { |contact| User.new(contact['nsid']) }
-      #or
-    end
-    
-    # Implements flickr.favorites.getPublicList and flickr.favorites.getList
-    def favorites
-      @client.favorites_getPublicList('user_id'=>@id)['photos']['photo'].collect { |photo| Photo.new(photo['id']) }
-      #or
-    end
-    
-    # Implements flickr.photosets.getList
-    def photosets
-      @client.photosets_getList('user_id'=>@id)['photosets']['photoset'].collect { |photoset| Photoset.new(photoset['id']) }
-    end
-
-    # Implements flickr.tags.getListUser
-    def tags
-      @client.tags_getListUser('user_id'=>@id)['who']['tags']['tag'].collect { |tag| tag }
-    end
-
-    # Implements flickr.photos.getContactsPublicPhotos and flickr.photos.getContactsPhotos
-    def contactsPhotos
-      @client.photos_getContactsPublicPhotos('user_id'=>@id)['photos']['photo'].collect { |photo| Photo.new(photo['id']) }
-      # or
-      #@client.photos_getContactsPhotos['photos']['photo'].collect { |photo| Photo.new(photo['id']) }
-    end
-    
-    def to_s
-      @name
-    end
-
-    private
-
-      # Implements flickr.people.getInfo, flickr.urls.getUserPhotos, and flickr.urls.getUserProfile
-      def getInfo
-        info = @client.people_getInfo('user_id'=>@id)['person']
-        @username = info['username']
-        @name = info['realname']
-        @location = info['location']
-        @count = info['photos']['count']
-        @firstdate = info['photos']['firstdate']
-        @firstdatetaken = info['photos']['firstdatetaken']
-        @photos_url = @client.urls_getUserPhotos('user_id'=>@id)['user']['url']
-        @url = @client.urls_getUserProfile('user_id'=>@id)['user']['url']
-        self
-      end
-
-  end
-
-  class Photo
-
-    attr_reader :id, :client
-
-    def initialize(id=nil)
-      @id = id
-      @client = Flickr.new
-    end
-    
-    def title
-      @title.nil? ? getInfo.title : @title
-    end
-
-    def owner
-      @owner.nil? ? getInfo.owner : @owner
-    end
-
-    def server
-      @server.nil? ? getInfo.server : @server
-    end
-
-    def isfavorite
-      @isfavorite.nil? ? getInfo.isfavorite : @isfavorite
-    end
-
-    def license
-      @license.nil? ? getInfo.license : @license
-    end
-
-    def rotation
-      @rotation.nil? ? getInfo.rotation : @rotation
-    end
-
-    def description
-      @description.nil? ? getInfo.description : @description
-    end
-
-    def notes
-      @notes.nil? ? getInfo.notes : @notes
-    end
-
-    # Returns the URL for the photo page (default or any specified size)
-    def url(size='Medium')
-      if size=='Medium'
-        owner.photos_url+id
-      else
-        sizes(size)['url']
-      end
-    end
-
-    # Returns the URL for the image (default or any specified size)
-    def source(size='Medium')
-      sizes(size)['source']
-    end
-
-    # Returns the photo file data itself, in any specified size. Example: File.open(photo.title, 'w') { |f| f.puts photo.file }
-    def file(size='Medium')
-      open(URI.parse(source(size))) {|h| h.read }
-    end
-
-    # Unique filename for the image, based on the Flickr NSID
-    def filename
-      "#{@id}.jpg"
-    end
-
-    # Implements flickr.photos.getContext
-    def context
-      context = @client.photos_getContext('photo_id'=>@id)
-      @previousPhoto = Photo.new(context['prevphoto']['id'])
-      @nextPhoto = Photo.new(context['nextphoto']['id'])
-      return [@previousPhoto, @nextPhoto]
-    end
-
-    # Implements flickr.photos.getExif
-    def exif
-      @client.photos_getExif('photo_id'=>@id)['photo']
-    end
-
-    # Implements flickr.photos.getPerms
-    def permissions
-      @client.photos_getPerms('photo_id'=>@id)['perms']
-    end
-
-    # Implements flickr.photos.getSizes
-    def sizes(size=nil)
-      sizes = @client.photos_getSizes('photo_id'=>@id)['sizes']['size']
-      sizes = sizes.find{|asize| asize['label']==size} if size
-      return sizes
-    end
-
-    # flickr.tags.getListPhoto
-    def tags
-      @client.tags_getListPhoto('photo_id'=>@id)['photo']['tags']
-    end
-
-    # Implements flickr.photos.notes.add
-    def add_note(note)
-    end
-    
-    # Implements flickr.photos.setDates
-    def dates=(dates)
-    end
-
-    # Implements flickr.photos.setPerms
-    def perms=(perms)
-    end
-    
-    # Implements flickr.photos.setTags
-    def tags=(tags)
-    end
-    
-    # Implements flickr.photos.setMeta
-    def title=(title)
-    end
-    def description=(title)
-    end
-
-    # Implements flickr.photos.addTags
-    def add_tag(tag)
-    end
-    
-    # Implements flickr.photos.removeTag
-    def remove_tag(tag)
-    end
-
-    # Implements flickr.photos.transform.rotate
-    def rotate
-    end
-
-    # Implements flickr.blogs.postPhoto
-    def postToBlog(blog_id, title='', description='')
-      @client.blogs_postPhoto('photo_id'=>@id, 'title'=>title, 'description'=>description)
-    end
-
-    # Implements flickr.photos.notes.delete
-    def deleteNote(note_id)
-    end
-
-    # Implements flickr.photos.notes.edit
-    def editNote(note_id)
-    end
-        
-    # Converts the Photo to a string by returning its title
-    def to_s
-      getInfo.title
-    end
-    
-    private
-
-      # Implements flickr.photos.getInfo
-      def getInfo
-        info = @client.photos_getInfo('photo_id'=>@id)['photo']
-        @title = info['title']
-        @owner = User.new(info['owner']['nsid'])
-        @server = info['server']
-        @isfavorite = info['isfavorite']
-        @license = info['license']
-        @rotation = info['rotation']
-        @description = info['description']
-        @notes = info['notes']['note']#.collect { |note| Note.new(note.id) }
-        self
-      end
-
-  end
-
-  # Todo:
-  # flickr.groups.pools.add
-  # flickr.groups.pools.getContext
-  # flickr.groups.pools.getGroups
-  # flickr.groups.pools.getPhotos
-  # flickr.groups.pools.remove
-  class Group
-    attr_reader :id, :client, :name, :members, :online, :privacy, :chatid, :chatcount, :url
-    
-    def initialize(id=nil)
-      @id = id
-      @client = Flickr.new
-    end
-
-    # Implements flickr.groups.getInfo and flickr.urls.getGroup
-    # private, once we can call it as needed
-    def getInfo
-      info = @client.groups_getInfo('group_id'=>@id)['group']
-      @name = info['name']
-      @members = info['members']
-      @online = info['online']
-      @privacy = info['privacy']
-      @chatid = info['chatid']
-      @chatcount = info['chatcount']
-      @url = @client.urls_getGroup('group_id'=>@id)['group']['url']
-      self
-    end
-
-  end
-
-  # Todo:
-  # flickr.photosets.delete
-  # flickr.photosets.editMeta
-  # flickr.photosets.editPhotos
-  # flickr.photosets.getContext
-  # flickr.photosets.getInfo
-  # flickr.photosets.getPhotos
-  class Photoset
-
-    attr_reader :id, :client, :owner, :primary, :photos, :title, :description, :url
-
-    def initialize(id=nil)
-      @id = id
-      @client = Flickr.new
-    end
-
-    # Implements flickr.photosets.getInfo
-    # private, once we can call it as needed
-    def getInfo
-      info = @client.photosets_getInfo('photosets_id'=>@id)['photoset']
-      @owner = User.new(info['owner'])
-      @primary = info['primary']
-      @photos = info['photos']
-      @title = info['title']
-      @description = info['description']
-      @url = "http://www.flickr.com/photos/#{@owner.getInfo.username}/sets/#{@id}/"
-      self
-    end
-
-  end
-    
-end