tenon 1.0.43 → 1.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92ad0c37de5b58258c53430f71571f2d07ec6c4e
-  data.tar.gz: 4946e2211844000b51074bbce033be913065e91a
+  metadata.gz: 0b13a90a22579e057551dcb855c0485dd7460b53
+  data.tar.gz: 37a6192605b14f8c67be6d30e3c599a3c5f170dd
 SHA512:
-  metadata.gz: f704b9eef76e1058f488ee1a7e51328efe44e76cde97be3a9e093929bbee21bded2e2fab06b2167e95941cd15d6437c0e89045433d489c3f5fb9245272bc1a0a
-  data.tar.gz: 3483bdcf78ad215fac36461e9699ac4671ec9640fb29b8efcb15baa2a5328a7e9141794c7a1b5fccd85d9a5bd4c2eb6c53ff4e111f7f936df0285cca29f4d1eb
+  metadata.gz: c835935254c5092d0496fed1506df3ef5247a1ad8d99b5a71c91030983703022c1d1855251aac813848fa7b9c23b62224d18dcd5e5e6bd1ebc60f632ee51ef62
+  data.tar.gz: f21220678071b5110613b0f619447eacd05e0a6d3d5de2928dbfa1d0f1d7dce84c18629c1a07a684de248ca94941736dd7d57f16cc5357def6c41ca6ad531e07

data/app/views/tenon/shared/_asset_field.html.haml

@@ -1,21 +1,24 @@
-%label.asset-label= asset.to_s.titleize
+/ TODO call this partial with local variable named asset_name rather than asset
+- asset_name = asset
+- proxy_attachment = f.object.send(asset_name)
+%label.asset-label= asset_name.to_s.titleize
 .asset-field
-  = f.hidden_field "#{asset}_id", class: 'asset-id-field'
+  = f.hidden_field "#{asset_name}_id", class: 'asset-id-field'
   .thumbnail
-    - if f.object.send(asset)
-      = image_tag url_for(f.object.send(asset).url(:_thumbnail))
+    - if proxy_attachment.try(:asset)
+      = asset_icon(proxy_attachment.asset)
     - else
-      = image_tag default_asset_thumbnail(f.object.send(asset))
+      = image_tag default_asset_thumbnail(proxy_attachment)
   .details
     .asset-info
-      - if f.object.send(asset)
-        = f.object.send(asset).display_name
+      - if proxy_attachment
+        = proxy_attachment.display_name
       - else
         No asset selected.
 
     .browse-button-holder{:class => ('with-remove' if defined?(remove_association) && remove_association)}
       .browse-button
-        = link_to 'Browse', new_item_asset_path, class: 'btn btn-comp browse', data: {'modal-remote' => true, 'modal-title' => "Select #{asset.to_s.titleize}", 'modal-handler' => 'Tenon.features.AssetAttachment'}
+        = link_to 'Browse', new_item_asset_path, class: 'btn btn-comp browse', data: {'modal-remote' => true, 'modal-title' => "Select #{asset_name.to_s.titleize}", 'modal-handler' => 'Tenon.features.AssetAttachment'}
         - if defined?(remove_association) && remove_association
           %small
             or

data/lib/tenon/engine.rb

@@ -34,6 +34,7 @@ require 'paperclip'
 require 'rails-observers'
 require 'rails-settings-cached'
 require 'rdiscount'
+require 'resque/server'
 require 'sass-rails'
 require 'simple-rss'
 require 'uglifier'

data/lib/tenon/has_asset.rb

@@ -36,7 +36,7 @@ module Tenon
             instance_variable_get("@#{asset_name}")
           elsif persisted?
             relation = Tenon::ItemAsset.where(item_type: self.class.to_s, item_id: id, asset_name: asset_name)
-            asset = relation.first.try(:asset).try(:attachment)
+            asset = relation.first.try(:asset)
             if asset
               attach = ProxyAttachment.new(asset, self.class, asset_name)
             else
@@ -83,7 +83,7 @@ module Tenon
             join = send("#{asset_name}_join") || send("build_#{asset_name}_join")
             join.assign_attributes(attrs)
             join.save
-            attachment = ProxyAttachment.new(asset.attachment, self.class, asset_name)
+            attachment = ProxyAttachment.new(asset, self.class, asset_name)
             instance_variable_set("@#{asset_name}_id", val)
             instance_variable_set("@#{asset_name}", attachment)
           else

data/lib/tenon/proxy_attachment.rb

@@ -1,9 +1,10 @@
 module Tenon
   class ProxyAttachment
-    attr_reader :attachment
+    attr_reader :attachment, :asset
 
     def initialize(attachment, klass, asset_name)
       @attachment = attachment.try(:attachment) || attachment
+      @asset = attachment if attachment.is_a?(Tenon::Asset)
       @style_prefix = "#{klass.to_s.underscore.gsub('/', '_')}_#{asset_name}"
     end
 

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.43'
+  VERSION = '1.0.44'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.43
+  version: 1.0.44
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -738,6 +738,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.7.3
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.25.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.25.2
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement