idonethis-cli 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 185ef7b01cd2290cb1a490da6ce5c00fe54bc2f9
-  data.tar.gz: 07695cb7ae264ab718c214515bfb53150c444d25
+  metadata.gz: 04191da2f4ac239fd862e5d1a3a9b3b3316a6199
+  data.tar.gz: 7712b787f29d890496bc477eb09fb894d692eaa4
 SHA512:
-  metadata.gz: f4fa499e4a1a4def07764d11395da24110e58e69a82a0395e8a37c65bc1325fd51645f043f7e56210b398a8ea6a7d308fc81ed87f5ca349b2132eee6050d0a5c
-  data.tar.gz: 4df3b5a63512c89ebac7b8096c7818ef18b7c63f9044ad4fec1bb6e144162127df8c566939fe0604274683d915ccc773c323c29eb2c236a63808ba68d7cb844c
+  metadata.gz: e70bca5da20be58634b7155885045bcfa1525c45c7e97fc49a8f82c8b114a7a59ac518a48469c1b136f7d3b4f4e10d15039fb8c23636ea65249d58d16c080c9a
+  data.tar.gz: e87e39a7992bd0637ade7d60a5bf3f163e12097085d582836278f269e8c043ae29e0d568d254f9078e804be9abf53a2b0e4c9c9d3b78c19cae08974ed6e46dc8

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 .settings
+.rspec

data/idonethis-cli.gemspec

@@ -29,5 +29,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"     , "~> 1.10"
   spec.add_development_dependency "rake"        , "~> 10.0"
+  spec.add_development_dependency "rspec"       , "~> 3"
   spec.add_dependency             "rest-client" , "~> 1"
 end

data/lib/idonethis/cli/version.rb

@@ -1,5 +1,5 @@
 module Idonethis
   module Cli
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

data/lib/idonethis/use_cases/list.rb

@@ -30,12 +30,9 @@ module Idonethis::UseCases
       end
 
       def get_page(page, credential, log, args) # https://idonethis.com/api/v0.1/dones/
-        params = {"order_by" => "-created", "page_size" => 100, "page" => page}
+        params = {"order_by" => "-created", "page_size" => 100, "page" => page}.
+          merge(done_date_from(args))
 
-        if args[:opts].include?("today")
-          params ["done_date"] = "today"
-        end
-        
         url = Idonethis::Index.dones(params)
 
         log.call "url: #{url}"
@@ -45,6 +42,16 @@ module Idonethis::UseCases
         parse internet.get(url, { "Authorization" => "Token #{credential[:token]}", accept: "application/json"})
       end
 
+      def done_date_from(args)
+        if args[:opts].include?("week")
+          return { done_date_after: (Time.now - (7*24*60*60)).strftime("%F") }
+        end
+        
+        intersection = (args[:opts] || []) & %W{ today yesterday }
+
+        return intersection.empty? ? {} : { done_date: intersection.first }
+      end
+
       def parse(reply)
         require 'json'
         
@@ -52,4 +59,4 @@ module Idonethis::UseCases
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idonethis-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Ben Biddington
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement