happyfunjuice 0.0.1.beta.2 → 0.1.0.beta.1

data/app/controllers/happyfunjuice/happyfunjuice_controller.rb

@@ -11,6 +11,7 @@ class Happyfunjuice::HappyfunjuiceController < ApplicationController
 
       render :json=> {
         activities: Happyfunjuice.activities(
+          since: params[:since],
           page: params[:page],
           per_page: params[:per_page],
           type: params[:activity],

data/lib/happyfunjuice/activity.rb

@@ -1,15 +1,23 @@
 module Happyfunjuice
-  mattr_accessor :activity_list
+  mattr_accessor :activity_list, :activity_meta
   @@activity_list = {}
+  @@activity_meta = {}
 
   DEFAULT_PER_PAGE = 50
-  MAX_PER_PAGE = 1000
 
   class << self
     def push_activity( key, scope, opts={}, &block )
       Happyfunjuice.activity_list[key.to_sym] = Happyfunjuice::Activity.new( key, scope, opts, &block )
     end
 
+    def set_field_meta( key, field, opts={} )
+      @@activity_meta[key] ||= {}
+      @@activity_meta[key][field] ||= {}
+      opts.each do |k,v|
+        @@activity_meta[key][field][k] = v
+      end
+    end
+
     # Query the list of activities. Data and metadata combined into one method since the
     # queries are otherwise identical.
     #
@@ -26,21 +34,26 @@ module Happyfunjuice
     def activities( opts = {} )
       # Default options
       opts.reverse_merge!({
-        page:1,
+        page:nil,
         per_page: DEFAULT_PER_PAGE,
+        since:nil, # The beginning of time
         type: nil,
         include_metadata: true,
         query_activities: true
       })
 
-      # If page unspecified or invalid, return page 1
-      _per_page = [(opts[:per_page] || DEFAULT_PER_PAGE).to_i,1].max
-      _page = [opts[:page].to_i || 1,1].max
-
-      raise StandardError.new("No more than #{MAX_PER_PAGE} records may be returned in a single response.") if _per_page > MAX_PER_PAGE
+      if opts[:page].nil?
+        _per_page = nil
+        _page = nil
+      else
+        _per_page = [(opts[:per_page] || DEFAULT_PER_PAGE).to_i,1].max
+        _page = [opts[:page].to_i || 1,1].max
+      end
 
       ret = {}
 
+      _since = Time.zone.at(opts[:since].try(:to_i)) rescue nil
+
       # Choose specified activity or else all activities
       types = [(opts[:type].to_sym rescue nil)].reject(&:nil?)
       types = Happyfunjuice.activity_list.keys if types.empty?
@@ -56,7 +69,7 @@ module Happyfunjuice
         activity = Happyfunjuice.activity_list[k]
 
         _ret = {}
-        _ret.merge!({data:     activity.query(_page,_per_page)}) if opts[:query_activities]
+        _ret.merge!({data:     activity.query(_page,_per_page,_since)}) if opts[:query_activities]
         _ret.merge!({metadata: activity.metadata    }) if opts[:include_metadata]
 
         ret[k] = _ret
@@ -82,20 +95,30 @@ module Happyfunjuice
       block.yield(@scope.new).keys
     end
 
-    # Execute the query. Reorder (not order, just in case a default order is specified) by id desc
-    # and paginate.
-    def query( page=1, limit=DEFAULT_PER_PAGE )
-      scope.reorder('id desc').limit(limit).offset((page-1)*limit).collect do |activity|
+    # Execute the query.
+    def query( page, limit, _since )
+      _scope =  scope.reorder("id desc")
+      _scope = _scope.reorder("#{@options[:time_column]} desc")     unless @options[:time_column].nil?
+      _scope = _scope.where("#{@options[:time_column] || 'created_at'} > ?",_since) unless _since.nil?
+      _scope = _scope.limit(limit).offset((page-1)*limit) unless page.nil? or limit.nil?
+
+      _scope.collect do |activity|
         block.yield activity
       end
     end
 
     # Metadata for this activity
     def metadata
+      activity_meta = Happyfunjuice.activity_meta[self.key.to_sym] || {}
+      field_meta = {}
+      fields.each do |field|
+        field_meta[field] = activity_meta[field] || {}
+      end
+
       {
-        key: @key,
+        #key: @key, # There shouldn't be any need to specify this since the value of this key is this hash
         name: @options[:name] || @key.to_s.humanize,
-        fields: fields
+        fields: field_meta
       }
     end
   end

data/lib/happyfunjuice/config.rb

@@ -3,6 +3,9 @@ module Happyfunjuice
   class << self
 
     def setup( &block )
+      
+      # Add option for this later. Filter now.
+      Rails.configuration.filter_parameters += [:api_key]
 
       # This MUST happen after initialization otherwise configuration variables
       # are not known to the models at the time activity reports are configured:
@@ -37,6 +40,10 @@ module Happyfunjuice
           Happyfunjuice.push_activity( key, scope, opts, &block )
         end
 
+        def meta( key, field, opts={} )
+          Happyfunjuice.set_field_meta( key, field, opts )
+        end
+
         def mailer= value
           unless %w( mailchimp sendgrid ).include? value.downcase
             raise ArgumentError.new('Mailer host must be either sendgrid or mailchimp. Choose one and reconfigure it later if necessary.')

data/lib/happyfunjuice/routes.rb

@@ -19,8 +19,8 @@ module ActionDispatch::Routing
 
       def activities 
         @mapper.namespace :happyfunjuice do
-          @mapper.get 'activities'   => 'happyfunjuice#activities'
-          @mapper.get 'metadata' => 'happyfunjuice#metadata'
+          @mapper.match ':api_version/activities' => 'happyfunjuice#activities', :via=>:post
+          @mapper.match ':api_version/metadata' => 'happyfunjuice#metadata', :via=>:post
         end
       end
 

data/lib/happyfunjuice/version.rb

@@ -1,5 +1,5 @@
 module Happyfunjuice
-  VERSION = "0.0.1.beta.2"
+  VERSION = "0.1.0.beta.1"
 
   class << self
     def version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happyfunjuice
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta.2
+  version: 0.1.0.beta.1
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml