machineshop 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5398a18d7fa06b98439cd8fb269584d75470e086
-  data.tar.gz: 79a3b0359fd318cb575793e235b3c9d874e049ea
+  metadata.gz: 3c441ae662e654ac372b9769d7b30dd03acaa18c
+  data.tar.gz: 2447a88093b40b35e9fbc01795406260622507d3
 SHA512:
-  metadata.gz: 91f0b27d60bc49ebd22a466b5522ecc449e0f3ab4d533c18d0c4a856fb69ba2e593c9938831efd16b0704ca16a37cda0452782ba0f048aaafeba707e470d2f10
-  data.tar.gz: 06609725eaf1067089ece7db9bbe045b11a13af8b821e86305bcc484749645730ba6688c2d35be197f595ea5fa2c0089617b7c1ec23ca269960a2c94642e4202
+  metadata.gz: 45cceddbd5c827716a615014bfb9f1b7e32924f0031db5b1e65f6c084cf5de12a79408582a6b1f8aa4c2f7d58a9bae25a2a124857779e73c2b9f744f9cfc2f7e
+  data.tar.gz: e8b4b81157b84c98a1a33be04fc77c7e48fa134ec302188d4bb2ce28ab21ba8cf5fbda921f2f2ecb27de401cdf25f42d63f64be5f43a8e0bc7033d8ff0dad0a5

data/lib/machineshop.rb

@@ -27,11 +27,6 @@ require 'machineshop/api_operations/update'
 require 'machineshop/machineshop_object'
 require 'machineshop/api_resource'
 require 'machineshop/device_instance'
-
-require 'machineshop/data_sources'
-require 'machineshop/data_source_types'
-
-
 require 'machineshop/device'
 require 'machineshop/machineshop_object'
 require 'machineshop/mapping'
@@ -44,6 +39,10 @@ require 'machineshop/users'
 require 'machineshop/utility'
 require 'machineshop/json'
 require 'machineshop/util'
+require 'machineshop/end_points'
+
+require 'machineshop/data_sources'
+require 'machineshop/data_source_types'
 
 # Errors
 require 'machineshop/errors/machineshop_error'
@@ -54,13 +53,13 @@ require 'machineshop/errors/api_connection_error'
 
 #Models
 require 'machineshop/models/api_request'
-# require 'machineshop/models/device_cache'
+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/v1'
+    @@api_base_url = 'http://stage.services.machineshop.io/api/v0'
 
     #configs starts
     attr_writer :configuration
@@ -88,19 +87,41 @@ module MachineShop
       @@api_base_url
     end
 
-    def get(url, auth_token, body_hash=nil)
+    #For Custom endpoints
+    def get(name, auth_token, *params)
+      url = Util.valid_endpoint(name,auth_token,:get, params)
+      platform_request(url, auth_token, nil, :get)
+    end
+
+    def post(name,auth_token, body_hash)
+      url = Util.valid_endpoint(name,auth_token,:post,[])
+      platform_request(url, auth_token,body_hash,:post)
+    end
+
+    def put(name,auth_token,*params,body_hash)
+      url = Util.valid_endpoint(name,auth_token,:put,params)
+      platform_request(url, auth_token,body_hash,:put)
+    end
+
+    def delete(name,auth_token,*params)
+      url = Util.valid_endpoint(name,auth_token,:delete,params)
+      platform_request(url, auth_token, nil ,:delete)
+    end
+
+    #Call for the predefined request
+    def gem_get(url, auth_token, body_hash=nil)
       platform_request(url, auth_token, body_hash)
     end
 
-    def post(url, auth_token, body_hash)
+    def gem_post(url, auth_token, body_hash)
       platform_request(url, auth_token, body_hash, :post)
     end
 
-    def delete(url, auth_token, body_hash)
+    def gem_delete(url, auth_token, body_hash)
       platform_request(url, auth_token, body_hash, :delete)
     end
 
-    def put(url, auth_token, body_hash)
+    def gem_put(url, auth_token, body_hash)
       platform_request(url, auth_token, body_hash, :put)
     end
 
@@ -117,9 +138,12 @@ module MachineShop
       # ApiRequest.cache(url,MachineShop.configuration.expiry_time)
       if http_verb==:get
 
-        if db_connected?
-          ApiRequest.cache(url, auth_token, MachineShop.configuration.expiry_time) do
+        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
@@ -158,6 +182,8 @@ module MachineShop
 
         end
 
+        puts "request params: #{opts} "
+
         begin
           response = execute_request(opts)
 
@@ -182,19 +208,19 @@ module MachineShop
         end
 
         rbody = response.body
+        # puts rbody
         rcode = response.code
       end
 
-
-
-
       begin
         # Would use :symbolize_names => true, but apparently there is
         # some library out there that makes symbolize_names not work.
         resp = MachineShop::JSON.load(rbody)
         resp ||= {}
         resp = Util.symbolize_names(resp)
+
         save_into_cache(url,resp,auth_token) if (http_verb == :get && cachedContent==:false)
+
         resp.merge!({:http_code => rcode}) if resp.is_a?(Hash)
         return resp
       rescue MultiJson::DecodeError
@@ -253,6 +279,7 @@ module MachineShop
         message = "Unexpected error communicating with MachineShop"
       end
       message += "\n\n(Network error: #{e.message})"
+      # puts "error message string : #{message}"
       raise APIConnectionError.new(message)
     end
 
@@ -266,168 +293,145 @@ module MachineShop
     end
 
 
-    #get the classname from url and get the record if exists
+    def save_into_cache(url, data,auth_token)
+      id,klass= Util.get_klass_from_url(url)
+      if !TABLE_NAME_BLACKLIST.include?(klass)
+        if Util.db_connected?
 
-    #Check if db_connected
-    def db_connected?
-      db_connected = true
-      begin
-        MachineShop::Database.new
-      rescue DatabaseError =>e
-        db_connected= false
-      rescue SchemaError =>e
-        # db_connected=true
-      end
+          klass = klass.capitalize+"Cache"
+          puts "creating dynamic class #{klass}"
 
-      db_connected
-    end
 
+          modelClass ||= (Object.const_set klass, Class.new(ActiveRecord::Base))
+          modelClass.inheritance_column = :_type_disabled
+          #Because 'type' is reserved for storing the class in case of inheritance and our array has "TYPE" key
 
-    def save_into_cache(url, data,auth_token)
-      if db_connected?
-
-        id=nil
-        splitted = url.split('/')
-        klass = splitted[-1]
-        if /[0-9]/.match(klass)
-          id=splitted[-1]
-          if splitted[-3]=="rule"
-            klass="rule"
-          else
-            klass = splitted[-2]
-          end
-        end
+          if ActiveRecord::Base.connection.table_exists? CGI.escape(klass.pluralize.underscore)
 
-        klass = klass.capitalize+"Cache"
-        modelClass ||= (Object.const_set klass, Class.new(ActiveRecord::Base))
-        modelClass.inheritance_column = :_type_disabled
-        #Because 'type' is reserved for storing the class in case of inheritance and our array has "TYPE" key
+            #delete all the previous records
 
-        if ActiveRecord::Base.connection.table_exists? CGI.escape(klass.pluralize.underscore)
-          if data.class ==Hash
+            modelClass.delete_all
+            puts "db table #{klass.pluralize.underscore} exists"
+            if data.class ==Hash
 
-            findId = data[:_id] || data["_id"]
-            @activeObject = modelClass.find_by(_id: findId) || modelClass.new
+              findId = data[:_id] || data["_id"]
+              @activeObject = modelClass.new
+              # @activeObject = modelClass.find_by(_id: findId) || modelClass.new
+              data.each do |k,v|
 
-            data.each do |k,v|
+                val=nil
 
-              val=nil
-              if v.class==Array
-                val = v.to_json
-              elsif v.class==Hash
-                val = v.to_json
-              else
-                val=v
-              end
-              if @activeObject.has_attribute?(k)
-                @activeObject.send("#{k}=",val)
+                if v.class==Array
+                  val = v.to_json
+                elsif v.class==Hash
+                  val = v.to_json
+                else
+                  val=v
+                end
+                if @activeObject.has_attribute?(k)
+                  @activeObject.send("#{k}=",val)
+                end
+                @activeObject.save
               end
-              @activeObject.save
-            end
 
 
-          else
-            data.each do |data_arr|
-              if data_arr
-                if data_arr.first.class==String && data_arr.class==Array
-                  @activeObject = modelClass.find_by(rule_condition: data_arr.select{|k| k.include?("rule_condition")})  || modelClass.new
-                  data_arr.each do |k|
-                    if k.include?("rule_condition")
-                      @activeObject.rule_condition = k
-                    else
-                      @activeObject.rule_description=k
-                    end
-                  end
-                else
-                  if data_arr.class!=String
-                    findId = data_arr[:_id] || data_arr["_id"]
-                    @activeObject = modelClass.find_by(_id: findId) || modelClass.new
-                    data_arr.each do |k,v|
-                      val=nil
-                      if v.class==Array
-                        val = v.to_json
-                      elsif v.class==Hash
-                        val = v.to_json
+            else
+              data.each do |data_arr|
+
+                if data_arr
+
+                  if data_arr.first.class==String && data_arr.class==Array
+                    @activeObject = modelClass.find_by(rule_condition: data_arr.select{|k| k.include?("rule_condition")})  || modelClass.new
+                    data_arr.each do |k|
+
+                      if k.include?("rule_condition")
+                        @activeObject.rule_condition = k
                       else
-                        val=v
+                        @activeObject.rule_description=k
                       end
+                    end
 
-                      #check if the database has the particular field to store
-                      if @activeObject.has_attribute?(k)
-                        @activeObject.send("#{k}=",val)
-                      end
 
+                  else
+                    if data_arr.class!=String
+                      findId = data_arr[:_id] || data_arr["_id"]
+                      @activeObject = modelClass.find_by(_id: findId) || modelClass.new
+                      data_arr.each do |k,v|
+
+                        val=nil
+
+                        if v.class==Array
+                          val = v.to_json
+                        elsif v.class==Hash
+                          val = v.to_json
+                        else
+                          val=v
+                        end
+                        #check if the database has the particular field to store
+                        if @activeObject.has_attribute?(k)
+                          @activeObject.send("#{k}=",val)
+                        end
+                      end
                     end
                   end
                 end
+                @activeObject.send("auth_token=",auth_token)
+                @activeObject.save
               end
-          @activeObject.send("auth_token=",auth_token)
-          @activeObject.save
             end
-          end
-        end
-      end
 
-    end
+          end #if ActiveRecord ends
 
+        end #if db_connected ends
+      end #if !TABLE_NAME_BLACKLIST.include? ends
+    end
 
 
     def get_from_cache(url, body_hash,auth_token)
       result =Array.new
-      if db_connected?
-
-        id=nil
-        splitted = url.split('/')
-        klass = splitted[-1]
-
-
-        if /[0-9]/.match(klass)
-          id=splitted[-1]
-
-          if splitted[-3]=="rule"
-            klass="rule"
-          else
-            klass = splitted[-2]
-          end
-
-        end
-
-        klass = klass.capitalize+"Cache"
-
-        modelClass = Object.const_set klass, Class.new(ActiveRecord::Base)
-        modelClass.inheritance_column = :_type_disabled
-
-        data_exist=false
-        if ActiveRecord::Base.connection.table_exists? CGI.escape(klass.pluralize.underscore)
-          resp= nil
-          if id
-            resp = modelClass.find_by(_id: id, auth_token: auth_token)
-            data_exist=true if resp
-          else
-            # pagination = body_hash.select{|k| k==:per_page || k==:page} if body_hash
-            resp = modelClass.where(parse_query_string(body_hash,auth_token))
-            data_exist = true if resp.exists?
-          end
-
-          if data_exist
-            if(klass.include?("rule_condition"))
-              resp.each do |rTemp|
-                temp = Array.new
-                temp.push rTemp["rule_description"]
-                temp.push rTemp["rule_condition"]
-                result << temp
-              end
-              result = result.to_json(:except=>[:id]) if result
+      id,klass= Util.get_klass_from_url(url)
+      if !TABLE_NAME_BLACKLIST.include?(klass)
+        if Util.db_connected?
+
+          klass = klass.capitalize+"Cache"
+
+          modelClass = Object.const_set klass, Class.new(ActiveRecord::Base)
+          modelClass.inheritance_column = :_type_disabled
+
+          data_exist=false
+          if ActiveRecord::Base.connection.table_exists? CGI.escape(klass.pluralize.underscore)
+            puts "db:table #{klass.pluralize} exists"
+            resp= nil
+            if id
+              resp = modelClass.find_by(_id: id, auth_token: auth_token)
+              data_exist=true if resp
             else
-              result = resp.to_json(:except=>[:id]) if resp
+              # pagination = body_hash.select{|k| k==:per_page || k==:page} if body_hash
+              resp = modelClass.where(parse_query_string(body_hash,auth_token))
+              data_exist = true if resp.exists?
             end
 
+            if data_exist
+              if(klass.include?("rule_condition"))
+                resp.each do |rTemp|
+                  temp = Array.new
+                  temp.push rTemp["rule_description"]
+                  temp.push rTemp["rule_condition"]
+                  result << temp
+                end
+                result = result.to_json(:except=>[:id]) if result
+              else
+                result = resp.to_json(:except=>[:id]) if resp
+              end
+
+            end
           end
         end
       end
       return result
     end
 
+    TABLE_NAME_BLACKLIST = ["user","routes"]
     QUERY_STRING_BLACKLIST = [
       'page',
       'per_page'

data/lib/machineshop/api_operations/create.rb

@@ -4,7 +4,7 @@ module MachineShop
     module Create
       module ClassMethods
         def create(params={}, auth_token=nil)
-          response = MachineShop.post(self.url, auth_token, params)
+          response = MachineShop.gem_post(self.url, auth_token, params)
           Util.convert_to_machineshop_object(response, auth_token, self.class_name)
         end
       end

data/lib/machineshop/api_operations/delete.rb

@@ -2,7 +2,7 @@ module MachineShop
   module APIOperations
     module Delete
       def delete
-        response = MachineShop.delete(url, @auth_token,{})
+        response = MachineShop.gem_delete(url, @auth_token,{})
         refresh_from(response, @auth_token)
         self
       end

data/lib/machineshop/api_operations/list.rb

@@ -3,7 +3,7 @@ module MachineShop
     module List
       module ClassMethods
         def all(filters={}, auth_token=nil)
-          response = MachineShop.get(url, auth_token, filters)
+          response = MachineShop.gem_get(url, auth_token, filters)
           Util.convert_to_machineshop_object(response, auth_token, self.class_name)
         end
       end