da_funk 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecfefdd9f32ae72fab6bc9d9cbdf47a9c595b233
-  data.tar.gz: 6c971e22e9a05fba418dc6fae68e964c6518fadb
+  metadata.gz: 2032799da050781996f22c8e836d952dcd4e8a4a
+  data.tar.gz: c49b3b3210886bf7c8820ce61c491dd0a15b3852
 SHA512:
-  metadata.gz: bbd7fbc8a25e83c03f5e91fecefa746990ca609a151a0106dfbbcae8e099749152121fc803f016a326d15d6c8942fb06fe6f2758ab7223dc5b5add04d25f3265
-  data.tar.gz: 2d6f5cc8f74dc7f9b4629738140bdae636616652fe7143680604e9a9134baededecdf35c5eaf7d36e3af8b2dadb2f989bdcc23a32e4a2f74f7b9e1b0607592b6
+  metadata.gz: 7c6360445482de2cd59ef6dfd01a183fcc91db4412faff67538c5d9dcc046a1e278fc4a322ee561862e0b9afb1d2446e516eeb70ee6986570f0d2382ee783925
+  data.tar.gz: af8b614fea0ce227284a7f01778f598ef87754a42991fc0ac5a05ce9914133f996d8405c20e545c37b13f54333c15dd91c6c76bffb0ae46175272af1790af90d

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+ - 2.4
+ - ruby

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (2.4.0)
+    da_funk (2.5.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -19,7 +19,7 @@ GEM
       bundler
       rake
     cloudwalk_handshake (0.13.2)
-    funky-emv (0.20.1)
+    funky-emv (0.20.2)
       funky-tlv (~> 0.2)
     funky-simplehttp (0.5.0)
     funky-tlv (0.2.3)
@@ -28,7 +28,7 @@ GEM
     parallel (1.12.1)
     parser (2.5.3.0)
       ast (~> 2.4.0)
-    posxml_parser (2.11.0)
+    posxml_parser (2.12.0)
       funky-emv (~> 0.3)
     powerpack (0.1.2)
     rainbow (3.0.0)
@@ -58,4 +58,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.16.1
+   2.0.1

data/README.md

@@ -2,27 +2,18 @@
 
 DaFunk is a Embedded System Framework optimized for programmer happiness and sustainable productivity. It encourages modulatiry by adapter pattern an beautiful code by favoring convention over configuration.
 
-## What do I have here?
-
-This repository contains a set of files and folder that compose the
-**DaFunk API**. The structure goes as follows:
-
-- The `guides` directory, which contains a group of files that are intended to instruct how to use our framework.
-- An `imgs` directory, containing a picture that references the creative origins of this project.
-- A `lib` directory, which holds the main source code of our Framework API.
-- An `out`directory, which has a previous generated binary of this project. All builds target this directory.
-- A `test` directory with example test cases. Tests are divided by _integration_ tests and _unit_ tests.
+This project was created to run on top of [mruby runtime](https://github.com/mruby/mruby), and it's part of bigger ecosystem created by CloudWalk to help embedded delopers, to undertand better why CloudWalk creat it, check the [DaFunk Ecosystem session](https://github.com/cloudwalkio/da_funk#dafunk-ecosystem).
 
 ## How do I use DaFunk?
 
-### Embedded Projects
+### Embedded Devices Engine
 
-DaFunk is a gem to be used in MRuby environment, to provide the environment we created a CLI that is able to create, compile, run and test DaFunk Apps. You can check [here](http://github.com/da-funk/funky-cli)
+DaFunk is a gem to be used in MRuby environment, to provide the environment we created a CLI that is able to create, compile, run and test DaFunk Apps. You can check [CloudWalk Runtime Setup Page](https://docs.cloudwalk.io/pt-BR/cli/setup)
 
 Project creation flow in Ruby environment:
 
 ```
-funky-cli new project
+cloudwalk new project
 cd project
 bundle install
 bundle exec rake test:unit
@@ -36,8 +27,49 @@ For more advanced users only wanting to use the `iso8583` module, here's how you
 require 'da_funk/iso8583'
 ```
 
+## DaFunk Ecosystem
+
+Using mruby we have created some projects that are the basis of the CloudWalk ecosystem of developing payment applications for POS terminals.
+
+### DaFunk API Architecture
+
+![DaFunkMap](https://github.com/cloudwalkio/around_the_world/blob/master/imgs/apps.jpg?raw=true)
+
+
+### Platform
+
+[mruby-cloudwalk-platform](https://github.com/cloudwalkio/mruby-cloudwalk-platform) is the project responsible for the homologation/support of new devices, using mruby's toolkit this repository provides support for cross-compilation of new platforms, and the minimal and modular API between the device (in C) and the da_funk framework (in Ruby).
+
+For more informations check the mruby-cloudwalk-platform [wiki page](https://github.com/cloudwalkio/mruby-cloudwalk-platform/wiki) and [mruby page](https://github.com/mruby/mruby).
+
+### DaFunk
+
+[da_funk] (https://github.com/cloudwalkio/da_funk) is an embedded system framework optimized for programmer happiness and productivity in a sustainable environment, it encourages, modularity using Adapter Pattern, and a beautiful code using convention on configuration.
+
+### Apps
+
+[cloudwalk cli](https://github.com/cloudwalkio/cloudwalk) is the project responsible to create, execute, test and deploy the application.
+
+### Motivation
+
+Check CloudWalk blog post about the motiviations create the this, [here.](https://www-staging.cloudwalk.io/en/blog/how-to-delivery-payment-applications-in-ruby)
+
+
 ## I would like to contribute
 
+### What do I have here?
+
+This repository contains a set of files and folder that compose the
+**DaFunk API**. The structure goes as follows:
+
+- The `guides` directory, which contains a group of files that are intended to instruct how to use our framework.
+- An `imgs` directory, containing a picture that references the creative origins of this project.
+- A `lib` directory, which holds the main source code of our Framework API.
+  - `lib/da_funk` - DaFunk API, Helpers, Communication, Froms everything not related to a Device in order to help the developer.
+  - `lib/device` - Interface between DaFunk API and homologate device
+- An `out`directory, which has a previous generated binary of this project. All builds target this directory.
+- A `test` directory with example test cases. Tests are divided by _integration_ tests and _unit_ tests.
+
 Please follow the instructions:
 
 1. Fork it under your github account!

data/README_GUIDE.md

@@ -50,7 +50,7 @@ Check test samples [here](da_funk/Guide.html).
 ```
 The MIT License (MIT)
 
-Copyright (c) 2016 CloudWalk, Inc.
+Copyright (c) 2019 CloudWalk, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 # DaFunk
 
+### 2.5.0 - 2019-02-05
+
+- Bug fix EventHandler with slot configuration
+    - Fix timestamp when configuration has changed;
+    - Fix execution between boots.
+
 ### 2.4.0 - 2019-01-14
 
 - Support Device::Network.mac_address.

data/lib/da_funk/event_handler.rb

@@ -39,16 +39,32 @@ module DaFunk
         raise "slot or hours missing on EventHandler creation"
       end
 
-      db    = FileDb.new("main/schedule.dat")
-      value = db[option[:slot]]
+      db     = FileDb.new("main/schedule.dat")
+      string = db[option[:slot]]
+      config = parse_slot(string)
 
-      if value.to_s.empty? || value.to_i <= Time.now.to_i
-        hours = 60 * 60 * option[:hours].to_i
-        hours = 99_999 if hours == 0
-        value = (Time.now.to_i + hours)
-        db[option[:slot]] = value
+      unless config
+        # configure from scrath
+        config = {"timestamp" => nil, "interval" => stringify_hours(option)}
       end
-      value.to_i
+
+      unless config["timestamp"]
+        config["timestamp"] = hours2seconds(option["interval"])
+      else
+        if config["interval"]["hours"].to_s != option[:hours].to_s
+          config["timestamp"] = hours2seconds(option[:hours])
+          config["interval"]["hours"] = option[:hours].to_s
+        else
+          if self.timer && self.timer.to_i < Time.now.to_i
+            config["timestamp"] = hours2seconds(option[:hours])
+            config["interval"]["hours"] = option[:hours].to_s
+          end
+        end
+      end
+
+      db[option[:slot]] = config.to_json
+
+      config["timestamp"].to_i
     end
 
     def execute?
@@ -59,6 +75,25 @@ module DaFunk
         ! self.timer
       end
     end
+
+    private
+    def stringify_hours(options)
+      {"hours" => options[:hours]}
+    end
+
+    def hours2seconds(interval)
+      hours = 60 * 60 * interval.to_i
+      hours = 99_999 if hours == 0
+      (Time.now.to_i + hours)
+    end
+
+    def parse_slot(string)
+      unless string.to_s.empty?
+        JSON.parse(string)
+      end
+    rescue # old format slot=<fixnum>
+      nil
+    end
   end
 end
 

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="2.4.0"
+  VERSION="2.5.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -132,6 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - ".yardopts"
 - Gemfile
 - Gemfile.lock