katsudo 0.0.2 → 0.0.4

data/CHANGELOG

@@ -0,0 +1,7 @@
+== 0.0.4
+
+* Flash stack has been moved to 'active_tools' gem.
+
+== 0.0.1..0.0.3
+
+* Initial releases.

data/katsudo.gemspec

@@ -12,6 +12,8 @@ Gem::Specification.new do |gem|
   gem.description   = %q{User activity for Rails}
   gem.summary       = %q{Stores activity traces + Flashing subsystem}
 
+  gem.add_dependency "active_tools"
+  
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/lib/katsudo/controller.rb

@@ -0,0 +1,67 @@
+module Katsudo
+  class Collector < Array
+    def store!
+      each {|activity| activity.save}
+    end
+  end
+
+  module ControllerExtension
+    extend ActiveSupport::Concern
+
+    name = Katsudo.config.name
+    class_name = Katsudo.config.activity_class_name
+    activity_user = "#{name}_user"
+    filter_method_name = "track_#{name}"
+
+    module_eval <<-EOV
+
+      included do
+        helper_method :#{name}, :#{activity_user}
+      end
+
+      module ClassMethods
+
+        def #{filter_method_name}(*args)
+          options = args.extract_options!
+          class_eval do
+            before_filter options do
+              @katsudo_collector ||= Katsudo::Collector.new
+            end
+            after_filter options do
+              @katsudo_collector.store!
+            end
+          end
+        end
+
+      end
+
+      def #{name}(name, resource=nil)
+        activity_class = name.to_s.classify.constantize
+        if activity_class <= #{class_name}
+          activity = activity_class.new(:user => #{activity_user}, :resource => resource)
+        else
+          raise(TypeError, "#{class_name} expected: \#{activity_class.class} passed")
+        end
+        if @katsudo_collector
+          activity.tap {|a| @katsudo_collector << a}
+        else
+          @last_activity = activity
+        end
+      end
+
+      def #{name}_message(*args)
+        activity = #{name}(*args)
+        {activity.flash_key => render_to_string(activity)}
+      end
+
+      def last_#{name}
+        @last_#{name}||@katsudo_collector.try(:last)
+      end
+
+      def #{activity_user} # override
+        current_user
+      end
+
+    EOV
+  end
+end

data/lib/katsudo/engine.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+require 'active_tools'
 module Katsudo #:nodoc:
   class Engine < ::Rails::Engine #:nodoc:
   end

data/lib/katsudo/railtie.rb

@@ -1,6 +1,6 @@
 require 'rails'
 require 'katsudo/models'
-require 'katsudo/dispatch'
+require 'katsudo/controller'
 
 module Katsudo
   class Railtie < ::Rails::Railtie
@@ -9,7 +9,7 @@ module Katsudo
         include ActiveRecordExtension
       end
       ActiveSupport.on_load(:action_controller) do
-        include Dispatch::ControllerExtension
+        include ControllerExtension
       end
     end
 

data/lib/katsudo/version.rb

@@ -1,3 +1,3 @@
 module Katsudo
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katsudo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
-dependencies: []
+date: 2013-01-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: active_tools
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: User activity for Rails
 email:
 - addagger@gmail.com
@@ -27,9 +43,7 @@ files:
 - katsudo.gemspec
 - lib/katsudo.rb
 - lib/katsudo/configuration.rb
-- lib/katsudo/dispatch.rb
-- lib/katsudo/dispatch/controller_extension.rb
-- lib/katsudo/dispatch/flash_stack.rb
+- lib/katsudo/controller.rb
 - lib/katsudo/engine.rb
 - lib/katsudo/models.rb
 - lib/katsudo/models/activity.rb
@@ -58,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Stores activity traces + Flashing subsystem

data/lib/katsudo/dispatch.rb

@@ -1,8 +0,0 @@
-require "katsudo/dispatch/controller_extension"
-require "katsudo/dispatch/flash_stack"
-
-module Katsudo
-  module Dispatch      
-    ActionDispatch::Flash::FlashHash.send(:include, FlashHashExtension)
-  end
-end

data/lib/katsudo/dispatch/controller_extension.rb

@@ -1,70 +0,0 @@
-module Katsudo
-  module Dispatch
-    
-    class Collector < Array
-      def store!
-        each {|activity| activity.save}
-      end
-    end
-    
-    module ControllerExtension
-      extend ActiveSupport::Concern
-
-      name = Katsudo.config.name
-      class_name = Katsudo.config.activity_class_name
-      activity_user = "#{name}_user"
-      filter_method_name = "track_#{name}"
-
-      module_eval <<-EOV
-
-        included do
-          helper_method :#{name}, :#{activity_user}
-        end
-
-        module ClassMethods
-
-          def #{filter_method_name}(*args)
-            options = args.extract_options!
-            class_eval do
-              before_filter options do
-                @katsudo_collector ||= Katsudo::Dispatch::Collector.new
-              end
-              after_filter options do
-                @katsudo_collector.store!
-              end
-            end
-          end
-
-        end
-
-        def #{name}(name, resource=nil)
-          activity_class = name.to_s.classify.constantize
-          if activity_class <= #{class_name}
-            activity = activity_class.new(:user => #{activity_user}, :resource => resource)
-          else
-            raise(TypeError, "#{class_name} expected: \#{activity_class.class} passed")
-          end
-          if @katsudo_collector
-            activity.tap {|a| @katsudo_collector << a}
-          else
-            @last_activity = activity
-          end
-        end
-
-        def #{name}_message(*args)
-          activity = #{name}(*args)
-          {activity.flash_key => render_to_string(activity)}
-        end
-
-        def last_#{name}
-          @last_#{name}||@katsudo_collector.try(:last)
-        end
-
-        def #{activity_user} # override
-          current_user
-        end
-
-      EOV
-    end
-  end
-end

data/lib/katsudo/dispatch/flash_stack.rb

@@ -1,57 +0,0 @@
-module Katsudo
-  module Dispatch
-    
-    class FlashStack
-      def initialize(flash)
-        @flash = flash
-        @stack = {}
-      end
-
-      def []=(k,v)
-        @stack[k] = Array(v)
-      end
-
-      def [](k)
-        @stack[k] ||= []
-      end
-      
-      def method_missing(*args, &block)
-        @stack.send(*args, &block)
-      end
-      
-      def use
-        @stack.dup.tap do
-          @stack.clear
-        end
-      end
-      
-    end
-    
-    module FlashHashExtension
-      extend ActiveSupport::Concern
-      
-      included do
-        class_eval do
-          def empty?
-            @flashes.empty? && (@stack.nil? ? true : @stack.empty?)
-          end
-        end
-      end
-      
-      def <<(*hashes)
-        hashes.each do |hash|
-          hash.each do |k,v|
-            Array(v).each do |value|
-              stack[k] << value
-            end
-          end
-        end
-      end
-      
-      def stack
-        @stack ||= FlashStack.new(self)
-      end
-    end
-    
-  end
-end