scintillation 1.0.0 → 1.0.1

data/Rakefile

@@ -36,11 +36,7 @@ task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "scintillation #{version}"

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/scintillation.rb

@@ -1,40 +1,63 @@
 module Scintillation
   
-  module ControllerHelpers
+  def self.included(base)
+    base.include(Controller)
+  end
+  
+  module Controller
     def self.included(base)
-      base.helper_method(:messages)
-      base.before_filter { |c| c.send(:flash).each { |t, m| c.messages.add(m, t) } }
+      base.extend(ClassMethods)
     end
     
-    def messages
-      @messages ||= Scintillation::SessionMessages.new(session)
+    module ClassMethods
+      def scintillate(options => {})
+        include InstanceMethods
+        ActionView::Base.send(:include, Scintillation::View)
+        
+        # import flash messages
+        before_filter { |c| c.send(:flash).each { |t, m| c.messages.add(m, t) } }
+        
+        helper_method :messages
+        
+        define_method(:messages) do
+          @messages ||= Scintillation::SessionMessages.new(session, :scope => options[:scope])
+        end
+      end
     end
     
-    def method_missing(method, *args, &block)
-      if /^((\w+)_)?msg(_for_(\w+))?$/.match(method.to_s)
-        messages.add(args[0], $2, $4)
-      elsif /^((\w+)_)?msgs$/.match(method.to_s)
-        messages.get($2)
-      else
-        super
+    module InstanceMethods
+      def method_missing(method, *args, &block)
+        if /^((\w+)_)?msg(_for_(\w+))?$/.match(method.to_s)
+          messages.add(args[0], $2, $4)
+        elsif /^((\w+)_)?msgs$/.match(method.to_s)
+          messages.get($2)
+        else
+          super
+        end
       end
     end
   end
   
   ##################################################
   
-  module ViewHelpers
-    def method_missing(method, *args, &block)
-      if /^((\w+)_)?msgs$/.match(method.to_s)
-        messages.get($2)
-      else
-        super
-      end
+  module View
+    def self.included(base)
+      base.include(InstanceMethods)
     end
     
-    def display_messages(msgs)
-      unless msgs.empty?
-        "<ul>\n  " + msgs.map { |m| "<li class=\"#{m.tone}\">#{m}</li>" }.join("\n  ") + "\n</ul>"
+    module InstanceMethods
+      def method_missing(method, *args, &block)
+        if /^((\w+)_)?msgs$/.match(method.to_s)
+          messages.get($2)
+        else
+          super
+        end
+      end
+    
+      def display_messages(msgs)
+        unless msgs.empty?
+          "<ul>\n  " + msgs.map { |m| "<li class=\"#{m.tone}\">#{m}</li>" }.join("\n  ") + "\n</ul>"
+        end
       end
     end
   end
@@ -42,17 +65,22 @@ module Scintillation
   ##################################################
   
   class SessionMessages
-    def initialize(session)
+    def initialize(session, options = {})
+      options.reverse_merge!(:scope => :messages)
       @session = session
-      @session[:messages] ||= {}
+      @session_scope = options[:scope]
       @temp_msgs = {}
     end
     
+    def msgs
+      @session[@session_scope] ||= {}
+    end
+    
     def add(obj, tone = nil, scope = nil)
-      @session[:messages][scope.to_s] ||= []
+      msgs[scope.to_s] ||= []
       
       case obj
-        when String, Symbol then @session[:messages][scope.to_s] << Scintillation::Message.new(obj, tone)
+        when String, Symbol then msgs[scope.to_s] << Scintillation::Message.new(obj, tone)
         when ActiveRecord::Errors then add(obj.full_messages, tone, scope)
         when Enumerable then obj.each { |o| add(o, tone, scope) }
         else add(obj.to_s, tone, scope)
@@ -60,7 +88,7 @@ module Scintillation
     end
     
     def get(scope = nil)
-      @temp_msgs[scope.to_s] ||= (@session[:messages].delete(scope.to_s) || [])
+      @temp_msgs[scope.to_s] ||= (msgs.delete(scope.to_s) || [])
     end
   end
   
@@ -70,7 +98,7 @@ module Scintillation
   
 end
 
-if defined? Rails
+if defined?(Rails)
   #a fix until they patch
   module ActionController
     class Base
@@ -82,6 +110,5 @@ if defined? Rails
     end
   end
   
-  ActionController::Base.send(:include, Scintillation::ControllerHelpers)
-  ActionView::Base.send(:include, Scintillation::ViewHelpers)
+  ActionController::Base.send(:include, Scintillation)
 end

data/scintillation.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{scintillation}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Austin Schneider"]
-  s.date = %q{2009-10-16}
+  s.date = %q{2010-03-31}
   s.description = %q{A flash messages replacement}
   s.email = %q{soccer022483@gmail.com}
   s.extra_rdoc_files = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://gemcutter.org/gems/scintillation}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A flash messages replacement}
   s.test_files = [
     "spec/scintillation_spec.rb",
@@ -51,3 +51,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
+

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: scintillation
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Austin Schneider
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 -04:00
+date: 2010-03-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: A flash messages replacement
 email: soccer022483@gmail.com
 executables: []
@@ -55,18 +62,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A flash messages replacement