MrMurano 1.10.3 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8ad8fbaf5b63c58af42e049c8239ceb1f21b438
-  data.tar.gz: 492f2947db94667d266c21412a2f508f0515b4af
+  metadata.gz: cf5ccffebdadc594e4bbee2043d852e75ccf2880
+  data.tar.gz: c4a286c251447baad93cdc7eaa25867968dcd66b
 SHA512:
-  metadata.gz: 1d2bac59edab8835c44941342df644c8beded98c4e5dacb5a3885f66d13013f90706e4cce057d41589c2a4a12291e251969ccacf5e94af32c794c3d0b5d95e92
-  data.tar.gz: 792d2ac4a45c882aa657103abe3f60ef32e76ec47ce78eed5b4f5190b626582b1ee7e0500a0840056695fc87f4a1f3ef409a0cf4e24bde3909021747c6dfa35f
+  metadata.gz: f6b88a0b7797d4382613e566482a2de65772c592d76d1937c1032ad2beee144b8becfca6444f17a6aaf1f65a41665c9a1c6e7952736479cd8e32eddb2d969072
+  data.tar.gz: eeabfe027720df8f0c3d02deae524382a755e83ac0e8875057ef643efaf1e99acba143e920f260c22185e7030c643fd85fe2db8ea313d2731854ba5e34915465

data/lib/MrMurano/Solution-Services.rb

@@ -11,21 +11,12 @@ module MrMurano
   # Things that servers do that is common.
   class ServiceBase < SolutionBase
 
-    def mkalias(name)
-      case name
-      when String
-        "/#{$cfg['solution.id']}_#{name}"
-      when Hash
-        if name.has_key? :name then
-          "/#{$cfg['solution.id']}_#{name[:name]}"
-        elsif name.has_key? :service and name.has_key? :event then
-          "/#{$cfg['solution.id']}_#{name[:service]}_#{name[:event]}"
-        else
-          raise "unknown keys. #{name}"
-        end
-      else
-        raise "unknown type. #{name}"
-      end
+    def mkalias(remote)
+      raise "Needs to be implemented in child"
+    end
+
+    def mkname(remote)
+      raise "Needs to be implemented in child"
     end
 
     def list
@@ -59,10 +50,11 @@ module MrMurano
         :solution_id => $cfg['solution.id'],
         :script => script,
         :alias=>mkalias(remote),
-        :name=>[remote[:service], remote[:event]].join('_')
+        :name=>mkname(remote),
       })
+      debug "f: #{local} >> #{pst.reject{|k,_| k==:script}.to_json}"
       # try put, if 404, then post.
-      put(mkalias(remote), pst) do |request, http|
+      put('/'+mkalias(remote), pst) do |request, http|
         response = http.request(request)
         case response
         when Net::HTTPSuccess
@@ -163,6 +155,21 @@ module MrMurano
       "#{name}.lua"
     end
 
+    def mkalias(remote)
+      if remote.has_key? :name then
+        [$cfg['solution.id'], remote[:name]].join('_')
+      else
+        raise "Missing parts! #{remote.to_json}"
+      end
+    end
+
+    def mkname(remote)
+      if remote.has_key? :name then
+        remote[:name]
+      else
+        raise "Missing parts! #{remote.to_json}"
+      end
+    end
 
     def toRemoteItem(from, path)
       name = path.basename.to_s.sub(/\..*/, '')
@@ -184,6 +191,22 @@ module MrMurano
       @location = $cfg['location.eventhandlers']
     end
 
+    def mkalias(remote)
+      if remote.has_key? :service and remote.has_key? :event then
+        [$cfg['solution.id'], remote[:service], remote[:event]].join('_')
+      else
+        raise "Missing parts! #{remote.to_json}"
+      end
+    end
+
+    def mkname(remote)
+      if remote.has_key? :service and remote.has_key? :event then
+        [remote[:service], remote[:event]].join('_')
+      else
+        raise "Missing parts! #{remote.to_json}"
+      end
+    end
+
     def list
       ret = get()
       # eventhandler.skiplist is a list of whitespace seperated dot-paired values.

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '1.10.3'.freeze
+  VERSION = '1.10.4'.freeze
 end
 

data/spec/Solution-ServiceEventHandler_spec.rb

@@ -102,7 +102,7 @@ end
   end
 
   it "uploads over old version" do
-    stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/eventhandler/XYZ_debug").
+    stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/eventhandler/XYZ_data_datapoint").
       with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                       'Content-Type'=>'application/json'}).
       to_return(body: "")
@@ -116,8 +116,8 @@ end
       tio.close
 
       ret = @srv.upload(tio.path, {:id=>"9K0",
-                                   :name=>"debug",
-                                   :alias=>"XYZ_debug",
+                                   :service=>'data',
+                                   :event=>'datapoint',
                                    :solution_id=>"XYZ",
       })
       expect(ret)
@@ -125,7 +125,7 @@ end
   end
 
   it "uploads when nothing is there" do
-    stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/eventhandler/XYZ_debug").
+    stub_request(:put, "https://bizapi.hosted.exosite.io/api:1/solution/XYZ/eventhandler/XYZ_device_datapoint").
       with(:headers=>{'Authorization'=>'token TTTTTTTTTT',
                       'Content-Type'=>'application/json'}).
       to_return(status: 404)
@@ -143,8 +143,6 @@ end
       tio.close
 
       ret = @srv.upload(tio.path, {:id=>"9K0",
-                                   :name=>"debug",
-                                   :alias=>"XYZ_debug",
                                    :solution_id=>"XYZ",
                                    :service=>"device",
                                    :event=>"datapoint",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.10.4
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander