tenon 1.0.44 → 1.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b13a90a22579e057551dcb855c0485dd7460b53
-  data.tar.gz: 37a6192605b14f8c67be6d30e3c599a3c5f170dd
+  metadata.gz: 3c42e7c73d5526e892c6c094fabc3eb382691280
+  data.tar.gz: 26115cd24985c5c562cd1885b6c7e9c83cac3ae9
 SHA512:
-  metadata.gz: c835935254c5092d0496fed1506df3ef5247a1ad8d99b5a71c91030983703022c1d1855251aac813848fa7b9c23b62224d18dcd5e5e6bd1ebc60f632ee51ef62
-  data.tar.gz: f21220678071b5110613b0f619447eacd05e0a6d3d5de2928dbfa1d0f1d7dce84c18629c1a07a684de248ca94941736dd7d57f16cc5357def6c41ca6ad531e07
+  metadata.gz: 396bccf8d05677354748023d03f95e0dc2557ea57791f767e6215bace26597cc1991317a04062d712ecca3e231bb40695cf649599c9fffca3aeaae8545978c0e
+  data.tar.gz: daee0bcfafbca0714a60fa8cc39dcab34eb97d0bac015e9be90bbcb2094bbac009cc0cd98ff902f85478f1d2d277cb29316061bbe405a923e9bcdd72c48410f8

data/app/models/tenon/user.rb

@@ -37,6 +37,10 @@ module Tenon
       is_super_admin? || is_admin? || is_contributor?
     end
 
+    def active_for_authentication?
+      super && approved?
+    end
+
     private
 
     def apply_member_role

data/app/views/tenon/tenon_content/_piece_selector.html.haml

@@ -0,0 +1,8 @@
+.embedded-content
+  = link_to 'Select Piece Type', '#', class: 'open-piece-selector-modal', 'data-modal-target' => '.select-piece-type', 'data-modal-title' => 'Select Piece Type', 'data-modal-clone' => 'true', 'data-modal-handler' => 'Tenon.features.tenonContent.PieceSelectorModalHandler'
+  .embed= raw f.object.try(:embed_code)
+
+
+= f.hidden_field :embed_code, class: 'embed-code-field'
+= f.hidden_field :position
+= f.hidden_field :size

data/app/views/tenon/tenon_content/piece_types/display/_image.html.haml

@@ -1,8 +1,11 @@
 .tn-tc-image{class: piece.stretch_to_fill? ? 'stretch' : ''}
-  - if piece.link_url.blank?
-    = image_tag(piece.image.url(:_medium))
+  - if piece.image.present?
+    - if piece.link_url.blank?
+      = image_tag(piece.image.url(:_medium))
+    - else
+      = link_to image_tag(piece.image.url(:_medium)), piece.link_url, target: '_'
   - else
-    = link_to image_tag(piece.image.url(:_medium)), piece.link_url, target: '_'
+    = image_tag('tenon/thumb-doc.png')
 - if piece.show_caption
   .tn-tc-caption
     = piece.caption

data/db/migrate/20141115154243_remove_unused_tenon_photo_columns.rb

@@ -0,0 +1,7 @@
+class RemoveUnusedTenonPhotoColumns < ActiveRecord::Migration
+  def change
+    remove_column :tenon_photos, :file_file_size
+    remove_column :tenon_photos, :file_file_name
+    remove_column :tenon_photos, :file_content_type
+  end
+end

data/lib/templates/active_record/model/model.rb

@@ -1,9 +1,9 @@
 class <%= class_name %> < ActiveRecord::Base
   # Scopes, attachments, etc.
   has_history
-<% unless attributes.select{|a| a.name == "list_order" }.empty? -%>
+<% unless attributes.select{|a| a.name == 'list_order' }.empty? -%>
   include Tenon::Reorderable
-  default_scope :order => '<%= table_name %>.list_order'
+  default_scope { order('<%= table_name %>.list_order') }
 <% end -%>
 <% attributes.select {|a| a.type.to_s == 'asset'}.each do |f| -%>
   has_asset :<%= f.name %>

data/lib/tenon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.44
+  version: 1.0.45
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.27.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.27.1
 - !ruby/object:Gem::Dependency
   name: spring
   requirement: !ruby/object:Gem::Requirement
@@ -1255,6 +1255,7 @@ files:
 - app/views/tenon/tenon_content/_display.html.haml
 - app/views/tenon/tenon_content/_embed_modal.html.haml
 - app/views/tenon/tenon_content/_fields.html.haml
+- app/views/tenon/tenon_content/_piece_selector.html.haml
 - app/views/tenon/tenon_content/_row.html.haml
 - app/views/tenon/tenon_content/piece_types/display/_embedded_content.html.haml
 - app/views/tenon/tenon_content/piece_types/display/_image.html.haml
@@ -1321,6 +1322,7 @@ files:
 - db/migrate/20140520161213_remove_published_feld_from_tenon_pages.rb
 - db/migrate/20140619135927_add_stretch_boolean_to_tenon_tenon_content_pieces.rb
 - db/migrate/20140623142634_create_tenon_redirects.rb
+- db/migrate/20141115154243_remove_unused_tenon_photo_columns.rb
 - db/seeds.rb
 - lib/generators/tenon/i18n_migrations/i18n_migrations_generator.rb
 - lib/generators/tenon/i18n_migrations/templates/migration.rb