activity_engine 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb52f7e33a80e8910a68df7e7a56a3202920abb1
-  data.tar.gz: 11b4ace2dd8bc74c2b55689adef42493afb6e926
+  metadata.gz: c9ea19bc1addf3c6339916689f55362f43462bab
+  data.tar.gz: e2b83cbdc64fe4784e4d07b4ec0deb812e492855
 SHA512:
-  metadata.gz: 3252cf91daa9ac4eb8d265281931a312211ba3f76d08bb7ed24f26d4fd88d2d6876170d9512912c14af1e174b9a78443a383a9c676353595382d829fb3d0afbe
-  data.tar.gz: d457234cef4c98a092704f81bdbe665e0e972656f0b73e9834e5e07acc424c9f8786e02653ed8f44aa6158acdaeb8265196b35a639eefa363c2ef7be71691462
+  metadata.gz: cefb4712ced5728293d6be2f423d0712547f0dc0f9a0eb5bacde9453b715ab2becb3372a82f1f11ffcfa0a8d46ac3f08e80ea5f32011e7db458de3cd51f4499a
+  data.tar.gz: cc22e8b91f49cd75df775842c0a97c7a39b26c75e90c98f5fa8eabde77a6bfa195d13be0e290adca80373da51c1f4eb96ee1df60e33ff185fa65d448b7d9e92b

data/Guardfile

@@ -4,7 +4,7 @@
 guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.+)\.rb$})     { |m| "spec/app/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
   watch('spec/support/*')  { "spec" }
 end

data/README.md

@@ -1,5 +1,7 @@
 # ActivityEngine
 
+[![Build Status](https://travis-ci.org/ndlib/activity_engine.png)](https://travis-ci.org/ndlib/activity_engine)
+
 A mountable Rails engine for both recording activity and displaying activity on
 a persisted object.
 
@@ -23,7 +25,7 @@ To record activity, register a class and method via a Rails generator.
 
     $ rails g activity_engine:register <ClassName> <MethodName> <Subject>
 
-Or by hand in a config/initializers/activity_engine_config.rb
+Or by hand in a config/post_initializers/activity_engine_config.rb
 
     ActivityEngine.register('<ClassName>', '<MethodName>') do |activity,context|
       activity.subject = context.<subject>
@@ -33,7 +35,3 @@ Or by hand in a config/initializers/activity_engine_config.rb
     end
 
 Then, whenever the ClassName#MethodName is invoke an activity will be recorded.
-
-## TODO
-
-* Provide a means for retrieving an object's activities

data/activity_engine.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "sqlite3"
   s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'capybara'
 end

data/lib/activity_engine/activity_sweeper.rb

@@ -29,7 +29,7 @@ module ActivityEngine
         self.records_processed << record
         ActivityEngine::Activity.new.tap {|activity|
           activity.subject = record
-          activity.user = current_user
+          activity.user = current_user if respond_to?(:current_user)
           activity.activity_type = "#{controller_name}##{action_name}"
         }.save!
       end

data/lib/activity_engine/version.rb

@@ -1,3 +1,3 @@
 module ActivityEngine
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/generators/activity_engine/register_generator.rb

@@ -6,17 +6,12 @@ module ActivityEngine
       desc "Creates a ActivityEngine initializer."
       argument :class_name, type: :string
       argument :method_name, type: :string
-      argument :subject_method, type: :string
 
       def copy_initializer
         generate('activity_engine:install')
         text = [
-          "ActivityEngine.register('#{class_name}', '#{method_name}') do |activity, context|",
-          "  activity.subject = context.#{subject_method}",
-          "  activity.current_user = context.current_user",
-          "  activity.activity_type = '#{class_name}##{method_name}'",
-          "#  activity.message = 'Specify a custom message if applicable'",
-          "end",
+          "ActivityEngine.register_models('#{class_name}')",
+          "ActivityEngine.register_controller('#{class_name.pluralize}Controller', '#{method_name}')",
           "",
           ""
         ].join("\n")

data/spec/features/dummy_scaffold_activity_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+# NOTE: These specs are very much tied into the output of the
+# `rake dummy:scaffold` commands. A change in those means a likely
+# change in the behavior.
+describe 'DummyScaffoldActivity', type: :feature do
+
+  it 'when I do a registered activity it is recorded' do
+    expect {
+      visit('/watches/new')
+      click_button("Create Watch")
+    }.to change{ActivityEngine::Activity.count}.by(1)
+  end
+
+  it 'when I do a non-registered activity it is not recorded' do
+    expect {
+      visit('/invisibles/new')
+      click_button("Create Invisible")
+    }.to_not change{ActivityEngine::Activity.count}
+  end
+
+end

data/spec/lib/activity_engine/activity_sweeper_spec.rb

@@ -12,13 +12,16 @@ describe ActivityEngine::ActivitySweeper do
 
   describe '#observe' do
     it 'should allow multiple registrations' do
+      # Registered via the dummy spec
+      expect(TestSweeper.observed_classes).to eq([Watch])
+
       expect {
         TestSweeper.observe(:book)
-      }.to change{TestSweeper.observed_classes}.from([]).to([Book])
+      }.to change{TestSweeper.observed_classes}.from([Watch]).to([Watch, Book])
 
       expect {
         TestSweeper.observe(:animal)
-      }.to change{TestSweeper.observed_classes}.from([Book]).to([Book, Animal])
+      }.to change{TestSweeper.observed_classes}.from([Watch,Book]).to([Watch,Book, Animal])
     end
   end
 end

data/tasks/dummy.rake

@@ -1,6 +1,6 @@
 namespace :dummy do
   desc "Generate a Rails dummy for ActivityEngine tests"
-  task :generate => [:init, :new_app, :install, :migrate]
+  task :generate => [:init, :new_app, :install, :scaffold, :migrate]
 
   desc 'Remove dummy application'
   task :remove => :init do
@@ -13,7 +13,7 @@ namespace :dummy do
   task :regenerate => [:remove, :generate]
 
 
-  task :new_app => [:init, :guard] do
+  task :new_app => [:init] do
     # Cribbed from https://gist.github.com/stas/4131823
     require 'rails'
     require 'activity_engine'
@@ -48,12 +48,20 @@ namespace :dummy do
     )
   end
 
+  task :scaffold => [:init, :new_app, :install] do
+    system("rails generate scaffold Watch --controller-specs false --view-specs false --routing-specs false")
+    system("rails generate scaffold Gear --controller-specs false --view-specs false --routing-specs false")
+    system("rails generate scaffold Invisible --controller-specs false --view-specs false --routing-specs false")
+
+    require 'generators/activity_engine/register_generator'
+    system("rails generate activity_engine:register Watch create")
+    system("rm -rf #{File.join(DUMMY_ROOT,'spec')}")
+  end
+
   task :install => [:init, :new_app] do
     puts "Installing ActivityEngine"
     require 'generators/activity_engine/install_generator'
-    ActivityEngine::Generators::InstallGenerator.start(
-      %W(. --force )
-    )
+    system("rails generate activity_engine:install --force")
   end
   task :migrate => :init do
     puts "Running activity_engine migrations"
@@ -66,11 +74,4 @@ namespace :dummy do
     DUMMY_ROOT = File.expand_path("../../spec/dummy", __FILE__).freeze
   end
 
-  task :guard => [:init] do
-    if File.exist?(File.join(DUMMY_ROOT, 'Rakefile'))
-      $stderr.puts "Dummy rakefile already exists"
-      exit!(-1)
-    end
-  end
-
 end

data/tasks/spec.rake

@@ -1,16 +1,12 @@
-task :spec do
-  APP_RAKEFILE = File.expand_path("../../spec/dummy/Rakefile", __FILE__)
-  load 'rails/tasks/engine.rake'
+task :spec => ['dummy:regenerate'] do
   require 'rails'
   require 'rspec/core/rake_task'
-  ENV['RAILS_ENV'] = 'test'
-  Rails.env = 'test'
-  Rake::Task["db:drop"].invoke rescue true
-  Rake::Task["db:create"].invoke
-  Rake::Task['environment'].invoke
-  Rake::Task['db:schema:load'].invoke
-  RSpec::Core::RakeTask.new(:__spec) do |t|
-    t.pattern = "./spec/**/*_spec.rb"
+  RSpec::Core::RakeTask.new(:rspec) do |t|
+    t.pattern = '../**/*_spec.rb'
+    # Because we are running in the context of the dummy app, we need to
+    # make sure that spec_helper.rb is somewhere in the load path.
+    # Thus the "-I ../"
+    t.rspec_opts = "--colour -I ../"
   end
-  Rake::Task['__spec'].invoke
+  Rake::Task['rspec'].invoke
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activity_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jeremy Friesen
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActivityEngine - a mountable Rails engine for activity streams
 email:
 - jeremy.n.friesen@gmail.com
@@ -93,13 +107,14 @@ files:
 - lib/generators/activity_engine/templates/insert_into_application_config.rb
 - lib/tasks/activity_engine_tasks.rake
 - script/rails
+- spec/app/models/activity_engine/activity_spec.rb
+- spec/app/models/activity_engine/statistic_spec.rb
+- spec/features/dummy_scaffold_activity_spec.rb
 - spec/lib/activity_engine/activity_builder_spec.rb
 - spec/lib/activity_engine/activity_data_structure_spec.rb
 - spec/lib/activity_engine/activity_sweeper_spec.rb
 - spec/lib/activity_engine/context_builder_spec.rb
 - spec/lib/activity_engine_spec.rb
-- spec/models/activity_engine/activity_spec.rb
-- spec/models/activity_engine/statistic_spec.rb
 - spec/spec_helper.rb
 - spec/spec_patch.rb
 - spec/support/persistence_layer.rb
@@ -130,13 +145,14 @@ signing_key:
 specification_version: 4
 summary: ActivityEngine - a mountable Rails engine for activity streams
 test_files:
+- spec/app/models/activity_engine/activity_spec.rb
+- spec/app/models/activity_engine/statistic_spec.rb
+- spec/features/dummy_scaffold_activity_spec.rb
 - spec/lib/activity_engine/activity_builder_spec.rb
 - spec/lib/activity_engine/activity_data_structure_spec.rb
 - spec/lib/activity_engine/activity_sweeper_spec.rb
 - spec/lib/activity_engine/context_builder_spec.rb
 - spec/lib/activity_engine_spec.rb
-- spec/models/activity_engine/activity_spec.rb
-- spec/models/activity_engine/statistic_spec.rb
 - spec/spec_helper.rb
 - spec/spec_patch.rb
 - spec/support/persistence_layer.rb