noodall-ui 0.1.4 → 0.1.5

data/app/models/asset.rb

@@ -43,14 +43,25 @@ class Asset
     elsif video?
       file.encode(:tiff, { :offset => "#{video_thumbnail_offset}%" }).thumb(*args).url
     else
-      file.thumb(*args).url(:suffix => ".#{file_ext}")
+      file.thumb(*args).url
     end
   end
 
+  def web_image_extension
+    # If the extension id anything other than a png or gif then it should be a jpg
+    case file_ext
+    when 'png', 'gif'
+      file_ext
+    else
+      'jpg'
+    end.to_sym
+  end
+
   def dragonfly_extension_sym
-    file_ext.gsub('jpeg','jpg').to_sym
+    warn "[DEPRECATION] `dragonfly_extension_sym` is deprecated.  Please use `web_image_extension` instead."
+    web_image_extension
   end
-  
+
   def file_uid
     # Required to rerun the correct object for Dragonfly pending
     return Dragonfly::ActiveRecordExtensions::PendingUID.new if @file_uid == "PENDING"

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

@@ -5,10 +5,10 @@
     <li class="file" title="<%= h( asset.title ) %>">
       <div class="file-detail" id="asset-<%= asset.id %>">
         <span class="file-title"><%= h( asset.title ) %></span>
-        
-        <%= (asset.image? or asset.video?) ? image_tag( asset.url('70x70#', asset.dragonfly_extension_sym)  ) : asset_icon(asset) %>
+
+        <%= (asset.image? or asset.video?) ? image_tag( asset.url('70x70#', asset.web_image_extension)  ) : asset_icon(asset) %>
       </div>
-      
+
       <%= link_to 'Show', noodall_admin_asset_path(asset, :readonly => readonly), :class => 'show button', :title => 'View this asset' %>
       <%= link_to 'Add me', asset.url, :class => 'add button', :title => 'Add this asset' %>
     </li>

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

@@ -45,7 +45,7 @@
 <div id="sub-form">
   <div id="image">
   <% if @asset.image? or @asset.video? %>
-    <%= image_tag( @asset.url('260x', @asset.dragonfly_extension_sym), :alt => @asset.description, :id => "asset-#{@asset.id}" ) %>
+    <%= image_tag( @asset.url('260x', @asset.web_image_extension), :alt => @asset.description, :id => "asset-#{@asset.id}" ) %>
     <% else -%>
     <%= link_to( @asset.file.name, @asset.url, :title => @asset.description, :id => "asset-#{@asset.id}" ) %>
   <% end -%>

data/app/views/noodall/admin/assets/_show.html.erb

@@ -4,7 +4,7 @@
 
   <div id="image">
   <% if @asset.image? or @asset.video? %>
-    <%= link_to(image_tag( @asset.url('500x400', @asset.dragonfly_extension_sym), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url, :class => ('lightboxVideo' if @asset.video?)) %>
+    <%= link_to(image_tag( @asset.url('500x400', @asset.web_image_extension), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url, :class => ('lightboxVideo' if @asset.video?)) %>
     <% else -%>
     <%= link_to( asset_icon(@asset) ) %>
   <% end -%>

data/app/views/noodall/admin/assets/add.html.erb

@@ -1,10 +1,10 @@
 <% if @asset.image? %>
-<%= link_to image_tag( @asset.url('100x100#', @asset.dragonfly_extension_sym), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url('800x600', @asset.dragonfly_extension_sym), :class => 'lightbox', :title => @asset.title %>
+<%= link_to image_tag( @asset.url('100x100#', @asset.web_image_extension), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url('800x600', @asset.web_image_extension), :class => 'lightbox', :title => @asset.title %>
 <% elsif @asset.video? %>
 <div class="video">
-  <%= link_to image_tag( @asset.url('220x125#', @asset.dragonfly_extension_sym), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url, :class => 'lightboxVideo', :title => @asset.title %>
+  <%= link_to image_tag( @asset.url('220x125#', @asset.web_image_extension), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url, :class => 'lightboxVideo', :title => @asset.title %>
   <strong><%= @asset.title %></strong>
 </div>
 <% else -%>
 <%= link_to( @asset.title, @asset.url, :title => @asset.description, :id => "asset-#{@asset.id}" ) %>
-<% end -%>
+<% end -%>

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

@@ -18,7 +18,7 @@
     <tr id="asset-<%= asset.id %>" class="<%=cycle('odd', 'even')%>">
       <td><%= link_to h( asset.title ), edit_noodall_admin_asset_path(asset), :class => 'edit', :title => 'Edit this asset' %></td>
       <td class="file">
-        <%= (asset.image? or asset.video?) ? image_tag( asset.url('70x70', asset.dragonfly_extension_sym), :alt => "#{truncate(asset.file.name, :length => 80)}")  : link_to( asset_icon(asset) ) %>
+        <%= (asset.image? or asset.video?) ? image_tag( asset.url('70x70', asset.web_image_extension), :alt => "#{truncate(asset.file.name, :length => 80)}")  : link_to( asset_icon(asset) ) %>
         <%= link_to 'Show', noodall_admin_asset_path(asset), :class => 'show', :title => 'View this asset' %>
       </td>
       <td><%=h asset.created_at.to_formatted_s(:short_ordinal) %></td>

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/public/javascripts/admin/assets.js

@@ -4,7 +4,7 @@ function setUpAssets() {
   document.write('<script type="text/javascript" src="http://bp.yahooapis.com/2.4.21/browserplus-min.js"></script>');
   document.write('<script type="text/javascript" src="/javascripts/plupload/plupload.full.min.js"></script>');
   document.write('<script type="text/javascript" src="/javascripts/plupload/jquery.plupload.queue.min.js"></script>');
-  
+
   $('#asset-browser ul.choices a, #asset-browser #tags a, #asset-browser .tags a, #asset-browser a.show, #asset-browser .pagination a').live('click', function() {
     $.get(
       $(this).attr('href'),
@@ -17,7 +17,7 @@ function setUpAssets() {
 }
 
 function setUpPlupload() {
-  
+
   $("#uploader").pluploadQueue({
 
     // General settings
@@ -26,17 +26,17 @@ function setUpPlupload() {
     // max_file_size : '10mb',
     chunk_size : '1mb',
     unique_names : false,
-    
+
     // Use multipart
-    // multipart: true,    
+    // multipart: true,
     // multipart_params: { 'var1': 'val1', 'var2': 'val2' },
-    
+
     // Resize images on clientside if we can
     // resize : {width : 320, height : 240, quality : 90},
 
     // Specify what files to browse for
     filters : [
-      {title : "Image files", extensions : "jpg,gif,png"},
+      {title : "Image files", extensions : "jpg,gif,png,tiff,bmp"},
       {title : "Zip files", extensions : "zip"},
       {title : "Flash files", extensions : "swf"},
       {title : "Document files", extensions : "doc,pdf,xls,txt,docx,ppt"},
@@ -50,8 +50,8 @@ function setUpPlupload() {
 
   });
   var uploader = $('#uploader').pluploadQueue();
-  
-  
+
+
   uploader.bind('FileUploaded', function(up, file, res) {
     if(this.total.queued == 0) {
       message = $('<div id="flash"><div class="flash notice">Assets were successfully uploaded. <strong>Please enter full information for each asset</strong></div></div>');
@@ -65,32 +65,32 @@ function setUpPlupload() {
       }
     }
   });
-  
+
   var error_translations = [];
     error_translations[700] = 'File type is not allowed.';
     error_translations[600] = 'File is too large, '+ plupload.formatSize(uploader.settings.max_file_size) +' maximum.';
-    
+
   uploader.bind('Error', function(up, err){
     uploader_dom = $('#uploader');
-    
+
     if(uploader_dom.find('.plupload_droptext').length >0)
       uploader_dom.find('.plupload_droptext').remove();
-    
+
     // get a nicer error message
     // or fail to pluploads errors
     error_message = err.message;
     err_code = Math.abs(err.code);
     if(error_translations[err_code])
       error_message = error_translations[err_code];
-    
+
     error_item = $('<li></li>');
     error_item.addClass('plupload_error');
     error_item.text(error_message + (err.file ? " (" + err.file.name + ")" : ""));
-    
+
     $('#uploader_filelist').append(error_item);
 
     error_item.delay(8000).fadeOut(2000, function(){ $(this).remove(); if($('#uploader_filelist li').length == 0) $('#uploader_filelist').append('<li class="plupload_droptext">Drag files here.</li>'); });
-    
+
     up.refresh(); // Reposition Flash/Silverlight
   });
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-ui
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Steve England
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +00:00
+date: 2011-01-16 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,10 +28,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   name: noodall-core
   prerelease: false
   version_requirements: *id001
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,26 +44,27 @@ dependencies:
         - 0
         - 6
         version: 0.0.6
-  type: :runtime
   name: thoughtbot-sortable_table
   prerelease: false
   version_requirements: *id002
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 270495401
+        hash: 1923831917
         segments: 
         - 3
         - 0
-        - pre2
+        - pre
+        - 2
         version: 3.0.pre2
-  type: :runtime
   name: will_paginate
   prerelease: false
   version_requirements: *id003
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,10 +75,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   name: dynamic_form
   prerelease: false
   version_requirements: *id004
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -90,10 +91,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
   name: bundler
   prerelease: false
   version_requirements: *id005
+  type: :development
 description: Noodall Rails User Interface Engine. Requires Noodall Core
 email: 
 - steve@wearebeef.co.uk
@@ -673,7 +674,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Noodall Rails User Interface