beef-has_assets 0.3.6 → 0.3.7

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/app/helpers/admin/assets_helper.rb

@@ -41,4 +41,23 @@ module Admin::AssetsHelper
     render :partial => 'admin/flickrs/selector', :locals => { :flickr_images => flickr_result }
   end
 
+
+  def lastest_flickr
+    return if Settings.flickr_api_key.blank? or Settings.flickr_user_id.blank?
+    Flickr::API.connect Settings.flickr_api_key, Settings.flickr_api_secret, Settings.flickr_auth_token
+    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::Photo.find(:all, flickr_params)
+    render :partial => 'admin/shared/flickr_latest.html.erb', :locals => { :flickr_images => flickr_result }
+  end
+  
+  
+  def flickr_select
+    return if Settings.flickr_api_key.blank? or Settings.flickr_user_id.blank?
+    Flickr::API.connect Settings.flickr_api_key, Settings.flickr_api_secret, Settings.flickr_auth_token
+    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::Photo.find(:all, flickr_params)
+    render :partial => 'admin/shared/flickr.html.erb', :locals => { :flickr_images => flickr_result }
+  end
 end

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

@@ -8,7 +8,7 @@
   <div class="auto_complete" id="asset_category_complete" style="display:none"></div>
 	
   <p>
-    <%= f.label :decription %><br />
+    <%= f.label :description %><br />
     <%= f.text_field :description %>
   </p>
   

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

@@ -0,0 +1,11 @@
+
+<div id="flickr-select">
+  <% form_remote_tag( :url => admin_flickr_path ) do -%>
+  <p><label for="tags">Search by tag:</label>
+  <%= text_field_tag :tags, params[:tags] %> &nbsp; <%= submit_tag "go" %></p>
+  
+  <% end -%>
+
+  <%= render :partial => 'admin/shared/flickr_image.html.erb', :collection => flickr_images -%>
+
+</div>

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

@@ -0,0 +1 @@
+<img src="/images/admin/flickr_logo.jpg" flickr_src="<%= flickr_image.source('s') %>" alt="<%= flickr_image.description || flickr_image.title %>" title="<%= flickr_image.title %>" onclick="addLinkedImage('<%= flickr_image.source %>',this.alt)"/>

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

@@ -0,0 +1,6 @@
+
+<div id="flickr-select">
+
+  <%= render :partial => 'admin/shared/flickr_image.html.erb', :collection => flickr_images -%>
+
+</div>

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

@@ -390,3 +390,11 @@ var Renameable = Class.create(Holdable, {
     });
   } 
 });
+
+var load_flickr_select = function(){
+  $$('#flickr-select img').each(function(el){
+    
+    el.writeAttribute('src', el.readAttribute('flickr_src'));
+  });
+}
+document.observe('dom:loaded', load_flickr_select);

data/has_assets.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{has_assets}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-09-07}
+  s.date = %q{2009-09-14}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -40,15 +43,20 @@ Gem::Specification.new do |s|
      "app/views/admin/flickrs/_selector.html.erb",
      "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",
      "config/routes.rb",
      "generators/asset_migration/asset_migration_generator.rb",
      "generators/asset_migration/templates/migration.rb",
      "generators/assets_admin_files/asset_admin_files_generator.rb",
      "generators/assets_admin_files/templates/public/flash/swfupload.swf",
+     "generators/assets_admin_files/templates/public/images/flickr_logo.jpg",
      "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",
@@ -65,8 +73,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/has_assets_test.rb",
-     "test/test_helper.rb"
+    "test/test_helper.rb",
+     "test/has_assets_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/flickr.rb

@@ -0,0 +1,386 @@
+# = 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-has_assets
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-07 00:00:00 -07:00
+date: 2009-09-14 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -50,15 +50,20 @@ files:
 - app/views/admin/flickrs/_selector.html.erb
 - 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
 - config/routes.rb
 - generators/asset_migration/asset_migration_generator.rb
 - generators/asset_migration/templates/migration.rb
 - generators/assets_admin_files/asset_admin_files_generator.rb
 - generators/assets_admin_files/templates/public/flash/swfupload.swf
+- generators/assets_admin_files/templates/public/images/flickr_logo.jpg
 - 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
@@ -70,7 +75,6 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/beef/assets
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -91,10 +95,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Rails Engine. Adds uploadable assets to a model and admin area for files
 test_files: 
-- test/has_assets_test.rb
 - test/test_helper.rb
+- test/has_assets_test.rb