ft_42 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 051de4f40afc1f66babddd02b0ff57edfc089974
-  data.tar.gz: c9d8ae2c26a384c2ed40f02fe61d8fd953c39162
+  metadata.gz: c634527047f7476d436a1253fd0c4edc2c722b16
+  data.tar.gz: 22c71971b199534fd21dce9a9b00ff7a12dc321c
 SHA512:
-  metadata.gz: c660b6ebb7179f9e5cfc5c5f6ec84d56ca949025016c4f28ca161047f990862fd6547731ef3f4aac8146ea8440dd96b4ebed58482aee6dd8d18bf02b49c8b30e
-  data.tar.gz: '084398ae0a05c678759216d35ebb293752c4cc2700a94c1ea7b2a6879213296eddefbafed1c58927d33338d9dc26a9d436e152ca1893ee659276fe0f33ffdf47'
+  metadata.gz: 3a7e1ec7c1a340edf2140af8a089f90bceacae00aadf6a25cf3d286bb6e85871c820cd884c27ad7b30fafd5820846e9b381d5f12f22631ed34299f6ed5636748
+  data.tar.gz: b11e520e552f54bc532d1e0bc0add6727748c510fe8662f4ed17e0ba9f37135f77667e6eb3e8ee7f437046f5c921d10630cffcc109e73c322aee94501b660f8a

data/lib/ft_42.rb

@@ -21,10 +21,18 @@ class FT_42
       if (args.first == "project")
         puts "This is a big request, it may take a minute or two."
         if (args.include?("after"))
-          date = args.pop(3).join(" ")
-          date = DateTime.parse(date)
+          after = args.pop(3).join(" ")
+          after = DateTime.parse(after)
           args.pop
-          ft_42 = Client.new(args.second, args.last, date)
+          ft_42 = Client.new(args.second, args.last, after)
+        elsif (args.include?("between"))
+          before = args.pop(3).join(" ")
+          before = DateTime.parse(before)
+          args.pop
+          after  = args.pop(3).join(" ")
+          after  = DateTime.parse(after)
+          args.pop
+          ft_42  = Client.new(args.second, args.last, after, before)
         else
           ft_42 = Client.new(args.second, args.last)
         end
@@ -66,12 +74,13 @@ end
 
 
 class Client
-  attr_reader :input_1, :input_2, :input_3, :token
+  attr_reader :input_1, :input_2, :input_3, :input_4, :token
 
-  def initialize(input_1, input_2 = nil, input_3 = nil)
+  def initialize(input_1, input_2 = nil, input_3 = nil, input_4 = nil)
     @input_1   = input_1
     @input_2   = input_2
     @input_3   = input_3
+    @input_4   = input_4
     @token     = Token.new.token
   end
 
@@ -98,7 +107,7 @@ class Client
       begin
         tries ||= 3
         if input_3
-          response = token.get("/v2/projects_users?filter[campus]=#{campus['id']}&filter[project_id]=#{project['id']}&range[created_at]=#{after},#{right_now}", params: { page: i, per_page: 100 }).parsed
+          response = token.get("/v2/projects_users?filter[campus]=#{campus['id']}&filter[project_id]=#{project['id']}&range[created_at]=#{after},#{before}", params: { page: i, per_page: 100 }).parsed
         else
           response = token.get("/v2/projects_users?filter[campus]=#{campus['id']}&filter[project_id]=#{project['id']}", params: { page: i, per_page: 100 }).parsed
         end
@@ -125,6 +134,14 @@ class Client
     input_3.to_time.to_s.split(" ")[0...-1].join("T")
   end
 
+  def before
+    if input_4
+      input_4.to_time.to_s.split(" ")[0...-1].join("T")
+    else
+      Time.current.beginning_of_week.to_s.split(" ")[0...-1].join("T")
+    end
+  end
+
   def time_ago
     if input_2
       time = Time.current - (input_2.to_i * 7).days

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ft_42
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Matias Fernandez