da_funk 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bde18d850bc388b6e35557c9333e387834bd10a
-  data.tar.gz: 5784cae788d6eee58877385a070c41f213483fea
+  metadata.gz: d0b539f11ff4bbc09a57745c7f4a792ee043e2e9
+  data.tar.gz: 42bb3e49baceca6ca7438e5b1898922ecf97c022
 SHA512:
-  metadata.gz: 27e2cbdd35fdefedb84e58bf92432f0dbe916f18b5b330e454923ba9657631be6265869483922a2c8e43e40ddf7c0551c20531aa2966481085226ad8b80cd366
-  data.tar.gz: eb7b1a2a4bf801ae68fe1abb676d8f13fe1f05541e85ea5740760ac6141e2f1dba603d7cca80b4cf34a3ca3ed68919aa3367b23b91787cac50e801fffaf0a38f
+  metadata.gz: cbae8601f3aa4b764677ce26661561ff9d330223928dc7202637bfede9d9c9ce1e1d3acd7cb9963667908ba6130646a80b8b5098ea70323cbcc11da8187e850e
+  data.tar.gz: ebfe524729b698f8ef8ea72609cae67da317fc08dae04b2e7bb2511d7ba64eb1fe8d49661ab9187d9bb7ce24ef8954c59b0eba59516871c4cef23662034cdaf3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (1.3.1)
+    da_funk (1.4.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -15,7 +15,7 @@ GEM
     archive-zip (0.10.0)
       io-like (~> 0.3.0)
     ast (2.3.0)
-    cloudwalk (1.1.0)
+    cloudwalk (1.4.0)
       bundler
       rake
     cloudwalk_handshake (0.12.0)
@@ -27,7 +27,7 @@ GEM
     parallel (1.12.1)
     parser (2.4.0.2)
       ast (~> 2.3)
-    posxml_parser (1.0.0)
+    posxml_parser (1.1.0)
       funky-emv (~> 0.3)
     powerpack (0.1.1)
     rainbow (3.0.0)

data/RELEASE_NOTES.md

@@ -1,5 +1,13 @@
 # DaFunk
 
+### 1.4.0 - 2018-01-16
+
+- Refactoring String.integer? And String.to_i adding more tests and support big numbers integer check.
+- Implement Screen.add to print and update x and y.
+- Support to print background image on menu if title path exists.
+- Update cloudwalk (1.4.0).
+-  Do no print menu entry if empty.
+
 ### 1.3.1 - 2018-01-12
 
 - Fix String.integer? Method supporting Float.

data/lib/da_funk/helper.rb

@@ -154,7 +154,9 @@ module DaFunk
           if options[:number]
             Device::Display.print("#{i+1} #{display}", i+line_zero, 0)
           else
-            Device::Display.print("#{display}", i+line_zero, 0)
+            unless display.to_s.empty?
+              Device::Display.print("#{display}", i+line_zero, 0)
+            end
           end
         end
       end
@@ -304,10 +306,14 @@ module DaFunk
     end
 
     def print_title(string, default)
-      if default
-        puts("#{string} (#{default})")
+      if string.to_s.downcase.include?(".bmp") && (path = "./shared/#{string}") && File.file?(path)
+        Device::Display.print_bitmap(path)
       else
-        puts("#{string}")
+        if default
+          puts("#{string} (#{default})")
+        else
+          puts("#{string}")
+        end
       end
     end
 

data/lib/da_funk/screen.rb

@@ -50,6 +50,16 @@ class Screen
     print(*args)
   end
 
+  def add(string, line, column)
+    ContextLog.info "STRING: #{string.inspect}"
+    string.split("\n", -1).each_with_index do |str, i|
+      self.y = i + line
+      self.x = column
+      Device::Display.print(str, self.y, self.x)
+      self.x = column + str.size
+    end
+  end
+
   private
   def loop_split_strings(*args)
     str, value_y, value_x = *args

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="1.3.1"
+  VERSION="1.4.0"
 end
 

data/lib/ext/string.rb

@@ -11,17 +11,17 @@ class String
   end
 
   def integer?
-    return true if self[0] == "0"
-    ! (self.to_f == 0)
+    !! Integer(self)
   rescue ArgumentError => e
     if e.message[-19..-1] == "too big for integer"
       begin
-        return self.to_i.to_s.size == self.size
+        self.to_f
+        return true
       rescue
         false
       end
     end
-    return false
+    false
   end
 
   def to_i(*args)
@@ -31,7 +31,7 @@ class String
     else
       begin
         Integer(self, args.first || 10)
-      rescue ArgumentError => e
+      rescue => e
         if e.message[-19..-1] == "too big for integer"
           self.to_f(*args)
         else

data/test/unit/ext/string_test.rb

@@ -15,5 +15,25 @@ class StringTest < DaFunk::Test.case
   def test_to_mask_number_bigger_than_value
     assert_equal "874948315", "874948315".to_mask("9999999999")
   end
+
+  def test_interger_check_false_5A179759
+    assert_false "5A179759".integer?
+  end
+
+  def test_interger_check_true_5A179759
+    assert "5179759".integer?
+  end
+
+  def test_interger_check_true_big
+    assert "51797590000000000000".integer?
+  end
+
+  def test_interger_check_false_0A179759
+    assert_false "0A179759".integer?
+  end
+
+  def test_interger_check_false_empty
+    assert_false "".integer?
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake