bentrackergem 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f74e9d9fa978f6ac460b7660b414ef0b770f5099
-  data.tar.gz: 7438ac0d05316e42098eddfc4255999d9cb4797d
+  metadata.gz: a2e0356821bd677edd748f02a078290d5d40630e
+  data.tar.gz: bb2dbf507fcea1ebe0ecb7f8276ab282e7e55e68
 SHA512:
-  metadata.gz: 9ed3d9bb3f27df18459162aaafc8b3a43a5d408824cf3a93b937e64f819c37ee0ef23962ac84941ab002c9380a1c9fde641aae429d37038a485d43c5a146fc85
-  data.tar.gz: 8662a87258dee5c1e1a20e587240fe1c87d85fbd3346e7a6e204e5ec83963a2fa77b3a79cf1946d1f05f635717f5b4a93323e1a8a6691b1e6797574669209f9e
+  metadata.gz: 40d09c8bfc3a29f527a2f94b73fbef0c7566aa9b181b2c0a0a407935c2b982b0bee8e343d96cdd48b91dabc74fc2d68599619f72a0fa728ce0e044ab6cd3db61
+  data.tar.gz: 1a2409e3585c0ed88a6ac2c16fa1193c0059fefa3c6e108a4549a949b3d8bfab70df5e4e1c4b6ef476c38e5082d67510696456a9fbd8e9df4e77fd01f0abb5c4

data/README.md

@@ -22,6 +22,8 @@ Post today's summary:
 
 `BenTrackerGem.post_message("What a great day!")`
 
+Note that support for this feature is limited to users who have my username and password as env variables, or, me. 
+
 Get today's stats:
 
 `BenTrackerGem.day_stats("2014-10-06")`
@@ -34,6 +36,14 @@ Get visual output of specific category:
 
 `BenTrackerGem.date_range_visual("code", "2014-10-03", "2014-10-06")`
 
+See what's been going on over the last week:
+
+`BenTrackerGem.diary`
+
+See what I've been reading lately:
+
+`BenTrackerGem.book_diary`
+
 ## Contributing
 
 1. Fork it ( https://github.com/benbrostoff/bentrackergem/fork )

data/lib/bentrackergem.rb

@@ -6,13 +6,23 @@ require "date"
 
 module BenTrackerGem
 
-  URL_GET = 'http://brostofftrack.herokuapp.com/history.json'
+  HISTORY = 'http://brostofftrack.herokuapp.com/history.json'
+  BOOK_HISTORY = 'http://brostofftrack.herokuapp.com/book_history.json'
   URL_POST = 'http://brostofftrack.herokuapp.com/email'
 
-  VALID_CATS = ["message", "code", "fitness"]
+  VALID_CATS = ["message", "code", "fitness",
+                "author", "title", "time_reading"]
 
   def self.get_history
-    JSON.parse(RestClient.get URL_GET).to_h["days"]
+    JSON.parse(RestClient.get HISTORY).to_h["days"]
+  end
+
+  def self.get_book_history
+    books = JSON.parse(RestClient.get BOOK_HISTORY).to_h["books"]
+    books.each do |book|
+      book["created_at"] = book["created_at"][0..9]
+    end
+    return books
   end
   
   def self.valid_format(date)
@@ -24,37 +34,52 @@ module BenTrackerGem
     date
   end
 
-  def self.filter_hash(hash)
-    {:day_of => hash["day_of"],
-     :message => hash["message"],
-     :code => hash["code"],
-     :fitness => hash["fitness"]}
+  def self.filter_hash(hash, book_flag = 0)
+    if book_flag == 0
+      return {:day_of => hash["day_of"],
+              :message => hash["message"],
+              :code => hash["code"],
+              :fitness => hash["fitness"]}
+    else
+      return {:created_at => hash["created_at"],
+              :title => hash["title"],  
+              :author => hash["author"],
+              :time_reading => hash["time_reading"]}
+    end
   end
 
-  def self.day_stats(date)
+  def self.day_stats(date, book_flag = 0)
     date = valid_format(date)
-    get_history.each do |summary|
-      if summary["day_of"] == date
-        return filter_hash(summary)
+    all, key = get_history, "day_of" if book_flag == 0
+    all, key = get_book_history, "created_at" if book_flag == 1
+    all.each do |summary|
+      if summary[key] == date
+        return filter_hash(summary, book_flag)
       end
     end
   end
 
-  def self.date_range(begin_date, end_date)
+  def self.date_range(begin_date, end_date, book_flag = 0)
     begin_date, end_date, hold = valid_format(begin_date), valid_format(end_date), []
-    filter = get_history.select { |summary| summary["day_of"] >= begin_date && 
-                              summary["day_of"] <= end_date }.
-                              map { |summary| day_stats(summary["day_of"]) }.
-                              sort_by { |summary| summary[:day_of] }
+    all, key = get_history, "day_of" if book_flag == 0
+    all, key = get_book_history, "created_at" if book_flag == 1
+
+    all.select { |summary| summary[key] >= begin_date && 
+                                           summary[key] <= end_date }.
+                map { |summary| day_stats(summary[key], book_flag) }.
+                sort_by { |summary| summary[key.to_sym] }
   end   
 
-  def self.date_range_visual(req, begin_date, end_date, sort = 0)
+  def self.date_range_visual(req, begin_date, end_date, book_flag = 0, sort = 0)
     raise ArgumentError, "must select valid category" if !VALID_CATS.include? req
 
-    filter = date_range(begin_date, end_date)
+    filter, key = date_range(begin_date, end_date), "day_of".to_sym if book_flag == 0
+    filter, key = date_range(begin_date, end_date, 1), "created_at".to_sym if book_flag == 1
     filter = filter.reverse if sort == 1
+    
     filter.each do |visi|
-      puts visi[:day_of] + ". " + visi[req.to_sym].to_s
+      puts visi[key.to_sym] + ". " + visi[req.to_sym].to_s if book_flag == 0
+      puts visi[key.to_sym] + ". " + visi[:title].to_s + " by " +  visi[:author].to_s if book_flag == 1
     end
     "COMPLETE"
   end
@@ -65,12 +90,21 @@ module BenTrackerGem
                       Chronic.parse(end_date).to_s[0..9])
   end
 
+  def self.book_diary(begin_date = "last week", end_date = "today")
+     date_range_visual("title", 
+                      Chronic.parse(begin_date).to_s[0..9],
+                      Chronic.parse(end_date).to_s[0..9],
+                      1)
+  end
+
   def self.post_message(message)
     raise ArgumentError, "must enter message as String" if !message.is_a? String
 
-    RestClient.post URL_POST, { 'message' => message }.to_json, 
-      :content_type => :json, 
-      :accept => :json
+    # Must have valid credentials as environment variables 
+    user = ENV['bg_user']
+    pass = ENV['bg_pass']
+    curl = "curl -d message='#{message}' -u #{user}:#{pass} #{URL_POST}"
+    system(curl)
   end
 
 end

data/lib/bentrackergem/version.rb

@@ -1,3 +1,3 @@
 module BenTrackerGem
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/bentrackergem_spec.rb

@@ -22,8 +22,7 @@ describe 'BenTrackerGem' do
     end
 
     it "successfully posts the data " do 
-      expect(response_post.code).to eq(200)
-      expect(response_post).to eq("{}")
+      expect(response_post).to eq(true)
   end
 
   end
@@ -83,6 +82,12 @@ describe 'BenTrackerGem' do
           BenTrackerGem.date_range_visual("message", "2014-10-08", "2014-10-15")  
         ).to eq("COMPLETE")
     end
+ 
+    it "should execute without error when valid category and dates are input on a book" do
+      expect( 
+          BenTrackerGem.date_range_visual("author", "2014-11-01", "2014-11-15", 1)  
+        ).to eq("COMPLETE")
+    end
 
   end
 
@@ -102,4 +107,18 @@ describe 'BenTrackerGem' do
 
   end
 
+  context "#book_diary" do
+     it "should replicate #date_range_visual with last week's info by default" do
+      expect( 
+          BenTrackerGem.book_diary
+        ).to eq("COMPLETE")
+    end
+
+    it "should allow for optional arguments" do
+      expect( 
+          BenTrackerGem.book_diary("three days ago", "today")
+        ).to eq("COMPLETE")
+    end    
+  end
+
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: bentrackergem
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ben Brostoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: date
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Leverages FitBit and GitHub to track fitness and code; messages can be
@@ -116,8 +116,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -136,17 +136,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple Ruby gem that serves as my virtual code, fitness and diary tracker.