da_funk 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdbb1364839d6181ce890eb4d5f3bef04e042adc
-  data.tar.gz: e1e4414dd9bab18170c5a6c6efa578f64fb9f2cd
+  metadata.gz: e71f255822e3ef065d041bfd48892098b35aeb2f
+  data.tar.gz: 4ba6e1a14efdc6fc727fdaf89532f0bbffddff03
 SHA512:
-  metadata.gz: 89da0c84a39bbabe0c17a5f7246d46f955a5656c58cfde94d1394731d874ae25eb92059e964cea87a9ca4dbd44e8550af94eeedba78dc88728748ad4a63a4520
-  data.tar.gz: 7944db8945cc2bdb9e06cf85635f7480e281c66ad7a483885109b97a2e3b5e455fe0156bcf657a2a5417cf0b0de50c67d5150e87c12dfa4f4db5df2851d1999f
+  metadata.gz: fc4871329bef72f26e250fce32913cf95ef2567e5160df2533fc35376521fb3e8eb42ae7124b04093fe0d05aba1a6aea0fbd0ebf22bd8078ab5076a594ecf407
+  data.tar.gz: 7acf4902f84660e10ad25a4959305e6b59d39ca6471d2a07247fc2ca956d0ccaa5c5cfd69017bc52aeac11b82c3e7334767d348819bcfb16deb8c41006dfc31e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (1.1.1)
+    da_funk (1.2.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake

data/RELEASE_NOTES.md

@@ -1,5 +1,18 @@
 # DaFunk
 
+### 1.2.0 - 2018-01-11
+
+- Remove NotificatioTest, it’s outdated.
+- Fix DaFunk::Application test when receiving a label that wasn’t expected.
+- Replace crc16 of downloaded files strategy instead of read the entire file move the responsibility to decide the better approach, 1. Read the entire file, 2. Read each 10k. It’s necessary to avoid a system error on File.read greater than 900k.
+- Finish the excecution after custom test run to avoid rake to try run a task with the file name.
+- Check if file is bigger than 500k on Crypto::file_crc16_hex and if it is, calculate the crc in chuncks.
+- Implement Float.to_s with other bases 10, nil and others.
+- Refactoring String.to_i adopting Interger() instead of alias.
+- Add Float tests.
+- Fix Display Test covering MRuby 1.3.0 puts/print API.
+- Refactoring NotificationEventTest following the new implementation.
+
 ### 1.1.1 - 2018-01-10
 
 - Update dependencies versions.

data/lib/da_funk/application.rb

@@ -117,11 +117,8 @@ module DaFunk
 
     def calculate_crc
       if exists?
-        handle = File.open(file)
-        Device::Crypto.crc16_hex(handle.read)
+        Device::Crypto.file_crc16_hex(file)
       end
-    ensure
-      handle.close if handle
     end
 
     def check_path(path)
@@ -139,7 +136,11 @@ module DaFunk
         number, text = text.to_s.split(" - ")
       end
 
-      [number.to_i, text.to_s]
+      if number && text
+        [number.to_i, text.to_s]
+      else
+        [0, text.to_s]
+      end
     end
   end
 end

data/lib/da_funk/file_parameter.rb

@@ -74,11 +74,8 @@ module DaFunk
     private
     def calculate_crc
       if exists?
-        handle = File.open(file)
-        Device::Crypto.crc16_hex(handle.read)
+        Device::Crypto.file_crc16_hex(file)
       end
-    ensure
-      handle.close if handle
     end
 
     def check_company(name)

data/lib/da_funk/rake_task.rb

@@ -138,7 +138,8 @@ module DaFunk
         desc "Run all test on mruby"
         task :all => "test:setup" do
           if ARGV[1]
-            execute_tests(FileList[ARGV[1]])
+            execute_tests(FileList[ARGV.delete_at(1)])
+            exit(1)
           else
             execute_tests(tests)
           end

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="1.1.1"
+  VERSION="1.2.0"
 end
 

data/lib/device/crypto.rb

@@ -61,15 +61,19 @@ class Device
     end
 
     def self.file_crc16_hex(path)
-      if File.exists?(path)
-        crc = 0
-        File.open(path) do |file|
-          loop do
-            break unless buf = file.read(1000)
-            crc = self.crc16(buf, crc)
+      if File.exists?(path) && (len = File.size(path))
+        if len > 500_000
+          crc = 0
+          File.open(path) do |file|
+            loop do
+              break unless buf = file.read(10_000)
+              crc = self.crc16(buf, crc)
+            end
           end
+          rjust(crc.to_s(16).upcase, 4, "0")
+        else
+          crc16_hex(File.read(path))
         end
-        rjust(crc.to_s(16).upcase, 4, "0")
       else
         "0000"
       end

data/lib/ext/float.rb

@@ -1,7 +1,7 @@
 class Float
-  alias to_s_old to_s
   def to_s(*args)
-    if args.first == 16
+    case args.first
+    when 16
       t = self
       v = []
       loop do
@@ -10,9 +10,39 @@ class Float
         break if t == 0
       end
       v.reverse.inject("") {|str, v| str << v.to_i.to_s(16)}
+    when 10, nil
+      if self.to_i.is_a?(Fixnum)
+        value = ("%f" % self)
+      else
+        t = self
+        v = []
+        loop do
+          v << (t % 10).to_i
+          t =  (t / 10).to_i
+          break if t == 0
+        end
+        value = v.reverse.inject("") {|str, v| str << v.to_i.to_s}
+      end
+      remove_zero(value)
     else
-      to_s_old(*args)
+      if self.to_i.is_a?(Fixnum)
+        self.to_i.to_s(*args)
+      else
+        "%f" % self
+      end
     end
   end
+
+  def remove_zero(str)
+    exclude = true
+    str.reverse.chars.select do |v|
+      if (v == "0" || v == ".") && exclude
+        false
+      else
+        exclude = false
+        true
+      end
+    end.reverse.join
+  end
 end
 

data/lib/ext/string.rb

@@ -24,12 +24,12 @@ class String
     return false
   end
 
-  alias to_i_old to_i
   def to_i(*args)
-    if args.first == 16
-      to_big(*args)
+    case args.first 
+    when 16
+      to_big(16)
     else
-      to_i_old(*args)
+      Integer(self, args.first || 10)
     end
   end
 

data/test/unit/device/notification_event_test.rb

@@ -1,73 +1,29 @@
 
 class NotificationEventTest < DaFunk::Test.case
   def setup
-    @stream_event = {
-      "Coalesce" => true,
-      "LTime" => 1792, 
-      "Payload" => "{\"Body\"=>\"message 62\"}",
-      "Name" => "pc1;0101",
-      "Event" => "user"
-    }
-    @event = DaFunk::NotificationEvent.new(@stream_event)
+    @str = '{"id":3,"event":"3|SHOW_MESSAGE|TEST1|12-20-2017 18:23","acronym":"pc1","logical_number":"5A179615"}'
+    @json  = JSON.parse @str
+    @event = DaFunk::NotificationEvent.new(@json["id"], @json["event"], @json["acronym"], @json["logical_number"])
   end
 
-  def test_attr_coalesce
-    assert_equal @stream_event["Coalesce"], @event.coalesce
+  def test_attr_id
+    assert_equal @json["id"], @event.id
   end
 
-  def test_attr_ltim
-    assert_equal @stream_event["LTime"], @event.ltime
+  def test_attr_acronym
+    assert_equal @json["acronym"], @event.acronym
   end
 
-  def test_attr_payload
-    assert_equal @stream_event["Payload"], @event.payload
+  def test_attr_logical_number
+    assert_equal @json["logical_number"], @event.logical_number
   end
 
-  def test_attr_name
-    assert_equal @stream_event["Name"], @event.name
-  end
-
-  def test_attr_event
-    assert_equal @stream_event["Event"], @event.event
-  end
-
-  def test_attr_message
-    assert_equal "{\"Body\" : \"message 62\"}", @event.message
-  end
-
-  def test_attr_value
-    hash = {"Body" => "message 62"}
-    assert_equal hash, @event.value
-  end
-
-  def test_attr_value
-    assert_equal "message 62", @event.body
+  def test_attr_parameters
+    assert_equal ["TEST1", "12-20-2017 18:23"], @event.parameters
   end
 
   def test_attr_callback
-    assert_equal "message 62", @event.callback
-  end
-
-  def test_attr_callback
-    assert_equal "message 62", @event.callback
-  end
-
-  def test_attr_none_parameters
-    assert_equal [], @event.parameters
-  end
-
-  def test_attr_one_parameter
-    stream_event = @stream_event.dup
-    stream_event["Payload"].gsub!("a", "|")
-    event = DaFunk::NotificationEvent.new(stream_event)
-    assert_equal ["ge 62"], event.parameters
-  end
-
-  def test_attr_multiple_parameters
-    stream_event = @stream_event.dup
-    stream_event["Payload"].gsub!("e", "|")
-    event = DaFunk::NotificationEvent.new(stream_event)
-    assert_equal ["ssag", " 62"], event.parameters
+    assert_equal "SHOW_MESSAGE", @event.callback
   end
 end
 

data/test/unit/ext/float_test.rb

@@ -0,0 +1,33 @@
+
+class FloatTest < DaFunk::Test.case
+  def test_to_s_16_small_len
+    assert_equal "200b1f", 2099999.to_s(16)
+  end
+
+  def test_to_s_16_medium_len
+    assert_equal "775f05a073fff", 2099999999999999.to_s(16)
+  end
+
+  def test_to_s_16_big_len
+    skip "Runtime stil have problem to deal with big numbers"
+    assert_equal "6c9144c1c690d4cb3ffffff", 2099999999999999999999999999.to_s(16)
+  end
+
+  def test_to_s_10_big_len
+    skip "Runtime stil have problem to deal with big numbers"
+    assert_equal "2099999999999999999999999999", 2099999999999999999999999999.to_s(10)
+  end
+
+  def test_to_s_nil
+    assert_equal "20.34", (20.34).to_s
+  end
+
+  def test_to_s_8
+    assert_equal "10005437", (2099999.00).to_s(8)
+  end
+
+  def test_to_s_8
+    assert_equal "1000000000101100011111", (2099999.00).to_s(2)
+  end
+end
+

data/utils/command_line_platform.rb

@@ -2,6 +2,14 @@ module Kernel
   def getc(timeout = 0)
     gets.chomp[0]
   end
+
+  def puts(*args)
+    STDOUT.puts(*args)
+  end
+
+  def print(*args)
+    STDOUT.print(*args)
+  end
 end
 
 class CommandLinePlatform

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -222,7 +222,7 @@ files:
 - test/unit/device/io_test.rb
 - test/unit/device/notification_callback_test.rb
 - test/unit/device/notification_event_test.rb
-- test/unit/device/notification_test.rb
+- test/unit/ext/float_test.rb
 - test/unit/ext/string_test.rb
 - test/unit/file_db_test.rb
 - test/unit/iso8583_build_klass.rb
@@ -271,7 +271,7 @@ test_files:
 - test/unit/device/io_test.rb
 - test/unit/device/notification_callback_test.rb
 - test/unit/device/notification_event_test.rb
-- test/unit/device/notification_test.rb
+- test/unit/ext/float_test.rb
 - test/unit/ext/string_test.rb
 - test/unit/file_db_test.rb
 - test/unit/iso8583_build_klass.rb

data/test/unit/device/notification_test.rb

@@ -1,21 +0,0 @@
-
-class NotificationTest < DaFunk::Test.case
-  def setup
-    @notification = DaFunk::Notification.new(15, 10)
-  end
-
-  def test_interval_last_check_blank
-    assert @notification.valid_check_interval?
-  end
-
-  def test_interval_expired
-    @notification.instance_eval { @last_check = (Time.now - 11) }
-    assert @notification.valid_check_interval?
-  end
-
-  def test_interval_not_expired
-    @notification.instance_eval { @last_check = Time.now }
-    assert_equal false, @notification.valid_check_interval?
-  end
-end
-