machineshop 1.0.2 → 1.1.1

data/machineshop/lib/machineshop/gateway_data_source_types.rb

@@ -0,0 +1,18 @@
+module MachineShop
+  class GatewayDataSourceTypes < 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
+
+  end
+end

data/machineshop/lib/machineshop/gateway_data_sources.rb

@@ -0,0 +1,60 @@
+module MachineShop
+  class GatewayDataSources < 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.get_attached_data_sources(gateway_data_source_id, auth_token)
+      response = MachineShop.gem_get("/platform/gateway_data_sources/#{gateway_data_source_id}/attached_data_sources", auth_token)
+      Util.convert_to_machineshop_object(response, auth_token, self.class_name)
+    end
+
+    def self.send_config(unique_id, auth_token)
+      MachineShop.gem_get("/platform/gateway_data_sources/#{unique_id}/config", auth_token)
+    end
+
+    def self.reset_gateway(id, auth_token)
+      MachineShop.gem_post("/platform/gateway_data_sources/#{id}/reset", auth_token, {})
+    end
+
+    def self.attach_data_sources(auth_token, params={})
+      MachineShop.gem_post("/platform/data_sources", auth_token, params)
+    end
+
+    def self.update_attached_data_sources(id, parent_gateway_id, auth_token, params={})
+      response = MachineShop.gem_put("/platform/gateway_data_sources/#{parent_gateway_id}/attached_data_sources/#{id}", auth_token, params)
+      Util.convert_to_machineshop_object(response, auth_token, self.class_name)
+    end
+
+    def self.remove_attached_data_source(id, ds_id, auth_token)
+      MachineShop.gem_delete("/platform/gateway_data_sources/#{id}/attached_data_sources/#{ds_id}", auth_token)
+    end
+
+    def self.initiate_log_upload(id, auth_token, params={})
+      MachineShop.gem_post("/platform/gateway_data_sources/#{id}/log_upload", auth_token, params)
+    end
+
+    def self.change_log_level(id, log_level, auth_token, params={})
+      MachineShop.gem_post("/platform/gateway_data_sources/#{id}/log_level/#{log_level}", auth_token, params)
+    end
+
+    def self.download_log_files(id, auth_token)
+      MachineShop.gem_get("/platform/gateway_data_sources/#{id}/logs", auth_token)
+    end
+
+    def self.firmware_update(id, auth_token, params={})
+      MachineShop.gem_post("/platform/gateway_data_sources/#{id}/update_firmware", auth_token, params)
+    end
+
+  end
+end

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

@@ -31,7 +31,9 @@ module MachineShop
     end
 
     def self.construct_from(values, auth_token=nil)
-      values[:id] = values[:_id] if values[:_id]
+      if(!values[:id])
+        values[:id] = values[:_id] if values[:_id]
+      end
       obj = self.new(values[:id], auth_token)
       obj.refresh_from(values, auth_token)
       obj
@@ -54,7 +56,10 @@ module MachineShop
       else
         #do nothing
       end
-      values[:id] = values[:_id] if values[:_id]
+
+      if(!values[:id])
+        values[:id] = values[:_id] if values[:_id]
+      end
 
       removed = partial ? Set.new : Set.new(@values.keys - values.keys)
       added = Set.new(values.keys - @values.keys)

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

@@ -3,8 +3,7 @@ module MachineShop
   include MachineShop::APIOperations::List    
 
     def self.url()    
-      ret = "/platform/data/#{CGI.escape(class_name.underscore)}"
-      ret
+      "/platform/data/#{CGI.escape(class_name.underscore)}"
     end
     
   end

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

@@ -60,7 +60,7 @@ ActiveRecord::Schema.define do
         t.string :updated_at
         t.string :created_at
         t.text :data_source_type
-        t.string :last_report
+        t.text :last_report
         t.string :report_count
         t.string :active
 
@@ -109,6 +109,7 @@ ActiveRecord::Schema.define do
         t.string :stale
         t.string :updated_at
         t.string :auth_token
+        t.string :data_source_id
     end
 
     create_table :comparison_rule_conditions_caches do |t|

data/machineshop/lib/machineshop/monitor.rb

@@ -0,0 +1,39 @@
+module MachineShop
+	class Monitor < APIResource
+		include MachineShop::APIOperations::List
+
+		def self.url()
+			"/platform/data/#{CGI.escape(class_name.underscore)}"
+			# ret
+		end
+
+		def self.total_reports_per_day(start_date, end_date, auth_token)
+			MachineShop.gem_get(data_url+"/total_reports_per_day/#{start_date}/#{end_date}",auth_token)
+		end
+
+		#for v0
+		def self.reports_per_device_instance_per_day(start_date, end_date, auth_token)
+			MachineShop.gem_get(data_url+"/reports_per_device_instance_per_day/#{start_date}/#{end_date}",auth_token)
+		end
+
+		#for v1
+		def self.reports_per_data_source_per_day(start_date, end_date, auth_token)
+			MachineShop.gem_get(data_url+"/reports_per_data_source_per_day/#{start_date}/#{end_date}",auth_token)
+		end
+
+		def self.api_requests_per_day(start_date, end_date, auth_token)
+			MachineShop.gem_get(data_url+"/api_requests_per_day/#{start_date}/#{end_date}",auth_token)
+		end
+
+		def self.rule_last_run_summary(auth_token)
+			MachineShop.gem_get(data_url+"/rule_last_run_summary",auth_token)
+		end
+
+		private
+		def self.data_url
+			"/platform/data"
+		end
+
+	end
+
+end

data/machineshop/lib/machineshop/report.rb

@@ -0,0 +1,11 @@
+module MachineShop
+  class Report < APIResource
+    include MachineShop::APIOperations::List    
+    include MachineShop::APIOperations::Create    
+    
+    def self.url()
+      "/monitor/#{CGI.escape(class_name.underscore)}"
+    end
+
+  end
+end

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

@@ -1,9 +1,11 @@
 module MachineShop
-  class Report < APIResource
+  class Reports < APIResource
     include MachineShop::APIOperations::List    
+    include MachineShop::APIOperations::Create    
     
     def self.url()
       ret = "/monitor/#{CGI.escape(class_name.underscore)}"
+      ap ret
       ret
     end
 

data/machineshop/lib/machineshop/routes.rb

@@ -0,0 +1,29 @@
+#User Routes
+module MachineShop
+
+	class Routes < APIResource
+		include MachineShop::APIOperations::List
+
+		def self.authorized_routes_json(auth_token)      
+	      auth_routes = MachineShop.gem_get("/platform/authorized_routes/", auth_token, nil)
+	    end
+
+	    def self.single_authorized_route(id,auth_token)      
+	      auth_routes = MachineShop.gem_get("/platform/authorized_routes/"+id, auth_token, nil)
+	    end
+
+	    def self.single_authorized_route_put(id,json,auth_token)   
+	      auth_routes = MachineShop.gem_put("/platform/authorized_routes/"+id, auth_token, json)
+	    end
+
+		private
+		def self.url
+			'/platform/routes?flag=portal'
+		end
+
+
+	end
+
+
+end
+

data/machineshop/lib/machineshop/rules.rb

@@ -0,0 +1,56 @@
+module MachineShop
+  class Rules < APIResource
+    include MachineShop::APIOperations::List
+    include MachineShop::APIOperations::Create
+    include MachineShop::APIOperations::Delete
+    include MachineShop::APIOperations::Update
+
+   
+
+    def self.get_join_rule_conditions(auth_token)
+      url = platform_url + "/join_rule_conditions"
+      MachineShop.gem_get(url, auth_token)
+    end
+
+    def self.get_comparison_rule_conditions(auth_token)
+      url = platform_url + "/comparison_rule_conditions"
+      MachineShop.gem_get(url, auth_token)
+    end
+
+    def self.get_deleted(auth_token)
+      url = platform_url + "/deleted"
+      MachineShop.gem_get(url, auth_token)
+    end
+
+    # def self.get_by_device_instance(auth_token,id)
+    #   url = platform_url + "/device_instance/#{id}"
+    #   MachineShop.gem_get(url, auth_token)
+    # end
+
+    def self.get_by_data_source(id,auth_token)
+      url = platform_url + "/data_sources/#{id}"
+      MachineShop.gem_get(url, auth_token)
+    end
+
+    # def post_rule(auth_token, rule_hash)
+    #   url = platform_url
+    #   MachineShop.gem_post(url, auth_token, rule_hash)
+    # end
+
+    def self.delete_rule(id,auth_token)
+      url = platform_url + "/#{id}"
+      MachineShop.gem_delete(url, auth_token)
+    end
+
+    def self.update(id,auth_token,params={})
+      response = MachineShop.gem_put(platform_url+"/#{id}", auth_token, params)
+      Util.convert_to_machineshop_object(response, auth_token, self.class_name)
+    end
+
+    private
+     def self.platform_url
+      '/platform/rules'
+    end
+
+  end
+end

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

@@ -3,12 +3,11 @@ module MachineShop
     
     # Specific API calls
     def self.authenticate(user_hash)
-      #user_hash is => { email: email, password: password }
       response = MachineShop.gem_post(authenticate_url, nil, user_hash)            
       auth_token = response[:authentication_token]
-      id = response[:_id]
-      
-      return auth_token, self.retrieve(id, auth_token)
+      # id = response[:_id]
+      return auth_token, response      
+      # return auth_token, self.retrieve(id, auth_token)
     end
     
     def self.all_roles(auth_token)
@@ -28,6 +27,25 @@ module MachineShop
       filters.merge!(:user_id => self.id)
       MachineShop::Meter.all(filters, @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.create_user_logo(user_id, params, auth_token)
+      MachineShop.gem_multipart(self.url+"/#{user_id}/logo", auth_token, params)
+    end
+
+    def self.delete_user_logo(user_id, auth_token)
+      MachineShop.gem_delete(self.url+"/#{user_id}/logo", auth_token)
+    end
+
+    def self.check_user_versions(user_hash)
+      MachineShop.gem_get("/user_session/user/versions",nil, user_hash)
+    end
+
     
     private
 

data/machineshop/lib/machineshop/users.rb

@@ -0,0 +1,81 @@
+module MachineShop
+  class Users < APIResource
+    include MachineShop::APIOperations::List
+    include MachineShop::APIOperations::Create
+    include MachineShop::APIOperations::Delete
+    include MachineShop::APIOperations::Update
+
+    # Specific API calls
+    def self.authenticate(user_hash)
+      response = MachineShop.gem_post(authenticate_url, nil, user_hash)            
+      auth_token = response[:authentication_token]
+      # id = response[:_id]
+      return auth_token, response
+      
+      # return auth_token, self.retrieve(id, auth_token)
+    end
+    
+    def self.all_roles(auth_token)
+      MachineShop.gem_get(self.role_url, auth_token)
+    end
+    
+    def all_roles
+      MachineShop.gem_get(self.class.role_url, @auth_token)
+    end
+
+    def self.new_api_key(user_id,auth_token)
+      MachineShop.gem_get("#{self.url}/#{user_id}/new_api_key", auth_token)
+    end       
+    
+    def device_instances(filters={})
+      filters.merge!(:user_id => self.id)
+      MachineShop::DeviceInstance.all(filters, @auth_token)
+    end
+    
+    def meters(filters={})
+      filters.merge!(:user_id => self.id)
+      MachineShop::Meter.all(filters, @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.create_user_logo(user_id, params, auth_token)
+      MachineShop.gem_multipart("/platform/users/#{user_id}/logo", auth_token, params)
+    end
+
+    def self.delete_user_logo(user_id, auth_token)
+      MachineShop.gem_delete("/platform/users/#{user_id}/logo", auth_token)
+    end
+
+    def self.check_user_versions(user_hash)
+      MachineShop.gem_get("/user_session/user/versions",nil, user_hash)
+    end
+
+    def self.delete(id,auth_token)
+      MachineShop.gem_delete(self.url+"/#{id}", auth_token)
+    end
+
+    def self.password_reset(params_hash)
+      MachineShop.gem_post("/platform/password_reset",nil, params_hash)
+    end
+
+    def self.password_reset_complete(reset_token,password_hash)
+      MachineShop.gem_post("/platform/password_reset/#{reset_token}",nil, password_hash)
+    end
+
+    private
+
+    def self.authenticate_url
+      '/platform/user/authenticate'
+    end
+
+    def self.role_url
+      '/platform/roles'
+    end
+    
+  end
+end

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

@@ -21,12 +21,19 @@ module MachineShop
         'DeviceInstance' => DeviceInstance,
         'Mapping' => Mapping,
         'Meter' => Meter,
+        'Monitor' => Monitor,
         'Report' => Report,
+        'Reports' => Reports,
         'Rule' => Rule,
-        # 'User' => User,
+        'Rules' => Rules,
+        'User' => User,
         'Users' => Users,
         'Utility' => Utility,
-        'Customer'=> Customer
+        'Customer'=> Customer,
+        'Customers'=> Customers,
+        'CustomApi'=> CustomApi,
+        'ApiProxies'=> ApiProxies,
+        # 'CustomApis'=> CustomApis
       }
       case resp
       when Array
@@ -121,15 +128,19 @@ module MachineShop
 
     #Check if db_connected
     def self.db_connected?
-      db_connected = true
-      begin
-        MachineShop::Database.new
-      rescue DatabaseError =>e
-        # puts e.message
-        db_connected= false
-      rescue SchemaError =>e
-        # puts e.message
-        # db_connected=true
+        db_connected = true
+      if MachineShop.configuration.enable_caching
+        begin
+          MachineShop::Database.new
+        rescue DatabaseError =>e
+          # puts e.message
+          db_connected= false
+        rescue SchemaError =>e
+          # puts e.message
+          # db_connected=true
+        end
+      else
+        db_connected = false
       end
 
       db_connected