beef-has_assets 0.5.0 → 0.6.1

data/Rakefile

@@ -4,14 +4,14 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "has_assets"
+    gem.name = "beef-has_assets"
     gem.summary = %Q{Rails Engine. Adds uploadable assets to a model and admin area for files}
     gem.email = "steve@wearebeef.co.uk"
     gem.homepage = "http://github.com/beef/assets"
     gem.authors = ["Steve England"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.1

data/app/controllers/admin/assets_controller.rb

@@ -39,6 +39,16 @@ class Admin::AssetsController < Admin::BaseController
       format.js { render :action => 'index'}
     end
   end
+
+  def category
+    @assets = Asset.all(:conditions => ["category = ?",params[:category]])
+
+    respond_to do |format|
+      format.html { render :layout => false}
+      format.xml  { @assets.to_xml }
+      format.js { render :layout => false}
+    end
+  end
   
   def descriptions
     @descriptions = Asset.not_thumbnails.find(:all, :select => 'description', :group => 'description', :order => 'description', :conditions => 'description IS NOT NULL')

data/app/controllers/admin/flickrs_controller.rb

@@ -14,13 +14,15 @@ class Admin::FlickrsController < Admin::BaseController
   end
 
   def index
-    @flickr_result = {}
-    if defined?(Flickr) and File.exists?("#{RAILS_ROOT}/config/flickr.yml")
-      flickr = Flickr.new("#{RAILS_ROOT}/config/flickr.yml")
-      flickr_params = { :per_page => '12', :page => params[:page], :user_id => Settings.flickr_user_id, :sort => 'date-taken-desc', :tag_mode => 'all' }
-      flickr_params[:tags] = params[:tags] unless params[:tags].blank?
-      @flickr_result = flickr.photos.search(flickr_params)
+    respond_to do |format|
+      format.js do
+        if defined?(Flickr) and File.exists?("#{RAILS_ROOT}/config/flickr.yml")
+          flickr = Flickr.new("#{RAILS_ROOT}/config/flickr.yml")
+          flickr_params = { :per_page => '12', :page => params[:page], :user_id => Settings.flickr_user_id, :sort => 'date-taken-desc', :tag_mode => 'all' }
+          flickr_params[:tags] = params[:tags] unless params[:tags].blank?
+          @flickr_result = flickr.photos.search(flickr_params)
+        end
+      end
     end
-    render :layout => false
   end
 end

data/app/helpers/admin/assets_helper.rb

@@ -10,7 +10,8 @@ module Admin::AssetsHelper
   def asset_browser(for_content = false)
     render :partial => '/admin/assets/browser', 
            :locals => { :asset_types => Asset.grouped_by_category,
-                        :for_content => for_content }
+                        :for_content => for_content,
+                        :ajaxify        => true }
   end
   
   def asset_upload_form
@@ -34,21 +35,20 @@ module Admin::AssetsHelper
 
 
   def lastest_flickr
-    return unless defined?(Flickr) and File.exists?("#{RAILS_ROOT}/config/flickr.yml")
+    return unless defined?(Flickr) and File.exists?("#{RAILS_ROOT}/config/flickr.yml") and !Settings.flickr_user_id.blank?
     flickr = Flickr.new("#{RAILS_ROOT}/config/flickr.yml")
     flickr_params = { :per_page => '5', :page => params[:page], :user_id => Settings.flickr_user_id, :sort => 'date-taken-desc', :tag_mode => 'all' }
     flickr_params[:tags] = params[:tags] unless params[:tags].blank?
     flickr_result = flickr.photos.search(flickr_params)
     render :partial => 'admin/shared/flickr_latest.html.erb', :locals => { :flickr_images => flickr_result }
+  rescue RuntimeError => e
+    logger.warn "Flickr error: #{e}"
+    return
   end
   
   
   def flickr_select
-    return unless defined?(Flickr) and File.exists?("#{RAILS_ROOT}/config/flickr.yml")
-    flickr = Flickr.new("#{RAILS_ROOT}/config/flickr.yml")
-    flickr_params = { :per_page => '12', :page => params[:page], :user_id => Settings.flickr_user_id, :sort => 'date-taken-desc', :tag_mode => 'all' }
-    flickr_params[:tags] = params[:tags] unless params[:tags].blank?
-    flickr_result = flickr.photos.search(flickr_params)
-    render :partial => 'admin/shared/flickr.html.erb', :locals => { :flickr_images => flickr_result }
+    return unless defined?(Flickr) and File.exists?("#{RAILS_ROOT}/config/flickr.yml") and !Settings.flickr_user_id.blank?
+    render :partial => 'admin/flickrs/selector'
   end
 end

data/app/views/admin/assets/_browser.html.erb

@@ -8,18 +8,10 @@
   <dd id="<%= asset_type.parameterize %>-description">
     <h3 class="type-heading"><%= asset_type %></h3>
     <ul id="<%= asset_type.parameterize %>-list" class="asset-list">
-<% for asset in assets -%>
-      <li class="<%= asset.content_type.gsub('/', ' ') %>" id="browser-asset-<%= asset.id %>">
-<% if asset.content_type =~ /image/ -%>
-        <%= render :partial => "admin/assets/image", :locals => { :asset => asset, :for_content => for_content } %>
-<% else -%>
-        <%= render :partial => "admin/assets/document", :locals => { :asset => asset, :for_content => for_content } %>
-<% end -%>
-      </li>
-<% end -%>
+<%= render :partial => "admin/assets/category_contents", :locals => { :assets => assets, :for_content => for_content } unless ajaxify %>
     </ul>
   </dd>
 <% end -%>
 </dl>
-<%= javascript_tag "new AssetBrowser('#{@grouping}', '#{params[:folder]}');" %>
+<%= javascript_tag "new AssetBrowser('#{@grouping}', '#{params[:folder]}', #{for_content.to_s}, #{ajaxify.to_s});" %>
 

data/app/views/admin/assets/_category_contents.html.erb

@@ -0,0 +1,9 @@
+<% for asset in assets -%>
+      <li class="<%= asset.content_type.gsub('/', ' ') %>" id="browser-asset-<%= asset.id %>">
+<%   if asset.content_type =~ /image/ -%>
+        <%= render :partial => "admin/assets/image", :locals => { :asset => asset, :for_content => for_content } %>
+<%   else -%>
+        <%= render :partial => "admin/assets/document", :locals => { :asset => asset, :for_content => for_content } %>
+<%   end -%>
+      </li>
+<% end -%>

data/app/views/admin/assets/category.html.erb

@@ -0,0 +1 @@
+<%= render :partial => "admin/assets/category_contents", :locals => { :ajaxify => true, :assets => @assets, :for_content => (params[:for_content] == "true" || false) } %>

data/app/views/admin/assets/index.html.erb

@@ -1,7 +1,7 @@
 <h1>Browse for Files</h1>
 <%= toggle_grouping_links %>
 <div id="main-browser">
-<%= render :partial => 'browser', :locals => { :asset_types => @asset_types, :for_content => false } %>
+<%= render :partial => 'browser', :locals => { :ajaxify => true, :asset_types => @asset_types, :for_content => false } %>
 </div>
 
 <% content_for :sub_content do  %>

data/app/views/admin/assets/index.js.rjs

@@ -1 +1 @@
-page.replace 'asset-browser', :partial => '/admin/assets/browser', :locals => { :asset_types => @asset_types, :for_content => (params[:for_content] == 'true' )}
+page.replace 'asset-browser', :partial => '/admin/assets/browser', :locals => { :ajaxify => true, :asset_types => @asset_types, :for_content => (params[:for_content] == 'true' )}

data/app/views/admin/flickrs/_photo.html.erb

@@ -0,0 +1 @@
+<%= link_to "#{image_tag photo.url(:square), :alt => photo.description}", "#{photo.url(:large)}", :title => "#{photo.title}", :onclick => "addLinkedImage('#{photo.url(:medium)}',this.title); return false;" %>

data/app/views/admin/flickrs/_selector.html.erb

@@ -3,8 +3,7 @@
   <% form_remote_tag( :url => admin_flickr_path, :method => :get ) do -%>
   <p><label for="tags">Search by tag:</label>
   <%= text_field_tag :tags, params[:tags] %> &nbsp; <%= submit_tag "go" %></p>
-  <% for photo in flickr_images %>
-     <%= link_to "#{image_tag photo.url(:square)}", "#{photo.url(:large)}", :title => "#{photo.title}", :onclick => "addLinkedImage('#{photo.url(:medium)}',this.title); return false;" %>
-  <% end -%>
+  
+  <div id="flickr-image-container">Loading Flickr images</div>
   <% end -%>
 </div>

data/app/views/admin/flickrs/index.js.rjs

@@ -0,0 +1,3 @@
+page.replace_html 'flickr-image-container', :partial => 'admin/flickrs/photo', :collection => @flickr_result
+page.insert_html :bottom, 'flickr-image-container', link_to_remote( '< Previous', :url => admin_flickrs_path(:page => @flickr_result.page - 1), :method => :get) unless @flickr_result.page == 1
+page.insert_html :bottom, 'flickr-image-container', link_to_remote( 'Next >', :url => admin_flickrs_path(:page => @flickr_result.page + 1), :method => :get) unless @flickr_result.page == @flickr_result.pages

data/{has_assets.gemspec → beef-has_assets.gemspec}

@@ -4,12 +4,12 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{has_assets}
-  s.version = "0.5.0"
+  s.name = %q{beef-has_assets}
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-09-25}
+  s.date = %q{2009-10-27}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -29,24 +29,26 @@ Gem::Specification.new do |s|
      "app/models/asset.rb",
      "app/models/asseting.rb",
      "app/views/admin/assets/_browser.html.erb",
+     "app/views/admin/assets/_category_contents.html.erb",
      "app/views/admin/assets/_document.html.erb",
      "app/views/admin/assets/_file_info.html.erb",
      "app/views/admin/assets/_form.html.erb",
      "app/views/admin/assets/_image.html.erb",
      "app/views/admin/assets/_list.html.erb",
      "app/views/admin/assets/_toggle.html.erb",
+     "app/views/admin/assets/category.html.erb",
      "app/views/admin/assets/index.html.erb",
      "app/views/admin/assets/index.js.rjs",
      "app/views/admin/assets/rename_category.js.rjs",
      "app/views/admin/assets/show.html.erb",
      "app/views/admin/assets/show.js.rjs",
+     "app/views/admin/flickrs/_flickr_latest.html.erb",
+     "app/views/admin/flickrs/_photo.html.erb",
      "app/views/admin/flickrs/_selector.html.erb",
-     "app/views/admin/flickrs/index.html.erb",
+     "app/views/admin/flickrs/index.js.rjs",
      "app/views/admin/flickrs/show.html.erb",
      "app/views/admin/flickrs/show.js.rjs",
-     "app/views/admin/shared/_flickr.html.erb",
-     "app/views/admin/shared/_flickr_image.html.erb",
-     "app/views/admin/shared/_flickr_latest.html.erb",
+     "beef-has_assets.gemspec",
      "config/routes.rb",
      "generators/asset_migration/asset_migration_generator.rb",
      "generators/asset_migration/templates/migration.rb",
@@ -56,8 +58,6 @@ Gem::Specification.new do |s|
      "generators/assets_admin_files/templates/public/javascripts/admin/assets.js",
      "generators/assets_admin_files/templates/public/javascripts/swfupload.js",
      "generators/assets_admin_files/templates/public/javascripts/upload_progress.js",
-     "has_assets.gemspec",
-     "lib/flickr.rb",
      "lib/has_assets.rb",
      "lib/has_assets/custom_redcloth_tags.rb",
      "lib/has_assets/flash_sesion_cookie_middleware.rb",
@@ -74,8 +74,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Rails Engine. Adds uploadable assets to a model and admin area for files}
   s.test_files = [
-    "test/test_helper.rb",
-     "test/has_assets_test.rb"
+    "test/has_assets_test.rb",
+     "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/config/routes.rb

@@ -1,6 +1,6 @@
 ActionController::Routing::Routes.draw do |map|
   map.namespace(:admin) do |admin|
     admin.resources :flickrs
-    admin.resources :assets, :collection => { :by_content_type => :get, :descriptions => :get, :by_category => :get, :categories => :get }, :member => { :set_lead => :put, :rename_category => :post }
+    admin.resources :assets, :collection => { :by_content_type => :get, :descriptions => :get, :by_category => :get, :categories => :get, :category => :get }, :member => { :set_lead => :put, :rename_category => :post }
   end
 end

data/generators/assets_admin_files/templates/public/javascripts/admin/assets.js

@@ -12,6 +12,10 @@ var AssetBrowser = Class.create({
         dt.dd.hide();
         dt.onclick = function() {
           AssetBrowser.closeInfo();
+
+          if(AssetBrowser.ajax && !this.dd.visible() && !dt.dd.down('ul li'))
+            AssetBrowser.loadFilesByFolder(dt.innerHTML, dt.dd.down('ul').id);
+
           this.dd.toggle();         
           if (AssetBrowser.current_content != this.dd) {
             if (AssetBrowser.current_content != null && AssetBrowser.current_content.visible()) {
@@ -74,7 +78,15 @@ Object.extend(AssetBrowser, {
       this.destroyAsset(asset);
     }
   },
-  
+
+  loadFilesByFolder: function(folder_name, folder_id){
+      new Ajax.Request('/admin/assets/category', { method: 'get',
+                                                     asynchronous:true, 
+                                                     parameters: { for_content: AssetBrowser.for_content, format: 'html', category: folder_name, authenticity_token: AJ.authenticity_token() },
+                                                     onSuccess: function(response){ $(folder_id).update(response.responseText); } } );
+    
+  },
+
   destroyAsset: function(asset) {
     if (confirm('Are you sure you wish to delete the asset \'' + asset.filename + ' \'?')) {
       new Ajax.Request('/admin/assets/'+ asset.id, { method: 'delete',
@@ -134,6 +146,8 @@ Object.extend(AssetBrowser, {
     this.contentNodeForm = $(id);
     if (this.contentNodeForm) {
       this.contentNodeForm.model_name = this.contentNodeForm.className.split('_').slice(1,this.contentNodeForm.className.split('_').length).join('_');
+      this.contentNodeForm.model_title = '';
+      this.contentNodeForm.className.split('_').slice(1,this.contentNodeForm.className.split('_').length).each(function(e){ this.contentNodeForm.model_title = this.contentNodeForm.model_title + e.charAt(0).toUpperCase() + e.slice(1).toLowerCase(); });
       this.setUpAssetList();
       this.contentNodeForm.addAssetIDs = function() {
         $$('input.asset_id').invoke('remove');
@@ -391,22 +405,64 @@ var Renameable = Class.create(Holdable, {
   } 
 });
 
+/**
+ * Ajax.Request.abort
+ * extend the prototype.js Ajax.Request object so that it supports an abort method
+ */
+Ajax.Request.prototype.abort = function() {
+    // prevent and state change callbacks from being issued
+    this.transport.onreadystatechange = Prototype.emptyFunction;
+    // abort the XHR
+    this.transport.abort();
+    // update the request counter
+    Ajax.activeRequestCount--;
+};
+
+
+
+
 var flickr_comms_ref = false;
 var flickr_before_handler = function(){
   if(false != flickr_comms_ref)
-    flickr_comms_ref;
+    flickr_comms_ref.abort();
   $('flickr_loading').show();
+};
+
+var current_page = 1;
+var flickr_get_next_page = function(button){
+  flickr_get_page(current_page+=1);
+}
+var flickr_get_prev_page = function(button){
+  current_page = Math.max(1,current_page-1)
+  flickr_get_page(current_page);
+}
+
+var flickr_get_page = function(num){
+  flickr_before_handler();
+
+  //if we have this page already
+  if(page_div = $('flickr-page-' + num)){
+    $$('.flickr-page').invoke('hide');
+    page_div.show();
+    $('flickr_loading').hide();
+  }
+  //get it
+  else{
+    flickr_comms_ref = new Ajax.Request('/admin/flickrs', {
+      method: 'get',
+      parameters: { page: num, format: 'html' },
+      onSuccess: function(response){ $$('.flickr-page').invoke('hide');flickr_display_images(response, num); }
+    });
+  }
+    
 }; 
-var flickr_display_images = function(response){
+var flickr_display_images = function(response, page){
   $('flickr_loading').hide();
-  $('flickr-image-container').update(response.responseText)
-}
+  $('flickr-image-container').insert('<div class="flickr-page" id="flickr-page-' + page + '">' +response.responseText+ '</div>')
+};
 var flickr_load_select = function(){
-  flickr_before_handler();
-  flickr_comms_ref = new Ajax.Request('/admin/flickrs', {
-    method: 'get',
-    parameters: { format: 'html', authenticity_token: AJ.authenticity_token() },
-    onSuccess: flickr_display_images
-});
-}
+  if($('flickr-image-container')) {
+    new Ajax.Request('/admin/flickrs', {method: 'get'});
+  }
+};
 document.observe('dom:loaded', flickr_load_select);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-has_assets
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-25 00:00:00 -07:00
+date: 2009-10-27 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -36,24 +36,26 @@ files:
 - app/models/asset.rb
 - app/models/asseting.rb
 - app/views/admin/assets/_browser.html.erb
+- app/views/admin/assets/_category_contents.html.erb
 - app/views/admin/assets/_document.html.erb
 - app/views/admin/assets/_file_info.html.erb
 - app/views/admin/assets/_form.html.erb
 - app/views/admin/assets/_image.html.erb
 - app/views/admin/assets/_list.html.erb
 - app/views/admin/assets/_toggle.html.erb
+- app/views/admin/assets/category.html.erb
 - app/views/admin/assets/index.html.erb
 - app/views/admin/assets/index.js.rjs
 - app/views/admin/assets/rename_category.js.rjs
 - app/views/admin/assets/show.html.erb
 - app/views/admin/assets/show.js.rjs
+- app/views/admin/flickrs/_flickr_latest.html.erb
+- app/views/admin/flickrs/_photo.html.erb
 - app/views/admin/flickrs/_selector.html.erb
-- app/views/admin/flickrs/index.html.erb
+- app/views/admin/flickrs/index.js.rjs
 - app/views/admin/flickrs/show.html.erb
 - app/views/admin/flickrs/show.js.rjs
-- app/views/admin/shared/_flickr.html.erb
-- app/views/admin/shared/_flickr_image.html.erb
-- app/views/admin/shared/_flickr_latest.html.erb
+- beef-has_assets.gemspec
 - config/routes.rb
 - generators/asset_migration/asset_migration_generator.rb
 - generators/asset_migration/templates/migration.rb
@@ -63,8 +65,6 @@ files:
 - generators/assets_admin_files/templates/public/javascripts/admin/assets.js
 - generators/assets_admin_files/templates/public/javascripts/swfupload.js
 - generators/assets_admin_files/templates/public/javascripts/upload_progress.js
-- has_assets.gemspec
-- lib/flickr.rb
 - lib/has_assets.rb
 - lib/has_assets/custom_redcloth_tags.rb
 - lib/has_assets/flash_sesion_cookie_middleware.rb
@@ -74,9 +74,10 @@ files:
 - rails/init.rb
 - test/has_assets_test.rb
 - test/test_helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/beef/assets
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -102,5 +103,5 @@ signing_key:
 specification_version: 3
 summary: Rails Engine. Adds uploadable assets to a model and admin area for files
 test_files: 
-- test/test_helper.rb
 - test/has_assets_test.rb
+- test/test_helper.rb

data/app/views/admin/flickrs/index.html.erb

@@ -1 +0,0 @@
-<%= render :partial => 'admin/shared/flickr_image.html.erb', :collection => @flickr_result -%>

data/app/views/admin/shared/_flickr.html.erb

@@ -1,17 +0,0 @@
-
-<div id="flickr-select">
-  <% form_remote_tag( :method => :get, :url => admin_flickrs_path, :before => "flickr_before_handler()", :success => "flickr_display_images(request);" ) do -%>
-  <p><label for="tags">Search by tag:</label>
-  <%= text_field_tag :tags, params[:tags] %> &nbsp; <%= submit_tag "go" %> <span id="flickr_loading">Loading Flickr images</span></p>
-  
-  <% end -%>
-  
-  <div id="flickr-image-container">
-    <% #= render :partial => 'admin/shared/flickr_image.html.erb', :collection => flickr_images -%>
-  </div>
-
-  <ul id="flickr_nav">
-    <li class="first"><a href="#" onclick="flickr_get_prev_page();return false;">previous</a></li>&nbsp;|&nbsp;
-    <li class="last"><a href="#" onclick="flickr_get_next_page();return false;">next</a></li>
-  </ul>
-</div>

data/app/views/admin/shared/_flickr_image.html.erb

@@ -1 +0,0 @@
-<img src="<%= flickr_image.url(:square) %>" alt="<%= flickr_image.description || flickr_image.title %>" title="<%= flickr_image.title %>" onclick="addLinkedImage('<%= flickr_image.url(:medium) %>',this.alt)"/>

data/lib/flickr.rb

@@ -1,386 +0,0 @@
-# = Flickr
-#   An insanely easy interface to the Flickr photo-sharing service. By Scott Raymond.
-#   Modified by Steve England www.wearebeef.co.uk
-
-# Now using ObjectiveFlickr gem as it makes auth easy
-# gem 'objectiveflickr'
-require 'objectiveflickr'
-
-class Flickr
-  
-  def self.connect(api_key, secret, auth_token = nil)
-    API.connect(api_key, secret, auth_token)
-    self
-  end
-
-  class Error < StandardError ; end
-
-  # Essentially a standard RuntimeError that can include the response as an
-  # REXML object reference.
-  class APIError < Error
-    attr_reader :response
- 
-    # Creates a new exception.
-    def initialize(response)
-      super
-      @response = response
-    end
- 
-    # The error string returned by the API call.
-    def to_s
-      response['message']
-    end
-  end
-
-  # Flickr client class. Requires an API key, and optionally takes an email and password for authentication
-  class API
-    class << self
-
-      # Replace this API key with your own (see http://www.flickr.com/services/api/misc.api_keys.html)
-      def connect(api_key, secret, auth_token = nil)
-        @api_key = api_key
-        @auth_token = auth_token
-        @fi = FlickrInvocation.new(api_key,secret)
-        self
-      end
-      
-      def fi
-        raise Error.new('API not connected') if @fi.nil?
-        @fi
-      end
-    
-      def login_url(permission='read')
-        fi.login_url(permission)
-      end
-    
-      def unauthorised?
-        params = { :api_key => @api_key, :auth_token => @auth_token }
-        logger.debug params
-        data = fi.call('flickr.auth.checkToken',params).data
-        logger.debug data
-        return data['message'] if data['stat'] != 'ok'
-        false
-      end
-    
-      def authorise(frob)
-        @auth_token = request('flickr.auth.getToken', { :api_key => @api_key, :frob => frob } )['auth']['token']['_content']
-      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, returns PhotoList object so
-      # that page_count, total etc. are avaiable for pagination.
-      def photos(params = {})
-        photos = (params.empty?) ? photos_getRecent['photos'] : photos_search(params)['photos']
-        PhotoList.new(photos, self)
-      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.find(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
-
-      # 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
-
-      private
-
-      def logger
-        RAILS_DEFAULT_LOGGER
-      end
-    
-      # Takes a Flickr API method name and set of parameters
-      def request(method, params = {}, auth = true)
-        params[:auth] = auth
-        params[:auth_token] = @auth_token unless @auth_token.nil?
-        logger.debug params.inspect
-      
-      
-        data = fi.call(method,params).data
-        logger.debug data.inspect
-        raise APIError.new(data) if data['stat'] != 'ok' 
-        data
-      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('flickr.' + method_id.id2name.gsub(/_/, '.'), params[0])
-      end
-    
-    end
-
-  end
-
-  class ApiObject
-    
-    protected
-    
-    def initialize(hash)
-      hash.each do |key, value|
-        instance_variable_set '@' + key, value
-      end
-    end
-
-    def self.find(*args)
-      case args.first
-      when :first then find_initial(args[1])
-      when :all  then find_every(args[1])
-      else find_by_id(args)
-      end 
-    end
-    
-  end
-
-  class Person < ApiObject
-
-    attr_reader :nsid, :username, :name, :location, :count, :firstdate, :firstdatetaken
-    
-    def self.find_by_id(id)
-      self.new(API.people_getInfo('user_id'=>id)['person'])
-    end
-
-    def self.find_by_email(email)
-      id = API.people_findByEmail('find_email'=>email)['user']['nsid']
-      find(id)
-    end
-
-    # Implements flickr.people.getPublicGroups
-    def groups
-      API.people_getPublicGroups('user_id'=>@nsid)['groups']['group'].collect { |group| Group.new(group['nsid']) }
-    end
-
-    def photos(params = {})
-      @photolist ||= API.photos(params.merge('user_id'=>@nsid, 'sort'=>'date-taken-desc'))
-    end
-
-    # Implements flickr.photosets.getList
-    def photosets
-      if @photosets.nil?
-        photosets = API.photosets_getList('user_id'=>@nsid)['photosets']
-        if photosets.empty?
-          @photosets = []
-        else
-          @photosets = photosets['photoset'].collect { |photoset| Photoset.new(photoset) }
-        end
-      else
-        @photosets
-      end
-    end
-
-    # Implements flickr.contacts.getPublicList and flickr.contacts.getList
-    def contacts
-      API.contacts_getPublicList('user_id'=>@nsid)['contacts']['contact'].collect { |contact| User.new(contact['nsid']) }
-    end
-
-    # Implements flickr.favorites.getPublicList and flickr.favorites.getList
-    def favorites
-      API.favorites_getPublicList('user_id'=>@nsid)['photos']['photo'].collect { |photo| Photo.new(photo) }
-      #or
-    end
-
-    # Implements flickr.tags.getListUser
-    def tags
-      API.tags_getListUser('user_id'=>@nsid)['who']['tags']['tag'].collect { |tag| tag }
-    end
-
-    # Implements flickr.photos.getContactsPublicPhotos and flickr.photos.getContactsPhotos
-    def contactsPhotos
-      API.photos_getContactsPublicPhotos('user_id'=>@nsid)['photos']['photo'].collect { |photo| Photo.new(photo) }
-      # or
-      #API.photos_getContactsPhotos['photos']['photo'].collect { |photo| Photo.new(photo['id']) }
-    end
-
-    def to_s
-      @name
-    end
-
-  end
-
-  class Photoset < ApiObject
-    attr_reader :id, :title, :description
-    
-    def find_by_id(id)
-      self.new(photosets_getInfo('photoset_id'=>id)['photoset'])
-    end
-
-    def total
-      @photos
-    end
-
-    def photos
-      photo = API.photosets_getPhotos('photoset_id'=>id)['photoset']['photo']
-      return [] if photo.nil?
-      return [Photo.new(photo, self)] if photo.is_a? Hash
-      photo.collect { |photo| Photo.new(photo) }
-    end
-  end
-
-  class Photo < ApiObject
-
-    attr_reader :id, :title, :owner_id, :server, :isfavourite, :license, :rotation, :description, :notes
-    attr_writer :owner
-    
-    def self.find_by_id(id)
-      self.new(API.photos_getInfo('photo_id'=>id)['photo'])
-    end
-    
-    # Implements flickr.photos.getRecent and flickr.photos.search, returns PhotoList object so
-    # that page_count, total etc. are avaiable for pagination.
-    def self.find_every(params = {})
-      photos = (params.empty?) ? API.photos_getRecent['photos'] : API.photos_search(params)['photos']
-      PhotoList.new(photos)
-    end
-    
-    def self.find_initial(params = {})
-      params[:per_page] = 1
-      find_every(params = {})
-    end
-
-    # Returns the URL for the photo page (default or any specified size)
-    def url(size='Medium')
-      if size=='Medium'
-        "http://flickr.com/photos/#{owner.username}/#{@id}"
-      else
-        sizes(size)['url']
-      end
-    end
-
-    # Returns the URL for the image (default or any specified size)
-    def source(size=nil)
-      url = "http://static.flickr.com/#{@server}/#{@id}_#{@secret}"
-      url << "_#{size}" unless size.nil?
-      url + ".jpg"
-    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=nil)
-      Net::HTTP.get_response(URI.parse(source(size))).body
-    end
-
-    # Unique filename for the image, based on the Flickr NSID
-    def filename
-      "#{@id}.jpg"
-    end
-
-    # Implements flickr.photos.getContext
-    def context
-      context = API.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
-      API.photos_getExif('photo_id'=>@id)['photo']
-    end
-
-    # Implements flickr.photos.getPerms
-    def permissions
-      API.photos_getPerms('photo_id'=>@id)['perms']
-    end
-
-    # Implements flickr.photos.getSizes
-    def sizes(size=nil)
-      sizes = API.photos_getSizes('photo_id'=>@id)['sizes']['size']
-      sizes = sizes.find{|asize| asize['label']==size} if size
-      return sizes
-    end
-
-    # flickr.tags.getListPhoto
-    def tags
-      API.tags_getListPhoto('photo_id'=>@id)['photo']['tags']
-    end
-
-    # Implements flickr.blogs.postPhoto
-    def postToBlog(blog_id, title='', description='')
-      API.blogs_postPhoto('photo_id'=>@id, 'title'=>title, 'description'=>description)
-    end
-
-    # Converts the Photo to a string by returning its title
-    def to_s
-      @title
-    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 < ApiObject
-    attr_reader :id, :client, :name, :members, :online, :privacy, :chatid, :chatcount, :url
-    
-    def self.find_by_id(id)
-      self.new(API.groups_getInfo('user_id'=>id)['person'])
-    end
-    
-    def self.photos(id, params = {})
-      params['group_id'] = id
-      PhotoList.new(API.groups_pools_getPhotos(params)['photos'])
-    end
-    
-    
-  end
-  
-  # Extended from array to allow perpage etc.
-  class PhotoList < Array
-    attr_reader :page, :pages, :perpage, :total
-    
-    def initialize(flickr_response)
-      @page = flickr_response['page'].to_i
-      @perpage = flickr_response['perpage'].to_i
-      @total = flickr_response['total'].to_i
-      @pages = flickr_response['pages'].to_i
-      
-      @photo = flickr_response['photo']
-
-      super Photo.new(@photo, self) if @photo.is_a? Hash
-      super @photo.collect { |photo| Photo.new(photo) }
-    end
-  end
-
-end