apiotics 0.1.48 → 0.1.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5abe6a208035b389fc0d17ead1bb877b1294a736
-  data.tar.gz: a924b379e1d4c12337e28a67697d2226a2ed8d30
+  metadata.gz: 006c5f0304bd785db021131aebef23b266e742eb
+  data.tar.gz: d045f6082b865340d3e216cecaaa4f1a50c2841f
 SHA512:
-  metadata.gz: 720c8fbc055a1b9bb4832c2f64a68f38c20f9dcf6a89438348f60efd6a6cd1d895b257d7bb37d090b9f671a9a2887437fc7225545777e5481676d5cbc6a00046
-  data.tar.gz: 3546d3e2f4d9060ce212597158fa6b953a6492a0f6786e2252784c260eed7efe0ac40b27e6a6161d2235a8d29081f7f11d95fa97be9c731d79e072914299ee05
+  metadata.gz: 2a3bbb4961e0805e1e7a164f2653527856ae252e7635e218eeeb59e5fc5b9e0023e29d9f72eb50110c33efd5566102637aef76167a167a1f2fc20a78aac32566
+  data.tar.gz: a40597c023ad2be4b442618e5a1c1c29d91002f2da067cda00c2f104e58347cad8b5b7eaed092de0abdbdea82ea1e6154234a3ba735ac1a382f5466c50981c16

data/lib/apiotics/configuration.rb

@@ -1,7 +1,7 @@
 module Apiotics
   class Configuration
   
-    attr_accessor :public_key, :private_key, :local_logging, :targets, :local_port, :server, :server_port, :portal, :push, :tls, :verify_peer, :handshake
+    attr_accessor :public_key, :private_key, :local_logging, :targets, :local_port, :server, :server_port, :portal, :push, :tls, :verify_peer, :handshake, :parents
   
     def initialize
       @public_key = nil
@@ -11,11 +11,12 @@ module Apiotics
       @local_port = 8001
       @server = "rgs.microarx.com"
       @server_port = 8000
-      @portal = "https://www.apiotics.com/"
+      @portal = "https://test.apiotics.com/"
       @push = false
       @tls = true
       @verify_peer = true
       @handshake = true
+      @parents = {}
     end
   
   end

data/lib/apiotics/extract.rb

@@ -14,6 +14,26 @@ module Apiotics
       end
       if interfaces != {}
         Extract.fire(object, interfaces, "set-request")
+        if Apiotics.configuration.parents != {}
+        interfaces.each do |k,v|
+          if Apiotics.configuration.parents[object.class.parent.demodulize][object.class.demodulize][k] != nil
+            m =  "#{object.class.parent}".demodulize.underscore.gsub(" ","_").downcase
+            target_class = Apiotics.configuration.parents[object.class.parent.demodulize][object.class.demodulize][k]["driver"].downcase.constantize
+            target = object.m.target_class
+            i = Apiotics.configuration.parents[object.class.parent.demodulize][object.class.demodulize][k]["interface"].downcase.constantize
+            if Apiotics.configuration.parents[object.class.parent.demodulize][object.class.demodulize][k].keys < 3
+              target.i = v
+              target.skip_extract = true
+              target.save
+              target.skip_extract = false
+            else
+              target.i = Apiotics.configuration.parents[object.class.parent.demodulize][object.class.demodulize][k][v]
+              target.skip_extract = true
+              target.save
+              target.skip_extract = false
+            end
+          end
+        end
       end
     end
     

data/lib/apiotics/hardware.rb

@@ -70,7 +70,7 @@ module Apiotics
       config = Apiotics::Portal.openocd_worker_config(worker_name)
       config = JSON.parse(config)
       unless config["openocd_config_file_name"] == nil || config["openocd_config_file_name"] == ""
-        path = Rails.root.join('lib', 'openocd', 'downloads', config["firmware_file_name"])
+        path = Rails.root.join('lib', 'openocd', 'downloads', config["openocd_config_file_name"])
         if File.exist?(path)
         else
           firmware_data = Apiotics::Portal.download_firmware(worker_name)

data/lib/apiotics/portal.rb

@@ -86,6 +86,47 @@ module Apiotics
       end
       hash
     end
+    
+    def self.parse_parents
+      configuration = Portal.retrieve_configuration
+      hash = Hash.new
+      configuration["workers"].each do |key, value|
+        if hash[key] == nil
+          hash[key] = Hash.new
+        end
+        value["drivers"].each do |k, v|
+          if hash[key][k] == nil
+            hash[key][k] = Hash.new
+          end
+          if v["parents"] != {}
+            v["parents"].each do |parent_driver, parent_hash|
+              parent_hash.each do |parent_interface, parent_value|
+                if parent_value.is_a? Hash
+                  hash[key][k][parent_value["interface"]] = Hash.new
+                  hash[key][k][parent_value["interface"]]["interface"] = parent_interface
+                  hash[key][k][parent_value["interface"]]["driver"] = parent_driver
+                  if hash[key][parent_driver] == nil
+                    hash[key][parent_driver] = Hash.new
+                    hash[key][parent_driver][parent_interface] = Hash.new
+                  end
+                  hash[key][parent_driver][parent_interface]["interface"] = parent_value["interface"]
+                  hash[key][parent_driver][parent_interface]["driver"] = k
+                  if parent_value.keys.count > 2
+                    parent_value.each do |pv_key, pv_value|
+                      unless pv_key == "interface"
+                        hash[key][parent_driver][parent_interface][pv_key] = pv_value
+                        hash[key][k][parent_value["interface"]][pv_value] = pv_key
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end 
+      end
+      hash
+    end
       
     def self.sync_device_instances(worker_name, sync_data)
       instance_hash = JSON.parse(HTTParty.post("#{Apiotics.configuration.portal}api/workers", :query => {:public_key => Apiotics.configuration.public_key, :private_key => Apiotics.configuration.private_key}).body)      

data/lib/apiotics/version.rb

@@ -1,3 +1,3 @@
 module Apiotics
-  VERSION = '0.1.48'
+  VERSION = '0.1.50'
 end

data/lib/generators/apiotics/create_table/create_table_generator.rb

@@ -6,6 +6,16 @@ module Apiotics
     argument :attributes, :type => :hash, :required => false
     
     def copy_create_table_files
+      @attribute_map = {
+        "smallint" => {"kind" => "integer", "limit" => 2},
+        "bigint" => {"kind" => "integer", "limit" => 8},
+        "uint8_t" => {"kind" => "integer", "limit" => 2},
+        "uint16_t" => {"kind" => "integer", "limit" => 4},
+        "uint32_t" => {"kind" => "integer", "limit" => 8},
+        "int16_t" => {"kind" => "integer", "limit" => 2},
+        "int32_t" => {"kind" => "integer", "limit" => 4},
+        "int_64t" => {"kind" => "integer", "limit" => 8}
+      }
       template "create_table.rb.erb", "db/migrate/#{date_string}_create_#{plural_name}.rb"
       unless Apiotics.configuration.local_logging == false
         sleep 1

data/lib/generators/apiotics/create_table/templates/create_logs_table.rb.erb

@@ -1,7 +1,7 @@
 class Create<%= logs_class_name(@k) %> < ActiveRecord::Migration[5.1]
   def change
     create_table :<%= logs_table_name(@k) %> do |t|
-      t.<%= @v %> :<%= @k %>
+      <% if @attribute_map[@v] != nil %>t.<%= @attribute_map[@v]["kind"] %> :<%= @k %>, limit: <%= @attribute_map[@v]["limit"] %><% else %>t.<%= @v %> :<%= @k %><% end %>
       t.boolean :<%= @k %>_ack
       t.boolean :<%= @k %>_complete
       t.string :<%= @k %>_timestamp

data/lib/generators/apiotics/create_table/templates/create_table.rb.erb

@@ -2,7 +2,7 @@ class Create<%= plural_class_name %> < ActiveRecord::Migration[5.1]
   def change
     create_table :<%= plural_name %> do |t|
       <% attributes.each do |k,v| %>
-      t.<%= v %> :<%= k %>
+      <% if @attribute_map[v] != nil %>t.<%= @attribute_map[v]["kind"] %> :<%= k %>, limit: <%= @attribute_map[v]["limit"] %><% else %>t.<%= v %> :<%= k %><% end %>
       t.boolean :<%= k %>_ack
       t.boolean :<%= k %>_complete
       t.string :<%= k %>_timestamp

data/lib/generators/apiotics/initializer/initializer_generator.rb

@@ -7,6 +7,8 @@ module Apiotics
       if portal == "true"
         @c = Apiotics::Portal.parse_all_interfaces
         template "apiotics_targets.rb.erb", "config/initializers/apiotics_targets.rb"
+        @p = Apiotics::Portal.parse_parents
+        template "apiotics_parents.rb.erb", "config/initializers/apiotics_parents.rb"
       else
         template "apiotics.rb.erb", "config/initializers/apiotics.rb"
         template "apiotics_settings.rb.erb", "db/migrate/#{date_string}_create_apiotics_settings.rb"

data/lib/generators/apiotics/initializer/templates/apiotics_parents.rb.erb

@@ -0,0 +1,3 @@
+Apiotics.configure do |config|
+  config.parents = <%= @p %>
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiotics
 version: !ruby/object:Gem::Version
-  version: 0.1.48
+  version: 0.1.50
 platform: ruby
 authors:
 - MicroArx Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,6 +193,7 @@ files:
 - lib/generators/apiotics/initializer/initializer_generator.rb
 - lib/generators/apiotics/initializer/templates/apiotics.rb.erb
 - lib/generators/apiotics/initializer/templates/apiotics_module.rb.erb
+- lib/generators/apiotics/initializer/templates/apiotics_parents.rb.erb
 - lib/generators/apiotics/initializer/templates/apiotics_settings.rb.erb
 - lib/generators/apiotics/initializer/templates/apiotics_targets.rb.erb
 - lib/generators/apiotics/initializer/templates/setting.rb.erb