simbiotes 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e16db3b4d2fbc5b2c45392f8c784c8947f421648
-  data.tar.gz: 420e5d67aef8834e313bafd585bc6f55096dc60c
+  metadata.gz: c51f1fa4ecf5a4bf4160a5d12bea91045c854d7a
+  data.tar.gz: 73b066227de266a112b3d84a2b95b5f924f4a5cd
 SHA512:
-  metadata.gz: de03d2823abfe34895d1ed13b46f4e400688400d2d4574554b67a26f03628035c175aaafa4114f43b36e97f5175849e80663b35d3fdaa7b5e51c55a5eeeae746
-  data.tar.gz: 0252fc8f0cc05632037e3d9abdf73b2479b00f81336d2595d1eeb9b4172d24a0463a99c3c1c802af4bb776fabba0b0f08aee80312a2a36d1cb95183982a92465
+  metadata.gz: ea506f1a352a6fc5a11cf50b13fdf7da7584b1b80b3dfc587677ca1ea2028451ea8989bac5a8e831cb755eefda2d4ab955f9181c42f99f3594f00aae13beed5d
+  data.tar.gz: 3ec816c891340934c6d0e378700ba1f7699e0b272dc5c5cfcdf124aa05cb60d991607583ba6e9e10e9c4ebb925f90a842d2d5511e23ada3ed18e81e3df452671

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

@@ -1,10 +1,8 @@
 module <%= module_name %>
-  def self.table_name_prefix
-    '<%= table_prefix %>'
+  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
-  
-  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

@@ -1,8 +1,10 @@
 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 %>
+  def self.table_name_prefix
+    '<%= table_prefix %>'
   end
+  
+  def self.sync_device_instances
+    Simbiotes.sync_device_instances(self.name)
+  end
+    
 end

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

@@ -9,7 +9,9 @@ module Simbiotes
         template "simbiotes_targets.rb.erb", "config/initializers/simbiotes_targets.rb"
       else
         template "simbiotes.rb.erb", "config/initializers/simbiotes.rb"
-        template "simbiotes_settings.rb.erb", "db/migrate/#{date_string}_create_simbiotes_settings.rb"    
+        template "simbiotes_settings.rb.erb", "db/migrate/#{date_string}_create_simbiotes_settings.rb"
+        template "setting.rb.erb", "app/models/simbiotes_setting.rb"
+        #template "simbiotes_module.rb.erb", "app/models/simbiotes.rb"    
       end
     end
 

data/lib/generators/simbiotes/initializer/templates/setting.rb.erb

@@ -0,0 +1,3 @@
+class SimbiotesSetting < ApplicationRecord
+
+end

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

@@ -0,0 +1,6 @@
+module Simbiotes
+  def self.table_name_prefix
+    'simbiotes_'
+  end
+    
+end

data/lib/simbiotes/portal.rb

@@ -132,7 +132,17 @@ module Simbiotes
     end
     
     def self.generate_certificate(csr)
-      instance_hash = JSON.parse(HTTParty.post("#{Simbiotes.configuration.portal}api/generate_certificate", :query => {:public_key => Simbiotes.configuration.public_key, :private_key => Simbiotes.configuration.private_key, :csr => csr}).body)
+      csr_file = Tempfile.new
+      csr_file.write(csr)
+      csr_file.rewind
+      payload = {
+        :multipart => true,
+        :csr => csr_file,
+        :public_key => Simbiotes.configuration.public_key,
+        :private_key => Simbiotes.configuration.private_key
+      }
+      r = RestClient.post("#{Simbiotes.configuration.portal}api/generate_certificate", payload)
+      instance_hash = JSON.parse(r.body)
       return instance_hash["certificate"]
     end
     

data/lib/simbiotes/server.rb

@@ -82,16 +82,17 @@ module Simbiotes
       else
         key = key.value
       end
-      pass_phrase = Setting.find_by(key: "key_pass_phrase").value
+      pass_phrase = SimbiotesSetting.find_by(key: "key_pass_phrase").value
       key = OpenSSL::PKey::RSA.new key, pass_phrase
       return key
     end
     
     def self.cert
-      cert = Setting.find_by(key: "cert")
+      cert = SimbiotesSetting.find_by(key: "cert")
       if cert == nil
         key = SimbiotesSetting.find_by(key: "key").value
-        key = OpenSSL::PKey::RSA.new key
+        pass_phrase = SimbiotesSetting.find_by(key: "key_pass_phrase").value
+        key = OpenSSL::PKey::RSA.new key, pass_phrase
         public_key = SimbiotesSetting.find_by(key: "public_key").value
         public_key = OpenSSL::PKey::RSA.new public_key
         cert = Server.generate_cert(key, public_key)
@@ -132,7 +133,7 @@ module Simbiotes
     def self.generate_cert(key, public_key)
       csr = OpenSSL::X509::Request.new
       csr.version = 0
-      csr.subject = Setting.cert_name
+      csr.subject = OpenSSL::X509::Name.parse 'CN=simbiotes.com'
       csr.public_key = key.public_key
       csr.sign key, OpenSSL::Digest::SHA1.new
       cert = Simbiotes::Portal.generate_certificate(csr)
@@ -140,7 +141,7 @@ module Simbiotes
     end
     
     def self.ca_cert
-      ca_cert = Setting.find_by(key: "ca_cert")
+      ca_cert = SimbiotesSetting.find_by(key: "ca_cert")
       if ca_cert == nil
         ca_cert = Simbiotes::Portal.generate_certificate(csr)
         c = SimbiotesSetting.new

data/lib/simbiotes/version.rb

@@ -1,3 +1,3 @@
 module Simbiotes
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simbiotes
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - MicroArx Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -166,7 +166,9 @@ files:
 - lib/generators/simbiotes/create_table/templates/create_table.rb.erb
 - lib/generators/simbiotes/initializer/USAGE
 - lib/generators/simbiotes/initializer/initializer_generator.rb
+- lib/generators/simbiotes/initializer/templates/setting.rb.erb
 - lib/generators/simbiotes/initializer/templates/simbiotes.rb.erb
+- lib/generators/simbiotes/initializer/templates/simbiotes_module.rb.erb
 - lib/generators/simbiotes/initializer/templates/simbiotes_settings.rb.erb
 - lib/generators/simbiotes/initializer/templates/simbiotes_targets.rb.erb
 - lib/generators/simbiotes/install/USAGE
@@ -228,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The easy way to integrate the IoT in your web app.