v2_intuity 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13104922bec089e414562de76b22ac3d7203beaf
-  data.tar.gz: 5aa9f094fb011b2476e7a3ef0c83f3acb52d3168
+  metadata.gz: b0d724b6101183d0b427d9d0dfd8d2bf28bf6301
+  data.tar.gz: 5cb7ee9ae865c8e62e7a39b70a65d042c371be8c
 SHA512:
-  metadata.gz: b2997175def3a560cd3585fb49d032d34a5aa53f89a869d7bae4850eceb358f84341c41bea2606a4e31d22bb1d72071b831a139df80b9fa797f3d95b194bb137
-  data.tar.gz: 3937dd0f96c57d44804cdb683c61f60b46740ce9c175eeb528a6ef16d6e40d5a18dcccf18db32c6b4f328049dd8dd9d11a9deb4c3e6d6ba812c9861adb682321
+  metadata.gz: 75561a970b89a7afa5e046570086a8a539451b4019c5adc07505d0b1574142c650f7c7949bfdcd3dea796c4ea65a5d3f886aea16edb40662cfc486af4a1c93c9
+  data.tar.gz: cf798fe739a306d91cfe4ffafda82e13fd3afddcf4d4134b4ebac74569c4ef962fe88f44ead865e7d5ca3efb1bdd1ddc6f758dbda2f72f8aad4a2112eb0fd9d2

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "v2_intuity"
+require 'bundler/setup'
+require 'v2_intuity'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "v2_intuity"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/requirements.rb

@@ -1,17 +1,21 @@
-require "v2_intuity/client"
-require "v2_intuity/request_error"
-require "v2_intuity/response"
-require "v2_intuity/request"
-require "v2_intuity/version"
-require "v2_intuity/filters/filter"
-require "v2_intuity/endpoints/endpoint"
-require "v2_intuity/filters/sort"
-require "v2_intuity/filters/date"
-require "v2_intuity/headers/header"
+require 'v2_intuity/clients/client'
+require 'v2_intuity/request_error'
+require 'v2_intuity/response'
+require 'v2_intuity/request'
+require 'v2_intuity/version'
+require 'v2_intuity/query_filters/filter'
+require 'v2_intuity/endpoints/endpoint'
+require 'v2_intuity/query_filters/sort'
+require 'v2_intuity/query_filters/date'
+require 'v2_intuity/headers/header'
+require 'v2_intuity/resource_filters/resource_filter'
 
 ROOT = File.dirname(File.expand_path(File.dirname(__FILE__))).freeze
 
-Dir["#{ROOT}/lib/v2_intuity/endpoints/*.rb"].each { |file|  require file unless file =~ /endpoint.rb/}
-Dir["#{ROOT}/lib/v2_intuity/filters/*.rb"].each { |file| require file unless file =~ /filter.rb|sort.rb|date.rb/ }
+Dir["#{ROOT}/lib/v2_intuity/clients/*.rb"].each { |file| require file unless file =~ /client.rb/ }
+Dir["#{ROOT}/lib/v2_intuity/endpoints/*.rb"].each { |file| require file unless file =~ /endpoint.rb/ }
+Dir["#{ROOT}/lib/v2_intuity/query_filters/*.rb"].each { |file| require file unless file =~ /query_filter.rb|sort.rb|date.rb/ }
 Dir["#{ROOT}/lib/v2_intuity/headers/*.rb"].each { |file| require file unless file =~ /header.rb/ }
+Dir["#{ROOT}/lib/v2_intuity/streams/*.rb"].each { |file| require file }
+Dir["#{ROOT}/lib/v2_intuity/resource_filters/*.rb"].each { |file| require file unless file =~ /resource_filter.rb/ }
 Dir["#{ROOT}/lib/v2_intuity/users/*.rb"].each { |file| require file }

data/lib/v2_intuity/clients/client.rb

@@ -0,0 +1,114 @@
+require 'httparty'
+module V2Intuity
+  module Clients
+    class Client
+      attr_accessor :token, :org_id, :accept,
+                    :content_type, :base_uri,
+                    :httparty_client
+
+      def initialize(attributes = {})
+        @token = attributes[:token]
+        raise 'Client requires token' unless @token
+
+        @base_uri = attributes.fetch(:base_uri, nil)
+        @accept = attributes.fetch(:accept, 'application/json')
+        @content_type = attributes.fetch(:content_type, 'application/json')
+      end
+
+      def send_request(request)
+        case request.method
+        when V2Intuity::Request::METHODS[:get], V2Intuity::Request::METHODS[:delete]
+          @httparty_client.send(request.method.to_sym, request.uri, query: request.options[:query_filters], headers: request.options[:headers]) # puts re.request.last_uri.to_s
+
+        when V2Intuity::Request::METHODS[:post], V2Intuity::Request::METHODS[:put]
+          @httparty_client.send(request.method.to_sym, request.uri, query: request.options[:query_filters],
+                                                                    body: request.options[:body].to_json,
+                                                                    headers: request.options[:headers])
+        end
+      end
+
+      def build_and_send_request(endpoint, options = {})
+        @request = build_request(endpoint, options)
+        send_request_generate_response(@request)
+      end
+
+      def build_request(endpoint, options = {})
+        http_party_options = {}
+        @query_filters = {}
+        @headers = {}
+
+        method = options[:method].to_s.nil? ? V2Intuity::Request::METHODS[:get] : options[:method]
+        id = options[:id].to_s.nil? ? nil : options[:id]
+
+        query_filters, headers = combine_query_filters_and_headers(options)
+
+        http_party_options[:query_filters] = query_filters
+        http_party_options[:headers] = headers
+        http_party_options[:body] = options[:body] unless method == V2Intuity::Request::METHODS[:get]
+
+        uri = endpoint.uri(org_id: org_id, id: id, base_uri: base_uri)
+
+        V2Intuity::Request.new(method: method, uri: uri, options: http_party_options)
+      end
+
+      def send_request_generate_response(request)
+        response = V2Intuity::Response.new(request: request)
+
+        self.httparty_client ||= HTTParty
+
+        response.define_response_and_json(send_request(request))
+
+        return response if response.response.success?
+
+        error = build_error(response)
+
+        response.add_errors(error)
+
+        response
+
+      rescue StandardError => e
+        response.add_errors(RequestError.new(code: 400, message: e.message))
+
+        response
+      end
+
+      private
+
+      def build_error(response)
+        json = response.g_json
+        if json
+          V2Intuity::RequestError.new(code: response.code, message: response.message, description: json['message'])
+        else
+          V2Intuity::RequestError.new(code: response.code, message: response.message)
+        end
+      end
+
+      def default_query_filters
+        [V2Intuity::QueryFilters::AccessToken.new(value: @token)]
+      end
+
+      def default_headers
+        [V2Intuity::Headers::Accept.new(value: @accept), V2Intuity::Headers::ContentType.new(value: @content_type)]
+      end
+
+      def combine_query_filters_and_headers(options)
+        total_query_filters = {}
+        total_headers = {}
+        filter_array = options[:query_filters].is_a?(Array) ? options[:query_filters] : []
+        header_array = options[:headers].is_a?(Array) ? options[:headers] : []
+
+        unique_query_filters = (default_query_filters + filter_array)
+        unique_query_filters.each do |filter|
+          total_query_filters.merge!(filter.to_hash)
+        end
+
+        unique_headers = (default_headers + header_array)
+        unique_headers.each do |header|
+          total_headers.merge!(header.to_hash)
+        end
+
+        [total_query_filters, total_headers]
+      end
+    end
+  end
+end

data/lib/v2_intuity/clients/rest_api.rb

@@ -0,0 +1,15 @@
+module V2Intuity
+  module Clients
+    class RestApi < Client
+      def initialize(options = {})
+        super
+        @base_uri = options[:rest_uri]
+
+        raise 'RestApi Client requires rest_uri' unless @base_uri
+
+        @org_id = options[:org_id]
+        raise 'Client requires org_id' unless @org_id
+      end
+    end
+  end
+end

data/lib/v2_intuity/clients/stream_api.rb

@@ -0,0 +1,12 @@
+module V2Intuity
+  module Clients
+    class StreamApi < Client
+      def initialize(options = {})
+        super
+        @base_uri = options[:stream_uri]
+
+        raise 'Stream Api Client requires stream_uri' unless @base_uri
+      end
+    end
+  end
+end

data/lib/v2_intuity/endpoints/endpoint.rb

@@ -25,9 +25,13 @@ module V2Intuity
       end
 
       def uri_options(options = {})
+        puts "whatt the hell"
         @base_uri ||= options[:base_uri]
         @org_id ||= options[:org_id]
         @id ||= options[:id]
+
+        raise 'org_id is needed' unless @org_id
+        raise 'base_uri is needed' unless @base_uri
       end
 
       def sign_with

data/lib/v2_intuity/endpoints/stream.rb

@@ -2,6 +2,9 @@ module V2Intuity
   module Endpoints
     class Stream < Endpoint
       def initialize(options = {})
+        super
+        @org_id = nil
+        @path = nil
         @base_uri = options[:stream_uri]
         @endpoint = Endpoint::ENDPOINTS[:streams]
       end
@@ -16,8 +19,11 @@ module V2Intuity
       end
 
       def uri_options(options = {})
-        @base_uri ||= options[:stream_uri]
+
+        @base_uri ||= options[:base_uri]
         @id ||= options[:id]
+
+        raise 'base_uri is needed' unless @base_uri
       end
     end
   end

data/lib/v2_intuity/endpoints/user.rb

@@ -3,6 +3,7 @@ module V2Intuity
     class User < Endpoint
       def initialize(options = {})
         super
+
         @endpoint = Endpoint::ENDPOINTS[:users]
       end
 

data/lib/v2_intuity/query_filters/access_token.rb

@@ -0,0 +1,10 @@
+module V2Intuity
+  module QueryFilters
+    class AccessToken < QueryFilter
+      def initialize(options = {})
+        super
+        @name = QueryFilter::QUERY_FILTERS[:access_token]
+      end
+    end
+  end
+end

data/lib/v2_intuity/{filters → query_filters}/asc_created_at.rb

@@ -1,9 +1,9 @@
 module V2Intuity
-  module Filters
+  module QueryFilters
     class AscCreatedAt < Sort
       def initialize(options = {})
         super
-        @value = Filter::Sort::SORT[:asc_created_at]
+        @value = QueryFilter::Sort::SORT[:asc_created_at]
       end
     end
   end

data/lib/v2_intuity/{filters → query_filters}/asc_updated_at.rb

@@ -1,9 +1,9 @@
 module V2Intuity
-  module Filters
+  module QueryFilters
     class AscUpdatedAt < Sort
       def initialize(options = {})
         super
-        @value = Filter::Sort::SORT[:asc_updated_at]
+        @value = QueryFilter::Sort::SORT[:asc_updated_at]
       end
     end
   end

data/lib/v2_intuity/{filters → query_filters}/date.rb

@@ -1,6 +1,6 @@
 module V2Intuity
-  module Filters
-    class Date < Filter
+  module QueryFilters
+    class Date < QueryFilter
       def initialize(options = {})
         super
         @value = DateTime.iso8601(options[:value])

data/lib/v2_intuity/{filters → query_filters}/dec_created_at.rb

@@ -1,9 +1,9 @@
 module V2Intuity
-  module Filters
+  module QueryFilters
     class DecCreatedAt < Sort
       def initialize(options = {})
         super
-        @value = Filter::Sort::SORT[:dec_created_at]
+        @value = QueryFilter::Sort::SORT[:dec_created_at]
       end
     end
   end

data/lib/v2_intuity/{filters → query_filters}/dec_updated_at.rb

@@ -1,9 +1,9 @@
 module V2Intuity
-  module Filters
+  module QueryFilters
     class DecUpdatedAt < Sort
       def initialize(options = {})
         super
-        @value = Filter::Sort::SORT[:dec_updated_at]
+        @value = QueryFilter::Sort::SORT[:dec_updated_at]
       end
     end
   end

data/lib/v2_intuity/{filters → query_filters}/end_date.rb

@@ -1,9 +1,9 @@
 module V2Intuity
-  module Filters
+  module QueryFilters
     class EndDate < Date
       def initialize(options = {})
         super
-        @name = Filter::FIRTERS[:end_date_filter]
+        @name = QueryFilter::FIRTERS[:end_date_filter]
       end
     end
   end

data/lib/v2_intuity/query_filters/filter.rb

@@ -0,0 +1,22 @@
+module V2Intuity
+  module QueryFilters
+    class QueryFilter
+      attr_accessor :name, :value
+
+      QUERY_FILTERS = { access_token: 'token', source: 'source',
+                        start_filter: 'start_date_filter',
+                        end_filter: 'end_date_filter',
+                        format_redirect: 'format',
+                        sort: 'sort' }.freeze
+
+      def initialize(options = {})
+        @name = options[:name]
+        @value = options[:value]
+      end
+
+      def to_hash
+        { @name.to_sym => @value }
+      end
+    end
+  end
+end

data/lib/v2_intuity/query_filters/format_redirect.rb

@@ -0,0 +1,10 @@
+module V2Intuity
+  module QueryFilters
+    class FormatRedirect < QueryFilter
+      def initialize(options = {})
+        super
+        @name = QueryFilter::QUERY_FILTERS[:format_redirect]
+      end
+    end
+  end
+end

data/lib/v2_intuity/{filters → query_filters}/sort.rb

@@ -1,12 +1,12 @@
 module V2Intuity
-  module Filters
-    class Sort < Filter
+  module QueryFilters
+    class Sort < QueryFilter
       SORT = { dec_updated_at: '-updated_at', asc_updated_at: 'updated_at',
                dec_created_at: '-created_at', asc_created_at: 'created_at' }.freeze
 
       def initialize(options = {})
         super
-        @name = Filter::FILTERS[:sort]
+        @name = QueryFilter::QUERY_FILTERS[:sort]
       end
     end
   end

data/lib/v2_intuity/query_filters/source.rb

@@ -0,0 +1,10 @@
+module V2Intuity
+  module QueryFilters
+    class Source < QueryFilter
+      def initialize(options = {})
+        super
+        @name = QueryFilter::QUERY_FILTERS[:source]
+      end
+    end
+  end
+end

data/lib/v2_intuity/{filters → query_filters}/start_date.rb

@@ -1,9 +1,9 @@
 module V2Intuity
-  module Filters
+  module QueryFilters
     class StartDate < Date
       def initialize(options = {})
         super
-        @name = Filter::FIRTERS[:start_date_filter]
+        @name = QueryFilter::FIRTERS[:start_date_filter]
       end
     end
   end

data/lib/v2_intuity/resource_filters/measurement.rb

@@ -0,0 +1,9 @@
+module V2Intuity
+  module ResourceFilters
+    class Measurement < ResourceFilter
+      def initialize(_options = {})
+        @name = ResourceFilter::FILTERS[:measurement]
+      end
+    end
+  end
+end

data/lib/v2_intuity/resource_filters/nutrition.rb

@@ -0,0 +1,9 @@
+module V2Intuity
+  module ResourceFilters
+    class Nutrition < ResourceFilter
+      def initialize(_options = {})
+        @name = ResourceFilter::FILTERS[:nutrition]
+      end
+    end
+  end
+end

data/lib/v2_intuity/resource_filters/resource_filter.rb

@@ -0,0 +1,19 @@
+module V2Intuity
+  module ResourceFilters # Stream resource query_filters that indicate what kind of data to be returned by stream. These are added to the body of the POST create stream endpoint
+    class ResourceFilter
+      attr_accessor :name
+
+      FILTERS = { measurement: 'measurement', nutrition: 'nutrition',
+                  sleep: 'sleep', summaries: 'summaries',
+                  workout: 'workout' }.freeze
+
+      def initialize(options = {})
+        @name = options.fetch(options[:name], nil)
+
+        raise 'unsupported filter' unless @name.nil? && FILTERS.key?(@name.to_sym)
+      end
+
+      attr_reader :name
+    end
+  end
+end

data/lib/v2_intuity/resource_filters/sleep.rb

@@ -0,0 +1,9 @@
+module V2Intuity
+  module ResourceFilters
+    class Sleep < ResourceFilter
+      def initialize(_options = {})
+        @name = ResourceFilter::FILTERS[:sleep]
+      end
+    end
+  end
+end

data/lib/v2_intuity/resource_filters/summary.rb

@@ -0,0 +1,9 @@
+module V2Intuity
+  module ResourceFilters
+    class Summary < ResourceFilter
+      def initialize(_options = {})
+        @name = ResourceFilter::FILTERS[:summaries]
+      end
+    end
+  end
+end

data/lib/v2_intuity/resource_filters/workout.rb

@@ -0,0 +1,9 @@
+module V2Intuity
+  module ResourceFilters
+    class Workout < ResourceFilter
+      def initialize(_options = {})
+        @name = ResourceFilter::FILTERS[:workout]
+      end
+    end
+  end
+end

data/lib/v2_intuity/streams/stream.rb

@@ -5,39 +5,66 @@ module V2Intuity
 
       def initialize(options = {})
         @name = options[:name]
-        @start_date = options.fetch(:start_date, Time.now.strftime('%Y-%d-%m'))
-        filters = options.fetch(:resource_filters, [])
-        @resource_filters = filters.is_a?(Array) ? filters : []
+        @start_date = options.fetch(:start_date, Time.now.strftime('%Y-%m-%d'))
+
+        @resource_filters = format_resource_filters(options.fetch(:resource_filters, nil))
         @stream_id = options[:stream_id]
       end
 
-      def send_request(method, client = V2Intuity::Client.new)
+      def send_request(method, client)
+        return 'StreamApi client is requied' unless client.class == V2Intuity::Clients::StreamApi
+
         endpoint, options = build_options(method)
         client.build_and_send_request(endpoint, options)
       end
 
-      def build_options(method, filters = [])
+      private
+
+      def build_options(method, query_filters = [])
         case method
         when V2Intuity::Request::METHODS[:delete]
-          raise 'stream id is needed' unless @stream_id
+          raise 'stream id is needed' unless stream_id
           options = { method: method, id: stream_id }
+
         when V2Intuity::Request::METHODS[:get]
           options = { method: method, id: stream_id }.compact # id can be blank when getting all streams
+
         when V2Intuity::Request::METHODS[:post]
+          raise 'name is required' unless name
           body = { name: name, start_date: start_date,
-                   resource_filters: resource_filters } # supported resource_filters include measurement, nutrition, sleep, workout
+                   resource_filters: resource_filters }.compact # supported resource_query_filters include measurement, nutrition, sleep, workout
           options = { method: method, body: body.compact }
+
         when V2Intuity::Request::METHODS[:put]
-          raise 'stream id is needed' unless @stream_id
+          raise 'stream id is needed' unless stream_id
           body = { name: name }
           options = { method: method, body: body.compact, id: stream_id }
+
         else
           raise 'incorrect method verb'
+
         end
-        options[:filters] = filters if !filters.to_s.nil?
+        options[:query_filters] = query_filters unless query_filters.to_s.nil?
 
         [V2Intuity::Endpoints::Stream.new, options]
       end
+
+      def format_resource_filters(filters)
+        return nil unless filters
+
+        filters = filters.is_a?(Array) ? filters : [filters]
+
+        filters.each do |filter|
+          filter_class = filter.class
+          next if filter_class < V2Intuity::ResourceFilters::ResourceFilter || filter_class == V2Intuity::ResourceFilters::ResourceFilter
+          raise 'unsupported filter'
+        end
+
+        filter_array = []
+        filters.each { |filter| filter_array << filter.name }
+
+        filter_array.uniq
+      end
     end
   end
 end

data/lib/v2_intuity/users/user.rb

@@ -11,31 +11,11 @@ module V2Intuity
         @country_code = options.fetch(:country_code, nil)
       end
 
-      def send_request(method)
+      def send_request(method, client)
         endpoint, options = build_options(method)
         client.build_and_send_request(endpoint, options)
       end
 
-      def build_options(method, filters = [])
-        raise 'uid is required' unless uid
-
-        case method
-        when V2Intuity::Request::METHODS[:delete], V2Intuity::Request::METHODS[:get]
-          options = { method: method, id: uid }
-        when V2Intuity::Request::METHODS[:post]
-          body = { id: uid, location: { timezone: time_zone, country_code: country_code }.compact }
-          options = { method: method, body: body.compact }
-        when V2Intuity::Request::METHODS[:put]
-          body = { location: { timezone: time_zone, country_code: country_code }.compact }
-          options = { method: method, body: body.compact, id: uid }
-        else
-          raise 'incorrect method verb'
-        end
-        options[:filters] = filters unless filters.to_s.nil?
-
-        [V2Intuity::Endpoints::User.new, options]
-      end
-
       # method refreshes marketplace user token.
       def refresh_marketplace(client)
         raise 'uid is required' unless uid
@@ -55,17 +35,40 @@ module V2Intuity
         client.build_and_send_request(endpoint, options)
       end
 
+      private
+
       def build_options_marketplace(token, format_redirect, redirect_uri) # marketplace user defined token
-        filters = []
-        filters << V2Intuity::Filters::AccessToken.new(value: token)
-        filters << V2Intuity::Filters::FormatRedirect.new(value: format_redirect)
+        query_filters = []
+        query_filters << V2Intuity::QueryFilters::AccessToken.new(value: token)
+        query_filters << V2Intuity::QueryFilters::FormatRedirect.new(value: format_redirect)
 
-        options = { filters: filters, method: V2Intuity::Request::METHODS[:get] }
+        options = { query_filters: query_filters, method: V2Intuity::Request::METHODS[:get] }
         endpoint = V2Intuity::Endpoints::Marketplace.new
-        endpoint.define_redirect_uri(redirect_uri)
+        endpoint.define_redirect_uri(redirect_uri) ## overrides client's base_uri
 
         [endpoint, options]
       end
+
+
+      def build_options(method, query_filters = [])
+        raise 'uid is required' unless uid
+
+        case method
+        when V2Intuity::Request::METHODS[:delete], V2Intuity::Request::METHODS[:get]
+          options = { method: method, id: uid }
+        when V2Intuity::Request::METHODS[:post]
+          body = { uid: uid, location: { timezone: time_zone, country_code: country_code }.compact }
+          options = { method: method, body: body.compact }
+        when V2Intuity::Request::METHODS[:put]
+          body = { location: { timezone: time_zone, country_code: country_code }.compact }
+          options = { method: method, body: body.compact, id: uid }
+        else
+          raise 'incorrect method verb'
+        end
+        options[:query_filters] = query_filters unless query_filters.to_s.nil?
+
+        [V2Intuity::Endpoints::User.new, options]
+      end
     end
   end
 end

data/lib/v2_intuity/version.rb

@@ -1,3 +1,3 @@
 module V2Intuity
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/lib/v2_intuity.rb

@@ -1,13 +1,17 @@
 require 'requirements'
 
 module V2Intuity
-    class << self
-      attr_accessor :base_uri, :token,
-                    :stream_uri, :org_id
+  include V2Intuity::Clients
+  include V2Intuity::Users
+  include V2Intuity::Streams
 
-      def configure
-        yield self
-        true
-      end
+  class << self
+    attr_accessor :rest_uri, :token,
+                  :stream_uri, :org_id
+
+    def configure
+      yield self
+      true
     end
+  end
 end

data/v2_intuity.gemspec

@@ -4,26 +4,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'v2_intuity/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "v2_intuity"
+  spec.name          = 'v2_intuity'
   spec.version       = V2Intuity::VERSION
-  spec.authors       = ["rruiz858"]
-  spec.email         = ["rruiz@ncsu.edu"]
+  spec.authors       = ['rruiz858']
+  spec.email         = ['rruiz@ncsu.edu']
 
-  spec.summary       = "V2Intuity is a ruby wrapper to connecting to the new V2Intuity platform"
+  spec.summary       = 'V2Intuity is a ruby wrapper to connecting to the new V2Intuity platform'
   spec.description   = "Wrapper allows one to manage V2Intuity's Rest API and even create/update/delete Streams. This is a work in progess and will not work, use other validic gem"
-  spec.homepage      = ""
-  spec.license       = "MIT"
-
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_dependency "httparty", "~> 0.14.0"
+  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_dependency 'httparty', '~> 0.14.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: v2_intuity
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - rruiz858
@@ -86,7 +86,9 @@ files:
 - bin/setup
 - lib/requirements.rb
 - lib/v2_intuity.rb
-- lib/v2_intuity/client.rb
+- lib/v2_intuity/clients/client.rb
+- lib/v2_intuity/clients/rest_api.rb
+- lib/v2_intuity/clients/stream_api.rb
 - lib/v2_intuity/endpoints/endpoint.rb
 - lib/v2_intuity/endpoints/marketplace.rb
 - lib/v2_intuity/endpoints/measurement.rb
@@ -96,24 +98,29 @@ files:
 - lib/v2_intuity/endpoints/summary.rb
 - lib/v2_intuity/endpoints/user.rb
 - lib/v2_intuity/endpoints/workout.rb
-- lib/v2_intuity/filters/access_token.rb
-- lib/v2_intuity/filters/asc_created_at.rb
-- lib/v2_intuity/filters/asc_updated_at.rb
-- lib/v2_intuity/filters/date.rb
-- lib/v2_intuity/filters/dec_created_at.rb
-- lib/v2_intuity/filters/dec_updated_at.rb
-- lib/v2_intuity/filters/end_date.rb
-- lib/v2_intuity/filters/filter.rb
-- lib/v2_intuity/filters/format_redirect.rb
-- lib/v2_intuity/filters/resource_filters.rb
-- lib/v2_intuity/filters/sort.rb
-- lib/v2_intuity/filters/source.rb
-- lib/v2_intuity/filters/start_date.rb
 - lib/v2_intuity/headers/accept.rb
 - lib/v2_intuity/headers/content_type.rb
 - lib/v2_intuity/headers/header.rb
+- lib/v2_intuity/query_filters/access_token.rb
+- lib/v2_intuity/query_filters/asc_created_at.rb
+- lib/v2_intuity/query_filters/asc_updated_at.rb
+- lib/v2_intuity/query_filters/date.rb
+- lib/v2_intuity/query_filters/dec_created_at.rb
+- lib/v2_intuity/query_filters/dec_updated_at.rb
+- lib/v2_intuity/query_filters/end_date.rb
+- lib/v2_intuity/query_filters/filter.rb
+- lib/v2_intuity/query_filters/format_redirect.rb
+- lib/v2_intuity/query_filters/sort.rb
+- lib/v2_intuity/query_filters/source.rb
+- lib/v2_intuity/query_filters/start_date.rb
 - lib/v2_intuity/request.rb
 - lib/v2_intuity/request_error.rb
+- lib/v2_intuity/resource_filters/measurement.rb
+- lib/v2_intuity/resource_filters/nutrition.rb
+- lib/v2_intuity/resource_filters/resource_filter.rb
+- lib/v2_intuity/resource_filters/sleep.rb
+- lib/v2_intuity/resource_filters/summary.rb
+- lib/v2_intuity/resource_filters/workout.rb
 - lib/v2_intuity/response.rb
 - lib/v2_intuity/streams/stream.rb
 - lib/v2_intuity/users/user.rb

data/lib/v2_intuity/client.rb

@@ -1,118 +0,0 @@
-require 'httparty'
-module V2Intuity
-  class Client
-    attr_accessor :token, :org_id, :accept,
-                  :content_type, :base_uri,
-                  :httparty_client
-
-    def initialize(attributes = {})
-      required_fields(attributes)
-      @accept = attributes.fetch(:accept, 'application/json')
-      @content_type = attributes.fetch(:content_type, 'application/json')
-    end
-
-    def send_request(request)
-      case request.method
-      when V2Intuity::Request::METHODS[:get], V2Intuity::Request::METHODS[:delete]
-        @httparty_client.send(request.method.to_sym, request.uri, query: request.options[:filters], headers: request.options[:headers]) # puts re.request.last_uri.to_s
-
-      when V2Intuity::Request::METHODS[:post], V2Intuity::Request::METHODS[:put]
-        @httparty_client.send(request.method.to_sym, request.uri, query: request.options[:filters],
-                                                                  body: request.options[:body].to_json,
-                                                                  headers: request.options[:headers])
-      end
-    end
-
-    def build_and_send_request(endpoint, options = {})
-      @request = build_request(endpoint, options)
-      send_request_generate_response(@request)
-    end
-
-    def build_request(endpoint, options = {})
-      http_party_options = {}
-      @filters = {}
-      @headers = {}
-
-      method = options[:method].to_s.nil? ? V2Intuity::Request::METHODS[:get] : options[:method]
-      id = options[:id].to_s.nil? ? nil : options[:id]
-
-      filters, headers = combine_filters_and_headers(options)
-
-      http_party_options[:filters] = filters
-      http_party_options[:headers] = headers
-      http_party_options[:body] = options[:body] unless method == V2Intuity::Request::METHODS[:get]
-      uri = endpoint.uri(org_id: org_id, id: id, base_uri: base_uri)
-
-      V2Intuity::Request.new(method: method, uri: uri, options: http_party_options)
-    end
-
-    def send_request_generate_response(request)
-      response = V2Intuity::Response.new(request: request)
-
-      self.httparty_client ||= HTTParty
-      response.define_response_and_json(send_request(request))
-
-      return response if response.response.success?
-
-      error = build_error(response)
-
-      response.add_errors(error)
-
-      response
-
-    rescue StandardError => e
-      response.add_errors(RequestError.new(code: 400, message: e.message))
-
-      response
-    end
-
-    private
-
-    def build_error(response)
-      json = response.json
-      if json
-        V2Intuity::RequestError.new(code: response.code, message: response.message, description: json['message'])
-      else
-        V2Intuity::RequestError.new(code: response.code, message: response.message)
-      end
-    end
-
-    def required_fields(attributes)
-      @token = attributes[:token]
-      raise 'Client requires token' unless @token
-
-      @org_id = attributes[:org_id]
-      raise 'Client requires org_id' unless @org_id
-
-      @base_uri = attributes[:base_uri]
-      raise 'Client requires base_uri' unless @base_uri
-    end
-
-    def default_filters
-      [V2Intuity::Filters::AccessToken.new(value: @token)]
-    end
-
-    def default_headers
-      [V2Intuity::Headers::Accept.new(value: @accept), V2Intuity::Headers::ContentType.new(value: @content_type)]
-    end
-
-    def combine_filters_and_headers(options)
-      total_filters = {}
-      total_headers = {}
-      filter_array = options[:filters].is_a?(Array) ? options[:filters] : []
-      header_array = options[:headers].is_a?(Array) ? options[:headers] : []
-
-      unique_filters = (default_filters + filter_array)
-      unique_filters.each do |filter|
-        total_filters.merge!(filter.to_hash)
-      end
-
-      unique_headers = (default_headers + header_array)
-      unique_headers.each do |header|
-        total_headers.merge!(header.to_hash)
-      end
-
-      [total_filters, total_headers]
-    end
-  end
-end

data/lib/v2_intuity/filters/access_token.rb

@@ -1,10 +0,0 @@
-module V2Intuity
-  module Filters
-    class AccessToken < Filter
-      def initialize(options = {})
-        super
-        @name = Filter::FILTERS[:access_token]
-      end
-    end
-  end
-end

data/lib/v2_intuity/filters/filter.rb

@@ -1,22 +0,0 @@
-module V2Intuity
-  module Filters
-    class Filter
-      attr_accessor :name, :value
-
-      FILTERS = { access_token: 'token', source: 'source',
-                  start_filter: 'start_date_filter',
-                  end_filter: 'end_date_filter',
-                  format_redirect: 'format',
-                  sort: 'sort' }.freeze
-
-      def initialize(options = {})
-        @name = options[:name]
-        @value = options[:value]
-      end
-
-      def to_hash
-        { @name.to_sym => @value }
-      end
-    end
-  end
-end

data/lib/v2_intuity/filters/format_redirect.rb

@@ -1,10 +0,0 @@
-module V2Intuity
-  module Filters
-    class FormatRedirect < Filter
-      def initialize(options = {})
-        super
-        @name = Filter::FILTERS[:format_redirect]
-      end
-    end
-  end
-end

data/lib/v2_intuity/filters/resource_filters.rb

@@ -1,20 +0,0 @@
-module V2Intuity
-  module Filters
-    class ResourceFilter # Strean resource filters that indicate what kind of data to be returned by stream
-      attr_accessor :name, :value
-
-      FILTERS = { measurement: 'measurement', nutrition: 'nutrition',
-                  sleep: 'sleep', summaries: 'summaries',
-                  workout: 'workout' }.freeze
-
-      def initialize(options = {})
-        @name = options[:name]
-        @value = options[:value]
-      end
-
-      def to_hash
-        { @name.to_sym => @value }
-      end
-    end
-  end
-end

data/lib/v2_intuity/filters/source.rb

@@ -1,10 +0,0 @@
-module V2Intuity
-  module Filters
-    class Source < Filter
-      def initialize(options = {})
-        super
-        @name = Filter::FILTERS[:source]
-      end
-    end
-  end
-end