reparty 0.1.0 → 0.1.2

data/History.md

@@ -1,3 +1,8 @@
+## 0.1.2
+
+- Accidentally included rake task twice by defining both an Engine and a Railtie
+- Add :total to ActiveRecord report types
+
 ## 0.1.0
 
 - Initial release

data/app/views/report_mailer/_active_record.html.erb

@@ -1,9 +1,14 @@
 <table width="500">
   <tr>
-    <td align="left"><h3 style="margin:0"><%= report.title %></h3></td>
-    <td align="right">Total <%= report.model.to_s.pluralize %>: <%= number_with_delimiter(report.total) %></td>
+    <td align="left">
+      <h3 style="margin:0"><%= report.title %></h3>
+      <ul>
+        <li>Total <%= report.model.to_s.pluralize %>: <%= number_with_delimiter(report.total) %></li>
+        <li><%= report.model.to_s.pluralize %> created yesterday: <%= number_with_delimiter(report.yesterday) %></li>
+      </ul>
+    </td>
   </tr>
   <tr>
-    <td colspan="2"><%= image_tag attachments["#{report.hash}.png"].url, align: "center" %></td>
+    <td align="center"><%= image_tag attachments["#{report.hash}.png"].url, align: "center" %></td>
   </tr>
 </table>

data/lib/reparty/report/active_record.rb

@@ -9,7 +9,7 @@ module Reparty
         raise "Report::ActiveRecord: model undefined" unless args.first.is_a?(Symbol)
         @model = Kernel.const_get(args.first.to_s.capitalize)
 
-        @operation = args.fetch(2, :count)
+        @operation = args.fetch(1, :count)
         @field = :created_at
 
         if args.last.is_a?(Hash)
@@ -26,11 +26,21 @@ module Reparty
       end
 
       def daily_dataset
-        7.downto(1).map { |x| @model.where("DATE(#{@field.to_s}) = ?", (DateTime.now.at_midnight-x).strftime('%Y-%m-%d')).send(@operation, @field) }
+        if @operation == :total
+          7.downto(1).map { |x| @model.where("#{@field.to_s} < ?", DateTime.now-x).send(:count, @field) }
+        else
+          7.downto(1).map { |x| @model.where("DATE(#{@field.to_s}) = ?", DateTime.now-x).send(@operation, @field) }
+        end
+      end
+
+      def yesterday
+        op = @operation == :total ? :count : @operation
+        @model.where("DATE(#{@field.to_s}) = ?", DateTime.now-1).send(op, @field)
       end
 
       def total
-        @model.send(@operation, @field)
+        op = @operation == :total ? :count : @operation
+        @model.send(op, @field)
       end
     end
   end

data/lib/reparty/version.rb

@@ -1,3 +1,3 @@
 module Reparty
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/reparty.rb

@@ -6,7 +6,6 @@ require "reparty/report/active_record"
 require "reparty/email"
 
 require "reparty/engine"
-require "reparty/railties"
 
 module Reparty
   class << self

metadata

@@ -2,7 +2,7 @@
 name: reparty
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Tim Dorr
@@ -211,7 +211,6 @@ files:
 - lib/reparty/config.rb
 - lib/reparty/email.rb
 - lib/reparty/engine.rb
-- lib/reparty/railties.rb
 - lib/reparty/report.rb
 - lib/reparty/report/active_record.rb
 - lib/reparty/version.rb
@@ -236,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 3863277872832140931
+      hash: 364078878128042041
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -245,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 3863277872832140931
+      hash: 364078878128042041
       version: '0'
   none: false
 requirements: []

data/lib/reparty/railties.rb

@@ -1,7 +0,0 @@
-module Reparty
-  class Railtie < Rails::Railtie
-    rake_tasks do
-      load "tasks/reparty.rake"
-    end
-  end
-end