beef-has_assets 0.2.10 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.3.1

data/app/controllers/admin/flickrs_controller.rb

@@ -0,0 +1,16 @@
+class Admin::FlickrsController < Admin::BaseController
+  def create
+    flickr = Flickr.new("#{RAILS_ROOT}/config/flickr.yml")
+    redirect_to flickr.auth.url(:write)
+  end
+  def show
+    respond_to do |format|
+      format.html do
+        flickr = Flickr.new("#{RAILS_ROOT}/config/flickr.yml")
+        flickr.auth.cache_token        
+      end
+      format.js
+    end
+  end
+
+end

data/app/helpers/admin/assets_helper.rb

@@ -31,5 +31,14 @@ module Admin::AssetsHelper
     session_key = ActionController::Base.session_options[:key]
     replace_thumbnail_admin_asset_path(asset, session_key => cookies[session_key], request_forgery_protection_token => form_authenticity_token)
   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/flickrs/selector', :locals => { :flickr_images => flickr_result }
+  end
 
 end

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

@@ -0,0 +1,12 @@
+<div id="flickr-select">
+  <h2>Flickr Images</h2>
+  <% 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>
+  <% end -%>
+
+  <% 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>

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

@@ -0,0 +1,2 @@
+<h1>Flickr</h1>
+<%= link_to "Authorise", admin_flickr_path, :method => :post %>

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

@@ -0,0 +1 @@
+page.replace 'flickr-select', flickr_select

data/config/routes.rb

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

data/has_assets.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_assets}
-  s.version = "0.2.10"
+  s.version = "0.3.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-03}
+  s.date = %q{2009-09-07}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "app/controllers/admin/assets_controller.rb",
+     "app/controllers/admin/flickrs_controller.rb",
      "app/helpers/admin/assets_helper.rb",
      "app/helpers/assets_helper.rb",
      "app/models/asset.rb",
@@ -36,6 +37,9 @@ Gem::Specification.new do |s|
      "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/_selector.html.erb",
+     "app/views/admin/flickrs/show.html.erb",
+     "app/views/admin/flickrs/show.js.rjs",
      "config/routes.rb",
      "generators/asset_migration/asset_migration_generator.rb",
      "generators/asset_migration/templates/migration.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-has_assets
 version: !ruby/object:Gem::Version 
-  version: 0.2.10
+  version: 0.3.1
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-03 00:00:00 -07:00
+date: 2009-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,7 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/admin/assets_controller.rb
+- app/controllers/admin/flickrs_controller.rb
 - app/helpers/admin/assets_helper.rb
 - app/helpers/assets_helper.rb
 - app/models/asset.rb
@@ -46,6 +47,9 @@ files:
 - 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/_selector.html.erb
+- app/views/admin/flickrs/show.html.erb
+- app/views/admin/flickrs/show.js.rjs
 - config/routes.rb
 - generators/asset_migration/asset_migration_generator.rb
 - generators/asset_migration/templates/migration.rb