redtastic 0.3.2 → 0.3.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDVkOWRlMWFhMzE2MGYzZGYyOWNiMzdlMTM0Mzg2M2Q0OTg2NTFiMg==
-  data.tar.gz: !binary |-
-    MzkxNTcxMGMyZGVjNGJjYzVhYWExYTAzNjk0ZjFkY2Q5YzgxOTk1Nw==
+SHA1:
+  metadata.gz: 861a12fa35fa9f12ce98f02a903f5009e1774ce0
+  data.tar.gz: b3182c21c83d2dd90c76981c712f219a79f7e2af
 SHA512:
-  metadata.gz: !binary |-
-    MWRkYzk3MmU1MjkyZGU3ODRkYzFjMTk0MWE0YWI4N2ZiM2RhNDU5NTFkN2Y1
-    MDFmY2I3MjdmMDE4MjVhMGJjOWRmOTg4ZWJlMDZkMmFhMjdlYzJmZmZmZTBk
-    N2MxZTlkMWIyYjg1MGNhZjcyOTQ1OGUxMjRjODQxNmY0MWE5ODU=
-  data.tar.gz: !binary |-
-    MzIwOWIwOTY5NGExY2RkNTM4ZmE3YjMwY2JmOGM4MmQwMDJiNzU2MjZlODk3
-    ODk1YmRkZTk3OGI0MGU1MjA0ZDU4MDYyOGRlODQ1YmU3NDZlMDQ4MWE5MDUx
-    M2FiZDE4NzIwYjQ1MmQ0MGJjZmYzY2E4MDU5MWM3MDNhYmMxNjY=
+  metadata.gz: 18b1c126af13fbb63102eb4915292183109e0a6964fd08191189cbe46bef69c034832fd95de0a65c0b0be7e2fe16107f3fdee71a6871a14691560eff94a8fb2d
+  data.tar.gz: a20adec1b09e6b2bb3d84bf6041688960fa5bbef05c02b47d7537cbc3c9aa8dc74b9ec8a9a10ee23caa183b799e0dd0f71cfbd9d6bdd3f94368512bf8ebb6094

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+master
+======
+* Added a CHANGELOG
+* [Fix for dates on weekly metrics](https://github.com/bellycard/redtastic/pull/37)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redtastic (0.3.2)
+    redtastic (0.3.3)
       activesupport
       redis
 

data/lib/redtastic/model.rb

@@ -235,7 +235,7 @@ module Redtastic
             timestamp.strftime('%Y-%m-%d')
           when :weeks
             week_number = timestamp.cweek
-            result = timestamp.strftime('%Y')
+            result = timestamp.cwyear.to_s
             result + "-W#{week_number}"
           when :months
             timestamp.strftime('%Y-%m')

data/lib/redtastic/version.rb

@@ -1,3 +1,3 @@
 module Redtastic
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/spec/model_spec.rb

@@ -267,27 +267,43 @@ describe Redtastic::Model do
         end
 
         context 'and is weeks' do
-          before do
-            @params[:interval] = :weeks
-            @result = Visits.aggregate(@params)
-          end
+          context 'for weeks in the same year' do
+            before do
+              @params[:interval] = :weeks
+              @result = Visits.aggregate(@params)
+            end
 
-          it 'returns the total over the date range' do
-            expect(@result[:visits]).to eq(8)
-          end
+            it 'returns the total over the date range' do
+              expect(@result[:visits]).to eq(8)
+            end
 
-          it 'returns the proper amount of data points' do
-            expect(@result[:weeks].size).to eq(2)
-          end
+            it 'returns the proper amount of data points' do
+              expect(@result[:weeks].size).to eq(2)
+            end
 
-          it 'returns the correct data for each point in the interval' do
-            expect(@result[:weeks][0][:visits]).to eq(5)
-            expect(@result[:weeks][1][:visits]).to eq(3)
+            it 'returns the correct data for each point in the interval' do
+              expect(@result[:weeks][0][:visits]).to eq(5)
+              expect(@result[:weeks][1][:visits]).to eq(3)
+            end
+
+            it 'returns the correct dates for each point in the interval' do
+              expect(@result[:weeks][0][:date]).to eq('2014-W1')
+              expect(@result[:weeks][1][:date]).to eq('2014-W2')
+            end
           end
 
-          it 'returns the correct dates for each point in the interval' do
-            expect(@result[:weeks][0][:date]).to eq('2014-W1')
-            expect(@result[:weeks][1][:date]).to eq('2014-W2')
+          context 'for weeks over two different years' do
+            before do
+              @params[:interval] = :weeks
+              @params[:start_date] = '2015-12-25'
+              @params[:end_date] = '2016-01-03'
+              @result = Visits.aggregate(@params)
+            end
+
+            it 'returns the correct dates' do
+              expect(@result[:weeks][0][:date]).to eq('2015-W52')
+              expect(@result[:weeks][1][:date]).to eq('2015-W53')
+            end
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redtastic
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Joe DiVita
@@ -14,129 +14,129 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   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: pry
   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: git
   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: rubocop
   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: simplecov
   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: coveralls
   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: ! ' A simple, Redis-backed interface for storing, retrieving, and aggregating
+description: ' A simple, Redis-backed interface for storing, retrieving, and aggregating
   analytics '
 email:
 - joediv31@gmail.com
@@ -147,6 +147,7 @@ files:
 - .gitignore
 - .rubocop.yml
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -180,17 +181,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.2.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A simple, Redis-backed interface for storing, retrieving, and aggregating