public_activity 1.0.3 → 1.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmNkMThlZWRmZmZjMzY4OGI5ZmI3MjMwYmFjOTZhMTk1MTgxN2NkMA==
-  data.tar.gz: !binary |-
-    MWU5NTNkZmYzZWJhMzk1YzYxNWM5OGNmNTkyMDlkNTY3ZGI4ZTQyNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZWFhOWI3NWNlMTlhZGRlYjU3NThiZjMyZGMxMDdmMTk3MTdjZDU2MTBlYTkw
-    ZDM4YTllMjNlZjVmNTk1OWE1MWI3NDc4OGFiY2E1ZmIyZjdiZGJhNzlmMmFk
-    OWUzZGVlNWE1NTAwMTkzNGJkNDUwMWJkZDI0YmRkNWQ4OGY3ZmE=
-  data.tar.gz: !binary |-
-    ZTg0N2JlNDBlOWViOTE5NWIzYjZmMmI0YTU4MmE5ODM0ZWVkN2ZiM2UzYzQy
-    ZGM4NWYzNGEzMjQ5NWYzMjAzMWM1OWIyYzdmMGRjMjVkMmQxODM5ZTExODY2
-    MjE3NDhjYjM5NDYzN2EyMWRhYTIwOTNkYWUyZDRhZGExMWY0NDU=
+SHA1:
+  metadata.gz: 8fd39acfbf854c069a2b94620e3053830683b8fb
+  data.tar.gz: d8c98bb1597029b47b4926aa98afd16a5afaf7ce
+SHA512:
+  metadata.gz: b21e5ce84fd4c69efb5c0a8ea47ad594c46d2405340ee51930ce7d05f9249adc173a25f2120bb404d475339a7c95716ee23053b1c8dcd1dab5b544a9e6bda888
+  data.tar.gz: e41642ab559c0616592d20e59ccbbec11e0bd3183855b493fe819bddb60bc04d9a5cd820086afc97c77eb055faa06daa44a726b569b7ec21ececb3748c54fcc5

data/Gemfile

@@ -1,6 +1,6 @@
 ENV['PA_ORM'] ||= 'active_record'
 
-source :rubygems
+source "https://rubygems.org"
 
 
 case ENV['PA_ORM']
@@ -14,7 +14,7 @@ group :development, :test do
   gem 'sqlite3', '~> 1.3.7' if ENV['PA_ORM'] == 'active_record'
   gem 'mocha', '~> 0.13.0', require: false
   gem 'simplecov', '~> 0.7.0'
-  gem 'minitest', '>= 4.3.0'
+  gem 'minitest', '< 5.0.0'
   gem 'redcarpet'
   gem 'yard', '~> 0.8'
 end

data/lib/public_activity.rb

@@ -8,15 +8,20 @@ require 'action_view'
 module PublicActivity
   extend ActiveSupport::Concern
   extend ActiveSupport::Autoload
+
+  autoload :Activity,     'public_activity/models/activity'
+  autoload :Activist,     'public_activity/models/activist'
+  autoload :Adapter,      'public_activity/models/adapter'
+  autoload :Trackable,    'public_activity/models/trackable'
+  autoload :Common
   autoload :Config
-  autoload :Tracked,      'public_activity/roles/tracked.rb'
-  autoload :Deactivatable,'public_activity/roles/deactivatable.rb'
   autoload :Creation,     'public_activity/actions/creation.rb'
-  autoload :Update,       'public_activity/actions/update.rb'
+  autoload :Deactivatable,'public_activity/roles/deactivatable.rb'
   autoload :Destruction,  'public_activity/actions/destruction.rb'
-  autoload :VERSION
-  autoload :Common
   autoload :Renderable
+  autoload :Tracked,      'public_activity/roles/tracked.rb'
+  autoload :Update,       'public_activity/actions/update.rb'
+  autoload :VERSION
 
   # Switches PublicActivity on or off.
   # @param value [Boolean]
@@ -39,6 +44,14 @@ module PublicActivity
     @@config ||= PublicActivity::Config.instance
   end
 
+  # Method used to choose which ORM to load
+  # when PublicActivity::Activity class is being autoloaded
+  def self.inherit_orm(model="Activity")
+    orm = PublicActivity.config.orm
+    require "public_activity/orm/#{orm.to_s}"
+    "PublicActivity::ORM::#{orm.to_s.classify}::#{model}".constantize
+  end
+
   # Module to be included in ActiveRecord models. Adds required functionality.
   module Model
     extend ActiveSupport::Concern
@@ -51,9 +64,5 @@ module PublicActivity
   end
 end
 
-# Force Active Record ORM to load
-# makes initializer optional for default config
-PublicActivity.config if defined? ActiveRecord
-
 require 'public_activity/utility/store_controller'
 require 'public_activity/utility/view_helpers'

data/lib/public_activity/activity.rb

@@ -0,0 +1,4 @@
+module PublicActivity
+  class Activity < inherit_orm("Activity")
+  end
+end

data/lib/public_activity/common.rb

@@ -22,8 +22,6 @@ module PublicActivity
     extend ActiveSupport::Concern
 
     included do
-      ::PublicActivity.config # it's the first module to be loaded into models
-                              # we need to have pieces provided by orm loaded
       include Trackable
       class_attribute :activity_owner_global, :activity_recipient_global,
                       :activity_params_global, :activity_hooks, :activity_custom_fields_global
@@ -273,9 +271,7 @@ module PublicActivity
       all_options = args.extract_options!
       options = {
         key: all_options.delete(:key),
-        owner: all_options.delete(:owner),
         action: all_options.delete(:action),
-        recipient: all_options.delete(:recipient),
         parameters: all_options.delete(:parameters) || all_options.delete(:params)
       }
       action = (args.first || options[:action]).try(:to_s)
@@ -288,22 +284,25 @@ module PublicActivity
 
       # user responsible for the activity
       options[:owner] = PublicActivity.resolve_value(self,
-        options[:owner] ||
-        self.activity_owner ||
-        self.class.activity_owner_global
+        (all_options.has_key?(:owner) ? all_options[:owner] : (
+          self.activity_owner || self.class.activity_owner_global
+          )
+        )
       )
 
       # recipient of the activity
       options[:recipient] = PublicActivity.resolve_value(self,
-        options[:recipient] ||
-        self.activity_recipient ||
-        self.class.activity_recipient_global
+        (all_options.has_key?(:recipient) ? all_options[:recipient] : (
+          self.activity_recipient || self.class.activity_recipient_global
+          )
+        )
       )
 
       #customizable parameters
-      params = options[:params] || options[:parameters] || {}
+      params = {}
       params.merge!(self.class.activity_params_global)
       params.merge!(self.activity_params) if self.activity_params
+      params.merge!(options[:params] || options[:parameters] || {})
       params.each { |k, v| params[k] = PublicActivity.resolve_value(self, v) }
       options[:parameters] = params
       options.delete(:params)

data/lib/public_activity/config.rb

@@ -11,7 +11,6 @@ module PublicActivity
     def initialize
       # Indicates whether PublicActivity is enabled globally
       @enabled  = true
-      load_orm
     end
 
     def self.set &block
@@ -36,15 +35,6 @@ module PublicActivity
       self.class.orm(orm)
     end
 
-    def load_orm
-      require "public_activity/orm/#{@@orm.to_s}"
-      m = "PublicActivity::ORM::#{@@orm.to_s.classify}".constantize
-      ::PublicActivity.const_set(:Activity,  m.const_get(:Activity))
-      ::PublicActivity.const_set(:Adapter,   m.const_get(:Adapter))
-      ::PublicActivity.const_set(:Activist,  m.const_get(:Activist))
-      ::PublicActivity.const_set(:Trackable, m.const_get(:Trackable))
-    end
-
     class Block
       def orm(orm = nil)
         @orm = (orm ? orm.to_sym : false) || @orm

data/lib/public_activity/models/activist.rb

@@ -0,0 +1,7 @@
+module PublicActivity
+  module Activist
+    def self.included(base)
+      base.extend PublicActivity::inherit_orm("Activist")
+    end
+  end
+end

data/lib/public_activity/models/activity.rb

@@ -0,0 +1,4 @@
+module PublicActivity
+  class Activity < inherit_orm("Activity")
+  end
+end

data/lib/public_activity/models/adapter.rb

@@ -0,0 +1,4 @@
+module PublicActivity
+  class Adapter < inherit_orm("Adapter")
+  end
+end

data/lib/public_activity/models/trackable.rb

@@ -0,0 +1,7 @@
+module PublicActivity
+  module Trackable
+    def self.included(base)
+      base.extend PublicActivity::inherit_orm("Trackable")
+    end
+  end
+end

data/lib/public_activity/orm/active_record/activist.rb

@@ -5,6 +5,9 @@ module PublicActivity
       module Activist
         extend ActiveSupport::Concern
 
+        def self.extended(base)
+          base.extend(ClassMethods)
+        end
         # Association of activities as their owner.
         # @!method activities
         # @return [Array<Activity>] Activities which self is the owner of.

data/lib/public_activity/orm/active_record/adapter.rb

@@ -1,12 +1,10 @@
 module PublicActivity
   module ORM
     module ActiveRecord
-      module Adapter
-        class << self
-          # Creates the activity on `trackable` with `options`
-          def create_activity(trackable, options)
-            trackable.activities.create options
-          end
+      class Adapter
+        # Creates the activity on `trackable` with `options`
+        def self.create_activity(trackable, options)
+          trackable.activities.create options
         end
       end
     end

data/lib/public_activity/orm/active_record/trackable.rb

@@ -2,7 +2,7 @@ module PublicActivity
   module ORM
     module ActiveRecord
       module Trackable
-        def self.included(base)
+        def self.extended(base)
           base.has_many :activities, :class_name => "::PublicActivity::Activity", :as => :trackable
         end
       end

data/lib/public_activity/orm/mongoid/activist.rb

@@ -5,6 +5,9 @@ module PublicActivity
       module Activist
         extend ActiveSupport::Concern
 
+        def self.extended(base)
+          base.extend(ClassMethods)
+        end
         # Association of activities as their owner.
         # @!method activities
         # @return [Array<Activity>] Activities which self is the owner of.

data/lib/public_activity/orm/mongoid/adapter.rb

@@ -1,12 +1,10 @@
 module PublicActivity
   module ORM
     module Mongoid
-      module Adapter
-        class << self
-          # Creates the activity on `trackable` with `options`
-          def create_activity(trackable, options)
-            trackable.activities.create options
-          end
+      class Adapter
+        # Creates the activity on `trackable` with `options`
+        def self.create_activity(trackable, options)
+          trackable.activities.create options
         end
       end
     end

data/lib/public_activity/orm/mongoid/trackable.rb

@@ -2,7 +2,7 @@ module PublicActivity
   module ORM
     module Mongoid
       module Trackable
-        def self.included(base)
+        def self.extended(base)
           base.has_many :activities, :class_name => "::PublicActivity::Activity", :as => :trackable
         end
       end

data/lib/public_activity/roles/tracked.rb

@@ -50,7 +50,7 @@ module PublicActivity
       #   == Examples:
       #
       #    tracked :owner => :author
-      #    tracked :owner => {|o| o.author}
+      #    tracked :owner => proc {|o| o.author}
       #
       #   Keep in mind that owner relation is polymorphic, so you can't just
       #   provide id number of the owner object.
@@ -60,7 +60,7 @@ module PublicActivity
       #   == Examples:
       #
       #    tracked :recipient => :author
-      #    tracked :recipient => {|o| o.author}
+      #    tracked :recipient => proc {|o| o.author}
       #
       #   Keep in mind that recipient relation is polymorphic, so you can't just
       #   provide id number of the owner object.

data/lib/public_activity/version.rb

@@ -1,4 +1,4 @@
 module PublicActivity
   # A constant with gem's version
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: public_activity
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Piotrek Okoński
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -43,14 +43,14 @@ dependencies:
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
@@ -86,8 +86,13 @@ files:
 - lib/public_activity/actions/creation.rb
 - lib/public_activity/actions/destruction.rb
 - lib/public_activity/actions/update.rb
+- lib/public_activity/activity.rb
 - lib/public_activity/common.rb
 - lib/public_activity/config.rb
+- lib/public_activity/models/activist.rb
+- lib/public_activity/models/activity.rb
+- lib/public_activity/models/adapter.rb
+- lib/public_activity/models/trackable.rb
 - lib/public_activity/orm/active_record.rb
 - lib/public_activity/orm/active_record/activist.rb
 - lib/public_activity/orm/active_record/activity.rb
@@ -112,7 +117,7 @@ files:
 homepage: https://github.com/pokonski/public_activity
 licenses: []
 metadata: {}
-post_install_message: ! "##################################################\n#  NOTE
+post_install_message: "##################################################\n#  NOTE
   FOR UPGRADING FROM PRE-0.4.0 VERSION     #\n##################################################\n\npublic_activity
   0.4.0 brings major changes compared to 0.3.X versions,\nplease read https://github.com/pokonski/public_activity#upgrading
   \nto learn about all the changes you need to apply to properly\nupgrade your applications.\n"
@@ -121,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Easy activity tracking for ActiveRecord models