lifeapi 0.0.12 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b53a2632baf1ec94a741981df2b50943b172ed8c
-  data.tar.gz: 20a297241c6e1f8443bf37e70d1374701c73c698
+  metadata.gz: c1cee89c310cf66a37d76f6410fcb92595eb4729
+  data.tar.gz: a3ac641366e5e8ef9446412aeae04ae9c95b1e32
 SHA512:
-  metadata.gz: 79aa75579a095ae28475a59640e7381e7ac3182f02dd935f64ed3b3a4bba2528276b21183b1d52ce7993ccaf552eebff161924da3b44f6afdfd028aec95cf6a4
-  data.tar.gz: 8b7d05b4f2fb94a745ef84529b8df51ebdf7d03aecdc46d489afcac69b4f609c337abd4b33228fc70ae295a36cecd52e8411514c9e1b5aa6594d464317763604
+  metadata.gz: 74956f307092a4fb9627d3b668549b067485b20fc8e8a9f5823ec27a12d01b4bb59959bd1992d8c00d629fa4bc4b1ea96fd0c723895c505ea5e950961675171c
+  data.tar.gz: 4531ad8ff673f5ee48e7d1b51263407270b0779f6b68cdc7e39d879e5efe5d68561b321eaed31bfd57bebcaeca8caa6ef0aab4224197d28aa22d7a5a52eaeb48

data/lib/lifeapi/version.rb

@@ -1,3 +1,3 @@
 module Lifeapi
-  VERSION = "0.0.12"
+  VERSION = "1.0.0"
 end

data/lib/lifeapi.rb

@@ -94,12 +94,9 @@ module Lifeapi
     end
   end
 
-  # returns a single day object
-  # year: the year to be searched
-  # month: the month to be searched
-  # day: the day to be searched
-  def self.get_one_day(year, month, day)
-    @year = year
+  # returns a single day
+  def self.single_day(month, day)
+    @year = 2016
     @month = month
     @day = day
     json_data = HTTParty.get("https://jack-lifeapi.herokuapp.com/v1/days/single?year=#{@year}&month=#{@month}&day=#{day}")
@@ -110,29 +107,24 @@ module Lifeapi
     end
 
     data = JSON.parse(json_data.to_json)
-
     day = Day.new(data["record_date"],data["activities"])
 
     return day
   end
 
-  # returns a range object (with condensed days)
-  # year1: the year to be used for the first start date
-  # month1: the month to be used for the first start date
-  # day1: the day to be used for the first start date
-  # year2: the year to be used for second the start date
-  # month2: the month to be used for second the start date
-  # day2: the day to be used for the second start date
-  def self.get_range_of_days_condensed(year1, month1, day1, year2, month2, day2)
-    @year1 = year1
+  # returns a range of days
+  # if the condense param is true it will return a condensed object representing the range of days
+  # otherwise it will retun an array of the days
+  def self.range(month1, day1, month2, day2, condense)
+    @year1 = 2016
     @month1 = month1
     @day1 = day1
-    @year2 = year2
+    @year2 = 2016
     @month2 = month2
     @day2 = day2
-    @condense = true
+    @condense = condense
 
-    json_data = HTTParty.get("https://jack-lifeapi.herokuapp.com/v1/days/range?year1=#{@year1}&month1=#{@month1}&day1=#{@day1}&year2=#{@year2}&month2=#{@month2}&day2=#{@day2}&condense=true")
+    json_data = HTTParty.get("https://jack-lifeapi.herokuapp.com/v1/days/range?year1=#{@year1}&month1=#{@month1}&day1=#{@day1}&year2=#{@year2}&month2=#{@month2}&day2=#{@day2}&condense=#{@condense}")
 
     #if the params are bad
     if json_data.code == 400
@@ -141,66 +133,24 @@ module Lifeapi
 
     data = JSON.parse(json_data.to_json)
 
-    day = Range.new(data["start_date"], data["end_date"], data["activities"])
-
-    return day
-  end
-
-  # returns an array of days (uncondensed)
-  # year1: the year to be used for the first start date
-  # month1: the month to be used for the first start date
-  # day1: the day to be used for the first start date
-  # year2: the year to be used for second the start date
-  # month2: the month to be used for second the start date
-  # day2: the day to be used for the second start date
-  def self.get_range_of_days(year1, month1, day1, year2, month2, day2)
-    @year1 = year1
-    @month1 = month1
-    @day1 = day1
-    @year2 = year2
-    @month2 = month2
-    @day2 = day2
-    @condense = false
-
-    json_data = HTTParty.get("https://jack-lifeapi.herokuapp.com/v1/days/range?year1=#{@year1}&month1=#{@month1}&day1=#{@day1}&year2=#{@year2}&month2=#{@month2}&day2=#{@day2}&condense=false")
-
-    #if the params are bad
-    if json_data.code == 400
-      raise Errors::BadParamsError
-    end
-
-    data = JSON.parse(json_data.to_json)
-
-    #day = Range.new(data["start_date"], data["end_date"], data["activities"])
-    @day_array = []
-    data.each do |d|
-      @day = Day.new(d["record_date"], d["activities"])
-      @day_array += [@day]
-    end
-
-    return @day_array
-  end
-
-  # returns the whole summer, in condensed format
-  def self.get_whole_summer_condensed()
-    json_data = HTTParty.get("https://jack-lifeapi.herokuapp.com/v1/days/all_time?condense=true")
-
-    #if the params are bad
-    if json_data.code == 400
-      raise Errors::BadParamsError
+    #if the data is condensed it needs to be handled differently
+    if @condense == true
+      day = Range.new(data["start_date"], data["end_date"], data["activities"])
+      return day
+    else
+      @day_array = []
+      data.each do |d|
+        @day = Day.new(d["record_date"], d["activities"])
+        @day_array += [@day]
+      end
+      return @day_array
     end
-
-    data = JSON.parse(json_data.to_json)
-
-    day = Range.new(data["start_date"], data["end_date"], data["activities"])
-
-    return day
-
   end
 
-  # returns the whole summer as an array of days, in uncondensed format
-  def self.get_whole_summer()
-    json_data = HTTParty.get("https://jack-lifeapi.herokuapp.com/v1/days/all_time?condense=false")
+  # the same thing as self.range() except the server collects every recorded day.
+  def self.all_time(condense)
+    @condense = condense
+    json_data = HTTParty.get("https://jack-lifeapi.herokuapp.com/v1/days/all_time?condense=#{@condense}")
 
     #if the params are bad
     if json_data.code == 400
@@ -209,22 +159,20 @@ module Lifeapi
 
     data = JSON.parse(json_data.to_json)
 
-    #day = Range.new(data["start_date"], data["end_date"], data["activities"])
-    @day_array = []
-    data.each do |d|
-      @day = Day.new(d["record_date"], d["activities"])
-      @day_array += [@day]
+    if @condense == true
+      day = Range.new(data["start_date"], data["end_date"], data["activities"])
+      return day
+    else
+      @day_array = []
+      data.each do |d|
+        @day = Day.new(d["record_date"], d["activities"])
+        @day_array += [@day]
+      end
+      return @day_array
     end
-
-    return @day_array
-
   end
 
-  # queries to find the activity that was done at a specific time
-  # month: the month to be searched
-  # day: the day to be searched
-  # hour: the hour to be searched
-  # minute: the minute to be searched
+  # returns the activity being performed at a certain time.
   def self.query(month, day, hour, minute)
     @year = 2016 # year is hardcoded right now because i dont track anything outside of 2016
     @month = month

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lifeapi
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 1.0.0
 platform: ruby
 authors:
 - jack rometty
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler