has-activity 0.1.1 → 0.1.2

data/README.rdoc

@@ -6,6 +6,10 @@ A simple way to grab recent activity on a given model grouped by hour, day, week
 
 == Usage
 
+Add gem to Gemfile...
+  
+  gem 'has-activity', '~>0.1.0'
+
 Add the activity functionality to a model...
 
   # app/models/user.rb

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/has-activity.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "has-activity"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cary Dunn"]

data/lib/has_activity/activitize_calculations.rb

@@ -113,7 +113,7 @@ module HasActivity
           entry = {
             :offset   => r["has_activity_#{unit}_ago"].to_i,
             :activity => r["has_activity_count"].to_i,
-            :date     => round_activity_timestamp(r["has_activity_timestamp"].is_a?(String) ? Time.parse(r["has_activity_timestamp"]) : r["has_activity_timestamp"], unit).in_time_zone
+            :date     => round_activity_timestamp(r["has_activity_timestamp"].is_a?(String) ? Time.parse(r["has_activity_timestamp"]) : r["has_activity_timestamp"], unit)
           }
           (order.to_s == "asc") ? rs.push(entry) : rs.unshift(entry)
         end
@@ -130,7 +130,7 @@ module HasActivity
             entry = {
               :offset    => current_unit_offset,
               :activity  => results[current_result_index]["has_activity_count"].to_i,
-              :timestamp => round_activity_timestamp(results[current_result_index]["has_activity_timestamp"].is_a?(String) ? Time.parse(results[current_result_index]["has_activity_timestamp"]) : results[current_result_index]["has_activity_timestamp"], unit).in_time_zone
+              :timestamp => round_activity_timestamp(results[current_result_index]["has_activity_timestamp"].is_a?(String) ? Time.parse(results[current_result_index]["has_activity_timestamp"]) : results[current_result_index]["has_activity_timestamp"], unit)
             }
             current_result_index = current_result_index+1
           else
@@ -159,8 +159,15 @@ module HasActivity
         padded_results
       end # pad_activity_results
 
-      def round_activity_timestamp(timestamp, round_to)
-        Time.at((timestamp.to_f / 1.send(round_to)).floor * 1.send(round_to))
+      def round_activity_timestamp(t, round_to)
+        #Time.at((t.to_f / 1.send(round_to)).floor * 1.send(round_to))
+        if round_to == "weeks"
+          day = t.beginning_of_week.day
+        else
+          day = t.day
+        end
+
+        Time.new(t.year, t.month, (%w(weeks days hours).include?(round_to) ? day : 1), (round_to == "hours" ? t.hour : 0), 0, 0, Time.zone.utc_offset)
       end
     
     end # OverallMethods

data/lib/has_activity/graph_ext.rb

@@ -30,5 +30,9 @@ unless Array.instance_methods.include? 'to_activity_gchart'
       end
     end
 
+    def to_activity_rickshaw_data
+      self.collect {|v| {:x => v[:timestamp].to_i, :y => v[:activity]} }
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has-activity
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70097998838120 !ruby/object:Gem::Requirement
+  requirement: &70135035018580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097998838120
+  version_requirements: *70135035018580
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70097998837460 !ruby/object:Gem::Requirement
+  requirement: &70135035017920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70097998837460
+  version_requirements: *70135035017920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70097998836700 !ruby/object:Gem::Requirement
+  requirement: &70135035017160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70097998836700
+  version_requirements: *70135035017160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70097998835820 !ruby/object:Gem::Requirement
+  requirement: &70135035016280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70097998835820
+  version_requirements: *70135035016280
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70097998160620 !ruby/object:Gem::Requirement
+  requirement: &70135034768360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097998160620
+  version_requirements: *70135034768360
 description: A simple way to grab recent activity on a given model grouped by hour,
   day, week or month (time series). Supports "padding" for intervals without activity.
 email: cary.dunn@gmail.com
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2504134347312114032
+      hash: 2987300255728733323
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: