validic 0.3.3 → 0.4.1

data/lib/validic.rb

@@ -1,37 +1,20 @@
-require "faraday"
-require "faraday_middleware"
-require "validic/client"
-require "validic/version"
-
-directory = File.expand_path(File.dirname(__FILE__))
+require 'validic/client'
 
 module Validic
-
+  BASE_URL = "https://api.validic.com/v1"
   class << self
     attr_accessor :api_url,
       :api_version,
       :access_token,
-      :organization_id,
-      :user_id
+      :organization_id
 
     ##
     # Configure default
     #
     # @yield [Validic]
     def configure
-      load_defaults
       yield self
       true
     end
-
-    private
-
-    def load_defaults
-      self.api_url          ||= 'https://api.validic.com'
-      self.api_version      ||= 'v1'
-      self.access_token     ||= 'ENTERPRISE_KEY'
-      self.organization_id  ||= '51aca5a06dedda916400002b'
-    end
   end
-
 end

data/lib/validic/app.rb

@@ -0,0 +1,11 @@
+module Validic
+  class App
+    def initialize(attrs={})
+      #create attr_reader for all key value pairs
+      attrs.each do |k, v|
+        instance_variable_set("@#{k}", v)
+        self.class.send(:attr_reader, k)
+      end
+    end
+  end
+end

data/lib/validic/biometrics.rb

@@ -0,0 +1,9 @@
+require 'validic/utils'
+module Validic
+  class Biometrics
+    include Validic::Utils
+    def initialize(attrs = {})
+      attributes_builder(attrs, self)
+    end
+  end
+end

data/lib/validic/client.rb

@@ -1,36 +1,38 @@
-# encoding: utf-8
-require 'forwardable'
-require 'validic/request'
-require 'validic/organization'
-require 'validic/user'
-require 'validic/profile'
-require 'validic/fitness'
-require 'validic/weight'
-require 'validic/nutrition'
-require 'validic/sleep'
-require 'validic/diabetes'
-require 'validic/biometric'
-require 'validic/routine'
-require 'validic/tobacco_cessation'
-require 'validic/third_party_app'
+require 'faraday'
+require 'faraday_middleware'
+
+require 'validic/rest/apps'
+require 'validic/rest/biometrics'
+require 'validic/rest/diabetes'
+require 'validic/rest/fitness'
+require 'validic/rest/nutrition'
+require 'validic/rest/organizations'
+require 'validic/rest/profile'
+require 'validic/rest/request'
+require 'validic/rest/routine'
+require 'validic/rest/sleep'
+require 'validic/rest/tobacco_cessation'
+require 'validic/rest/users'
+require 'validic/rest/utils'
+require 'validic/rest/weight'
+require 'validic/version'
 
 module Validic
   class Client
-    extend Forwardable
-
-    include Request
-    include Organization
-    include User
-    include Profile
-    include Fitness
-    include Weight
-    include Nutrition
-    include Sleep
-    include Diabetes
-    include Biometric
-    include Routine
-    include TobaccoCessation
-    include ThirdPartyApp
+    include REST::Apps
+    include REST::Biometrics
+    include REST::Diabetes
+    include REST::Fitness
+    include REST::Nutrition
+    include REST::Organizations
+    include REST::Profile
+    include REST::Request
+    include REST::Routine
+    include REST::Sleep
+    include REST::TobaccoCessation
+    include REST::Users
+    include REST::Utils
+    include REST::Weight
 
     attr_accessor :api_url,
       :api_version,
@@ -42,11 +44,10 @@ module Validic
     #
     # @params options[Hash]
     def initialize(options={})
-      @api_url        = options[:api_url].nil? ? Validic.api_url : options[:api_url]
+      @api_url        = options[:api_url].nil? ? 'https://api.validic.com' : options[:api_url]
       @api_version    = options[:api_version].nil? ? 'v1' : options[:api_version]
       @access_token   = options[:access_token].nil? ? Validic.access_token : options[:access_token]
       @organization_id = options[:organization_id].nil? ? Validic.organization_id : options[:organization_id]
-
       reload_config
     end
 
@@ -55,56 +56,14 @@ module Validic
     #
     # @return [Faraday::Connection]
     def connection
-      params = {}
-      @connection = Faraday.new(url: @api_url, params: params, headers: default_headers, ssl: {verify: true}) do |faraday|
-        faraday.use FaradayMiddleware::Mashify
+      Faraday.new(url: @api_url, headers: default_headers, ssl: { verify: true }) do |faraday|
+        # faraday.use FaradayMiddleware::Mashify
         faraday.use FaradayMiddleware::ParseJson, content_type: /\bjson$/
         faraday.use FaradayMiddleware::FollowRedirects
         faraday.adapter Faraday.default_adapter
       end
     end
 
-    ##
-    # Pull the latest endpoint
-    def latest(type, org_id=nil, user_id=nil, params={})
-      organization_id = org_id.nil? ? Validic.organization_id : org_id
-      user_id = org_id.nil? ? Validic.user_id : org_id
-
-      url = "/#{Validic.api_version}/organizations/#{organization_id}/#{type.to_s}/latest.json"
-
-      if user_id
-        url = "/#{Validic.api_version}/organizations/#{organization_id}/users/#{user_id}/#{type.to_s}/latest.json"
-      end
-
-      get(url, params)
-    end
-
-    ##
-    # Generic Pull of Validic Objects
-    def get_endpoint(type, params={})
-
-      url = "/#{Validic.api_version}/organizations/#{Validic.organization_id}/#{type.to_s}.json"
-
-      if Validic.user_id && type != :users
-        url = "/#{Validic.api_version}/organizations/#{Validic.organization_id}/users/#{Validic.user_id}/#{type.to_s}.json"
-      elsif Validic.user_id && type == :users
-        url = "/#{Validic.api_version}/organizations/#{Validic.organization_id}/users/#{Validic.user_id}.json"
-      end
-
-      get(url, params)
-    end
-
-    ##
-    # Generic POST to Validic
-    def post_to_validic(type, params={})
-      url = "/#{Validic.api_version}/organizations/#{Validic.organization_id}/#{type.to_s}.json"
-
-      if Validic.user_id
-        url = "/#{Validic.api_version}/organizations/#{Validic.organization_id}/users/#{Validic.user_id}/#{type.to_s}.json"
-      end
-      post(url, params)
-    end
-
     private
 
     def default_headers
@@ -121,6 +80,5 @@ module Validic
       Validic.access_token = access_token
       Validic.organization_id = organization_id
     end
-
   end
 end

data/lib/validic/diabetes.rb

@@ -1,64 +1,8 @@
-# encoding: utf-8
-
 module Validic
-  module Diabetes
-
-    ##
-    # Get User Diabetes Activities base on `access_token`
-    # Default data fetched is from yesterday
-    #
-    # @params :organization_id - for organization specific
-    # @params :user_id - for user specific
-    #
-    # @params :start_date - optional
-    # @params :end_date - optional
-    # @params :access_token - override for default access_token
-    # @params :source - optional - data per source (e.g 'fitbit')
-    # @params :expanded - optional - will show the raw data
-    #
-    # @return [Hashie::Mash] with list of Diabetes
-    def get_diabetes(params={})
-      params = extract_params(params)
-      get_endpoint(:diabetes, params)
+  class Diabetes
+    include Validic::Utils
+    def initialize(attrs = {})
+      attributes_builder(attrs, self)
     end
-
-    ##
-    # Create Diabetes base on `access_token` and `authentication_token`
-    #
-    # @params :access_token - *required if not specified on your initializer / organization access_token
-    # @params :authentication_token - *required / authentication_token of a specific user
-    #
-    # @params :c_peptide
-    # @params :fasting_plasma_glucose_test
-    # @params :hba1c
-    # @params :insulin
-    # @params :oral_glucose_tolerance_test
-    # @params :random_plasma_glucose_test
-    # @params :triglyceride
-    # @params :timestamp
-    # @params :source
-    #
-    # @return success
-    def create_diabetes(options={})
-      options = {
-        authentication_token: options[:authentication_token],
-        access_token: options[:access_token],
-        diabetes: {
-          c_peptide: options[:c_peptide],
-          fasting_plasma_glucose_test: options[:fasting_plasma_glucose_test],
-          hba1c: options[:hba1c],
-          insulin: options[:insulin],
-          oral_glucose_tolerance_test: options[:oral_glucose_tolerance_test],
-          random_plasma_glucose_test: options[:random_plasma_glucose_test],
-          triglyceride: options[:triglyceride],
-          timestamp: options[:timestamp],
-          source: options[:source]
-        }
-      }
-
-      response = post("/#{Validic.api_version}/diabetes.json", options)
-      response if response
-    end
-
   end
 end

data/lib/validic/error.rb

@@ -0,0 +1,33 @@
+module Validic
+  class Error < StandardError
+    ClientError = Class.new(self)
+    ServerError = Class.new(self)
+
+    Unauthorized = Class.new(ClientError)
+    NotFound = Class.new(ClientError)
+    Forbidden = Class.new(ClientError)
+    UnprocessableEntity = Class.new(ClientError)
+    Conflict = Class.new(ClientError)
+    InternalServerError = Class.new(ServerError)
+
+    ERRORS = {
+      401 => Validic::Error::Unauthorized,
+      403 => Validic::Error::Forbidden,
+      404 => Validic::Error::NotFound,
+      409 => Validic::Error::Conflict,
+      422 => Validic::Error::UnprocessableEntity,
+      500 => Validic::Error::InternalServerError
+    }
+
+    def self.from_response(body)
+      code, errors = [body['code'], body['errors']]
+      message = "#{code}: #{errors}"
+      new(message)
+    end
+
+    def initialize(message = '', code = nil)
+      super(message)
+      @code = code
+    end
+  end
+end

data/lib/validic/extra.rb

@@ -0,0 +1,10 @@
+module Validic
+  class Extra
+    def initialize(attrs = {})
+      attrs.each do |k, v|
+        instance_variable_set("@#{k}", v)
+        self.class.send(:attr_reader, k)
+      end
+    end
+  end
+end

data/lib/validic/fitness.rb

@@ -1,61 +1,8 @@
-# encoding: utf-8
-
 module Validic
-  module Fitness
-
-    ##
-    # Get Fitness Activities base on `access_token`
-    # Default data fetched is from yesterday
-    #
-    # @params :organization_id - for organization specific
-    # @params :user_id - for user specific
-    #
-    # @params :start_date - optional
-    # @params :end_date - optional
-    # @params :access_token - override for default access_token
-    # @params :source - optional - data per source (e.g 'fitbit')
-    # @params :expanded - optional - will show the raw data
-    #
-    # @return [Hashie::Mash] with list of Fitness
-    def get_fitness(params={})
-      params = extract_params(params)
-      get_endpoint(:fitness, params)
+  class Fitness
+    include Validic::Utils
+    def initialize(attrs = {})
+      attributes_builder(attrs, self)
     end
-
-    alias :get_fitnesses :get_fitness
-
-    ##
-    # Create Fitness base on `access_token` and `authentication_token`
-    #
-    # @params :access_token - *required if not specified on your initializer / organization access_token
-    # @params :authentication_token - *required / authentication_token of a specific user
-    #
-    # @params :timestamp
-    # @params :primary_type
-    # @params :intensity
-    # @params :start_time
-    # @params :total_distance
-    # @params :duration
-    # @params :source
-    # 
-    # @return success
-    def create_fitness(options={})
-      options = {
-        access_token: options[:access_token],
-        fitness: {
-          timestamp: options[:timestamp],
-          primary_type: options[:primary_type],
-          intensity: options[:intensity],
-          start_time: options[:start_time],
-          total_distance: options[:total_distance],
-          duration: options[:duration],
-          source: options[:source]
-        }
-      }
-
-      response = post("/#{Validic.api_version}/fitness.json", options)
-      response if response
-    end
-
   end
 end

data/lib/validic/nutrition.rb

@@ -1,65 +1,9 @@
-# encoding: utf-8
-
+require 'validic/utils'
 module Validic
-  module Nutrition
-
-    ##
-    # Get Nutrition Activities base on `access_token`
-    # Default data fetched is from yesterday
-    #
-    # @params :organization_id - for organization specific
-    # @params :user_id - for user specific
-    #
-    # @params :start_date - optional
-    # @params :end_date - optional
-    # @params :access_token - override for default access_token
-    # @params :source - optional - data per source (e.g 'fitbit')
-    # @params :expanded - optional - will show the raw data
-    # 
-    # @return [Hashie::Mash] with list of Nutrition
-    def get_nutritions(params={})
-      params = extract_params(params)
-      get_endpoint(:nutrition, params)
+  class Nutrition
+    include Validic::Utils
+    def initialize(attrs = {})
+      attributes_builder(attrs, self)
     end
-
-    ##
-    # Create Nutrition base on `access_token` and `authentication_token`
-    #
-    # @params :access_token - *required if not specified on your initializer / organization access_token
-    # @params :authentication_token - *required / authentication_token of a specific user
-    # 
-    # @params :calories
-    # @params :carbohydrates
-    # @params :fat
-    # @params :fiber
-    # @params :protein
-    # @params :sodium
-    # @params :water
-    # @params :timestamp
-    # @params :meal
-    # @params :source
-    #
-    # @return success
-    def create_nutrition(options={})
-      options = {
-        access_token: options[:access_token],
-        nutrition: {
-          calories: options[:calories],
-          carbohydrates: options[:carbohydrates],
-          fat: options[:fat],
-          fiber: options[:fiber],
-          protein: options[:protein],
-          sodium: options[:sodium],
-          water: options[:water],
-          timestamp: options[:timestamp],
-          meal: options[:meal],
-          source: options[:source]
-        }
-      }
-
-      response = post("/#{Validic.api_version}/nutrition.json", options)
-      response if response
-    end
-
   end
 end