scintillation 0.1.1 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+1.0.0

data/lib/scintillation.rb

@@ -1,42 +1,87 @@
-module Soccer022483
-  module Scintillation
-    class Messages
-      def initialize
-        @messages = []
+module Scintillation
+  
+  module ControllerHelpers
+    def self.included(base)
+      base.helper_method(:messages)
+      base.before_filter { |c| c.send(:flash).each { |t, m| c.messages.add(m, t) } }
+    end
+    
+    def messages
+      @messages ||= Scintillation::SessionMessages.new(session)
+    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
       end
-      
-      def method_missing(name, *args)
-        if /^(([a-z]+)_)?(message(s)?)(_for_([a -z]+))?$/.match(name.to_s)
-          options = {:tone => $2, :scope => $6}
-          ($3 == 'message') ? send(:add, args.first, options) : send(:get, options)
-        else
-          super
-        end
+    end
+  end
+  
+  ##################################################
+  
+  module ViewHelpers
+    def method_missing(method, *args, &block)
+      if /^((\w+)_)?msgs$/.match(method.to_s)
+        messages.get($2)
+      else
+        super
       end
-      
-      private
-      
-      def add(body, options = {})
-        @messages << Message.new(body, options[:tone], options[:scope])
+    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
+  
+  ##################################################
+  
+  class SessionMessages
+    def initialize(session)
+      @session = session
+      @session[:messages] ||= {}
+      @temp_msgs = {}
+    end
+    
+    def add(obj, tone = nil, scope = nil)
+      @session[:messages][scope.to_s] ||= []
       
-      def get(options = {})
-        msgs = []
-        @messages.delete_if do |m|
-          msgs << m if {:tone => m.tone, :scope => m.scope} == options
-        end
-        msgs
+      case obj
+        when String, Symbol then @session[:messages][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)
       end
     end
     
-    class Message
-      attr_reader :to_s, :tone, :scope
-      
-      def initialize(body, tone = nil, scope = nil)
-        @to_s = body.to_s
-        @tone = tone.to_s unless tone !~ /\S/
-        @scope = scope.to_s unless scope !~ /\S/
+    def get(scope = nil)
+      @temp_msgs[scope.to_s] ||= (@session[:messages].delete(scope.to_s) || [])
+    end
+  end
+  
+  ##################################################
+  
+  Message = Struct.new(:to_s, :tone)
+  
+end
+
+if defined? Rails
+  #a fix until they patch
+  module ActionController
+    class Base
+      def method_missing(method, *args, &block)
+        super(method.to_sym, args, &block)
+      rescue NoMethodError
+        default_render
       end
     end
   end
+  
+  ActionController::Base.send(:include, Scintillation::ControllerHelpers)
+  ActionView::Base.send(:include, Scintillation::ViewHelpers)
 end

data/scintillation.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scintillation}
-  s.version = "0.1.1"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Austin Schneider"]
-  s.date = %q{2009-10-14}
+  s.date = %q{2009-10-16}
   s.description = %q{A flash messages replacement}
   s.email = %q{soccer022483@gmail.com}
   s.extra_rdoc_files = [

data/spec/scintillation_spec.rb

@@ -1,49 +1,32 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-SampleData = Struct.new(:setter_method, :getter_method, :tone, :scope) do
-  def body
-    setter_method
-  end
-end
+module ActiveRecord; Errors = Struct.new(nil); end
 
-describe "Scintillation" do
-  it "messages" do
-    msgs_obj = Soccer022483::Scintillation::Messages.new
-    msgs_obj.instance_variable_get(:@messages).should be_empty
+describe Scintillation::SessionMessages do
+  it "should add/get messages" do
+    sm = Scintillation::SessionMessages.new({})
     
-    samples = []
-    samples << SampleData.new('message', 'messages', nil, nil)
-    samples << SampleData.new('positive_message', 'positive_messages', 'positive', nil)
-    samples << SampleData.new('message_for_login', 'messages_for_login', nil, 'login')
-    samples << SampleData.new('negative_message_for_user', 'negative_messages_for_user', 'negative', 'user')
+    sm.add("a")
+    sm.add("b", 'x')
+    sm.add("c", nil, 'y')
+    sm.add("d", 'x', 'y')
     
-    samples.each { |s| msgs_obj.send(s.setter_method, s.body) }
+    messages = sm.get
+    messages.size.should == 2
+    messages.map { |m| [m.to_s, m.tone] }.should == [['a', nil], ['b', 'x']]
     
-    size = 4
+    messages = sm.get('z')
+    messages.size.should == 0
     
-    samples.each do |s|
-      msgs_obj.instance_variable_get(:@messages).size.should == size
-      msgs = msgs_obj.send(s.getter_method)
-      msgs.size.should == 1
-      msgs.map { |m| [m.to_s, m.tone, m.scope] }.should == [[s.body, s.tone, s.scope]]
-      size -= 1
-    end
+    messages = sm.get('y')
+    messages.size.should == 2
+    messages.map { |m| [m.to_s, m.tone] }.should == [['c', nil], ['d', 'x']]
   end
-  
-  it "message" do
-    m = Soccer022483::Scintillation::Message.new("message")
-    [m.to_s, m.tone, m.scope].should == ['message', nil, nil]
-    
-    m = Soccer022483::Scintillation::Message.new("message", nil, nil)
-    [m.to_s, m.tone, m.scope].should == ['message', nil, nil]
-    
-    m = Soccer022483::Scintillation::Message.new("message", '', '')
-    [m.to_s, m.tone, m.scope].should == ['message', nil, nil]
-    
-    m = Soccer022483::Scintillation::Message.new("message", ' ', ' ')
-    [m.to_s, m.tone, m.scope].should == ['message', nil, nil]
-    
-    m = Soccer022483::Scintillation::Message.new("message", 'positive', 'login')
-    [m.to_s, m.tone, m.scope].should == ['message', 'positive', 'login']
+end
+
+describe Scintillation::Message do
+  it "should create" do
+    m = Scintillation::Message.new("message", 'positive')
+    [m.to_s, m.tone].should == ['message', 'positive']
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'scintillation'
+require 'scintillation.rb'
 require 'spec'
 require 'spec/autorun'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scintillation
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors: 
 - Austin Schneider
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 -04:00
+date: 2009-10-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency