acts_as_unvlogable 1.0.0 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 884f8db9f2bab7470f0e4e5f08d7e79c6648e225
+  data.tar.gz: d240151cccc6f0e9c62a647ebb1bb8fd38a23f23
+SHA512:
+  metadata.gz: dcfd4c8effb6d374031d9e26c5ab7af15cf8645c352077369983295f330b1fbd3f44288ec2a093b4c6398fa3c5fb6822db24bc3f12be67e1cdd44c8c697e47f7
+  data.tar.gz: 14237cb88f50ea0bdd9478df84269752f62d35f623de14666016cb14c9111e689776b0a0d3549a3d1db8429db33e9e8b1db10159bc81d0d7631f6f86dee60561

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+coverage
+.DS_Store

data/.travis.yml

@@ -0,0 +1,19 @@
+language: ruby
+cache: bundler
+
+rvm:
+  - 2.1.0
+
+branches:
+  only:
+    - master
+    - refactor
+
+script: "bundle exec rspec"
+
+notifications:
+  email:
+    recipients:
+      - mamuso@mamuso.net
+    on_failure: change
+    on_success: never

data/Gemfile

@@ -1,15 +1,10 @@
 source "http://rubygems.org"
-
-# Specify your gem's dependencies in acts_as_unvlogable.gemspec
 gemspec
 
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem 'ruby-debug', :platforms => :mri_18
-  gem 'ruby-debug19', :require => 'ruby-debug', :platforms => :mri_19
-end
-
-group :development, :test do
-  gem "shoulda"
+  gem "bundler", "> 1.3"
 end
 
+group :test do
+  gem 'coveralls', require: false
+end

data/README.markdown

@@ -1,5 +1,5 @@
-Acts as unvlogable
-==================
+# Acts as unvlogable [![Build Status](https://travis-ci.org/mamuso/acts_as_unvlogable.svg?branch=master)](https://travis-ci.org/mamuso/acts_as_unvlogable) [![Coverage Status](https://coveralls.io/repos/mamuso/acts_as_unvlogable/badge.png?branch=master)](https://coveralls.io/r/mamuso/acts_as_unvlogable?branch=master)
+
 
 What the hell is this!
 ----------------------
@@ -15,14 +15,12 @@ To include [this video](http://www.youtube.com/watch?v=GPQnbtldFyo) in [this pos
         @aha.thumbnail => "http://i4.ytimg.com/vi/GPQnbtldFyo/default.jpg"
         @aha.embed_url => "http://www.youtube.com/v/GPQnbtldFyo"
         @aha.embed_html(width, height) => "<object [...]</object>"
-        @aha.flv => "http://...flv"
         # all together :)
         @aha.video_details(width, height) => {
                                                 :title => ...,
                                                 :thumbnail => ...,
                                                 :embed_url => ...,
                                                 :embed_html => ...,
-                                                :flv => ...
                                               }
         
 With this plugin we have an unique way to manage multiple services :)
@@ -37,15 +35,6 @@ Install it!
         
 2. Optionally you can create the `config/unvlogable.yml` to store keys for the different services. You have in the plugin a [sample file](http://github.com/mamuso/acts_as_unvlogable/tree/master/unvlogable_sample.yml). At this moment you only need specify keys for flickr.
 
-
-Dependencies
-------------
-
-The plugin depends on [youtube-it](https://github.com/kylejginavan/youtube_it), [xml-simple](http://xml-simple.rubyforge.org/) and [hpricot](https://code.whytheluckystiff.net/hpricot/).
-
-We have included a modified version of the flickr gem to skip the gem dependency and manage video capabilities.
-
-
 Use it!
 -------
 
@@ -81,10 +70,7 @@ Then we have methods to know the 'basics' for use this video on your application
           videotron.embed_html(400, 300)
           => "<object width='400' height='300'><param name='mo [...] 300'></embed></object>"
 
--   __flv:__ Gets the flv url. In this edition we implement this method in all the services, but is possible that we can't get the flv in some scenarios. Remember that in some services the flv url expires and in most of their terms don't allow use the flv without its player.
-
-          videotron.flv
-          => "http://www.vimeo.com/moogaloop/play/clip:1785993/ [...] 8ee400/video.flv"
+-   __flv:__ **DEPRECATED** 
 
 -   __video\_details(width, height):__ All together :), returns all the previous elements in a hash. Width and height can be specified to build the embed\_html.
 
@@ -107,21 +93,11 @@ At this moment we support the following video services:
 -   [Myspace](http://vids.myspace.com/)
 -   [Ted Talks](http://www.ted.com/talks/)
 -   [11870.com](http://11870.com/)
--   [Marca.tv](http://www.marca.tv/)
 -   [Dalealplay](http://www.dalealplay.com/)
 -   [RuTube](http://www.rutube.ru/)
+-   [Wistia](http://wistia.com/)
+-   [Pleer — Audio](http://pleer.com/)
 
-Broken services
----------------
-
-These services were implemented but due to changes in the website they don't work anymore. Any patch for fixing them would be great ;)
-
--   [Qik](http://qik.com/)
--   [MTV](http://www.mtvhive.com/)
-
-You can detect new broken services when running the tests.
-
-We are always open to incude new services.
 
 And... what else?
 -----------------

data/Rakefile

@@ -1,2 +1,2 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks
+Bundler::GemHelper.install_tasks

data/acts_as_unvlogable.gemspec

@@ -7,20 +7,22 @@ Gem::Specification.new do |s|
   s.version     = ActsAsUnvlogable::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Manuel Muñoz", "Fernando Blat", "Alberto Romero"]
-  s.email       = ["mamusino@gmail.com", "ferblape@gmail.com", "denegro@gmail.com"]
-  s.homepage    = ""
+  s.email       = ["mamuso@mamuso.net", "ferblape@gmail.com", "denegro@gmail.com"]
+  s.homepage    = "https://github.com/mamuso/acts_as_unvlogable"
   s.summary     = %q{An easy way to include external video services in a rails app}
   s.description = %q{An easy way to include external video services in a rails app. This gem provides you wrappers for the most common video services, such as Youtube, Vimeo, Flickr, and so on...}
 
   s.rubyforge_project = "acts_as_unvlogable"
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test}/*`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_development_dependency "shoulda"
-  s.add_development_dependency "ruby-debug"
-  s.add_dependency("xml-simple")
-  s.add_dependency("youtube_it")
-  s.add_dependency("hpricot")
+
+  s.add_development_dependency 'bundler', '~> 1.3'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_runtime_dependency("nokogiri")
+  s.add_runtime_dependency("xml-simple")
+  s.add_runtime_dependency("youtube_it")
 end

data/lib/acts_as_unvlogable.rb

@@ -1,36 +1,33 @@
-require "rubygems"
 require "bundler/setup"
-
-require "xmlsimple"
+require "cgi"
+require "json"
+require "net/http"
+require 'rexml/document'
 require "youtube_it"
-require "hpricot"
-require "iconv"
-
+require "nokogiri"
 require "acts_as_unvlogable/flickr"
-# Extensions
+
+
 if defined?(ActiveSupport).nil?
   require "acts_as_unvlogable/string_base"
   require "acts_as_unvlogable/object_base"
 end
 require "acts_as_unvlogable/string_extend"
 
-# Video classes
+
+# Video Services
 videolibs = File.join(File.dirname(__FILE__), "acts_as_unvlogable", "vg_*.rb")
 Dir.glob(videolibs).each {|file| require file}
 
+
 class UnvlogIt
-  
+
   def initialize(url=nil, options={})
-    raise ArgumentError.new("We need a video url") if url.blank?
-    @object ||= "vg_#{get_domain(url).downcase}".camelize.constantize.new(url, options) rescue nil
-    raise ArgumentError.new("Unsuported url or service") and return if @object.nil?
-    unless @object.instance_variable_get("@details").nil? || !@object.instance_variable_get("@details").respond_to?("noembed")
-      raise ArgumentError.new("Embedding disabled by request") and return if @object.instance_variable_get("@details").noembed
-    end
+    @object = VideoFactory.new(url, options).load_service
   end
   
   def title
-    @object.title #rescue nil
+    @object.title rescue nil
   end
   
   def thumbnail
@@ -49,21 +46,21 @@ class UnvlogIt
     @object.video_id rescue nil
   end
 
-  def embed_html(width=425, height=344, options={})
-    @object.embed_html(width, height, options) rescue nil
-  end
-  
-  def flv
-    @object.flv rescue nil
-  end
-  
-  def download_url
-    @object.download_url rescue nil
+  def embed_html(width=425, height=344, options={}, params={})
+    @object.embed_html(width, height, options, params) rescue nil
   end
 
   def service
     @object.service rescue nil
   end
+
+  # Deprecated
+  def flv
+  end
+
+  # Deprecated
+  def download_url
+  end
   
   def video_details(width=425, height=344)
     {
@@ -71,21 +68,50 @@ class UnvlogIt
       :thumbnail => @object.thumbnail,
       :embed_url => @object.embed_url,
       :embed_html => @object.embed_html(width, height),
-      :flv => @object.flv,
-      :download_url => @object.download_url,
+      :flv => nil,              # Deprecated
+      :download_url => nil,     # Deprecated
       :service => @object.service,
       :duration => @object.duration
     }
   end
 
-  
-  def get_domain(url)
-    host = URI::parse(url).host.split(".")
-    unless host.size == 1
-      host[host.size-2]
-    else
-      host[0]
+  class VideoFactory
+    def initialize(url, options = {})
+      raise ArgumentError.new("We need a video url") if url.blank?
+      @url     = url
+      @options = options
+    end
+
+    def load_service
+      @object = service_object
+      validate_embed(@object)
+    end
+
+    private
+
+    def validate_embed(object)
+      unless object.instance_variable_get("@details").nil? || !object.instance_variable_get("@details").respond_to?("noembed")
+        if !object.instance_variable_get("@details").embeddable?
+          raise ArgumentError.new("Embedding disabled by request")
+        end
+      end
+      object
+    end
+
+    def service_object
+      class_name = "vg_#{get_domain.downcase}".camelize
+      class_name.constantize.new(@url, @options)
+    rescue NameError
+      raise ArgumentError.new("Unsuported url or service")
+    end
+
+    def get_domain
+      host = URI::parse(@url).host.split(".")
+      unless host.size == 1
+        host[host.size-2]
+      else
+        host[0]
+      end
     end
   end
-  
-end
+end

data/lib/acts_as_unvlogable/flickr.rb

@@ -1,40 +1,6 @@
 # included here to skip the gem dependency and modified to manage video capabilities.
 # this is the updated version from http://github.com/ctagg/flickr/tree/master/lib/flickr.rb
-
-# = 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>. Additional content by Patrick Plattes and Chris Taggart (http://pushrod.wordpress.com)
-# License::   MIT <http://www.opensource.org/licenses/mit-license.php>
-#
-# BASIC USAGE:
-#  require 'flickr'
-#  flickr = Flickr.new('some_flickr_api_key')    # create a flickr client (get an API key from http://www.flickr.com/services/api/)
-#  user = flickr.users('sco@scottraymond.net')   # lookup a user
-#  user.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 = recentphotos.first                    # or very most recent one
-#  photo.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
-
+# Modified and simplified to keep only the used methods
 
 require 'cgi'
 require 'net/http'
@@ -46,7 +12,7 @@ class Flickr
   attr_reader :api_key, :auth_token
   attr_accessor :user
   
-  HOST_URL = 'http://flickr.com'
+  HOST_URL = 'https://flickr.com'
   API_PATH = '/services/rest'
 
   # Flickr, annoyingly, uses a number of representations to specify the size 
@@ -92,87 +58,6 @@ class Flickr
     end
   end
 
-  # Gets authentication token given a Flickr frob, which is returned when user
-  # allows access to their account for the application with the api_key which
-  # made the request
-  def get_token_from(frob)
-    auth_response = request("auth.getToken", :frob => frob)['auth']
-    @auth_token = auth_response['token']
-    @user = User.new( 'id' => auth_response['user']['nsid'], 
-                      'username' => auth_response['user']['username'],
-                      'name' => auth_response['user']['fullname'],
-                      'client' => self)
-    @auth_token
-  end
-  
-  # Stores authentication credentials to use on all subsequent calls.
-  # If authentication succeeds, returns a User object.
-  # NB This call is no longer in API and will result in an error if called
-  def login(email='', password='')
-    @email = email
-    @password = password
-    user = request('test.login')['user'] rescue fail
-    @user = User.new(user['id'], nil, nil, nil, @api_key)
-  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'], nil, nil, nil, @api_key) : Group.new(response['group']['id'], @api_key) unless response.nil?
-  end
-
-  # Implements flickr.photos.getRecent and flickr.photos.search
-  def photos(*criteria)
-    criteria ? photos_search(*criteria) : recent
-  end
-
-  # flickr.photos.getRecent
-  # 100 newest photos from everyone
-  def recent
-    photos_request('photos.getRecent')
-  end
-  
-  def photos_search(params={})
-    photos_request('photos.search', params)
-  end
-  alias_method :search, :photos_search
-  
-  # Gets public photos with a given tag
-  def tag(tag)
-    photos('tags'=>tag)
-  end
-  
-  # Implements flickr.people.findByEmail and flickr.people.findByUsername. 
-  def users(lookup=nil)
-    user = people_findByEmail('find_email'=>lookup)['user'] rescue people_findByUsername('username'=>lookup)['user']
-    return User.new("id" => user["nsid"], "username" => user["username"], "client" => self)
-  end
-
-  # Implements flickr.groups.search
-  def groups(group_name, options={})
-    collection = groups_search({"text" => group_name}.merge(options))['groups']['group']
-    collection = [collection] if collection.is_a? Hash
-    
-    collection.collect { |group| Group.new( "id" => group['nsid'], 
-                                            "name" => group['name'], 
-                                            "eighteenplus" => group['eighteenplus'],
-                                            "client" => self) }
-  end
-  
-  # Implements flickr.tags.getRelated
-  def related_tags(tag)
-    tags_getRelated('tag'=>tag)['tags']['tag']
-  end
-  
-  # Implements flickr.photos.licenses.getInfo
-  def licenses
-    photos_licenses_getInfo['licenses']['license']
-  end
-  
-  # Returns url for user to login in to Flickr to authenticate app for a user
-  def login_url(perms)
-    "http://flickr.com/services/auth/?api_key=#{@api_key}&perms=#{perms}&api_sig=#{signature_from('api_key'=>@api_key, 'perms' => perms)}"
-  end
     
   # Implements everything else.
   # Any method not defined explicitly will be passed on to the Flickr API,
@@ -182,11 +67,6 @@ class Flickr
     request(method_id.id2name.gsub(/_/, '.'), params)
   end
 
-  # Does an HTTP GET on a given URL and returns the response body
-  def http_get(url)
-    Net::HTTP.get_response(URI.parse(url)).body.to_s
-  end
-
   # Takes a Flickr API method name and set of parameters; returns an XmlSimple object with the response
   def request(method, params={})
     url = request_url(method, params)
@@ -194,12 +74,6 @@ class Flickr
     raise response['err']['msg'] if response['stat'] != 'ok'
     response
   end
-
-  # acts like request but returns a PhotoCollection (a list of Photo objects)
-  def photos_request(method, params={})
-    photos = request(method, params)
-    PhotoCollection.new(photos, @api_key)
-  end
   
   # Builds url for Flickr API REST request from given the flickr method name 
   # (exclusing the 'flickr.' that begins each method call) and params (where
@@ -228,10 +102,6 @@ class Flickr
     # builds a PhotoCollection from given params, such as those returned from 
     # photos.search API call
     def initialize(photos_api_response={}, api_key=nil)
-      [ "page", "pages", "perpage", "total" ].each { |i| instance_variable_set("@#{i}", photos_api_response["photos"][i])} 
-      collection = photos_api_response['photos']['photo'] || []
-      collection = [collection] if collection.is_a? Hash
-      collection.each { |photo| self << Photo.new(photo.delete('id'), api_key, photo) }
     end
   end
   
@@ -280,110 +150,6 @@ class Flickr
       @client.login(@email, @password) if @email and @password # this is now irrelevant as Flickr API no longer supports authentication this way
     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
-    
-    # Builds url for user's photos page as per 
-    # http://www.flickr.com/services/api/misc.urls.html
-    def photos_url
-      "http://www.flickr.com/photos/#{id}/"
-    end
-        
-    # Builds url for user's profile page as per 
-    # http://www.flickr.com/services/api/misc.urls.html
-    def url
-      "http://www.flickr.com/people/#{id}/"
-    end
-    
-    def pretty_url
-      @pretty_url ||= @client.urls_getUserProfile('user_id'=>@id)['user']['url']
-    end
-    
-    # Implements flickr.people.getPublicGroups
-    def groups
-      collection = @client.people_getPublicGroups('user_id'=>@id)['groups']['group']
-      collection = [collection] if collection.is_a? Hash
-      collection.collect { |group| Group.new( "id" => group['nsid'], 
-                                           "name" => group['name'],
-                                           "eighteenplus" => group['eighteenplus'],
-                                           "client" => @client) }
-    end
-    
-    # Implements flickr.people.getPublicPhotos. Options hash allows you to add
-    # extra restrictions as per flickr.people.getPublicPhotos docs, e.g. 
-    # user.photos('per_page' => '25', 'extras' => 'date_taken')
-    def photos(options={})
-      @client.photos_request('people.getPublicPhotos', {'user_id' => @id}.merge(options))
-      # 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'], contact['username'], nil, nil, @api_key) }
-      #or
-    end
-    
-    # Implements flickr.favorites.getPublicList
-    def favorites
-      @client.photos_request('favorites.getPublicList', 'user_id' => @id)
-    end
-    
-    # Implements flickr.photosets.getList
-    def photosets
-      @client.photosets_getList('user_id'=>@id)['photosets']['photoset'].collect { |photoset| Photoset.new(photoset['id'], @api_key) }
-    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_request('photos.getContactsPublicPhotos', 'user_id' => @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']
-        self
-      end
-
   end
 
   class Photo
@@ -396,192 +162,20 @@ class Flickr
       extra_params.each { |k,v| self.instance_variable_set("@#{k}", v) } # convert extra_params into instance variables
       @client = Flickr.new @api_key
     end
-    
-    # Allows access to all photos instance variables through hash like 
-    # interface, e.g. photo["datetaken"] returns @datetaken instance 
-    # variable. Useful for accessing any weird and wonderful parameter
-    # that may have been returned by Flickr when finding the photo,
-    # e.g. those returned by the extras argument in 
-    # flickr.people.getPublicPhotos
-    def [](param_name)
-      instance_variable_get("@#{param_name}")
-    end
-    
+        
     def title
       @title.nil? ? getInfo("title") : @title
     end
     
-    # Returns the owner of the photo as a Flickr::User. If we have no info 
-    # about the owner, we make an API call to get it. If we already have
-    # the owner's id, create a user based on that. Either way, we cache the
-    # result so we don't need to check again
-    def owner
-      case @owner
-      when Flickr::User
-        @owner
-      when String
-        @owner = Flickr::User.new(@owner, nil, nil, nil, @api_key)
-      else
-        getInfo("owner")
-      end
-    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 || getInfo("description")
-    end
-
-    def notes
-      @notes.nil? ? getInfo("notes") : @notes
-    end
-
-    # Returns the URL for the photo size page
-    # defaults to 'Medium'
-    # other valid sizes are in the VALID_SIZES hash
-    def size_url(size='Medium')
-      uri_for_photo_from_self(size) || sizes(size)['url']
-    end
-
     # converts string or symbol size to a capitalized string
     def normalize_size(size)
       size ? size.to_s.capitalize : size
     end
 
-    # the URL for the main photo page
-    # if getInfo has already been called, this will return the pretty url
-    #
-    # for historical reasons, an optional size can be given
-    # 'Medium' returns the regular url; any other size returns a size page
-    # use size_url instead
-    def url(size = nil)
-      if normalize_size(size) != 'Medium'
-        size_url(size)
-      else
-        @url || uri_for_photo_from_self
-      end
-    end
-
-    # the 'pretty' url for a photo
-    # (if the user has set up a custom name)
-    # eg, http://flickr.com/photos/granth/2584402507/ instead of
-    #     http://flickr.com/photos/23386158@N00/2584402507/
-    def pretty_url
-      @url || getInfo("pretty_url")
-    end
-
     # Returns the URL for the image (default or any specified size)
     def source(size='Medium')
       image_source_uri_from_self(size) || 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')
-      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 = @client.photos_getContext('photo_id'=>@id)
-      @previousPhoto = Photo.new(context['prevphoto'].delete('id'), @api_key, context['prevphoto']) if context['prevphoto']['id']!='0'
-      @nextPhoto = Photo.new(context['nextphoto'].delete('id'), @api_key, context['nextphoto']) if context['nextphoto']['id']!='0'
-      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)
-      size = normalize_size(size)
-      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
-      title
-    end
-    
     
     # unvlog
     def media
@@ -630,84 +224,6 @@ class Flickr
         end
       end
       
-      # Builds uri of Flickr page for photo. By default returns the main 
-      # page for the photo, but if passed a size will return the simplified
-      # flickr page featuring the given size of the photo
-      # TODO: Handle "Original" size
-      def uri_for_photo_from_self(size=nil)
-        return unless @owner&&@id
-        size = normalize_size(size)
-        s_size = VALID_SIZES[size] # get the short letters array corresponding to the size
-        s_size = s_size&&s_size[1] # the second element of this array is used to build the uri of the flickr page for this size
-        "http://www.flickr.com/photos/#{owner.id}/#{@id}" + (s_size ? "/sizes/#{s_size}/" : "")
-      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, :description, :name, :eighteenplus, :members, :online, :privacy, :url#, :chatid, :chatcount
-    
-    def initialize(id_or_params_hash=nil, api_key=nil)
-      if id_or_params_hash.is_a?(Hash)
-        id_or_params_hash.each { |k,v| self.instance_variable_set("@#{k}", v) } # convert extra_params into instance variables
-      else
-        @id = id_or_params_hash
-        @api_key = api_key      
-        @client = Flickr.new @api_key
-      end
-    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, api_key=nil)
-      @id = id
-      @api_key = api_key
-      @client = Flickr.new @api_key
-    end
-
-    # Implements flickr.photosets.getInfo
-    # private, once we can call it as needed
-    def getInfo
-      info = @client.photosets_getInfo('photoset_id'=>@id)['photoset']
-      @owner = User.new(info['owner'], nil, nil, nil, @api_key)
-      @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