divygrid 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38e392b50f6af50e3dfd478f272d62d369b7e941
-  data.tar.gz: 4967a50bc05991739dc5dd6e5bbac7bb24371c1f
+  metadata.gz: 4b4eeb20f434b517a67a0626b7a3fea6129ca493
+  data.tar.gz: df0548b8228d09f9225a659c8c3c145b977e5ee0
 SHA512:
-  metadata.gz: 208bf7eb651b078cb1b28964ff442553c9e99eea24a9b83a4b211109b727a0986d3dc480776c5fa15eb7abb19d7a5c84d8bc4e539bd2ab203aaa5a08935785cc
-  data.tar.gz: 3cf4b571121bf9455a0145bc9df4348443165d736f9cf1ef446a5fdfac564525a09cdef51f19353082526b92adf2ac09a967ce1966c7abd2d60aaafd6893009f
+  metadata.gz: 9052b49613a019c02e5de80ea05850145943aa720b73bbdfe1233d861f542bcab34bddeea3a1a35920b5262815097be70dfe0389cc46d4a8c8a0dc289f6f6b0d
+  data.tar.gz: 79a6f1ccdc2795c020c4040e9cffcace38bc3df81d453f78dc1596b6b650cf34a2ec68a4bc89ca4a0261385f9073551f50725e523dbe01927dc882f3dc6e8353

data/.gitignore

@@ -1,2 +1,3 @@
 .hound.yml
 .bundle
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    divygrid (0.0.2)
+    divygrid (0.0.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/divy/div_generator.rb

@@ -1,7 +1,7 @@
 module Divy
   class DivGenerator
     def divy_container(container_size, container_content)
-      style = "style=\"width: #{size_and_unit(container_size[0])}; height: #{size_and_unit(container_size[1])};\""
+      style = "style=\"position:relative; width: #{size_and_unit(container_size[0])}; height: #{size_and_unit(container_size[1])};\""
       begin_tag = "<div class=\"divycontainer\" #{style}>\n"
       end_tag = "</div>\n"
       begin_tag + container_content + end_tag
@@ -28,7 +28,7 @@ module Divy
       when :html
         divy_box(content[:location][0], content[:location][1], grid_size, content[:value], content[:size], options)
       when :image
-        divy_box(content[:location][0], content[:location][1], grid_size, image_html(content[:value]), content[:size],options)
+        divy_box(content[:location][0], content[:location][1], grid_size, image_html(content[:value]), content[:size], options)
       when :none
         ''
       end
@@ -39,7 +39,7 @@ module Divy
     end
 
     def grid_html(grid_dimensions, options = {})
-      div_grid_html = ""
+      div_grid_html = ''
       (0..(grid_dimensions[0] - 1)).each do |x|
         (0..(grid_dimensions[1] - 1)).each do |y|
           div_grid_html += divy_box(x, y, grid_dimensions, nil, nil, options)
@@ -55,13 +55,13 @@ module Divy
 
     def divy_box_stylez(x, y, grid_size, content_size = nil, options = {})
       if content_size
-        content_divy_box_stylez(x, y, grid_size, content_size, options)
+        content_divy_box_stylez(x, y, grid_size, content_size)
       else
-        general_divy_box_stylez(x, y, grid_size, content_size, options)
+        general_divy_box_stylez(x, y, grid_size, options)
       end
     end
 
-    def general_divy_box_stylez(x, y, grid_size, content_size = nil, options = {})
+    def general_divy_box_stylez(x, y, grid_size, options = {})
       bottom = scaled_value(grid_size[1], y)
       left = scaled_value(grid_size[0], x)
       width = scaled_percentage(grid_size[0])
@@ -69,12 +69,12 @@ module Divy
       "bottom: #{bottom}%; left: #{left}%; width: #{width}%; height: #{height}%; #{default_stylez(options)}"
     end
 
-    def content_divy_box_stylez(x, y, grid_size, content_size = nil, options = {})
+    def content_divy_box_stylez(x, y, grid_size, content_size = nil)
       bottom = scaled_value(grid_size[1], (y - 0.5))
       left = scaled_value(grid_size[0], (x - 0.5))
       width = scaled_value(grid_size[0], content_size[0])
       height = scaled_value(grid_size[1], content_size[1])
-      "bottom: #{bottom}%; left: #{left}%; width: #{width}%; height: #{height}%; #{default_stylez(options)}"
+      "bottom: #{bottom}%; left: #{left}%; width: #{width}%; height: #{height}%; #{default_stylez(nil)}"
     end
 
     def scaled_value(total_units, val)
@@ -86,7 +86,7 @@ module Divy
     end
 
     def default_stylez(options = {})
-      if options[:show_grid]
+      if options && options[:show_grid]
         color = options[:grid_color] || '#000000'
         "position: absolute; border-style:solid; border-color:#{color};"
       else

data/lib/divy/grid.rb

@@ -11,6 +11,42 @@ module Divy
       @div_generator = Divy::DivGenerator.new
     end
 
+    def content=(input)
+      if input.kind_of?(Array)
+        @content = validated_content_arr(input)
+      elsif input.kind_of?(Hash)
+        @content = [validated_content_hsh(input)]
+      end
+      rescue
+        @content = @content
+    end
+
+    def container_size=(input)
+      @container_size = validated_container_size(input)
+      rescue
+        @container_size = @container_size
+    end
+
+    def grid_dimensions=(input)
+      @grid_dimensions = validated_number_array(input)
+      rescue
+        @grid_dimensions = @grid_dimensions
+    end
+
+    def grid_color=(input)
+      @grid_color = validated_hex_color(input)
+      rescue
+        @grid_color = @grid_color
+    end
+
+    def show_grid=(input)
+      if input.kind_of?(TrueClass) || input.kind_of?(FalseClass)
+        @show_grid = input
+      else
+        @show_grid = @show_grid
+      end
+    end
+
     def add_content(input_content)
       @content += validated_content_arr(input_content)
     end
@@ -43,8 +79,8 @@ module Divy
 
     def validated_content_hsh(content_hsh)
       if valid_content_type?(content_hsh)
-        content_hsh[:location] = validated_number_array(content_hsh[:location] || [0,0])
-        content_hsh[:size] = validated_number_array(content_hsh[:size] || [1,1])
+        content_hsh[:location] = validated_number_array(content_hsh[:location] || [0, 0])
+        content_hsh[:size] = validated_number_array(content_hsh[:size] || [1, 1])
         content_hsh[:value] ||= ''
         content_hsh
       else

data/lib/divy/version.rb

@@ -1,3 +1,3 @@
 module Divy
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/test/lib/divy/div_generator_test.rb

@@ -70,7 +70,7 @@ describe Divy::DivGenerator do
 
     it 'should return modified content styles if content size is passed' do
       options = {show_grid: true, grid_color: '#00FFFF'}
-      style = 'bottom: 15.0%; left: 5.0%; width: 20.0%; height: 20.0%; position: absolute; border-style:solid; border-color:#00FFFF;'
+      style = 'bottom: 15.0%; left: 5.0%; width: 20.0%; height: 20.0%; position: absolute;'
       @test_div.divy_box_stylez(1, 2, [10, 10], [2, 2], options).must_equal style
     end
   end
@@ -89,12 +89,12 @@ describe Divy::DivGenerator do
 
   describe '#divy_container' do
     it 'should wrap the given content in a divycontainer div with %' do
-      div_content = "<div class=\"divycontainer\" style=\"width: 100%; height: 100%;\">\ntest content</div>\n"
+      div_content = "<div class=\"divycontainer\" style=\"position:relative; width: 100%; height: 100%;\">\ntest content</div>\n"
       @test_div.divy_container(['100%', '100%'], 'test content').must_equal div_content
     end
 
     it 'should wrap the given content in a divycontainer div with as px' do
-      div_content = "<div class=\"divycontainer\" style=\"width: 100px; height: 100px;\">\ntest content</div>\n"
+      div_content = "<div class=\"divycontainer\" style=\"position:relative; width: 100px; height: 100px;\">\ntest content</div>\n"
       @test_div.divy_container([100, 100], 'test content').must_equal div_content
     end
 

data/test/lib/divy/grid_test.rb

@@ -203,4 +203,69 @@ describe Divy::Grid do
       @grid.html.must_equal (@html_results[4] + "\n")
     end
   end
+
+  describe '#content=' do
+    it 'sets content if valid array' do
+      @grid.content = [{type: :html, value: 'totally valid', location: [1, 3], size: [1, 1]}]
+      @grid.content.must_equal([{type: :html, value: 'totally valid', location: [1, 3], size: [1, 1]}])
+    end
+
+    it 'sets content if valid hash' do
+      @grid.content = {type: :html, value: 'totally valid', location: [1, 3], size: [1, 1]}
+      @grid.content.must_equal([{type: :html, value: 'totally valid', location: [1, 3], size: [1, 1]}])
+    end
+
+    it 'does not change content if invalid' do
+      @grid.content = 'not quite right'
+      @grid.content.wont_equal 'not quite right'
+    end
+  end
+
+  describe '#container_size=' do
+    it 'sets container size if valid' do
+      @grid.container_size = [4, 5]
+      @grid.container_size.must_equal [4, 5]
+    end
+
+    it 'does not set container size if invalid' do
+      @grid.container_size = [4, 5, 6, 7]
+      @grid.container_size.wont_equal [4, 5, 6, 7]
+    end
+  end
+
+  describe '#grid_dimensions=' do
+    it 'sets grid dimensions if valid' do
+      @grid.grid_dimensions = [4, 5]
+      @grid.grid_dimensions.must_equal [4, 5]
+    end
+
+    it 'does not set grid dimensions if invalid' do
+      @grid.grid_dimensions = [4, 5, 6, 7]
+      @grid.grid_dimensions.wont_equal [4, 5, 6, 7]
+    end
+  end
+
+  describe '#grid_color=' do
+    it 'sets grid color if valid' do
+      @grid.grid_color = '#FFFFFF'
+      @grid.grid_color.must_equal '#FFFFFF'
+    end
+
+    it 'does not set grid color if invalid' do
+      @grid.grid_color = 'notacolor'
+      @grid.grid_color.wont_equal 'notacolor'
+    end
+  end
+
+  describe '#show_grid=' do
+    it 'sets show grid if a boolean' do
+      @grid.show_grid = true
+      @grid.show_grid.must_equal true
+    end
+
+    it 'does not set show grid if not a boolean' do
+      @grid.show_grid = 'bunnies!'
+      @grid.show_grid.wont_equal 'bunnie!'
+    end
+  end
 end

data/test/lib/divy/html_examples.yml

@@ -1,8 +1,8 @@
 ---
 - |-
-    <div class="divycontainer" style="width: 100px; height: 100px;">
-    <div class="divybox" style="bottom: 50.0%; left: 10.0%; width: 20.0%; height: 20.0%; position: absolute; border-style:solid; border-color:#FF00CC;">coolhtmlstuff</div>
-    <div class="divybox" style="bottom: 50.0%; left: 10.0%; width: 40.0%; height: 40.0%; position: absolute; border-style:solid; border-color:#FF00CC;"><img src="someimagepath" height="100%" width="100%"></img></div>
+    <div class="divycontainer" style="position:relative; width: 100px; height: 100px;">
+    <div class="divybox" style="bottom: 50.0%; left: 10.0%; width: 20.0%; height: 20.0%; position: absolute;">coolhtmlstuff</div>
+    <div class="divybox" style="bottom: 50.0%; left: 10.0%; width: 40.0%; height: 40.0%; position: absolute;"><img src="someimagepath" height="100%" width="100%"></img></div>
     <div class="divybox" style="bottom: 0.0%; left: 0.0%; width: 20.0%; height: 20.0%; position: absolute; border-style:solid; border-color:#FF00CC;"></div>
     <div class="divybox" style="bottom: 20.0%; left: 0.0%; width: 20.0%; height: 20.0%; position: absolute; border-style:solid; border-color:#FF00CC;"></div>
     <div class="divybox" style="bottom: 40.0%; left: 0.0%; width: 20.0%; height: 20.0%; position: absolute; border-style:solid; border-color:#FF00CC;"></div>
@@ -40,13 +40,13 @@
     <div class="divybox" style="bottom: 33.333333333333336%; left: 66.66666666666667%; width: 33.333333333333336%; height: 33.333333333333336%; position: absolute;"></div>
     <div class="divybox" style="bottom: 66.66666666666667%; left: 66.66666666666667%; width: 33.333333333333336%; height: 33.333333333333336%; position: absolute;"></div>
 - |
-    <div class="divybox" style="bottom: 25.0%; left: 5.0%; width: 10.0%; height: 10.0%; position: absolute; border-style:solid; border-color:#00FFFF;">coolhtmlstuff</div>
-    <div class="divybox" style="bottom: 45.0%; left: 5.0%; width: 10.0%; height: 10.0%; position: absolute; border-style:solid; border-color:#00FFFF;"><img src="someimagepath" height="100%" width="100%"></img></div>
+    <div class="divybox" style="bottom: 25.0%; left: 5.0%; width: 10.0%; height: 10.0%; position: absolute;">coolhtmlstuff</div>
+    <div class="divybox" style="bottom: 45.0%; left: 5.0%; width: 10.0%; height: 10.0%; position: absolute;"><img src="someimagepath" height="100%" width="100%"></img></div>
 - |
     <div class="divybox" style="bottom: 25.0%; left: 5.0%; width: 10.0%; height: 10.0%; position: absolute;">coolhtmlstuff</div>
     <div class="divybox" style="bottom: 45.0%; left: 5.0%; width: 10.0%; height: 10.0%; position: absolute;"><img src="someimagepath" height="100%" width="100%"></img></div>
 - |-
-    <div class="divycontainer" style="width: 100%; height: 100%;">
+    <div class="divycontainer" style="position:relative; width: 100%; height: 100%;">
     <div class="divybox" style="bottom: 0.0%; left: 0.0%; width: 10.0%; height: 10.0%; position: absolute;"></div>
     <div class="divybox" style="bottom: 10.0%; left: 0.0%; width: 10.0%; height: 10.0%; position: absolute;"></div>
     <div class="divybox" style="bottom: 20.0%; left: 0.0%; width: 10.0%; height: 10.0%; position: absolute;"></div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: divygrid
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Stephen Salinas