machineshop 1.0.0 → 1.0.2

data/lib/machineshop/api_operations/update.rb

@@ -3,7 +3,7 @@ module MachineShop
   module APIOperations
     module Update
         def update(param={})
-          response = MachineShop.put(url, @auth_token,param)
+          response = MachineShop.gem_put(url, @auth_token,param)
           refresh_from(response, @auth_token)
         end
     end

data/lib/machineshop/api_resource.rb

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

data/lib/machineshop/configuration.rb

@@ -1,11 +1,14 @@
 module MachineShop
 	class Configuration
-		attr_accessor :expiry_time, :enable_caching, :db_username, :db_password, :db_name, :db_host
+		attr_accessor :expiry_time, :enable_caching, :db_username, :db_password, :db_name, :db_host, :base_version, :custom_endpoints_cache_time
 
 		def initialize
 			#default values
 			@expiry_time=0
-			@enable_caching = true		
+			@enable_caching = true
+			@base_version = "v0"
+			@custom_endpoints_cache_time = lambda{86400.seconds.ago}
+			#default 1 day
 		end
 	end
 end

data/lib/machineshop/data_source_types.rb

@@ -12,7 +12,7 @@ module MachineShop
 
      def create_email_data_source(params)
       params.merge!({:data_source_type => self.id})
-      MachineShop.post(email_data_source_url, @auth_token, params)
+      MachineShop.gem_post(email_data_source_url, @auth_token, params)
     end
 
     private

data/lib/machineshop/data_sources.rb

@@ -8,7 +8,7 @@ module MachineShop
     # Specific API calls
     
     def report_count(params)      
-      MachineShop.get(report_count_url, @auth_token, params)
+      MachineShop.gem_get(report_count_url, @auth_token, params)
     end
     
     def reports(filters={})
@@ -22,7 +22,7 @@ module MachineShop
     end
 
     def delete
-      MachineShop.delete("/platform/data_sources/#{self.id}?_type=#{self._type}", @auth_token,{})
+      MachineShop.gem_delete("/platform/data_sources/#{self.id}?_type=#{self._type}", @auth_token,{})
     end
     
     private

data/lib/machineshop/device.rb

@@ -6,7 +6,7 @@ module MachineShop
 
     # Specific API calls
     def payload_fields(params=nil)
-      MachineShop.get(payload_fields_url, @auth_token, params)
+      MachineShop.gem_get(payload_fields_url, @auth_token, params)
     end
 
     def create_instance(params)

data/lib/machineshop/device_instance.rb

@@ -7,7 +7,7 @@ module MachineShop
     # Specific API calls
     
     def report_count(params)      
-      MachineShop.get(report_count_url, @auth_token, params)
+      MachineShop.gem_get(report_count_url, @auth_token, params)
     end
     
     def reports(filters={})

data/lib/machineshop/end_points.rb

@@ -0,0 +1,30 @@
+module MachineShop
+  class EndPoints < APIResource
+    include MachineShop::APIOperations::List
+
+    # Specific API calls
+
+    def self.url()
+      return "/gem/routes"
+    end
+
+    def self.all(version=v0,namespace="",auth_token)
+
+      # ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+      endpoints = MachineShop.gem_get(url+"/#{version}/#{namespace}",auth_token)
+
+      endpoints=endpoints.as_json
+      endpoints = endpoints["#{version}"]["api"]
+
+      if Util.db_connected?
+        endpoints.each do |endpoint|
+          apiend = ApiEndpoint.find_or_initialize_by(verb: endpoint['verb'], endpoint:endpoint['endpoint'], auth_token: auth_token)
+          apiend.save
+
+        end
+
+      end
+    end
+  end
+end

data/lib/machineshop/mapping.rb

@@ -2,15 +2,15 @@ module MachineShop
   class Mapping
     # Specific API calls
     def self.geocode(params={}, auth_token)
-      MachineShop.get(geocode_url, auth_token, params)
+      MachineShop.gem_get(geocode_url, auth_token, params)
     end
 
     def self.directions(params={}, auth_token)
-      MachineShop.get(directions_url, auth_token, params)
+      MachineShop.gem_get(directions_url, auth_token, params)
     end
 
     def self.distance(params={}, auth_token)
-      MachineShop.get(distance_url, auth_token, params)
+      MachineShop.gem_get(distance_url, auth_token, params)
     end
 
     private

data/lib/machineshop/models/api_endpoint.rb

@@ -0,0 +1,8 @@
+class ApiEndpoint < ActiveRecord::Base
+	validates :endpoint, presence: true
+	validates :verb, presence: true
+	# validates: url, presence: true, uniqueness: true
+
+	validates_uniqueness_of :endpoint, :scope=> [:verb,:auth_token]
+	# validates_uniqueness_of :user_id, :scope => [:entity_id, :post_id]
+end

data/lib/machineshop/models/api_request.rb

@@ -20,6 +20,7 @@ class ApiRequest < ActiveRecord::Base
 		if updated_at < cache_policy.call.utc
 			update_attributes(updated_at: Time.now.utc)
 		else
+			# puts "Not expired"
 			yield
 		end
 	end

data/lib/machineshop/models/schema.rb

@@ -1,5 +1,19 @@
 ActiveRecord::Schema.define do
+    # puts ActiveRecord::Schema.new.migrations_paths
     self.verbose = false
+    # change_table(:device_caches) do |t|
+    #     t.column :auth_token, :string, limit: 60
+    # end
+
+    
+    create_table :api_endpoints do |t| 
+        t.string :_id
+        t.string :verb
+        t.string :endpoint
+        t.string :auth_token
+    end
+    add_index :api_endpoints, [:verb,:endpoint], unique=>true
+
 
     create_table :data_source_types_caches do |t|
         t.string :_id
@@ -51,6 +65,7 @@ ActiveRecord::Schema.define do
         t.string :active
 
     end
+    
 
 
     create_table :device_instance_caches do |t|

data/lib/machineshop/rule.rb

@@ -4,54 +4,38 @@ module MachineShop
     include MachineShop::APIOperations::Create
     include MachineShop::APIOperations::Delete
 
-=begin
-    # Specific API calls
-    def get_rules(auth_token)
-      url = platform_url + "/rule"
-      MachineShop.get(url,auth_token)
-      #get url, auth_token
-    end
-=end
-
     def self.platform_url
       '/platform'
     end
 
-=begin
-    def get_rule(auth_token, id)
-      url = platform_url + "/rule/#{id}"
-      MachineShop.get(url, auth_token)
-    end
-=end
-
     def self.get_join_rule_conditions(auth_token)
       url = platform_url + "/rule/join_rule_conditions"
-      MachineShop.get(url, auth_token)
+      MachineShop.gem_get(url, auth_token)
     end
 
     def self.get_comparison_rule_conditions(auth_token)
       url = platform_url + "/rule/comparison_rule_conditions"
-      MachineShop.get(url, auth_token)
+      MachineShop.gem_get(url, auth_token)
     end
 
     def self.get_deleted(auth_token)
       url = platform_url + "/rules/deleted"
-      MachineShop.get(url, auth_token)
+      MachineShop.gem_get(url, auth_token)
     end
 
     def self.get_by_device_instance(auth_token,id)
       url = platform_url + "/rule/device_instance/#{id}"
-      MachineShop.get(url, auth_token)
+      MachineShop.gem_get(url, auth_token)
     end
 
     def post_rule(auth_token, rule_hash)
       url = platform_url + "/rule"
-      MachineShop.post(url, auth_token, rule_hash)
+      MachineShop.gem_post(url, auth_token, rule_hash)
     end
 
     def delete_rule(auth_token, id)
       url = platform_url + "/rule/#{id}"
-      MachineShop.delete(url, auth_token)
+      MachineShop.gem_delete(url, auth_token)
     end
 
   end

data/lib/machineshop/user.rb

@@ -4,7 +4,7 @@ module MachineShop
     # Specific API calls
     def self.authenticate(user_hash)
       #user_hash is => { email: email, password: password }
-      response = MachineShop.post(authenticate_url, nil, user_hash)            
+      response = MachineShop.gem_post(authenticate_url, nil, user_hash)            
       auth_token = response[:authentication_token]
       id = response[:_id]
       
@@ -12,11 +12,11 @@ module MachineShop
     end
     
     def self.all_roles(auth_token)
-      MachineShop.get(self.role_url, auth_token)
+      MachineShop.gem_get(self.role_url, auth_token)
     end
     
     def all_roles
-      MachineShop.get(self.class.role_url, @auth_token)
+      MachineShop.gem_get(self.class.role_url, @auth_token)
     end       
     
     def device_instances(filters={})

data/lib/machineshop/users.rb

@@ -4,7 +4,7 @@ module MachineShop
     # Specific API calls
     def self.authenticate(user_hash)
       #user_hash is => { email: email, password: password }
-      response = MachineShop.post(authenticate_url, nil, user_hash)            
+      response = MachineShop.gem_post(authenticate_url, nil, user_hash)            
       auth_token = response[:authentication_token]
       id = response[:_id]
       
@@ -12,11 +12,11 @@ module MachineShop
     end
     
     def self.all_roles(auth_token)
-      MachineShop.get(self.role_url, auth_token)
+      MachineShop.gem_get(self.role_url, auth_token)
     end
     
     def all_roles
-      MachineShop.get(self.class.role_url, @auth_token)
+      MachineShop.gem_get(self.class.role_url, @auth_token)
     end       
     
     def device_instances(filters={})

data/lib/machineshop/util.rb

@@ -11,7 +11,7 @@ module MachineShop
       when Array
         h.map { |v| objects_to_ids(v) }
       else
-      h
+        h
       end
     end
 
@@ -34,12 +34,12 @@ module MachineShop
       when Hash
         # Try converting to a known object class.  If none available, fall back to generic APIResource
         if klass_name = type
-        klass = types[klass_name]
+          klass = types[klass_name]
         end
         klass ||= MachineShopObject
         klass.construct_from(resp, auth_token)
       else
-      resp
+        resp
       end
     end
 
@@ -49,7 +49,7 @@ module MachineShop
       rescue
         false
       else
-      true
+        true
       end
     end
 
@@ -65,7 +65,7 @@ module MachineShop
       when Array
         object.map { |value| symbolize_names(value) }
       else
-      object
+        object
       end
     end
 
@@ -101,6 +101,83 @@ module MachineShop
       end
       result
     end
+
+    def self.get_klass_from_url(url)
+      id=nil
+      klass=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
+      return id,klass
+    end
+
+    #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
+      end
+
+      db_connected
+    end
+
+
+    def self.valid_endpoint(name,auth_token,verb,params)
+      if Util.db_connected?
+        endpoints_upto_date=false
+
+        ApiRequest.cache("/gem/routes/#{MachineShop.configuration.base_version}", auth_token, MachineShop.configuration.custom_endpoints_cache_time) do
+          #time not expired, cached routes are oke
+          endpoints_upto_date = true
+        end
+
+        if !endpoints_upto_date
+          #request the endpoints
+          MachineShop::EndPoints.all(MachineShop.configuration.base_version,auth_token)
+
+        end
+
+        endpoint = ApiEndpoint.where(:verb=>verb).where(:auth_token=>auth_token).where("api_endpoints.endpoint LIKE :endpoint", {:endpoint => "/#{name}%"}).take(1)
+        if !endpoint.empty?
+          splitEndpoints = (endpoint[0].endpoint).split("/").reject{|val| val=="" }
+          if splitEndpoints[0]==name
+            url="/"
+            key=0
+            splitEndpoints.each do |v|
+              if v.start_with? ":" #parameter
+                if params[key]
+                  url+=params[key]
+                  key+=1
+                else
+                  raise APIError.new("Invalid parameters, Please provide value for #{v}")
+                end
+              else
+                url+="#{v}/"
+              end
+            end
+          end
+          return url
+        else
+          raise APIError.new("Invalid url request")
+          return false
+        end
+      end
+    end
+
   end
 end
 

data/lib/machineshop/utility.rb

@@ -1,11 +1,11 @@
 module MachineShop
   class Utility < APIResource
     def self.email(params={}, auth_token)
-      MachineShop.post(email_url, auth_token, params)
+      MachineShop.gem_post(email_url, auth_token, params)
     end
 
     def self.sms(params={}, auth_token)
-      MachineShop.post(sms_url, auth_token, params)
+      MachineShop.gem_post(sms_url, auth_token, params)
     end
 
     private

data/lib/machineshop/version.rb

@@ -1,3 +1,3 @@
 module MachineShop
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/machineshop.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
-
+    
   # gem.add_development_dependency 'mysql'
 
   # gem.add_runtime_dependency 'mysql'
@@ -31,9 +31,5 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
   gem.post_install_message = "Thanks for installing Machineshop gem, Enjoy!!"
   gem.requirements << 'mysql, activerecord'
-
-
-# Test for rake task database
-  # gem.executables << 'rake'
-  # gem.extensions << 'lib/machineshop/models/schema.rb'
+  
 end