activity_engine 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44e070ee34ba7d6773a9d4ce58474044c08304cc
-  data.tar.gz: f28abe04afab9921b4491fdd7d013c0bc607c64b
+  metadata.gz: dd4228050d5a42c2041d1887fc5190c8f674e835
+  data.tar.gz: 0d2eca2469b07a9c17395d7e2336c97b44c11316
 SHA512:
-  metadata.gz: eb936342551fe849a5dda6b7f7c3719c3cee77b79b5db47e29600311a597981029858076912bdf41a58773940def2dc56b207e6a7ae88df1160fffd6bb9e6ea1
-  data.tar.gz: e035c9e31eeb99dd197604759ef9cca6bff80c1f37883240c9fdd4e64722686aefc626aa2844a279a4168ef1138d7e6d5f3f846cb59ed6d5a79bf6b63823dbce
+  metadata.gz: d429da6d161dc74357cfd57d14646b5f1191572f37f7a4373046ccef7c82b8ebebcd7af8cf01c13b3a43fef49fd64c178739eac97215b8f0dd11516ae395d4b2
+  data.tar.gz: f4246549a5c52a4b8ae6af8dd6fb2f1f861f5160bcfe6270df577ee64c24929155d3dab913131fd66cc0b97af7e2a05d0262cd5076e81a84ec5e498e39666060

data/app/models/activity_engine/activity.rb

@@ -13,7 +13,7 @@ module ActivityEngine
 
     scope :for_user, lambda {|user| where(user: user)}
     scope :for_subject, lambda {|subject|
-      where(subject_id: subject.to_param, subject_type: subject.class.to_s)
+      where(subject_id: ActivityEngine.extract_subject_id(subject), subject_type: subject.class.to_s)
     }
     scope :for_activity_type, lambda {|activity_type|
       where(activity_type: activity_type)
@@ -31,7 +31,7 @@ module ActivityEngine
     def subject=(object)
       if object.persisted?
         write_attribute(:subject_type, object.class.to_s)
-        write_attribute(:subject_id, object.to_param)
+        write_attribute(:subject_id, ActivityEngine.extract_subject_id(object))
       else
         raise UnpersistedSubjectError.new(object)
       end

data/lib/activity_engine.rb

@@ -11,4 +11,8 @@ module ActivityEngine
     context_builder.wrap!(activity_builder)
   end
 
+  def extract_subject_id(object)
+    Array(object.to_key).join(":")
+  end
+
 end

data/lib/activity_engine/activity_builder.rb

@@ -31,15 +31,6 @@ module ActivityEngine
       }
     end
 
-    def subject=(persisted_object)
-      if persisted_object.persisted?
-        @subject = persisted_object
-      else
-        raise UnpersistedSubjectError.new(persisted_object)
-      end
-    end
-
-    attr_reader :subject
-    attr_accessor :current_user, :message, :activity_type
+    attr_accessor :current_user, :message, :activity_type, :subject
   end
 end

data/lib/activity_engine/version.rb

@@ -1,3 +1,3 @@
 module ActivityEngine
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/generators/activity_engine/register_generator.rb

@@ -13,7 +13,7 @@ module ActivityEngine
         text = [
           "ActivityEngine.register('#{class_name}', '#{method_name}') do |activity, context|",
           "  activity.subject = context.#{subject_method}",
-          "  activity.user = context.current_user",
+          "  activity.current_user = context.current_user",
           "  activity.activity_type = '#{class_name}##{method_name}'",
           "#  activity.message = 'Specify a custom message if applicable'",
           "end",

data/lib/generators/activity_engine/templates/activity_engine_config.rb

@@ -1,6 +1,6 @@
 # ActivityEngine.register('PagesController', 'show') do |activity,context|
 #   activity.subject = context.page
-#   activity.user = context.current_user
+#   activity.current_user = context.current_user
 #   activity.activity_type = 'pages#show'
 #   activity.message = "A particulare message?"
 # end

data/spec/lib/activity_engine/activity_builder_spec.rb

@@ -30,25 +30,8 @@ describe ActivityEngine::ActivityBuilder do
     end
   end
 
-  describe '#subject=' do
-    it 'accepts a subject that is persisted' do
-      expect {
-        subject.subject = persisted_object
-      }.to_not raise_error
-    end
-    it 'rejects a subject that is not persisted' do
-      expect {
-        subject.subject = non_persisted_object
-      }.to raise_error
-    end
-    it 'rejects a subject that does not respond_to persisted?' do
-      expect {
-        subject.subject = ""
-      }.to raise_error(NoMethodError)
-    end
-  end
-
   it { should respond_to :current_user= }
+  it { should respond_to :subject= }
   it { should respond_to :message= }
   it { should respond_to :activity_type= }
 end

data/spec/lib/activity_engine_spec.rb

@@ -27,6 +27,21 @@ describe ActivityEngine do
     end
   end
 
+  describe '.extract_subject_id' do
+    it 'with multi-values' do
+      obj = double(to_key: ['a','b'] )
+      expect(ActivityEngine.extract_subject_id(obj)).to eq('a:b')
+    end
+    it 'with single value' do
+      obj = double(to_key: ['a'] )
+      expect(ActivityEngine.extract_subject_id(obj)).to eq('a')
+    end
+    it 'with string' do
+      obj = double(to_key: 'a' )
+      expect(ActivityEngine.extract_subject_id(obj)).to eq('a')
+    end
+  end
+
   describe 'entry creation' do
     it 'creates an entry for a persisted object'
     it 'requires an object to be persisted'

data/spec/support/persistence_layer.rb

@@ -6,9 +6,10 @@ class PersistenceLayer
     self.class.registry << self
   end
   def self.find(id)
-    @registry.find {|obj| obj.to_param == Integer(id)}
+    @registry.find {|obj| obj.to_key == Array(id)}
   end
 
   def persisted?; true; end
-  def to_param; object_id; end
+  def to_param; String(object_id); end
+  def to_key; [String(object_id)]; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activity_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Jeremy Friesen