tenon 1.0.43 → 1.0.44

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 92ad0c37de5b58258c53430f71571f2d07ec6c4e
4
- data.tar.gz: 4946e2211844000b51074bbce033be913065e91a
3
+ metadata.gz: 0b13a90a22579e057551dcb855c0485dd7460b53
4
+ data.tar.gz: 37a6192605b14f8c67be6d30e3c599a3c5f170dd
5
5
  SHA512:
6
- metadata.gz: f704b9eef76e1058f488ee1a7e51328efe44e76cde97be3a9e093929bbee21bded2e2fab06b2167e95941cd15d6437c0e89045433d489c3f5fb9245272bc1a0a
7
- data.tar.gz: 3483bdcf78ad215fac36461e9699ac4671ec9640fb29b8efcb15baa2a5328a7e9141794c7a1b5fccd85d9a5bd4c2eb6c53ff4e111f7f936df0285cca29f4d1eb
6
+ metadata.gz: c835935254c5092d0496fed1506df3ef5247a1ad8d99b5a71c91030983703022c1d1855251aac813848fa7b9c23b62224d18dcd5e5e6bd1ebc60f632ee51ef62
7
+ data.tar.gz: f21220678071b5110613b0f619447eacd05e0a6d3d5de2928dbfa1d0f1d7dce84c18629c1a07a684de248ca94941736dd7d57f16cc5357def6c41ca6ad531e07
@@ -1,21 +1,24 @@
1
- %label.asset-label= asset.to_s.titleize
1
+ / TODO call this partial with local variable named asset_name rather than asset
2
+ - asset_name = asset
3
+ - proxy_attachment = f.object.send(asset_name)
4
+ %label.asset-label= asset_name.to_s.titleize
2
5
  .asset-field
3
- = f.hidden_field "#{asset}_id", class: 'asset-id-field'
6
+ = f.hidden_field "#{asset_name}_id", class: 'asset-id-field'
4
7
  .thumbnail
5
- - if f.object.send(asset)
6
- = image_tag url_for(f.object.send(asset).url(:_thumbnail))
8
+ - if proxy_attachment.try(:asset)
9
+ = asset_icon(proxy_attachment.asset)
7
10
  - else
8
- = image_tag default_asset_thumbnail(f.object.send(asset))
11
+ = image_tag default_asset_thumbnail(proxy_attachment)
9
12
  .details
10
13
  .asset-info
11
- - if f.object.send(asset)
12
- = f.object.send(asset).display_name
14
+ - if proxy_attachment
15
+ = proxy_attachment.display_name
13
16
  - else
14
17
  No asset selected.
15
18
 
16
19
  .browse-button-holder{:class => ('with-remove' if defined?(remove_association) && remove_association)}
17
20
  .browse-button
18
- = 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'}
21
+ = 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'}
19
22
  - if defined?(remove_association) && remove_association
20
23
  %small
21
24
  or
data/lib/tenon/engine.rb CHANGED
@@ -34,6 +34,7 @@ require 'paperclip'
34
34
  require 'rails-observers'
35
35
  require 'rails-settings-cached'
36
36
  require 'rdiscount'
37
+ require 'resque/server'
37
38
  require 'sass-rails'
38
39
  require 'simple-rss'
39
40
  require 'uglifier'
@@ -36,7 +36,7 @@ module Tenon
36
36
  instance_variable_get("@#{asset_name}")
37
37
  elsif persisted?
38
38
  relation = Tenon::ItemAsset.where(item_type: self.class.to_s, item_id: id, asset_name: asset_name)
39
- asset = relation.first.try(:asset).try(:attachment)
39
+ asset = relation.first.try(:asset)
40
40
  if asset
41
41
  attach = ProxyAttachment.new(asset, self.class, asset_name)
42
42
  else
@@ -83,7 +83,7 @@ module Tenon
83
83
  join = send("#{asset_name}_join") || send("build_#{asset_name}_join")
84
84
  join.assign_attributes(attrs)
85
85
  join.save
86
- attachment = ProxyAttachment.new(asset.attachment, self.class, asset_name)
86
+ attachment = ProxyAttachment.new(asset, self.class, asset_name)
87
87
  instance_variable_set("@#{asset_name}_id", val)
88
88
  instance_variable_set("@#{asset_name}", attachment)
89
89
  else
@@ -1,9 +1,10 @@
1
1
  module Tenon
2
2
  class ProxyAttachment
3
- attr_reader :attachment
3
+ attr_reader :attachment, :asset
4
4
 
5
5
  def initialize(attachment, klass, asset_name)
6
6
  @attachment = attachment.try(:attachment) || attachment
7
+ @asset = attachment if attachment.is_a?(Tenon::Asset)
7
8
  @style_prefix = "#{klass.to_s.underscore.gsub('/', '_')}_#{asset_name}"
8
9
  end
9
10
 
data/lib/tenon/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Tenon
2
- VERSION = '1.0.43'
2
+ VERSION = '1.0.44'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tenon
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.43
4
+ version: 1.0.44
5
5
  platform: ruby
6
6
  authors:
7
7
  - factor[e] design initiative
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-23 00:00:00.000000000 Z
11
+ date: 2014-11-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: better_errors
@@ -738,6 +738,20 @@ dependencies:
738
738
  - - '='
739
739
  - !ruby/object:Gem::Version
740
740
  version: 2.0.7.3
741
+ - !ruby/object:Gem::Dependency
742
+ name: resque
743
+ requirement: !ruby/object:Gem::Requirement
744
+ requirements:
745
+ - - '='
746
+ - !ruby/object:Gem::Version
747
+ version: 1.25.2
748
+ type: :runtime
749
+ prerelease: false
750
+ version_requirements: !ruby/object:Gem::Requirement
751
+ requirements:
752
+ - - '='
753
+ - !ruby/object:Gem::Version
754
+ version: 1.25.2
741
755
  - !ruby/object:Gem::Dependency
742
756
  name: sass-rails
743
757
  requirement: !ruby/object:Gem::Requirement