streakable 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 351782a55fc775615acae919fe2bdda45a2568ac
-  data.tar.gz: 4966f88de54044aa9bf4124c9f181ce1822a3c9f
+SHA256:
+  metadata.gz: f18abd101f35ccae5f18f0a696402bc7b5fec278212694c49073abef81ae455f
+  data.tar.gz: 9ef4e70f39696b7456821489ca60ba41b34a3828d8420b55e055cd5a61259d04
 SHA512:
-  metadata.gz: 3dea2bb330bd23b5c90932106cd7f46cbaaa7d5c7a2e656815a54669d698b2c92c3901dce9112ec714ab68129e1b5e04651bccb26632880912d714608e8e0101
-  data.tar.gz: '09afb569c90899d4ef11208c32731152ac1c0e87525346633b39c081ad26529288e8fe3cdc2abc685c6d8b01f472b19b70a64081d2f5e2ae326628c31ac057d4'
+  metadata.gz: 26d0da96da351c7e7b58444affe0e6c5882fb3bc5ad4867f6a393201968b8cb92b6aea8b9d24f07894c4c536af2b3451e25df4fdb6a4d0854b891cb5383b3d1f
+  data.tar.gz: 3caeeb38257f789b34204b84c5d76b6f237761aba3b81f4b527af614ef11e1f2e25fcf6266d22306e7df0ee290529fe839437582cd92ee5d5959ad396eac9070

data/.gitignore

@@ -1,17 +1,54 @@
 *.gem
 *.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+# Used by dotenv library to load environment variables.
+# .env
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+.ruby-version
+.ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+# appraisal
+# https://github.com/thoughtbot/appraisal
+gemfiles/*.gemfile.lock

data/.travis.yml

@@ -2,11 +2,35 @@ language: ruby
 cache: bundler
 matrix:
   fast_finish: true
-branches:
-  only: master
 rvm:
   - 2.1.0
   - 2.2.0
   - 2.3.0
   - 2.4.0
-script: bundle exec rspec
+  - 2.5.0
+  - 2.6.0
+gemfile:
+  - gemfiles/rails3.gemfile
+  - gemfiles/rails4.gemfile
+  - gemfiles/rails5.gemfile
+matrix:
+  exclude:
+    - rvm: 2.1.0
+      gemfile: gemfiles/rails5.gemfile
+    - rvm: 2.2.0
+      gemfile: gemfiles/rails5.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails3.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails4.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/rails3.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/rails4.gemfile
+    - rvm: 2.6.0
+      gemfile: gemfiles/rails3.gemfile
+    - rvm: 2.6.0
+      gemfile: gemfiles/rails4.gemfile
+script: bundle exec rspec
+before_install:
+  - gem install bundler -v '< 2'

data/Appraisals

@@ -0,0 +1,16 @@
+appraise "rails3" do
+  gem "activerecord", "3.2.22"
+end
+
+appraise "rails4" do
+  gem "activerecord", "4.0.0"
+end
+
+appraise "rails5" do
+  gem "activerecord", "5.0.0"
+end
+
+# TODO: uncomment this once Rails 6 is released on April 30, 2019
+# appraise "rails6" do
+#   gem "activerecord", "6.0.0"
+# end

data/Gemfile.lock

@@ -0,0 +1,90 @@
+PATH
+  remote: .
+  specs:
+    streakable (0.2.0)
+      activerecord (>= 3.2.22)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
+      arel (>= 9.0)
+    activesupport (5.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.4)
+    coveralls (0.8.22)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    database_cleaner (1.7.0)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    i18n (1.5.3)
+      concurrent-ruby (~> 1.0)
+    json (2.1.0)
+    method_source (0.9.2)
+    minitest (5.11.3)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rake (12.3.2)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sqlite3 (1.3.13)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    timecop (0.9.1)
+    tins (1.20.2)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 2.2, >= 2.2.0)
+  bundler (>= 1.3)
+  coveralls (~> 0.8, >= 0.8.22)
+  database_cleaner (~> 1.7.0, >= 1.7.0)
+  pry (~> 0.11, >= 0.11.3)
+  rake (~> 12.3, >= 12.3.1)
+  rspec (~> 3.8, >= 3.8.0)
+  sqlite3 (~> 1.3.6)
+  streakable!
+  timecop (~> 0.9, >= 0.9.1)
+
+BUNDLED WITH
+   1.17.3

data/README.md

@@ -1,8 +1,10 @@
-[![Gem Version](https://badge.fury.io/rb/streakable.svg)](https://badge.fury.io/rb/streakable) [![Build Status](https://travis-ci.org/szTheory/streakable.svg?branch=master)](https://travis-ci.org/szTheory/streakable) [![Inline docs](http://inch-ci.org/github/szTheory/streakable.svg?branch=master)](http://inch-ci.org/github/szTheory/streakable) [![MIT License](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/szTheory/streakable/blob/master/LICENSE.txt)
+[![Gem Version](https://badge.fury.io/rb/streakable.svg)](https://badge.fury.io/rb/streakable) [![Build Status](https://travis-ci.org/szTheory/streakable.svg?branch=master)](https://travis-ci.org/szTheory/streakable) [![Coverage Status](https://coveralls.io/repos/github/szTheory/streakable/badge.svg?branch=master)](https://coveralls.io/github/szTheory/streakable?branch=master) [![Inline docs](http://inch-ci.org/github/szTheory/streakable.svg?branch=master)](http://inch-ci.org/github/szTheory/streakable) [![Maintainability](https://api.codeclimate.com/v1/badges/cacc27fc37181c331918/maintainability)](https://codeclimate.com/github/szTheory/streakable/maintainability) [![MIT License](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/szTheory/streakable/blob/master/LICENSE.txt) [![Gem](https://img.shields.io/gem/dt/streakable.svg)](https://rubygems.org/gems/streakable) [![GitHub stars](https://img.shields.io/github/stars/sztheory/streakable.svg?label=Stars&style=social)](https://github.com/szTheory/streakable)
 
-# Streakable
+![Streakable Logo](https://user-images.githubusercontent.com/28652/49296229-aa500a00-f485-11e8-8f13-51f2ad326e5c.png)
 
-Ruby gem to track consecutive day streaks :calendar: on your Rails/ActiveRecord models. Fork of [has_streak](https://github.com/garrettqmartin8/has_streak) by Garrett Martin. This version has a different include interface and more options. Requires Ruby >= 2.1 and ActiveRecord >= 3.0. GitHub project page: https://github.com/szTheory/streakable
+Streakable is a Ruby gem to track consecutive day streaks :calendar: on your Rails/ActiveRecord models. Hard fork of [has_streak](https://github.com/garrettqmartin8/has_streak) by Garrett Martin with a different include interface and more features. Requires Ruby >= 2.1 and ActiveRecord >= 3.2.22.
+
+[Github Project Page](https://github.com/szTheory/streakable)
 
 ## Installation
 
@@ -75,7 +77,7 @@ user.streaks(:posts)
 ## Contributing
 
 1. Fork it
-2. Create your feature branch (`git checkout -b feature/my-new-feature`)
+2. Create your feature branch (`git checkout -b feature/my-new-feature`) or bugfix branch (`git checkout -b bugfix/my-helpful-bugfix`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin feature/my-new-feature`)
 5. Make sure specs are passing (`bundle exec rspec`)

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/rails3.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "3.2.22"
+
+gemspec path: "../"

data/gemfiles/rails4.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "4.0.0"
+
+gemspec path: "../"

data/gemfiles/rails5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.0.0"
+
+gemspec path: "../"

data/lib/streakable/streak.rb

@@ -41,7 +41,9 @@ class Streak
     if streaks.empty?
       0
     elsif longest
-      streaks.sort.first.size
+      streaks.sort do |x, y|
+        y.size <=> x.size
+      end.first.size
     else
       streak = streaks.first
       if streak.include?(Date.current) || except_today && streak.include?(Date.yesterday)
@@ -97,6 +99,10 @@ class Streak
 
   private
     def days
-      @days ||= instance.send(association).order(column => :desc).pluck(column).map(&:to_date).uniq
+      @days ||= begin
+        date_strings = instance.send(association).order(column => :desc).pluck(column)
+        dates = date_strings.map(&:to_date)
+        dates.sort.reverse.uniq
+      end
     end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
+require 'coveralls'
+Coveralls.wear!
+
 require "streakable"
 require "database_cleaner"
+require "pry"
 require "support/database_cleaner"
 require "support/user"
 require "support/post"
@@ -12,6 +16,7 @@ ActiveRecord::Schema.define do
 
   create_table :users, force: true do |t|
     t.string :name
+    t.timestamps
   end
 
   create_table :posts, force: true do |t|

data/spec/streakable_spec.rb

@@ -29,7 +29,7 @@ describe Streakable do
     context "user only has a post today" do
       let(:post_dates) { [DateTime.current] }
       before do
-        expect(user.posts.size).to eql(1)
+        expect(user.posts.length).to eql(1)
         expect(user.posts.first.created_at.to_date).to eql(Date.current)
       end
 
@@ -54,6 +54,22 @@ describe Streakable do
       end
     end
 
+    context "user has streak today, and a shorter streak before that" do
+      let(:post_dates) { [5.days.ago, 4.days.ago, 2.days.ago, 1.day.ago, DateTime.current] }
+
+      it "still returns the current streak" do
+        expect(subject).to eq(3)
+      end
+
+      context "with longest option" do
+        subject { user.streak(:posts, longest: true) }
+
+        it "still returns the longer streak" do
+          expect(subject).to eq(3)
+        end
+      end
+    end
+
     context "user didn't post today, but has a streak before that" do
       let(:post_dates) { [3.days.ago, 2.day.ago, 1.day.ago] }
       before { expect(post_dates.map(&:to_date)).to_not include(Date.current) }
@@ -120,7 +136,7 @@ describe Streakable do
     context "user only has a post today" do
       let(:post_dates) { [DateTime.current] }
       before do
-        expect(user.posts.size).to eql(1)
+        expect(user.posts.length).to eql(1)
         expect(user.posts.first.created_at.to_date).to eql(Date.current)
       end
 
@@ -132,7 +148,7 @@ describe Streakable do
     context "user only has a post yesterday" do
       let(:post_dates) { [DateTime.current.yesterday] }
       before do
-        expect(user.posts.size).to eql(1)
+        expect(user.posts.length).to eql(1)
         expect(user.posts.first.created_at.to_date).to eql(Date.current.yesterday)
       end
 

data/streakable.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'streakable'
-  spec.version       = '0.1.2'
+  spec.version       = '0.2.0'
   spec.authors       = ['szTheory', 'Garrett Martin']
-  spec.description   = %q{Track consecutive day streaks on ActiveRecord models.}
+  spec.description   = %q{Track consecutive day streaks on Rails/ActiveRecord models.}
   spec.summary       = %q{Easily track consecutive day streaks on your Rails/ActiveRecord model associations for a given date column.}
   spec.homepage      = 'https://sztheory.github.io/streakable/'
   spec.license       = 'MIT'
@@ -17,13 +17,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activerecord', '>= 3.0'
+  spec.add_runtime_dependency 'activerecord', '>= 3.2.22'
 
-  spec.add_development_dependency 'sqlite3', '~> 1.3', '>= 1.3.13'
-  spec.add_development_dependency 'rspec', '~> 3.8', '>= 3.8.0'
+  spec.add_development_dependency 'appraisal', '~> 2.2', '>= 2.2.0'
+  spec.add_development_dependency 'bundler', '>= 1.3', '>= 1.3'
+  spec.add_development_dependency 'coveralls', '~> 0.8', '>= 0.8.22'
   spec.add_development_dependency 'database_cleaner', '~> 1.7.0', '>= 1.7.0'
-  spec.add_development_dependency 'bundler', '~> 1.3', '>= 1.3'
-  spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.1'
   spec.add_development_dependency 'pry', '~> 0.11', '>= 0.11.3'
+  spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.1'
+  spec.add_development_dependency 'rspec', '~> 3.8', '>= 3.8.0'
+  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
   spec.add_development_dependency 'timecop', '~> 0.9', '>= 0.9.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: streakable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - szTheory
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,54 +17,68 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.22
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 0.8.22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 0.8.22
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -86,25 +100,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.11.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,25 +140,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 12.3.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '3.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '3.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 3.8.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +193,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
-description: Track consecutive day streaks on ActiveRecord models.
+description: Track consecutive day streaks on Rails/ActiveRecord models.
 email: 
 executables: []
 extensions: []
@@ -173,11 +201,17 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - _config.yml
+- gemfiles/.bundle/config
+- gemfiles/rails3.gemfile
+- gemfiles/rails4.gemfile
+- gemfiles/rails5.gemfile
 - lib/streakable.rb
 - lib/streakable/streak.rb
 - spec/spec_helper.rb
@@ -207,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Easily track consecutive day streaks on your Rails/ActiveRecord model associations