exist 0.1.0.beta.3 → 0.1.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0986bf7fc3179f7b6454e934da0ddb6130fe7b7
-  data.tar.gz: 67587540565de5faa21f3b2b8f9fad67f966d5bd
+  metadata.gz: 21dab1306f76bac038b16bfc2d7c6e5ccb43ea23
+  data.tar.gz: 5217e66cc73f48eceb15e6baa470f9304c41fa5a
 SHA512:
-  metadata.gz: 8132cb4aabb07dc2a42673e0733351fb8366e11fe345f05630c1aed154105b700d57ac28cfc0c4a6adf651df6c375cf5ae256f8c7d95097b926ef184b2ab2fdf
-  data.tar.gz: f94ada28b20e7cec9d065bc54cc7d0020df0db38bdef701ba17c57e016a8bce142481df8f363fe1444e72513869b867597ecc7f9543729a4294c899d32e886b6
+  metadata.gz: 306e8f7e13843f67f036ace37e9329fbb113a43593e9a0cee432e58b5bf44eb1da7c4827d8710ab03dc3d9d17aa7127e4fa5faf8121d6d906d85fe06bc3ee534
+  data.tar.gz: c2ccf39403583e638823aaa0a803a60dc3ed9cada21bfa77afe902ec11b634a837670d6e02ff2682608ec8907d9dae4e95f3e3989f583d84103b2512771c4c7e

data/lib/exist/api.rb

@@ -21,7 +21,7 @@ module Exist
     end
 
     def me
-      User.new(client.get('users/$self/').body)
+      User.new(user_resource(nil))
     end
 
     def overview(username = '$self')
@@ -29,65 +29,57 @@ module Exist
     end
 
     def attributes(limit: 31)
-      response = client.get('users/$self/attributes/', limit: limit).body
-
+      response = user_resource('attributes', limit: limit)
       AttributeList.new(attributes: response)
     end
 
     # Date format is YYYY-mm-dd
     def attribute(attribute, limit: 31, page: 1, oldest_date: nil, newest_date: nil)
-      response = client.get(
-        "users/$self/attributes/#{attribute}/",
-        page: page, limit: limit, date_min: oldest_date, date_max: newest_date
-      ).body
+      response = paginated_user_resource(
+        "attributes/#{attribute}", page, limit, oldest_date, newest_date
+      )
       AttributeList.new(
-        attributes: response['results'],
-        total:      response['count'],
+        attributes: response['results'], total: response['count']
       )
     end
 
     def insights(limit: 31, page: 1, oldest_date: nil, newest_date: nil)
-      response = client.get(
-        "users/$self/insights/",
-        page: page, limit: limit, date_min: oldest_date, date_max: newest_date
+      response = paginated_user_resource(
+        'insights', page, limit, oldest_date, newest_date
       )
 
-      InsightList.new(
-        insights: response.body['results'],
-        total: response.body['count'],
-      )
+      InsightList.new(insights: response['results'], total: response['count'])
     end
 
     def insights_for_attribute(attribute, limit: 31, page: 1, oldest_date: nil, newest_date: nil)
-      response = client.get(
-        "users/$self/insights/attribute/#{attribute}/",
-        page: page, limit: limit, date_min: oldest_date, date_max: newest_date
+      response = paginated_user_resource(
+        "insights/attribute/#{attribute}",
+        page, limit, oldest_date, newest_date
       )
       InsightList.new(
-        insights: response.body['results'],
-        total:    response.body['count'],
+        insights: response['results'],
+        total:    response['count'],
       )
     end
 
     def averages
-      response = client.get('users/$self/averages/')
-      AverageList.new(averages: response.body)
+      response = user_resource('averages')
+      AverageList.new(averages: response)
     end
 
     def average_for_attribute(attribute, limit: 31, page: 1, oldest_date: nil, newest_date: nil)
-      response = client.get(
-        "users/$self/averages/attribute/#{attribute}/",
-        page: page, limit: limit, date_min: oldest_date, date_max: newest_date
-      ).body
+      response = paginated_user_resource(
+        "averages/attribute/#{attribute}", page, limit, oldest_date, newest_date
+      )
 
       AverageList.new(averages: response['results'], total: response['count'])
     end
 
-    def correlations(username, attribute,
-                     limit: 31, page: 1, oldest_date: nil, newest_date: nil,
-                     latest_only: false)
+    def correlations(username, attribute, limit: 31, page: 1, oldest_date: nil,
+                     newest_date: nil, latest_only: false)
 
       params = { page: page, limit: limit }
+
       if !latest_only
         params.merge!(date_min: oldest_date, date_max: newest_date)
       else
@@ -115,6 +107,20 @@ module Exist
       end
     end
 
+    def user_resource(resource, params = {})
+      url = base_url + "users/$self/#{resource}"
+      url += "/" unless url.end_with?('/')
+
+      client.get(url, params).body
+    end
+
+    def paginated_user_resource(resource, page, limit, newest_date, oldest_date)
+      user_resource(resource, {
+        page: page, limit: limit, date_min: oldest_date,
+        date_max: newest_date
+      })
+    end
+
     def base_url
       'https://exist.io/api/1/'
     end

data/lib/exist/version.rb

@@ -1,3 +1,3 @@
 module Exist
-  VERSION = "0.1.0.beta.3"
+  VERSION = "0.1.0.beta.4"
 end

data/spec/spec_helper.rb

@@ -28,15 +28,6 @@ RSpec.configure do |config|
   config.order = :random
 
   Kernel.srand config.seed
-
-  config.expect_with :rspec do |expectations|
-    expectations.syntax = :expect
-  end
-
-  config.mock_with :rspec do |mocks|
-    mocks.syntax = :expect
-    mocks.verify_partial_doubles = true
-  end
 end
 
 require 'exist'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exist
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta.3
+  version: 0.1.0.beta.4
 platform: ruby
 authors:
 - Adrian Perez