tenon 1.0.59 → 1.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e1552d054d34f083ccfc50373dcabadf752fd73
-  data.tar.gz: c4ceadb0f3c8f00d2112dda9f1c8ff621d1fc914
+  metadata.gz: 1d53e72b5baba5b7ebbb44a67898108bb0c0e3c1
+  data.tar.gz: dd2d373cf02d70ad9663605f6c15bc2ad4cee705
 SHA512:
-  metadata.gz: ae9c6153301dca657825b2e6dff6442cb481258660d95fb152cfaa79261224db2faf9366dab2d77bd62588d190c9bb5f7653572d9ba8fa3f8c4bf85a2be446f0
-  data.tar.gz: 7f1b2dfaf00b234a737616cee00781664c7a79e346f0849bf564a0503a8c847771420baa21a0e56329cf8eca80eaa2d61f0856f69b89154d9bdb4c01d4ac044e
+  metadata.gz: 25ffa3ebba9e761239daebff9b12531489d5fb5d5151872cacedc7504efa18ce78bc2cc193e14120fb44c2e02dec5126b479ca8ba3db1e169eee0b48d7103abc
+  data.tar.gz: 5b8d63a1bd0baeb4c8057cd603867aa2bc158be8f83782f81d7bc800588982867525460db32cffb7474ecd671d3ef5085ff41d7d6bd79cd045a7243ec4204425

data/app/helpers/tenon/piece_helper.rb

@@ -35,9 +35,9 @@ module Tenon
         image_size = image_size.round(-2)
         image_size += 100 if (image_size / 100).odd?
 
-        default_style = computed_style(piece, "x#{image_size}").to_sym
+        default_style = "x#{image_size}"
 
-        piece.image.attachment.exists?(default_style) ? default_style : :_medium
+        piece.image.attachment.exists?(computed_style(piece, default_style.to_sym)) ? default_style : :_medium
       end
 
       # Iterate through the defined breakpoints and lookup the tenon_content

data/app/models/tenon/tenon_content/row_types/four_column_image.rb

@@ -5,10 +5,10 @@ module Tenon
         class << self
           def add_pieces_to(row)
             if row.pieces.empty?
-              row.pieces.build(piece_type: 'Image', position: 0)
-              row.pieces.build(piece_type: 'Image', position: 1)
-              row.pieces.build(piece_type: 'Image', position: 2)
-              row.pieces.build(piece_type: 'Image', position: 3)
+              row.pieces.build(piece_type: 'Image', position: 0, size: 'three')
+              row.pieces.build(piece_type: 'Image', position: 1, size: 'three')
+              row.pieces.build(piece_type: 'Image', position: 2, size: 'three')
+              row.pieces.build(piece_type: 'Image', position: 3, size: 'three')
             end
           end
         end

data/app/models/tenon/tenon_content/row_types/four_column_text.rb

@@ -5,10 +5,10 @@ module Tenon
         class << self
           def add_pieces_to(row)
             if row.pieces.empty?
-              row.pieces.build(piece_type: 'Text', position: 0)
-              row.pieces.build(piece_type: 'Text', position: 1)
-              row.pieces.build(piece_type: 'Text', position: 2)
-              row.pieces.build(piece_type: 'Text', position: 3)
+              row.pieces.build(piece_type: 'Text', position: 0, size: 'three')
+              row.pieces.build(piece_type: 'Text', position: 1, size: 'three')
+              row.pieces.build(piece_type: 'Text', position: 2, size: 'three')
+              row.pieces.build(piece_type: 'Text', position: 3, size: 'three')
             end
           end
         end

data/app/models/tenon/tenon_content/row_types/full_width_embedded_content.rb

@@ -4,7 +4,7 @@ module Tenon
       class FullWidthEmbeddedContent < TenonContent::RowTypes::Base
         class << self
           def add_pieces_to(row)
-            row.pieces.build(piece_type: 'EmbeddedContent', position: 0) if row.pieces.empty?
+            row.pieces.build(piece_type: 'EmbeddedContent', position: 0, size: 'twelve') if row.pieces.empty?
           end
         end
       end

data/app/models/tenon/tenon_content/row_types/full_width_image.rb

@@ -4,7 +4,7 @@ module Tenon
       class FullWidthImage < TenonContent::RowTypes::Base
         class << self
           def add_pieces_to(row)
-            row.pieces.build(piece_type: 'Image', position: 0) if row.pieces.empty?
+            row.pieces.build(piece_type: 'Image', position: 0, size: 'twelve') if row.pieces.empty?
           end
         end
       end

data/app/models/tenon/tenon_content/row_types/full_width_text.rb

@@ -4,7 +4,7 @@ module Tenon
       class FullWidthText < TenonContent::RowTypes::Base
         class << self
           def add_pieces_to(row)
-            row.pieces.build(piece_type: 'Text', position: 0) if row.pieces.empty?
+            row.pieces.build(piece_type: 'Text', position: 0, size: 'twelve') if row.pieces.empty?
           end
         end
       end

data/app/models/tenon/tenon_content/row_types/left_wrapped_image_with_text.rb

@@ -6,7 +6,7 @@ module Tenon
           def add_pieces_to(row)
             if row.pieces.empty?
               row.pieces.build(piece_type: 'Image', position: 0, size: 'four')
-              row.pieces.build(piece_type: 'Text', position: 1)
+              row.pieces.build(piece_type: 'Text', position: 1, size: 'eight')
             end
           end
         end

data/app/models/tenon/tenon_content/row_types/right_wrapped_image_with_text.rb

@@ -6,7 +6,7 @@ module Tenon
           def add_pieces_to(row)
             if row.pieces.empty?
               row.pieces.build(piece_type: 'Image', position: 0, size: 'four')
-              row.pieces.build(piece_type: 'Text', position: 1)
+              row.pieces.build(piece_type: 'Text', position: 1, size: 'eight')
             end
           end
         end

data/app/models/tenon/tenon_content/row_types/six_column_image.rb

@@ -5,12 +5,12 @@ module Tenon
         class << self
           def add_pieces_to(row)
             if row.pieces.empty?
-              row.pieces.build(piece_type: 'Image', position: 0)
-              row.pieces.build(piece_type: 'Image', position: 1)
-              row.pieces.build(piece_type: 'Image', position: 2)
-              row.pieces.build(piece_type: 'Image', position: 3)
-              row.pieces.build(piece_type: 'Image', position: 4)
-              row.pieces.build(piece_type: 'Image', position: 5)
+              row.pieces.build(piece_type: 'Image', position: 0, size: 'two')
+              row.pieces.build(piece_type: 'Image', position: 1, size: 'two')
+              row.pieces.build(piece_type: 'Image', position: 2, size: 'two')
+              row.pieces.build(piece_type: 'Image', position: 3, size: 'two')
+              row.pieces.build(piece_type: 'Image', position: 4, size: 'two')
+              row.pieces.build(piece_type: 'Image', position: 5, size: 'two')
             end
           end
         end

data/app/models/tenon/tenon_content/row_types/three_column_image.rb

@@ -5,9 +5,9 @@ module Tenon
         class << self
           def add_pieces_to(row)
             if row.pieces.empty?
-              row.pieces.build(piece_type: 'Image', position: 0)
-              row.pieces.build(piece_type: 'Image', position: 1)
-              row.pieces.build(piece_type: 'Image', position: 2)
+              row.pieces.build(piece_type: 'Image', position: 0, size: 'four')
+              row.pieces.build(piece_type: 'Image', position: 1, size: 'four')
+              row.pieces.build(piece_type: 'Image', position: 2, size: 'four')
             end
           end
         end

data/app/models/tenon/tenon_content/row_types/three_column_text.rb

@@ -5,9 +5,9 @@ module Tenon
         class << self
           def add_pieces_to(row)
             if row.pieces.empty?
-              row.pieces.build(piece_type: 'Text', position: 0)
-              row.pieces.build(piece_type: 'Text', position: 1)
-              row.pieces.build(piece_type: 'Text', position: 2)
+              row.pieces.build(piece_type: 'Text', position: 0, size: 'four')
+              row.pieces.build(piece_type: 'Text', position: 1, size: 'four')
+              row.pieces.build(piece_type: 'Text', position: 2, size: 'four')
             end
           end
         end

data/app/models/tenon/tenon_content/row_types/two_column_text.rb

@@ -5,8 +5,8 @@ module Tenon
         class << self
           def add_pieces_to(row)
             if row.pieces.empty?
-              row.pieces.build(piece_type: 'Text', position: 0)
-              row.pieces.build(piece_type: 'Text', position: 1)
+              row.pieces.build(piece_type: 'Text', position: 0, size: 'six')
+              row.pieces.build(piece_type: 'Text', position: 1, size: 'six')
             end
           end
         end

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.59'
+  VERSION = '1.0.60'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.59
+  version: 1.0.60
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -1517,7 +1517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A highly flexible mountable Rails CMS built for rapid application development.