machineshop 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c441ae662e654ac372b9769d7b30dd03acaa18c
-  data.tar.gz: 2447a88093b40b35e9fbc01795406260622507d3
+  metadata.gz: 4b0a0136b4c4cd5790096b60321711db8041599a
+  data.tar.gz: 8b9cc59f1fad9fa1da4c43535c15d2093626a2ed
 SHA512:
-  metadata.gz: 45cceddbd5c827716a615014bfb9f1b7e32924f0031db5b1e65f6c084cf5de12a79408582a6b1f8aa4c2f7d58a9bae25a2a124857779e73c2b9f744f9cfc2f7e
-  data.tar.gz: e8b4b81157b84c98a1a33be04fc77c7e48fa134ec302188d4bb2ce28ab21ba8cf5fbda921f2f2ecb27de401cdf25f42d63f64be5f43a8e0bc7033d8ff0dad0a5
+  metadata.gz: 0a0238549fe978afc7d723a810d725d6aa5f21799ac43ae37881739655fa3939c33da59111c98426f5ddfebbedb7a62ec4198024fb076b28660d5a751b0fa0a3
+  data.tar.gz: 7fe74c5078503d400d8767867d37be486429f535f9eac715f859fe00a6844bc3cc429bf757baa9b68fbabcbeac8453c6967116f432dd1dfdd325b206bdf9970e

data/.gitignore

@@ -0,0 +1,45 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+../.project
+.project
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp
+
+# Ignore all mac metadata files and emacs autosaves
+auto-save-list
+custom.el
+url/
+.org-id-locations
+\#*
+org-mode-config.el
+*~
+.#*
+\#*\#
+*.log
+.DS_Store
+org-clock-save.el
+emacs-config.el
+
+# Ignore rvm
+.rvmrc
+.project
+nbproject/
+.idea
+.idea/*

data/{lib → machineshop/lib}/machineshop.rb

@@ -31,10 +31,18 @@ require 'machineshop/device'
 require 'machineshop/machineshop_object'
 require 'machineshop/mapping'
 require 'machineshop/meter'
+require 'machineshop/monitor'
 require 'machineshop/report'
+require 'machineshop/reports'
 require 'machineshop/customer'
+require 'machineshop/customers'
+# require 'machineshop/custom_apis'
+require 'machineshop/api_proxies'
+require 'machineshop/custom_api'
+require 'machineshop/routes'
 require 'machineshop/rule'
-# require 'machineshop/user'
+require 'machineshop/rules'
+require 'machineshop/user'
 require 'machineshop/users'
 require 'machineshop/utility'
 require 'machineshop/json'
@@ -43,6 +51,10 @@ require 'machineshop/end_points'
 
 require 'machineshop/data_sources'
 require 'machineshop/data_source_types'
+require 'machineshop/gateway_data_sources'
+require 'machineshop/gateway_data_source_types'
+
+require 'machineshop/gateway_configs'
 
 # Errors
 require 'machineshop/errors/machineshop_error'
@@ -59,7 +71,7 @@ require 'machineshop/models/api_endpoint'
 module MachineShop
   class << self
     # @@api_base_url = 'http://api.machineshop.io/api/v0'
-    @@api_base_url = 'http://stage.services.machineshop.io/api/v0'
+    @@api_base_url = 'http://stage.services.machineshop.io/api/v1'
 
     #configs starts
     attr_writer :configuration
@@ -117,33 +129,34 @@ module MachineShop
       platform_request(url, auth_token, body_hash, :post)
     end
 
-    def gem_delete(url, auth_token, body_hash)
-      platform_request(url, auth_token, body_hash, :delete)
+    def gem_delete(url, auth_token, *params)
+      platform_request(url, auth_token, nil ,:delete)
     end
 
     def gem_put(url, auth_token, body_hash)
       platform_request(url, auth_token, body_hash, :put)
     end
 
+    def gem_multipart(url, auth_token, body_hash)
+      platform_request(url, auth_token, body_hash, :post, true)
+    end
+
     def headers(auth_token)
       header ={:content_type => :json,
-      :accept => :json}
-      header.merge!({ authorization: "Basic " + Base64.encode64(auth_token + ':X') }) if auth_token
-      header
-    end
+        :accept => :json}
+        header.merge!({ authorization: "Basic " + Base64.encode64(auth_token + ':X') }) if auth_token
+        header
+      end
 
-    def platform_request(url, auth_token, body_hash=nil, http_verb=:get )
-      rbody=nil
-      cachedContent = :true
+      def platform_request(url, auth_token, body_hash=nil, http_verb=:get , multipart=false)
+        rbody=nil
+        cachedContent = :true
       # ApiRequest.cache(url,MachineShop.configuration.expiry_time)
       if http_verb==:get
 
         if Util.db_connected?
-          xpired=true
 
           ApiRequest.cache(url, auth_token, MachineShop.configuration.expiry_time) do
-            xpired=false
-            puts "Not expired , calling from local "
             rbody = get_from_cache(url,body_hash,auth_token)
             rcode="200"
           end
@@ -176,14 +189,13 @@ module MachineShop
             :url => api_uri,
             :headers => headers,
             :open_timeout => 30,
-            :payload => MachineShop::JSON.dump(body_hash),
+            # :payload => MachineShop::JSON.dump(body_hash),
             :timeout => 80
           }
 
+          opts[:payload] = multipart ?  {:multipart=>true}.merge!(body_hash) :MachineShop::JSON.dump(body_hash)
         end
 
-        puts "request params: #{opts} "
-
         begin
           response = execute_request(opts)
 
@@ -208,7 +220,6 @@ module MachineShop
         end
 
         rbody = response.body
-        # puts rbody
         rcode = response.code
       end
 

data/machineshop/lib/machineshop/api_proxies.rb

@@ -0,0 +1,20 @@
+#User Defined API for V1
+module MachineShop
+	class ApiProxies < APIResource
+		include MachineShop::APIOperations::List
+		include MachineShop::APIOperations::Create
+		# include MachineShop::APIOperations::Delete
+		# include MachineShop::APIOperations::Update
+
+
+		def self.update(id,auth_token,params={})
+			response = MachineShop.gem_put(self.url+"/#{id}", auth_token, params)
+			Util.convert_to_machineshop_object(response, auth_token, self.class_name)
+		end
+
+		def self.delete(id,auth_token)
+			response = MachineShop.gem_delete(self.url+"/#{id}", auth_token, {})
+		end
+	end
+end
+

data/{lib → machineshop/lib}/machineshop/api_resource.rb

@@ -20,7 +20,7 @@ module MachineShop
       ret
     end
 
-    def refresh      
+    def refresh
       response = MachineShop.gem_get(url, @auth_token)
       refresh_from(response, auth_token)
       self

data/{lib → machineshop/lib}/machineshop/configuration.rb

@@ -5,7 +5,8 @@ module MachineShop
 		def initialize
 			#default values
 			@expiry_time=0
-			@enable_caching = true
+			# default caching is set to false
+			@enable_caching = false
 			@base_version = "v0"
 			@custom_endpoints_cache_time = lambda{86400.seconds.ago}
 			#default 1 day

data/machineshop/lib/machineshop/custom_api.rb

@@ -0,0 +1,28 @@
+#User Defined API for V0
+module MachineShop
+	class CustomApi < APIResource
+		include MachineShop::APIOperations::List
+		include MachineShop::APIOperations::Create
+		# include MachineShop::APIOperations::Delete
+		# include MachineShop::APIOperations::Update
+
+
+		def self.update(name,auth_token,params={})
+			response = MachineShop.gem_put(self.url+"/#{name}", auth_token, params)
+			Util.convert_to_machineshop_object(response, auth_token, self.class_name)
+		end
+
+		def self.delete(name,auth_token)
+			response = MachineShop.gem_delete(self.url+"/#{name}", auth_token, {})
+		end
+
+		def self.url()
+			"/platform/custom"
+		end
+
+	end
+
+
+
+end
+

data/machineshop/lib/machineshop/custom_apis.rb

@@ -0,0 +1,21 @@
+#User Defined API for V1
+# deprecated
+module MachineShop
+	class CustomApis < APIResource
+		include MachineShop::APIOperations::List
+		include MachineShop::APIOperations::Create
+		# include MachineShop::APIOperations::Delete
+		# include MachineShop::APIOperations::Update
+
+
+		def self.update(id,auth_token,params={})
+			response = MachineShop.gem_put(self.url+"/#{id}", auth_token, params)
+			Util.convert_to_machineshop_object(response, auth_token, self.class_name)
+		end
+
+		def self.delete(id,auth_token)
+			response = MachineShop.gem_delete(self.url+"/#{id}", auth_token, {})
+		end
+	end
+end
+

data/{lib → machineshop/lib}/machineshop/customer.rb

@@ -7,7 +7,7 @@ module MachineShop
 
 
 		def self.update(id,auth_token,params={})
-			response = MachineShop.put(self.url+"/#{id}", auth_token, params)
+			response = MachineShop.gem_put(self.url+"/#{id}", auth_token, params)
 			Util.convert_to_machineshop_object(response, auth_token, self.class_name)
 		end
 	end

data/machineshop/lib/machineshop/customers.rb

@@ -0,0 +1,20 @@
+module MachineShop
+	class Customers < APIResource
+		include MachineShop::APIOperations::List
+		include MachineShop::APIOperations::Create
+		include MachineShop::APIOperations::Delete
+		include MachineShop::APIOperations::Update
+
+
+		def self.update(id,auth_token,params={})
+			response = MachineShop.gem_put(self.url+"/#{id}", auth_token, params)
+			Util.convert_to_machineshop_object(response, auth_token, self.class_name)
+		end
+
+		def self.delete(id,auth_token)
+			MachineShop.gem_delete(self.url+"/#{id}", auth_token)
+		end
+
+	end
+end
+

data/{lib → machineshop/lib}/machineshop/data_source_types.rb

@@ -2,19 +2,29 @@ module MachineShop
   class DataSourceTypes < APIResource
     include MachineShop::APIOperations::List
     include MachineShop::APIOperations::Create
+    include MachineShop::APIOperations::Update
     include MachineShop::APIOperations::Delete
 
 
-     def create_data_source(params)
+    def create_data_source(params)
       params.merge!({:data_source_type => self.id})
       DataSources.create(params, @auth_token)
     end
 
-     def create_email_data_source(params)
+    def create_email_data_source(params)
       params.merge!({:data_source_type => self.id})
       MachineShop.gem_post(email_data_source_url, @auth_token, params)
     end
 
+    def self.update(id,auth_token,params={})
+      response = MachineShop.gem_put(self.url+"/#{id}", auth_token, params)
+      Util.convert_to_machineshop_object(response, auth_token, self.class_name)
+    end
+
+    def self.delete_data_source_type(id, auth_token)
+      MachineShop.gem_delete(self.url + "/#{id}", auth_token, {})
+    end
+
     private
     def self.url
       '/platform/data_source_types'

data/machineshop/lib/machineshop/data_sources.rb

@@ -0,0 +1,57 @@
+module MachineShop
+  class DataSources < APIResource
+    include MachineShop::APIOperations::List
+    include MachineShop::APIOperations::Create
+    include MachineShop::APIOperations::Update
+    include MachineShop::APIOperations::Delete
+    
+    # Specific API calls
+    
+    def report_count(params)      
+      MachineShop.gem_get(report_count_url, @auth_token, params)
+    end
+    
+    def reports(filters={})
+      filters.merge!(:device_instance_id => self.id)
+      MachineShop::Report.all(filters, @auth_token)
+    end
+    
+    def meters(filters={})
+      filters.merge!(:device_instance_id => self.id)
+      MachineShop::Meter.all(filters, @auth_token)
+    end
+
+    def delete
+      MachineShop.gem_delete("/platform/data_sources/#{self.id}", @auth_token,{})
+    end
+    
+    def self.delete(id,auth_token)
+      MachineShop.gem_delete("/platform/data_sources/#{id}", auth_token)
+    end
+   
+    def self.update(id,auth_token,params={})
+      response = MachineShop.gem_put(self.url+"/#{id}", auth_token, params)
+      Util.convert_to_machineshop_object(response, auth_token, self.class_name)
+    end
+
+    # def self.delete(name,auth_token)
+    #   response = MachineShop.gem_delete(self.url+"/#{name}", auth_token, {})
+    # end
+
+    def self.create_email_data_source(params, auth_token)
+      MachineShop.gem_post('/platform/email_data_sources', auth_token, params)
+    end
+
+    private
+
+    def self.report_count_url
+      url + '/report_count'
+    end
+
+    def self.email_data_source_url
+      '/platform/email_data_sources'
+    end
+
+
+  end
+end

data/machineshop/lib/machineshop/gateway_configs.rb

@@ -0,0 +1,34 @@
+module MachineShop
+  class GatewayConfigs < APIResource
+    include MachineShop::APIOperations::List
+    include MachineShop::APIOperations::Create
+    include MachineShop::APIOperations::Update
+    include MachineShop::APIOperations::Delete
+
+    def self.update(id,auth_token,params={})
+      response = MachineShop.gem_put(self.url+"/#{id}", auth_token, params)
+      Util.convert_to_machineshop_object(response, auth_token, self.class_name)
+    end
+
+    def self.delete(id, auth_token)
+      MachineShop.gem_delete(self.url + "/#{id}", auth_token, {})
+    end
+
+    def self.set_gateway_configs(auth_token, params={})
+      MachineShop.gem_put('/platform/gateway_data_sources/set_gateway_configs', auth_token, params)
+    end
+
+    def self.set_configs(auth_token, params={})
+      MachineShop.gem_put('/platform/gateway_data_sources/set_configs', auth_token, params)
+    end
+
+    def self.reset_group(id, auth_token)
+      MachineShop.gem_post("/platform/gateway_configs/#{id}/reset", auth_token, {})
+    end
+
+    def self.send_group_config(id, auth_token)
+      MachineShop.gem_post("/platform/gateway_configs/#{id}/send_gateway_config", auth_token, {})
+    end
+
+  end
+end