lays 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e72ed5d8477765417dde167c2dbeac3b89f62a70
-  data.tar.gz: 7d074dff6b535e3a80288e1de7231e0591a13e48
+  metadata.gz: 344ff19d7f82fb426330068e995002461d9d1923
+  data.tar.gz: 9844e0a80af77ef7cba68c6658ac75e259b28a8f
 SHA512:
-  metadata.gz: 9ce367aab90f87597976dc85c4ef55650a3ed5784970a0dcbae6c22a025e0fcd4cd46b9fbac7487147da1e465bf4136c4efec406d256f4663b31790e67933548
-  data.tar.gz: 36cd5ab70131d080ca515cc8f7cb78d706cbdac3a99710dc4eef1a8bcad4757d26cf60f8424471f460cf522c4c5e845671186b41d97697ee232fc087cf540d07
+  metadata.gz: 9b8587f285088249e77ab175f7151d4b8c8896e0f1c9f6864ffa03736f0b89129bf7dfb63cefb9b5498a7cad078468464eb2125e04c5506080819a46dead37f3
+  data.tar.gz: b54611b69960f0e711cc51090f29730f3a7b08d9a0d24b730a8bd6ad0c48bb82dce7393ddb95391d295e12e3fb26b802ad2799a1da4fa15dcab0c80dd5beeb98

data/lib/lays/version.rb

@@ -1,3 +1,3 @@
 module Lays
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/lays.rb

@@ -3,6 +3,14 @@ require "ostruct"
 
 module Lays
 
+  Layer = Struct.new(:content, :transparent_char) do
+    def initialize(attrs={})
+      attrs.each do |attr, val|
+        self.send("#{attr}=", val)
+      end
+    end
+  end
+
   def []=(layer, content)
     set_layer(layer)
     layers[layer].content = content
@@ -15,11 +23,11 @@ module Lays
   end
 
   def set_layer(id)
-    layers[id] ||= OpenStruct.new
+    layers[id] ||= Layer.new
   end
-  
+
   def layers
-    @layer ||= {}
+    @layers ||= {}
   end
 
   def to_s
@@ -28,16 +36,33 @@ module Lays
 
   def render
     result = []
-    layers.sort {|a, b| a[0] <=> b[0] }.each do |_, layer|
+    lays = layers.sort {|a, b| a[0] <=> b[0] }
+    lays.each do |key, layer|
       content = layer.content
       content.split("\n").each_with_index.map do |line, i|
         line.each_char.each_with_index do |c, j|
           result[i] ||= []
-          transparent = layer.transparent || " "
-          result[i][j] = c unless c == nil || c == transparent
+          if !transparent_char_for(layer, c)
+            result[i][j] = c
+          elsif key == lays.first.first
+            result[i][j] = " "
+          end
         end
       end
     end
     result.map {|a|a.join}.join("\n")
   end
+
+  def transparent_char=(char)
+    @transparent_char = char
+  end
+
+  def transparent_char
+    @transparent_char ||= " "
+  end
+
+  def transparent_char_for(layer, char)
+    transparent = layer.transparent_char || transparent_char
+    char == transparent
+  end
 end

data/test/lays_test.rb

@@ -98,13 +98,20 @@ test "re-rendering frames" do
   assert_equal res, "*n*#"
 end
 
+scope do
+  # width and height
+  test "width" do
+
+  end
+end
+
 scope do
   # Transparency
   test "transparent char" do
     frame = Frame.new
 
     frame[6] = "0=0 0"
-    frame[6].transparent = "="
+    frame[6].transparent_char = "="
     frame[3] = "11111"
     assert_equal frame.to_s, "010 0"
   end
@@ -112,9 +119,34 @@ scope do
   test "setting transparent char beforehand" do
     frame = Frame.new
 
-    frame[6].transparent = "#"
+    frame[6].transparent_char = "#"
     frame[6] = "2 # 2"
     frame[3] = "11111"
     assert_equal frame.to_s, "2 1 2"
   end
+
+  test "setting global transparent char for frame" do
+    frame = Frame.new
+    frame.transparent_char = "$"
+
+    frame[6] = "2 $ 2"
+    frame[3] = "11111"
+    assert_equal frame.to_s, "2 1 2"
+  end
+
+  test "full transparency example" do
+    frame = Frame.new
+    frame.transparent_char = "$"
+
+    frame[9].transparent_char = "*"
+    frame[6].transparent_char = "%"
+
+    frame[9] =               "3**$***3 "
+    frame[6] =               "22%2$%%2 "
+    frame[3] =               "11111$$1 "
+    frame[1] =               "000000$0 "
+    assert_equal frame.to_s, "321$$0 3 "
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lays
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Federico Iachetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler