simbiotes 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 484f7f27f89451148e07395edce8fa2b116f6fef
-  data.tar.gz: 261c4e13b133b9fe78c21b45f080e694034b8ef4
+  metadata.gz: 5175c82cbb859c8acf4e373e14853b27c27181fa
+  data.tar.gz: ca6226e2bdaa00d2e20cfe8e9362a785341fcfc8
 SHA512:
-  metadata.gz: 83e5239515bac34def1a1d5eeb8d2c0e6c5de5de8b21bfc83847f9ea6a6adee90d5c231a455f882c55fb1e61aa013b45c6c119336ee49783f3ae14ebb245bdae
-  data.tar.gz: 65e2b8ad8e291728e20fdbe411b62be7afd74906bbf3cf3614b421fce6c2b0dbef746c4d458c6867e70c95ba98a4013a78b7e09f7b9bf9984ecc38413fa1f36b
+  metadata.gz: ae1a9cb4215875a16ee809ee132f55004d4d28a0f8115c3a412ec338e127623cccb12a0ef900bd92db72e324e707893c1ef0224d8249ec7416b0f853b6dd132d
+  data.tar.gz: '09d629d03704e362da4f8f8ffcc5d672c8171bef955eec3a227c9d71c64b2241560b2d8761ef372f204c4fa09da9f213b6ccb2ec9bde400efb2fa8e3dd4b8945'

data/README.md

@@ -80,7 +80,7 @@ In your console run:
 > Thermostat.sync_device_instances
 ```
 
-That will create a database record for each device you currently have.
+That will create a database record for each device instance you currently have defined in for your Thermostat worker.  If you have no instances defined, create one on the Thermostat worker page in the simbiotes.com portal.
 
 Next, exit your rails console by typing:
 
@@ -186,6 +186,81 @@ Now that you are synced with the device, you can set the device's Interfaces eas
 
 All of the communications to the device are taken care of for you.  If the value of these Interfaces changes (if the ambient temperature rises or falls for example) then your database will be kept up to date via the communications server without needing to sync the device instance going forward.
 
+### Building a Web Scaffold
+
+Now that you can communicate with your devices from the rails console, let's create a web scaffold so that you can communicate with them via your web browser.
+
+If you haven't done it already, run 
+
+```bash
+> rails generate simple_form:install
+```
+
+To install the form helpers we will use to build forms to edit device interfaces via the browser.
+
+Once you've done that, you can run the simbiotes scaffold controller generator to generate a scaffold and views for your device.
+
+```bash
+> rails generate simbiotes:controller Thermostat
+```
+
+This command installs a default controller and views for your Thermostat.  Once they are installed, you can see them in your browser by starting up your development web server.
+
+```bash
+> rails server
+```
+
+Then in your web browser of choice, navigate to http://localhost:3000/Thermostats.  This page will show you a list of your Thermostat instances, as well as the current values of the different interfaces for your device.  You can use the edit links for each device instance to change these values.
+
+### Adding Push Web Updates
+
+Since we want to be able to see changes to our devices without refreshing our webpage manually, we can leverage Rails 5's ActionCable to push device updates to our page.
+
+To do this, run:
+
+```bash
+> rails generate simbiotes:channel Thermostat
+```
+
+This command installs a configuration file, in this case app/channels/thermostat_channel.rb, to define an ActionCable channel for your Worker, in this case thermostat_channel, as well as a coffeescript file, in this case app/assets/javascripts/channels/thermostat.coffee, that defines how the browser will update information from the server on the page.
+
+In order for the ActionCable messages to actually transmit to the browser, we need to install Redis.  Redis is an open source in-memory data store that ActionCable uses to implement its PubSub messaging.
+
+The easiest way to install Redis (if you are on a Mac) is:
+
+```bash
+> brew install redis
+```
+
+Then, once it is installed, run:
+
+```bash
+> redis-server
+```
+
+In your Rails application, edit your config/cable.yml file to look as follows:
+
+```yaml
+	development:
+	  adapter: redis
+
+	test:
+	  adapter: redis
+
+	production:
+	  adapter: redis
+```
+
+Next, open up your app/assets/javascripts/application.js file.  Make sure the end of it looks like the following:
+
+```js
+//= require jquery
+//= require jquery_ujs
+//= require_tree .
+```
+
+Then, restart your Rails server.
+
 
 ## Contributing
 Contribution directions go here.

data/lib/generators/simbiotes/channel/USAGE

@@ -0,0 +1,10 @@
+Description:
+    This generator creates channel files with the right code for Simbiotes interactions.
+
+Example:
+    rails generate simbiotes:channel Worker Driver
+		rails generate simbiotes:channel Worker Script
+
+    This will create:
+        app/channel/worker/driver_channel.rb
+				app/assets/javascripts/channels/worker_driver.coffee

data/lib/generators/simbiotes/channel/channel_generator.rb

@@ -0,0 +1,35 @@
+module Simbiotes
+  class ChannelGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    argument :parent, :type => :string
+  
+    def copy_channel_files
+      template "simbiotes_channel.rb.erb", "app/channels/#{module_file_name}_channel.rb"
+      template "simbiotes_channel_client.coffee.erb", "app/assets/javascripts/channels/#{module_file_name}.coffee"
+      template "simbiotes_channel_initializer.rb.erb", "config/initializers/simbiotes_channel.rb"
+      route "mount ActionCable.server => '/cable'"
+    end
+    
+    private
+    
+    def file_name
+      name.underscore
+    end
+    
+    def module_file_name
+      parent.underscore
+    end
+    
+    def class_name
+      name.classify
+    end
+    
+    def module_name
+      parent.classify
+    end
+    
+    def table_prefix
+      parent.underscore + "_"
+    end
+  end
+end

data/lib/generators/simbiotes/channel/templates/simbiotes_channel.rb.erb

@@ -0,0 +1,9 @@
+class <%= module_name + "Channel" %> < ApplicationCable::Channel
+  def subscribed
+    stream_from "<%= "#{module_file_name}_channel" %>"
+  end
+
+  def unsubscribed
+    # Any cleanup needed when channel is unsubscribed
+  end
+end

data/lib/generators/simbiotes/channel/templates/simbiotes_channel_client.coffee.erb

@@ -0,0 +1,12 @@
+App.alert = App.cable.subscriptions.create('<%= "#{module_name}" + "Channel" %>',
+	connected: ->
+		# Called when the subscription is ready for use on the server
+		return
+	disconnected: ->
+		# Called when the subscription has been terminated by the server
+		return
+	received: (data) ->
+	  
+		# Called when there's incoming data on the websocket for this channel
+		return
+)

data/lib/generators/simbiotes/channel/templates/simbiotes_channel_initializer.rb.erb

@@ -0,0 +1,3 @@
+Simbiotes.configure do |config|
+  config.push = true
+end

data/lib/generators/simbiotes/controller/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Creates a model and associated database table with the attributes specified.  If using data from the portal (recommended) Worker should be the name of a worker defined in your Hive, and Model should be the name of a Driver or Script in that Worker.
+
+Example:
+    rails generate simbiotes:scaffold Worker
+
+    This will create:
+				app/controllers/worker.rb

data/lib/generators/simbiotes/controller/controller_generator.rb

@@ -0,0 +1,24 @@
+module Simbiotes
+  class ControllerGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    argument :parent, :type => :string
+  
+    def copy_scaffold_files
+      @models = Simbiotes.configuration.targets[module_name.to_s]
+      template "simbiotes_scaffold.rb.erb", "app/controllers/#{module_file_name}/#{module_file_name.pluralize}_controller.rb"
+      generate "simbiotes:view", "#{parent}"
+      route "scope module: :#{module_file_name} do \n\t\tresources :#{module_file_name}s\n\tend"
+    end
+    
+    private
+    
+    def module_file_name
+      parent.underscore
+    end
+    
+    def module_name
+      parent.classify
+    end
+    
+  end
+end

data/lib/generators/simbiotes/controller/templates/simbiotes_scaffold.rb.erb

@@ -0,0 +1,60 @@
+module <%= module_name %>
+  class <%= module_name.pluralize + "Controller"%> < ApplicationController
+    before_action <%= ":set_" + module_file_name %>, only: [:show, :edit, :update, :destroy]
+
+    # GET /alert/leds
+    def index
+      @<%= module_file_name + "s" %> = <%= "::" + module_name + "::" + module_name + ".all" %>
+    end
+
+    # GET /alert/leds/1
+    def show
+    end
+
+    # GET /alert/leds/new
+    def new
+      redirect_to <%= module_file_name %>s_url, notice: 'You are not authorized to do that.'
+    end
+
+    # GET /alert/leds/1/edit
+    def edit
+    end
+
+    # POST /alert/leds
+    def create
+      @<%= module_file_name %> = <%= "::" + module_name + "::" + module_name + ".new(#{module_file_name}_params)" %>
+
+      if @<%= module_file_name %>.save
+        redirect_to <%= module_file_name %>_path(@<%= module_file_name %>), notice: '<%= module_name %> was successfully created.'
+      else
+        render :new
+      end
+    end
+
+    # PATCH/PUT /alert/leds/1
+    def update
+      if @<%= module_file_name %>.update(<%= module_file_name %>_params)
+        redirect_to <%= module_file_name %>_path(@<%= module_file_name %>), notice: '<%= module_name %> was successfully updated.'
+      else
+        render :edit
+      end
+    end
+
+    # DELETE /alert/leds/1
+    def destroy
+      @<%= module_file_name %>.destroy
+      redirect_to <%= module_file_name %>s_url, notice: '<%= module_file_name %> was successfully destroyed.'
+    end
+
+    private
+      # Use callbacks to share common setup or constraints between actions.
+      def set_<%= module_file_name %>
+        @<%= module_file_name %> = <%= "::" + module_name + "::" + module_name + ".find(params[:id])" %>
+      end
+
+      # Only allow a trusted parameter "white list" through.
+      def <%= module_file_name %>_params
+        params.fetch(:<%= module_file_name %>, {}).permit(:id, :simbiotes_instance<% Simbiotes.configuration.targets[module_name].keys.each do |key| %>, :<%= key.downcase %>_attributes => <%= Simbiotes.configuration.targets[module_name][key] %><% end %>)
+      end
+  end
+end

data/lib/generators/simbiotes/create_model/USAGE

@@ -2,7 +2,9 @@ Description:
     This generator creates model files with the right code for Simbiotes interactions.
 
 Example:
-    rails generate simbiotes:model Thing
+    rails generate simbiotes:model Worker Driver
+		rails generate simbiotes:model Worker Script
 
     This will create:
-        app/models/thing.rb
+				app/models/worker.rb
+        app/models/worker/driver.rb

data/lib/generators/simbiotes/create_model/create_model_generator.rb

@@ -9,7 +9,12 @@ module Simbiotes
       if portal == "true"
         @c = Simbiotes.get_attributes(parent, name)
       end
+      @targets = Simbiotes::Portal.parse_all_interfaces
       template "simbiotes_module.rb.erb", "app/models/#{module_file_name}.rb"
+      unless File.exist?("app/models/#{module_file_name}/#{module_file_name}.rb")
+        template "create_module_model_table.rb.erb", "db/migrate/#{date_string}_create_#{plural_name}.rb"
+      end
+      template "simbiotes_module_model.rb.erb", "app/models/#{module_file_name}/#{module_file_name}.rb"
       template "simbiotes_model.rb.erb", "app/models/#{module_file_name}/#{file_name}.rb"
       unless Simbiotes.configuration.local_logging == false
         if portal == "true"
@@ -46,5 +51,26 @@ module Simbiotes
     def table_prefix
       parent.underscore + "_"
     end
+    
+    def plural_name
+      parent.underscore.pluralize
+    end
+    
+    def plural_table_name
+      parent.underscore + "_" + parent.underscore.pluralize
+    end
+    
+    def plural_class_name
+      parent.classify + name.classify.pluralize
+    end
+    
+    def plural_module_name
+      parent.classify.pluralize
+    end
+    
+    def date_string
+      date_string = DateTime.now.strftime("%Y%m%d%H%M%S")
+    end
+    
   end
 end

data/lib/generators/simbiotes/create_model/templates/create_module_model_table.rb.erb

@@ -0,0 +1,8 @@
+class Create<%= plural_module_name %> < ActiveRecord::Migration[5.1]
+  def change
+    create_table :<%= plural_table_name %> do |t|
+      t.string :simbiotes_instance
+      t.timestamps
+    end
+  end
+end

data/lib/generators/simbiotes/create_model/templates/simbiotes_model.rb.erb

@@ -4,8 +4,10 @@ module <%= module_name %>
     <%unless @c == nil %><% unless Simbiotes.configuration.local_logging == false %><% @c[:attributes].each do |k,v| %>
     has_many :<%= class_name.underscore.downcase.gsub(" ", "_") + "_#{k.underscore.downcase.gsub(" ", "_")}_logs"%>, dependent: :destroy
     <% end %><% end %><% end %>
+    belongs_to :<%= module_name.underscore.downcase.gsub(" ", "_")%>
     attr_accessor :skip_extract
     after_commit :extract, unless: :skip_extract
+    after_commit :channel_push
     <% unless @c == nil %><% @c[:attributes].each do |k,v| %><% unless v[:values] == "" %>validates :<%= k.downcase.gsub(" ", "_").underscore %>, inclusion: { in: %w(<%= v[:values].join(" ") %>,
     message: "%{value} is not a valid <%= k %>" }<% end %><% unless v[:range] == "" %>
     validates :<%= k.gsub(" ", "_").underscore %>, inclusion: { in: <%= v[:range] %>,
@@ -22,6 +24,26 @@ module <%= module_name %>
     def extract
       Simbiotes::Extract.send(self)
     end
+    
+    def channel_push
+      if Simbiotes.configuration.push == true
+        interfaces = Hash.new
+        puts self.previous_changes
+        self.previous_changes.each do |k,v|
+          if Simbiotes::Extract.is_target(self, k)
+            interfaces[k] = v[1].to_s
+          end
+        end
+        interfaces.each do |k,v|
+          ActionCable.server.broadcast "#{self.class.parent.to_s.downcase.underscore.gsub(" ", "_")}_channel",
+            simbiotes_instance: self.<%= module_name.underscore.downcase.gsub(" ", "_")%>.simbiotes_instance,
+            worker_name: self.class.parent.to_s.downcase.underscore.gsub(" ", "_"),
+            model_name: self.class.name.demodulize.to_s.downcase.underscore.gsub(" ", "_"),
+            interface: k,
+            value: v
+        end
+      end
+    end
   
   end
 end

data/lib/generators/simbiotes/create_model/templates/simbiotes_module.rb.erb

@@ -6,5 +6,5 @@ module <%= module_name %>
   def self.sync_device_instances
     Simbiotes.sync_device_instances(self.name)
   end
-  
+    
 end

data/lib/generators/simbiotes/create_model/templates/simbiotes_module_model.rb.erb

@@ -0,0 +1,8 @@
+module <%= module_name %>
+  class <%= module_name %> < ApplicationRecord
+    <% @targets[module_name].keys.each do |key| %>
+      has_one :<%= key.underscore.downcase.gsub(" ", "_")%>, dependent: :destroy
+      accepts_nested_attributes_for :<%= key.underscore.downcase.gsub(" ", "_")%>
+    <% end %>
+  end
+end

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

@@ -9,7 +9,7 @@ class Create<%= plural_class_name %> < ActiveRecord::Migration[5.1]
       t.string :<%= k %>_status
       t.string :<%= k %>_action
       <% end %>
-      t.string :simbiotes_instance
+      t.integer :<%= parent.underscore.downcase.gsub(" ", "_") + "_id" %>
       t.timestamps
     end
   end

data/lib/generators/simbiotes/view/USAGE

@@ -0,0 +1,12 @@
+Description:
+    Creates a model and associated database table with the attributes specified.  If using data from the portal (recommended) Worker should be the name of a worker defined in your Hive, and Model should be the name of a Driver or Script in that Worker.
+
+Example:
+    rails generate simbiotes:view Worker
+
+    This will create:
+				app/views/worker/show.html.erb
+				app/views/worker/new.html.erb
+				app/views/worker/edit.html.erb
+				app/views/worker/index.html.erb
+				app/views/worker/_form.html.erb

data/lib/generators/simbiotes/view/templates/default.css.erb

@@ -0,0 +1,18 @@
+table {
+    border-collapse: collapse;
+    border: 1px solid black;
+}
+
+th, td {
+    padding: 15px;
+    text-align: center;
+}
+
+th {
+    background-color: #f5f5f5;
+    color: black;
+}
+
+tr:nth-child(even) {
+  background-color: #f2f2f2
+}

data/lib/generators/simbiotes/view/templates/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing <%= module_name %></h1>
+
+<%%= render 'form' %>
+
+<%%= link_to 'Show', <%= module_file_name %>_path(@<%= module_file_name %>) %> |
+<%%= link_to 'Back', <%= module_file_name %>s_path %>

data/lib/generators/simbiotes/view/templates/form.html.erb

@@ -0,0 +1,28 @@
+<%%= simple_form_for(@<%= module_file_name %>, url: <%= module_file_name %>_path(@<%= module_file_name %>)) do |form| %>
+  <table>
+    <% Simbiotes.configuration.targets[module_name].keys.each do |key| %>
+      <tr>
+        <th rowspan='<%= Simbiotes.configuration.targets[module_name][key].count %>'>
+          <%= key %>
+        </th>
+        <%%= form.simple_fields_for :<%= key.downcase %> do |fields| %>
+          <% Simbiotes.configuration.targets[module_name][key].each do |interface| %>
+            <td>
+              <%%= fields.input :<%= interface %> %>
+            </td>
+          <% end %>
+        <%% end %>
+      </tr>
+    <% end %>
+      <tr>
+        <th>
+          &nbsp;
+        </th>
+        <td>
+          <div class="actions">
+            <%%= form.submit %>
+          </div>
+        </td>
+      </tr>
+  </table>
+<%% end %>

data/lib/generators/simbiotes/view/templates/index.html.erb

@@ -0,0 +1,57 @@
+<p id="notice"><%%= notice %></p>
+<h1>
+  <%= module_name %>s
+</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th style="border: 1px solid black;">
+        Id
+      </th>
+      <% Simbiotes.configuration.targets[module_name].keys.each do |key| %>
+        <th colspan='<%= Simbiotes.configuration.targets[module_name][key].count %>' style="border: 1px solid black;">
+          <%= key %>
+        </th>
+      <% end %>
+      <th style="border: 1px solid black;">
+        &nbsp;
+      </th>
+    </tr>
+    <tr>
+      <th>
+        &nbsp;
+      </th>
+      <% Simbiotes.configuration.targets[module_name].keys.each do |key| %>
+        <% Simbiotes.configuration.targets[module_name][key].each do |interface| %>
+          <th>
+            <%= interface %>
+          </th>
+        <% end %>
+      <% end %>
+      <th>
+        &nbsp;
+      </th>
+    </tr>
+  </thead>
+  <tbody>
+    <%% @<%= module_file_name %>s.each do |object| %>
+      <tr id='<%%= object.simbiotes_instance %>'>
+        <td>
+          <%%= object.simbiotes_instance %>
+        </td>
+        <% Simbiotes.configuration.targets[module_name].keys.each do |key| %>
+          <% Simbiotes.configuration.targets[module_name][key].each do |interface| %>
+            <td class='<%= module_file_name %>-<%= key.downcase %>-<%= interface %>'>
+              <%%= object.<%= key.downcase %>.<%= interface %> %>
+            </td>
+          <% end %>
+        <% end %>
+        <td>
+          <%%= link_to "Edit", edit_<%= module_file_name %>_path(object)%>
+          <%%= link_to "Show", <%= module_file_name %>_path(object) %>
+        </td>
+      </tr>
+    <%% end %>
+  </tbody>
+</table>

data/lib/generators/simbiotes/view/templates/show.html.erb

@@ -0,0 +1,47 @@
+<p id="notice"><%%= notice %></p>
+<h1>
+  <%= module_name %>
+</h1>
+<table>
+  <thead>
+    <tr>
+      <th style="border: 1px solid black;">
+        Id
+      </th>
+      <% Simbiotes.configuration.targets[module_name].keys.each do |key| %>
+        <th colspan='<%= Simbiotes.configuration.targets[module_name][key].count %>' style="border: 1px solid black;">
+          <%= key %>
+        </th>
+      <% end %>
+    </tr>
+    <tr>
+      <th>
+        &nbsp;
+      </th>
+      <% Simbiotes.configuration.targets[module_name].keys.each do |key| %>
+        <% Simbiotes.configuration.targets[module_name][key].each do |interface| %>
+          <th>
+            <%= interface %>
+          </th>
+        <% end %>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <tr id='<%%= @<%= module_file_name %>.simbiotes_instance %>'>
+      <td>
+        <%%= @<%= module_file_name %>.simbiotes_instance %>
+      </td>
+      <% Simbiotes.configuration.targets[module_name].keys.each do |key| %>
+        <% Simbiotes.configuration.targets[module_name][key].each do |interface| %>
+          <td class='<%= module_file_name %>-<%= key.downcase %>-<%= interface %>'>
+            <%%= @<%= module_file_name %>.<%= key.downcase %>.<%= interface %> %>
+          </td>
+        <% end %>
+      <% end %>
+    </tr>
+  </tbody>
+</table>
+
+<%%= link_to 'Edit', edit_<%= module_file_name %>_path(@<%= module_file_name %>) %> |
+<%%= link_to 'Back', <%= module_file_name %>s_path %>

data/lib/generators/simbiotes/view/view_generator.rb

@@ -0,0 +1,26 @@
+module Simbiotes
+  class ViewGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    argument :parent, :type => :string
+  
+    def copy_scaffold_files
+      @models = Simbiotes.configuration.targets[module_name.to_s]
+      template "show.html.erb", "app/views/#{module_file_name}/#{module_file_name.pluralize}/show.html.erb"
+      template "edit.html.erb", "app/views/#{module_file_name}/#{module_file_name.pluralize}/edit.html.erb"
+      template "index.html.erb", "app/views/#{module_file_name}/#{module_file_name.pluralize}/index.html.erb"
+      template "form.html.erb", "app/views/#{module_file_name}/#{module_file_name.pluralize}/_form.html.erb"
+      template "default.css.erb", "app/assets/stylesheets/#{module_file_name}.css"
+    end
+    
+    private
+    
+    def module_file_name
+      parent.underscore
+    end
+    
+    def module_name
+      parent.classify
+    end
+    
+  end
+end

data/lib/simbiotes/configuration.rb

@@ -1,7 +1,7 @@
 module Simbiotes
   class Configuration
   
-    attr_accessor :public_key, :private_key, :local_logging, :targets, :local_port, :server, :server_port, :portal
+    attr_accessor :public_key, :private_key, :local_logging, :targets, :local_port, :server, :server_port, :portal, :push
   
     def initialize
       @public_key = nil
@@ -12,6 +12,7 @@ module Simbiotes
       @server = "rgs.microarx.com"
       @server_port = 8000
       @portal = "http://www.simbiotes.com/"
+      @push = false
     end
   
   end

data/lib/simbiotes/extract.rb

@@ -8,7 +8,7 @@ module Simbiotes
       interfaces = Hash.new
       puts object.previous_changes
       object.previous_changes.each do |k,v|
-        if Simbiotes.configuration.targets[object.class.parent.to_s][object.class.name.demodulize.to_s].include?(k) || Simbiotes.configuration.targets[object.class.parent.to_s][object.class.name.demodulize.to_s].include?(k.titleize)
+        if Simbiotes::Extract.is_target(object, k)
           interfaces[k] = v[1].to_s
         end
       end
@@ -17,6 +17,14 @@ module Simbiotes
       end
     end
     
+    def self.is_target(object, k)
+      if Simbiotes.configuration.targets[object.class.parent.to_s][object.class.name.demodulize.to_s].include?(k) || Simbiotes.configuration.targets[object.class.parent.to_s][object.class.name.demodulize.to_s].include?(k.titleize)
+        return true
+      else
+        return false
+      end
+    end
+    
     def self.get(object, time0= nil, time1= nil)
       object.accessed_fields.each do |field|
         v = Array.new
@@ -30,9 +38,11 @@ module Simbiotes
     
     def self.fire(object, interfaces, a, time0= nil, time1= nil)
       if Simbiotes.configuration.targets[object.class.parent.to_s] != nil
+        k = "#{object.class.parent}::#{object.class.parent}".constantize
+        i = "#{object.class.parent}".demodulize.gsub(" ","_").downcase + "_id"
         msg = {
           "action" => a,
-          "instance" => object.simbiotes_instance,
+          "instance" => k.find(object.send(i)).simbiotes_instance,
           "driver" => object.class.name.to_s,
           "interface" => interfaces,
         }

data/lib/simbiotes/insert.rb

@@ -33,7 +33,8 @@ module Simbiotes
     def find_record
       begin
         klass = @class.classify.constantize
-        @record = klass.find_by(simbiotes_instance: @id)
+        master_record = (@class.parent.to_s + "::" + @class.parent.to_s).classify.constantize.find_by(simbiotes_instance: @id)
+        @record = master_record.send(klass.demodulize.downcase)
       rescue => e
         puts e
       end

data/lib/simbiotes/portal.rb

@@ -88,24 +88,31 @@ module Simbiotes
     end
       
     def self.sync_device_instances(worker_name)
-      instance_hash = JSON.parse(HTTParty.post("#{Simbiotes.configuration.portal}api/workers", :query => {:public_key => Simbiotes.configuration.public_key, :private_key => Simbiotes.configuration.private_key}).body)
-      Simbiotes.configuration.targets[worker_name].keys.each do |key|
-        klass = (worker_name + "::" + key).constantize rescue nil
-        unless klass == nil
-          instance_ids = Array.new
-          instance_hash[worker_name].each do |instance_id,status|
-            instance_ids << instance_id
-          end
-          stale_instances = klass.where.not(simbiotes_instance: instance_ids)
-          stale_instances.destroy_all
-          instance_ids.each do |instance_id|
-            i = klass.find_by(simbiotes_instance: instance_id)
-            if i == nil
-              i = klass.new
-              i.simbiotes_instance = instance_id
-              i.skip_extract = true
-              i.save(:validate => false)
-              i.skip_extract = false
+      instance_hash = JSON.parse(HTTParty.post("#{Simbiotes.configuration.portal}api/workers", :query => {:public_key => Simbiotes.configuration.public_key, :private_key => Simbiotes.configuration.private_key}).body)      
+      klass = (worker_name.to_s + "::" + worker_name.to_s).constantize rescue nil
+      unless klass == nil
+        instance_ids = Array.new
+        instance_hash[worker_name].each do |instance_id,status|
+          instance_ids << instance_id
+        end
+        stale_instances = klass.where.not(simbiotes_instance: instance_ids)
+        stale_instances.destroy_all
+        instance_ids.each do |instance_id|
+          i = klass.find_by(simbiotes_instance: instance_id)
+          if i == nil
+            i = klass.new
+            i.simbiotes_instance = instance_id
+            i.save(:validate => false)
+            Simbiotes.configuration.targets[worker_name].keys.each do |key|
+              subklass = (worker_name + "::" + key).constantize rescue nil
+              unless subklass == nil
+                s = subklass.new
+                k = worker_name.downcase.gsub(" ","_").to_s + "_id="
+                s.send((k).to_sym, i.id)
+                s.skip_extract = true
+                s.save(:validate => false)
+                s.skip_extract = false
+              end
             end 
           end
         end

data/lib/simbiotes/version.rb

@@ -1,3 +1,3 @@
 module Simbiotes
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simbiotes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - MicroArx Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: simple_form
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "."
 email: info@microarx.com
 executables: []
@@ -89,11 +145,21 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- lib/generators/simbiotes/channel/USAGE
+- lib/generators/simbiotes/channel/channel_generator.rb
+- lib/generators/simbiotes/channel/templates/simbiotes_channel.rb.erb
+- lib/generators/simbiotes/channel/templates/simbiotes_channel_client.coffee.erb
+- lib/generators/simbiotes/channel/templates/simbiotes_channel_initializer.rb.erb
+- lib/generators/simbiotes/controller/USAGE
+- lib/generators/simbiotes/controller/controller_generator.rb
+- lib/generators/simbiotes/controller/templates/simbiotes_scaffold.rb.erb
 - lib/generators/simbiotes/create_model/USAGE
 - lib/generators/simbiotes/create_model/create_model_generator.rb
+- lib/generators/simbiotes/create_model/templates/create_module_model_table.rb.erb
 - lib/generators/simbiotes/create_model/templates/simbiotes_logs_model.rb.erb
 - lib/generators/simbiotes/create_model/templates/simbiotes_model.rb.erb
 - lib/generators/simbiotes/create_model/templates/simbiotes_module.rb.erb
+- lib/generators/simbiotes/create_model/templates/simbiotes_module_model.rb.erb
 - lib/generators/simbiotes/create_table/USAGE
 - lib/generators/simbiotes/create_table/create_table_generator.rb
 - lib/generators/simbiotes/create_table/templates/create_logs_table.rb.erb
@@ -117,6 +183,13 @@ files:
 - lib/generators/simbiotes/script/templates/script.rb.erb
 - lib/generators/simbiotes/script/templates/server.rb
 - lib/generators/simbiotes/script/templates/server_control.rb
+- lib/generators/simbiotes/view/USAGE
+- lib/generators/simbiotes/view/templates/default.css.erb
+- lib/generators/simbiotes/view/templates/edit.html.erb
+- lib/generators/simbiotes/view/templates/form.html.erb
+- lib/generators/simbiotes/view/templates/index.html.erb
+- lib/generators/simbiotes/view/templates/show.html.erb
+- lib/generators/simbiotes/view/view_generator.rb
 - lib/simbiotes.rb
 - lib/simbiotes/client.rb
 - lib/simbiotes/configuration.rb