beef-has_assets 0.3.7 → 0.3.8

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/app/helpers/admin/assets_helper.rb

@@ -31,33 +31,24 @@ 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
 
 
   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
+    return unless defined?(Flickr) and File.exists?("#{RAILS_ROOT}/config/flickr.yml")
+    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::Photo.find(:all, flickr_params)
+    flickr_result = flickr.photos.search(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
+    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::Photo.find(:all, flickr_params)
+    flickr_result = flickr.photos.search(flickr_params)
     render :partial => 'admin/shared/flickr.html.erb', :locals => { :flickr_images => flickr_result }
   end
 end

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

@@ -1 +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)"/>
+<img src="<%= flickr_image.url(:square) %>" flickr_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/has_assets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_assets}
-  s.version = "0.3.7"
+  s.version = "0.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-09-14}
+  s.date = %q{2009-09-15}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -73,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/test_helper.rb",
-     "test/has_assets_test.rb"
+    "test/has_assets_test.rb",
+     "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-has_assets
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-14 00:00:00 -07:00
+date: 2009-09-15 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -75,6 +75,7 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/beef/assets
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -95,10 +96,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.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