riaction 0.2.1 → 0.3.0

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG #
 
+## 0.3.0 ##
+
+* re-organized module and got rid of a memory leak that showed up in Rails apps running with cache\_classes set to false
+
+## 0.2.1 ##
+
+* Fixed problematic load order of the IActionable objects
+
+
+## 0.2.0 ##
+
+* Generator added to create YAML file for IActionable credentials
+
+
 ## 0.1.1 ##
 
 * Rake task `riaction:rails:list:achievements` produces formatted output of all achievements defined on IActionable

data/lib/riaction/constants.rb

@@ -0,0 +1,11 @@
+module Riaction
+  class Constants
+    def self.crud_actions
+      Set.new [:create, :update, :destroy]
+    end
+  
+    def self.retry_attempts_for_internal_error
+      3
+    end
+  end
+end

data/lib/riaction/crud_event_callback.rb

@@ -0,0 +1,28 @@
+require "resque"
+require 'riaction/event_performer'
+
+module Riaction
+  class CrudEventCallback
+    def initialize(event_name)
+      @event_name = event_name
+    end
+
+    def after_create(record)
+      if record.riaction_log_event?(@event_name)
+        Resque.enqueue(::Riaction::EventPerformer, @event_name, record.class.base_class.to_s, record.id)
+      end
+    end                                 
+
+    def after_update(record)            
+      if record.riaction_log_event?(@event_name)
+        Resque.enqueue(::Riaction::EventPerformer, @event_name, record.class.base_class.to_s, record.id)
+      end
+    end
+
+    def after_destroy(record)
+      if record.riaction_log_event?(@event_name)
+        Resque.enqueue(::Riaction::EventPerformer, @event_name, record.class.base_class.to_s, record.id)
+      end
+    end
+  end
+end

data/lib/riaction/event_performer.rb

@@ -0,0 +1,43 @@
+require 'riaction/iactionable/api'
+require 'riaction/constants'
+require "resque"
+
+module Riaction
+  class EventPerformer
+    @queue = :riaction_event_logger
+
+    def self.perform(event_name, klass_name, id, attempt=0)
+      iactionable_api = IActionable::Api.new
+
+      event_object = klass_name.constantize.find_by_id!(id)
+      event_details = event_object.riaction_event(event_name)
+      profile_keys = event_details[:profile].riaction_profile_keys
+
+      # assert the profile exists, and if not, create it
+      unless  begin
+                !!iactionable_api.get_profile_summary(profile_keys[:profile_type], profile_keys[:id_type], profile_keys[:id])
+              rescue IActionable::Error::BadRequest => e
+                false
+              end
+        iactionable_api.create_profile(profile_keys[:profile_type], profile_keys[:id_type], profile_keys[:id])
+      end
+
+      # Log the event
+      iactionable_api.log_event(profile_keys[:profile_type], profile_keys[:id_type], profile_keys[:id], event_details[:key], event_details[:params])
+    rescue ActiveRecord::RecordNotFound => e
+      # event_object no longer exists; no means to recover
+    rescue IActionable::Error::BadRequest => e
+      # Log event should never throw this as of IActionable API v3
+    rescue NoMethodError => e
+      raise NoEventDefined.new
+    rescue IActionable::Error::Internal => e
+      # upon an intenal error from IActionable, retry some set number of times by requeueing the task through Resque 
+      # after the max number of attempts, re-raise
+      if attempt < ::Riaction::Constants.retry_attempts_for_internal_error
+        Resque.enqueue(self, event_name, klass_name, id, attempt+1)
+      else
+        raise e
+      end
+    end
+  end
+end

data/lib/riaction/profile_creation_callback.rb

@@ -0,0 +1,10 @@
+require "resque"
+require 'riaction/profile_creator'
+
+module Riaction
+  class ProfileCreationCallback
+    def after_create(record)
+      Resque.enqueue(::Riaction::ProfileCreator, record.class.base_class.to_s, record.id)
+    end                                 
+  end
+end

data/lib/riaction/profile_creator.rb

@@ -0,0 +1,33 @@
+require 'riaction/iactionable/api'
+require 'riaction/constants'
+require "resque"
+
+module Riaction
+  class ProfileCreator
+    @queue = :riaction_profile_creator
+  
+    def self.perform(klass_name, id, attempt=0)
+      if klass_name.constantize.riaction_profile?      
+        iactionable_api = IActionable::Api.new
+        profile_object = klass_name.constantize.find_by_id!(id)
+        profile_keys = profile_object.riaction_profile_keys
+        iactionable_api.create_profile(profile_keys[:profile_type], profile_keys[:id_type], profile_keys[:id])
+      else
+        raise NoProfileDefined.new
+      end
+    rescue ActiveRecord::RecordNotFound => e
+      # event_object no longer exists; no means to recover
+    rescue IActionable::Error::BadRequest => e
+      # This should only be thrown if the profile type names specified in the model don't match what's on IActionable's dashboard 
+      raise e
+    rescue IActionable::Error::Internal => e
+      # upon an intenal error from IActionable, retry some set number of times by requeueing the task through Resque 
+      # after the max number of attempts, re-raise
+      if attempt < ::Riaction::Constants.retry_attempts_for_internal_error
+        Resque.enqueue(self, klass_name, id, attempt+1)
+      else
+        raise e
+      end
+    end
+  end
+end

data/lib/riaction/riaction.rb

@@ -1,388 +1,296 @@
-require 'riaction/iactionable/api.rb'
-
+require 'riaction/iactionable/api'
 require "active_support"
 require "active_record"
-require "resque"
+require 'riaction/event_performer'
+require 'riaction/profile_creator'
+require 'riaction/profile_creation_callback'
+require 'riaction/crud_event_callback'
 
 module Riaction
-  PROFILE_CLASSES = []
-  EVENT_LOGGING_CLASSES = []
   
   class NoEventDefined < StandardError; end
   class NoProfileDefined < StandardError; end
-  
-  def self.included(base)
-    base.extend(ClassMethods)  
-  end
-  
-  def self.crud_actions
-    Set.new [:create, :update, :destroy]
-  end
-  
-  def self.retry_attempts_for_internal_error
-    3
-  end
-  
-  class ProfileCreator
-    @queue = :riaction_profile_creator
-    
-    def self.perform(klass_name, id, attempt=0)
-      if klass_name.constantize.riaction_profile?      
-        iactionable_api = IActionable::Api.new
-        profile_object = klass_name.constantize.find_by_id!(id)
-        profile_keys = profile_object.riaction_profile_keys
-        iactionable_api.create_profile(profile_keys[:profile_type], profile_keys[:id_type], profile_keys[:id])
-      else
-        raise NoProfileDefined.new
-      end
-    rescue ActiveRecord::RecordNotFound => e
-      # event_object no longer exists; no means to recover
-    rescue IActionable::Error::BadRequest => e
-      # This should only be thrown if the profile type names specified in the model don't match what's on IActionable's dashboard 
-      raise e
-    rescue IActionable::Error::Internal => e
-      # upon an intenal error from IActionable, retry some set number of times by requeueing the task through Resque 
-      # after the max number of attempts, re-raise
-      if attempt < Riaction.retry_attempts_for_internal_error
-        Resque.enqueue(Riaction::ProfileCreator, klass_name, id, attempt+1)
-      else
-        raise e
-      end
-    end
-  end
-  
-  class EventPerformer
-    @queue = :riaction_event_logger
-    
-    def self.perform(event_name, klass_name, id, attempt=0)
-      iactionable_api = IActionable::Api.new
-      
-      event_object = klass_name.constantize.find_by_id!(id)
-      event_details = event_object.riaction_event(event_name)
-      profile_keys = event_details[:profile].riaction_profile_keys
-      
-      # assert the profile exists, and if not, create it
-      unless  begin
-                !!iactionable_api.get_profile_summary(profile_keys[:profile_type], profile_keys[:id_type], profile_keys[:id])
-              rescue IActionable::Error::BadRequest => e
-                false
-              end
-        iactionable_api.create_profile(profile_keys[:profile_type], profile_keys[:id_type], profile_keys[:id])
-      end
-      
-      # Log the event
-      iactionable_api.log_event(profile_keys[:profile_type], profile_keys[:id_type], profile_keys[:id], event_details[:key], event_details[:params])
-    rescue ActiveRecord::RecordNotFound => e
-      # event_object no longer exists; no means to recover
-    rescue IActionable::Error::BadRequest => e
-      # Log event should never throw this as of IActionable API v3
-    rescue NoMethodError => e
-      raise NoEventDefined.new
-    rescue IActionable::Error::Internal => e
-      # upon an intenal error from IActionable, retry some set number of times by requeueing the task through Resque 
-      # after the max number of attempts, re-raise
-      if attempt < Riaction.retry_attempts_for_internal_error
-        Resque.enqueue(Riaction::EventPerformer, event_name, klass_name, id, attempt+1)
-      else
-        raise e
-      end
-    end
-  end
-  
-  class CrudEventCallback
-    def initialize(event_name)
-      @event_name = event_name
-    end
-    
-    def after_create(record)
-      if record.riaction_log_event?(@event_name)
-        Resque.enqueue(Riaction::EventPerformer, @event_name, record.class.base_class.to_s, record.id)
-      end
-    end                                 
-                                        
-    def after_update(record)            
-      if record.riaction_log_event?(@event_name)
-        Resque.enqueue(Riaction::EventPerformer, @event_name, record.class.base_class.to_s, record.id)
-      end
-    end
+
+  module Riaction
+    PROFILE_CLASSES = []
+    EVENT_LOGGING_CLASSES = []
     
-    def after_destroy(record)
-      if record.riaction_log_event?(@event_name)
-        Resque.enqueue(Riaction::EventPerformer, @event_name, record.class.base_class.to_s, record.id)
-      end
-    end
-  end
-  
-  class ProfileCreationCallback
-    def after_create(record)
-      Resque.enqueue(Riaction::ProfileCreator, record.class.base_class.to_s, record.id)
-    end                                 
-  end
-  
-  module ClassMethods
     def riaction(object_type, opts)
       if object_type == :profile
-        (PROFILE_CLASSES << self).uniq!
-        define_profile(opts.delete(:type), opts)
-        include Riaction::ProfileInstanceMethods unless instance_methods.include? :riaction_profile
-        send "after_create".to_sym, Riaction::ProfileCreationCallback.new
+        unless riaction_profile?
+          (PROFILE_CLASSES << self.to_s).uniq!
+          define_profile(opts.delete(:type), opts)
+          include Riaction::ProfileInstanceMethods
+          send :after_create, ::Riaction::ProfileCreationCallback.new
+        end
       elsif object_type == :event
-        (EVENT_LOGGING_CLASSES << self).uniq!
-        define_event(opts[:name], opts[:trigger], opts[:profile], opts[:params], opts[:if])
-        include Riaction::EventInstanceMethods unless instance_methods.include? :riaction_event
+        unless riaction_defines_events?
+          make_events_definable
+        end
+        unless riaction_defines_event?(opts[:name])
+          (EVENT_LOGGING_CLASSES << self.to_s).uniq!
+          define_event(opts[:name], opts[:trigger], opts[:profile], opts[:params], opts[:if])
+          include Riaction::EventInstanceMethods
+        end
       end
     end
     
-    def define_event(name, trigger, profile, params = {}, guard = nil)
+    def make_events_definable
       class << self
         def riaction_events
-          class_variable_defined?(:@@riaction_events) ? class_variable_get(:@@riaction_events) : class_variable_set(:@@riaction_events, {})
+          @riaction_events ||= {}
         end
-      end
       
-      events = riaction_events
+        def riaction_defines_events? 
+          true
+        end
+      end
+    end
+    
+    def define_event(name, trigger, profile, params = {}, guard = nil)
       trigger = name unless trigger
-      
+    
       # store the event
-      events[name] = {:trigger => trigger, :profile => profile, :params => params, :guard => guard}
-      class_variable_set(:@@riaction_events, events)
-      
+      riaction_events.store(name, {:trigger => trigger, :profile => profile, :params => params, :guard => guard})
+    
       # Create the callback or the means to trigger it
-      if Riaction.crud_actions.include? trigger
-        send "after_#{trigger}".to_sym, Riaction::CrudEventCallback.new(name)
-        
+      if ::Riaction::Constants.crud_actions.include? trigger
+        send "after_#{trigger}".to_sym, ::Riaction::CrudEventCallback.new(name)
+      
         define_method("trigger_#{name}!") do
           if self.riaction_log_event?(name)
-            Resque.enqueue(Riaction::EventPerformer, name, self.class.base_class.to_s, self.id)
+            Resque.enqueue(::Riaction::EventPerformer, name, self.class.base_class.to_s, self.id)
           end
         end
       else
         define_method("trigger_#{trigger}!") do
           if self.riaction_log_event?(name)
-            Resque.enqueue(Riaction::EventPerformer, name, self.class.base_class.to_s, self.id)
+            Resque.enqueue(::Riaction::EventPerformer, name, self.class.base_class.to_s, self.id)
           end
         end
       end
     end
-    
+  
     def define_profile(type, fields)
       class << self
         def riaction_profiles
-          class_variable_defined?(:@@riaction_profiles) ? class_variable_get(:@@riaction_profiles) : class_variable_set(:@@riaction_profiles, {})
+          @riaction_profiles ||= {}
         end
-      end
       
-      profiles = riaction_profiles
-      
-      # store the profile
-      profiles[type] = fields
-      class_variable_set(:@@riaction_profiles, profiles)
-      
-      class << self
         def riaction_profile?
           true
         end
       end
-    end
     
+      # store the profile
+      riaction_profiles.store(type, fields)
+    end
+  
     def riaction_profile?
       false
     end
-  end
+  
+    def riaction_defines_events?
+      false
+    end
+  
+    def riaction_defines_event?(event_name)
+      if riaction_defines_events?
+        riaction_events[event_name].present?
+      else
+        false
+      end
+    end
+    # end
 
-  module EventInstanceMethods
-    def riaction_event(event_name)
-      events = self.class.class_variable_defined?(:@@riaction_events) ? self.class.class_variable_get(:@@riaction_events) : {}
-      event = events.fetch(event_name.to_sym)
+    module EventInstanceMethods
+      def riaction_event(event_name)
+        event = self.class.riaction_events.fetch(event_name.to_sym)
+        profile = riaction_event_profile(event[:profile])
+        
+        unless profile.class.respond_to?(:riaction_profile?) && profile.class.riaction_profile?
+          raise TypeError.new("Object defined for #{self.class} on event #{event_name} as a profile must itself declare riaction(:profile ...)")
+        end
+        
+        params = riaction_event_params(event[:params])
+        
+        raise TypeError.new("Params defined for #{self.class} on event #{event_name} must be a hash") unless params.kind_of? Hash
       
-      profile = riaction_event_profile(event[:profile])
-      unless profile.class.respond_to?(:riaction_profile?) && profile.class.riaction_profile?
-        raise TypeError.new("Object defined for #{self.class} on event #{event_name} as a profile must itself declare riaction(:profile ...)")
+        {
+          :key => event_name.to_sym,
+          :profile => profile,
+          :params => params
+        }
+      rescue KeyError => e
+        raise NoEventDefined.new("no such event #{event_name} defined on #{self.class}")
       end
-      params = riaction_event_params(event[:params])
-      raise TypeError.new("Params defined for #{self.class} on event #{event_name} must be a hash") unless params.kind_of? Hash
-      
-      {
-        :key => event_name.to_sym,
-        :profile => profile,
-        :params => params
-      }
-    rescue KeyError => e
-      raise NoEventDefined.new("no such event #{event_name} defined on #{self.class}")
-    end
     
-    def riaction_log_event?(event_name)
-      events = self.class.class_variable_defined?(:@@riaction_events) ? self.class.class_variable_get(:@@riaction_events) : {}
-      event = events.fetch(event_name.to_sym)
-      guard = event[:guard]
+      def riaction_log_event?(event_name)
+        event = self.class.riaction_events.fetch(event_name.to_sym)
+        guard = event[:guard]
       
-      case guard
-      when NilClass
-        true
-      when Symbol
-        self.send guard
-      when Proc
-        guard.call self
-      else 
-        true
+        case guard
+        when NilClass
+          true
+        when Symbol
+          self.send guard
+        when Proc
+          guard.call self
+        else 
+          true
+        end
+      rescue KeyError => e
+        raise NoEventDefined.new("no such event #{event_name} defined on #{self.class}")
       end
-    rescue KeyError => e
-      raise NoEventDefined.new("no such event #{event_name} defined on #{self.class}")
-    end
     
-    private
+      private
     
-    def riaction_event_profile(profile)
-      if profile == :self
-        self
-      elsif profile.kind_of? Symbol
-        self.send(profile)
-      elsif profile.kind_of? Proc
-        profile.call
-      else
-        nil
+      def riaction_event_profile(profile)
+        if profile == :self
+          self
+        elsif profile.kind_of? Symbol
+          self.send(profile)
+        elsif profile.kind_of? Proc
+          profile.call
+        else
+          nil
+        end
+      rescue Exception => e
+        raise
       end
-    rescue Exception => e
-      raise
-    end
     
-    def riaction_event_params(params)
-      if params.kind_of? Symbol
-        self.send(params)
-      elsif params.kind_of? Proc
-        params.call
-      elsif params.kind_of? Hash
-        resolved_params = {}
-        params.each_pair do |key, value|
-          resolved_params[key] = self.respond_to?(value) ? self.send(value) : value
+      def riaction_event_params(params)
+        if params.kind_of? Symbol
+          self.send(params)
+        elsif params.kind_of? Proc
+          params.call
+        elsif params.kind_of? Hash
+          resolved_params = {}
+          params.each_pair do |key, value|
+            resolved_params[key] = self.respond_to?(value) ? self.send(value) : value
+          end
+          resolved_params
+        else
+          {}
         end
-        resolved_params
-      else
-        {}
+      rescue Exception => e
+        raise
       end
-    rescue Exception => e
-      raise
     end
-  end
 
-  module ProfileInstanceMethods
-    def riaction_profile_keys(profile_type=nil, id_type=nil)
-      profiles = self.class.class_variable_defined?(:@@riaction_profiles) ? self.class.class_variable_get(:@@riaction_profiles) : {}
-      
-      if profiles.size > 0
-        if profile_type && profiles.has_key?(profile_type)
-          ids = profiles.fetch(profile_type)
-        else
-          profile_type = profiles.first[0]
-          ids = profiles.first[1]
-        end
+    module ProfileInstanceMethods
+      def riaction_profile_keys(profile_type=nil, id_type=nil)
+        if self.class.riaction_profiles.size > 0
+          if profile_type && self.class.riaction_profiles.has_key?(profile_type)
+            ids = self.class.riaction_profiles.fetch(profile_type)
+          else
+            profile_type = self.class.riaction_profiles.first[0]
+            ids = self.class.riaction_profiles.first[1]
+          end
       
-        if id_type && ids.has_key?(id_type)
-          {:profile_type => profile_type.to_s, :id_type => id_type.to_s, :id => self.send(ids.fetch(id_type)).to_s}
+          if id_type && ids.has_key?(id_type)
+            {:profile_type => profile_type.to_s, :id_type => id_type.to_s, :id => self.send(ids.fetch(id_type)).to_s}
+          else
+            {:profile_type => profile_type.to_s, :id_type => ids.first[0].to_s, :id => self.send(ids.first[1]).to_s}
+          end
         else
-          {:profile_type => profile_type.to_s, :id_type => ids.first[0].to_s, :id => self.send(ids.first[1]).to_s}
+          {}
         end
-      else
+      rescue KeyError, NoMethodError => e
         {}
       end
-    rescue KeyError, NoMethodError => e
-      {}
-    end
     
-    #################
-    #  API wrappers #
-    #################
+      #################
+      #  API wrappers #
+      #################
     
-    def riaction_profile_summary(achievement_count=nil)
-      keys = riaction_profile_keys
-      unless keys.empty?
-        @iactionable_api ||= IActionable::Api.new
-        @iactionable_api.get_profile_summary(keys[:profile_type], keys[:id_type], keys[:id], achievement_count)
-      else
-        raise NoProfileDefined.new("Class #{self.class} does not adequately define itself as an IActionable profile")
+      def riaction_profile_summary(achievement_count=nil)
+        keys = riaction_profile_keys
+        unless keys.empty?
+          @iactionable_api ||= IActionable::Api.new
+          @iactionable_api.get_profile_summary(keys[:profile_type], keys[:id_type], keys[:id], achievement_count)
+        else
+          raise NoProfileDefined.new("Class #{self.class} does not adequately define itself as an IActionable profile")
+        end
+      rescue IActionable::Error::BadRequest => e
+        nil
       end
-    rescue IActionable::Error::BadRequest => e
-      nil
-    end
     
-    def riaction_create_profile
-      keys = riaction_profile_keys
-      unless keys.empty?
-        existing = riaction_profile_summary
-        unless existing
-          @iactionable_api ||= IActionable::Api.new
-          @iactionable_api.create_profile(keys[:profile_type], keys[:id_type], keys[:id])
+      def riaction_create_profile
+        keys = riaction_profile_keys
+        unless keys.empty?
+          existing = riaction_profile_summary
+          unless existing
+            @iactionable_api ||= IActionable::Api.new
+            @iactionable_api.create_profile(keys[:profile_type], keys[:id_type], keys[:id])
+          else
+            existing
+          end
         else
-          existing
+          raise NoProfileDefined.new("Class #{self.class} does not adequately define itself as an IActionable profile")
         end
-      else
-        raise NoProfileDefined.new("Class #{self.class} does not adequately define itself as an IActionable profile")
       end
-    end
     
-    def riaction_update_profile(new_id_type)
-      old_keys = riaction_profile_keys
-      new_keys = riaction_profile_keys(old_keys[:profile_type], new_id_type)
-      unless old_keys.empty? || new_keys.empty?
-        @iactionable_api ||= IActionable::Api.new
-        @iactionable_api.add_profile_identifier(old_keys[:profile_type], old_keys[:id_type], old_keys[:id], new_keys[:id_type], new_keys[:id])
-      else
-        raise NoProfileDefined.new("Class #{self.class} does not adequately define itself as an IActionable profile")
+      def riaction_update_profile(new_id_type)
+        old_keys = riaction_profile_keys
+        new_keys = riaction_profile_keys(old_keys[:profile_type], new_id_type)
+        unless old_keys.empty? || new_keys.empty?
+          @iactionable_api ||= IActionable::Api.new
+          @iactionable_api.add_profile_identifier(old_keys[:profile_type], old_keys[:id_type], old_keys[:id], new_keys[:id_type], new_keys[:id])
+        else
+          raise NoProfileDefined.new("Class #{self.class} does not adequately define itself as an IActionable profile")
+        end
       end
-    end
     
-    def riaction_profile_achievements(filter_type=nil)
-      keys = riaction_profile_keys
-      unless keys.empty?
-        @iactionable_api ||= IActionable::Api.new
-        @iactionable_api.get_profile_achievements(keys[:profile_type], keys[:id_type], keys[:id], filter_type)
-      else
-        raise NoProfileDefined.new("Class #{self.class} does not adequately define itself as an IActionable profile")
+      def riaction_profile_achievements(filter_type=nil)
+        keys = riaction_profile_keys
+        unless keys.empty?
+          @iactionable_api ||= IActionable::Api.new
+          @iactionable_api.get_profile_achievements(keys[:profile_type], keys[:id_type], keys[:id], filter_type)
+        else
+          raise NoProfileDefined.new("Class #{self.class} does not adequately define itself as an IActionable profile")
+        end
+      rescue IActionable::Error::BadRequest => e
+        nil
       end
-    rescue IActionable::Error::BadRequest => e
-      nil
-    end
     
-    def riaction_profile_challenges(filter_type=nil)
-      keys = riaction_profile_keys
-      unless keys.empty?
-        @iactionable_api ||= IActionable::Api.new
-        @iactionable_api.get_profile_challenges(keys[:profile_type], keys[:id_type], keys[:id], filter_type)
-      else
-        raise NoProfileDefined.new("Class #{self.class} does not adequately define itself as an IActionable profile")
+      def riaction_profile_challenges(filter_type=nil)
+        keys = riaction_profile_keys
+        unless keys.empty?
+          @iactionable_api ||= IActionable::Api.new
+          @iactionable_api.get_profile_challenges(keys[:profile_type], keys[:id_type], keys[:id], filter_type)
+        else
+          raise NoProfileDefined.new("Class #{self.class} does not adequately define itself as an IActionable profile")
+        end
+      rescue IActionable::Error::BadRequest => e
+        nil
       end
-    rescue IActionable::Error::BadRequest => e
-      nil
-    end
     
-    def riaction_profile_goals(filter_type=nil)
-      keys = riaction_profile_keys
-      unless keys.empty?
-        @iactionable_api ||= IActionable::Api.new
-        @iactionable_api.get_profile_goals(keys[:profile_type], keys[:id_type], keys[:id], filter_type)
-      else
-        raise NoProfileDefined.new("Class #{self.class} does not adequately define itself as an IActionable profile")
+      def riaction_profile_goals(filter_type=nil)
+        keys = riaction_profile_keys
+        unless keys.empty?
+          @iactionable_api ||= IActionable::Api.new
+          @iactionable_api.get_profile_goals(keys[:profile_type], keys[:id_type], keys[:id], filter_type)
+        else
+          raise NoProfileDefined.new("Class #{self.class} does not adequately define itself as an IActionable profile")
+        end
+      rescue IActionable::Error::BadRequest => e
+        nil
       end
-    rescue IActionable::Error::BadRequest => e
-      nil
-    end
     
-    def riaction_profile_notifications
-      keys = riaction_profile_keys
-      unless keys.empty?
-        @iactionable_api ||= IActionable::Api.new
-        @iactionable_api.get_profile_notifications(keys[:profile_type], keys[:id_type], keys[:id])
-      else
-        raise NoProfileDefined.new("Class #{self.class} does not adequately define itself as an IActionable profile")
+      def riaction_profile_notifications
+        keys = riaction_profile_keys
+        unless keys.empty?
+          @iactionable_api ||= IActionable::Api.new
+          @iactionable_api.get_profile_notifications(keys[:profile_type], keys[:id_type], keys[:id])
+        else
+          raise NoProfileDefined.new("Class #{self.class} does not adequately define itself as an IActionable profile")
+        end
+      rescue IActionable::Error::BadRequest => e
+        nil
       end
-    rescue IActionable::Error::BadRequest => e
-      nil
     end
   end
 end
 
-begin
-  ActiveRecord::Base.send(:include, Riaction)
-rescue NameError => e
-  # 
-end
+ActiveRecord::Base.extend ::Riaction::Riaction

data/lib/riaction/version.rb

@@ -1,3 +1,3 @@
 module Riaction
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/tasks/riaction.rake

@@ -7,7 +7,8 @@ namespace 'riaction' do
           require rbfile
         end
       
-        Riaction::EVENT_LOGGING_CLASSES.each do |klass|
+        Riaction::EVENT_LOGGING_CLASSES.each do |class_name|
+          klass = class_name.constantize
           puts "#{klass} defines the following events:"
           klass.riaction_events.each_pair do |name, deets|
             puts " :#{name}:"
@@ -75,7 +76,8 @@ namespace 'riaction' do
           require rbfile
         end
       
-        Riaction::PROFILE_CLASSES.each do |klass|
+        Riaction::PROFILE_CLASSES.each do |class_name|
+          klass = class_name.constantize
           begin
             klass.all.each do |obj|
               declaration = klass.riaction_profiles.first

data/spec/riaction_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper.rb'
 describe Riaction do
   class RiactionTestBase
     extend ActiveModel::Callbacks
-    include Riaction
+    extend Riaction::Riaction
     
     define_model_callbacks :create, :update, :destroy
     
@@ -34,6 +34,74 @@ describe Riaction do
     Resque.stub!(:enqueue)
   end
   
+  describe "using riaction" do    
+    describe "to define a profile" do
+      before do
+        class RiactionClass < RiactionTestBase
+        end
+      end
+      
+      describe "the first time" do
+        it "should set up the profile info" do
+          RiactionClass.riaction_profile?.should be_false
+          RiactionClass.class_eval do
+            riaction :profile, :type => :user, :custom => :id
+          end
+          RiactionClass.riaction_profile?.should be_true
+          hash_including(:custom => :id).should == RiactionClass.riaction_profiles[:user]
+        end
+      end
+      
+      describe "a second time" do
+        before do
+          RiactionClass.class_eval do
+            riaction :profile, :type => :user, :custom => :id
+          end
+        end
+        it "should not try to invoke any internal config methods" do
+          RiactionClass.should_not_receive(:define_profile)
+          RiactionClass.should_not_receive(:include)
+          RiactionClass.should_not_receive(:after_create)
+          RiactionClass.class_eval do
+            riaction :profile, :type => :user, :custom => :id
+          end
+        end
+      end
+    end
+    
+    describe "to define an event" do
+      before do
+        class RiactionClass < RiactionTestBase
+        end
+      end
+
+      describe "the first time" do
+        it "should set up the event info" do
+          RiactionClass.riaction_defines_event?(:create_profile).should be_false
+          RiactionClass.class_eval do
+            riaction :event, :name => :create_profile, :trigger => :create, :profile => :self, :params => {:foo => "bar"}
+          end
+          RiactionClass.riaction_defines_event?(:create_profile).should be_true
+        end
+      end
+
+      describe "a second time" do
+        before do
+          RiactionClass.class_eval do
+            riaction :event, :name => :create_profile, :trigger => :create, :profile => :self, :params => {:foo => "bar"}
+          end
+        end
+        it "should not try to invoke any internal config methods" do
+          RiactionClass.should_not_receive(:define_event)
+          RiactionClass.should_not_receive(:include)
+          RiactionClass.class_eval do
+            riaction :event, :name => :create_profile, :trigger => :create, :profile => :self, :params => {:foo => "bar"}
+          end
+        end
+      end
+    end
+  end
+  
   describe "logging events" do
     class MyClass < RiactionTestBase
       riaction :profile, :type => :user, :custom => :id
@@ -96,12 +164,12 @@ describe Riaction do
       end
       
       it "should re-schedule the task some defined number of times before re-raising again on the last attempt" do
-        Resque.should_receive(:enqueue).exactly(Riaction.retry_attempts_for_internal_error).times.with(Riaction::EventPerformer, :create_profile, "MyClass", @instance.id, instance_of(Fixnum))
+        Resque.should_receive(:enqueue).exactly(Riaction::Constants.retry_attempts_for_internal_error).times.with(Riaction::EventPerformer, :create_profile, "MyClass", @instance.id, instance_of(Fixnum))
         
-        (Riaction.retry_attempts_for_internal_error).times do |i|
+        (Riaction::Constants.retry_attempts_for_internal_error).times do |i|
           lambda { Riaction::EventPerformer.perform(:create_profile, "MyClass", @bad_instance.id, i) }.should_not raise_error
         end
-        lambda { Riaction::EventPerformer.perform(:create_profile, "MyClass", @bad_instance.id, Riaction.retry_attempts_for_internal_error) }.should raise_error(IActionable::Error::Internal)
+        lambda { Riaction::EventPerformer.perform(:create_profile, "MyClass", @bad_instance.id, Riaction::Constants.retry_attempts_for_internal_error) }.should raise_error(IActionable::Error::Internal)
       end
     end
   end
@@ -147,12 +215,12 @@ describe Riaction do
       end
       
       it "should re-schedule the task some defined number of times before re-raising again on the last attempt" do
-        Resque.should_receive(:enqueue).exactly(Riaction.retry_attempts_for_internal_error).times.with(Riaction::ProfileCreator, "MyClass", @instance.id, instance_of(Fixnum))
+        Resque.should_receive(:enqueue).exactly(Riaction::Constants.retry_attempts_for_internal_error).times.with(Riaction::ProfileCreator, "MyClass", @instance.id, instance_of(Fixnum))
         
-        (Riaction.retry_attempts_for_internal_error).times do |i|
+        (Riaction::Constants.retry_attempts_for_internal_error).times do |i|
           lambda { Riaction::ProfileCreator.perform("MyClass", @instance.id, i) }.should_not raise_error
         end
-        lambda { Riaction::ProfileCreator.perform("MyClass", @instance.id, Riaction.retry_attempts_for_internal_error) }.should raise_error(IActionable::Error::Internal)
+        lambda { Riaction::ProfileCreator.perform("MyClass", @instance.id, Riaction::Constants.retry_attempts_for_internal_error) }.should raise_error(IActionable::Error::Internal)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riaction
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000Z
+date: 2011-12-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161282420 !ruby/object:Gem::Requirement
+  requirement: &2153241880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2161282420
+  version_requirements: *2153241880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2161282000 !ruby/object:Gem::Requirement
+  requirement: &2153241460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161282000
+  version_requirements: *2153241460
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2161281500 !ruby/object:Gem::Requirement
+  requirement: &2153240920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161281500
+  version_requirements: *2153240920
 - !ruby/object:Gem::Dependency
   name: faraday-stack
-  requirement: &2161281060 !ruby/object:Gem::Requirement
+  requirement: &2153235960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161281060
+  version_requirements: *2153235960
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2161280420 !ruby/object:Gem::Requirement
+  requirement: &2153235400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161280420
+  version_requirements: *2153235400
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161279800 !ruby/object:Gem::Requirement
+  requirement: &2153234880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161279800
+  version_requirements: *2153234880
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2161279200 !ruby/object:Gem::Requirement
+  requirement: &2153234500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161279200
+  version_requirements: *2153234500
 description: Wrapper for IActionable's restful API and an "acts-as" style interface
   for models to behave as profiles and drive game events.
 email:
@@ -105,6 +105,9 @@ files:
 - lib/generators/riaction/riaction_generator.rb
 - lib/generators/riaction/templates/i_actionable.yml
 - lib/riaction.rb
+- lib/riaction/constants.rb
+- lib/riaction/crud_event_callback.rb
+- lib/riaction/event_performer.rb
 - lib/riaction/iactionable/api.rb
 - lib/riaction/iactionable/connection.rb
 - lib/riaction/iactionable/error.rb
@@ -125,6 +128,8 @@ files:
 - lib/riaction/iactionable/objects/profile_summary.rb
 - lib/riaction/iactionable/objects/progress.rb
 - lib/riaction/iactionable/settings.rb
+- lib/riaction/profile_creation_callback.rb
+- lib/riaction/profile_creator.rb
 - lib/riaction/railtie.rb
 - lib/riaction/riaction.rb
 - lib/riaction/version.rb