scintillation 1.0.11 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.0.11
+1.1.1

data/lib/scintillation.rb

@@ -1,99 +1,10 @@
+require 'active_support'
+require 'scintillation/controller'
+require 'scintillation/view'
+
 module Scintillation
-  
-  def self.included(base)
-    base.send(:include, Controller)
-  end
-  
-  module Controller
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-    
-    module ClassMethods
-      def scintillate(options = {})
-        include InstanceMethods
-        ActionView::Base.send(:include, Scintillation::View)
-        
-        options.reverse_merge!(:scope => :messages)
-        
-        # 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
-    
-    module InstanceMethods
-      def method_missing(method, *args, &block)
-        case method.to_s
-          when /^((\w+)_)?msg(_for_(\w+))?$/ then messages.add(args[0], $2, $4)
-          when /^((\w+)_)?msgs$/ then messages.get($2)
-          else super
-        end
-      end
-    end
-  end
-  
-  ##################################################
-  
-  module View
-    def self.included(base)
-      base.send(:include, InstanceMethods)
-    end
-    
-    module InstanceMethods
-      def method_missing(method, *args, &block)
-        if method.to_s =~ /^((\w+)_)?msgs$/
-          messages.get($2)
-        else
-          super
-        end
-      end
-    
-      def display_messages(msgs)
-        content_tag(:ul) { msgs.map { |m| content_tag(:li, m, :class => m.tone) } }
-      end
-    end
-  end
-  
-  ##################################################
-  
-  class SessionMessages
-    def initialize(session, options = {})
-      options.reverse_merge!(:scope => :messages)
-      @session = session
-      @session_scope = options[:scope]
-      @temp_msgs = {}
-    end
-    
-    def msgs
-      @session[@session_scope] ||= {}
-    end
-    
-    def add(obj, tone = nil, scope = nil)
-      msgs[scope.to_s] ||= []
-      
-      case obj
-        when ActiveModel::Errors then obj.full_messages
-        else Array(obj)
-      end.each do |m|
-        msgs[scope.to_s] << Scintillation::Message.new(m.to_s, tone)
-      end
-    end
-    
-    def get(scope = nil)
-      @temp_msgs[scope.to_s] ||= (msgs.delete(scope.to_s) || [])
-    end
-  end
-  
-  ##################################################
-  
-  Message = Struct.new(:to_s, :tone)
-  
 end
 
-ActionController::Base.send(:include, Scintillation) if defined?(Rails)
+if defined?(Rails)
+  ActionController::Base.send(:extend, Scintillation::Controller)
+end

data/lib/scintillation/controller.rb

@@ -0,0 +1,25 @@
+require 'scintillation/message_queue'
+
+module Scintillation
+  module Controller
+  
+    def scintillate(options = {})
+      include MessageQueue
+      include InstanceMethods
+      
+      ActionView::Base.send(:include, Scintillation::View)
+    
+      options.reverse_merge!(:scope => :messages)
+    
+      helper_method :message_store
+    
+      define_method(:scintillation_scope) { options[:scope] }
+    end
+  
+    module InstanceMethods
+      def message_store
+        @message_store ||= (session[scintillation_scope] ||= {})
+      end
+    end
+  end
+end

data/lib/scintillation/message_queue.rb

@@ -0,0 +1,24 @@
+require 'scintillation/message_queue/message'
+
+module Scintillation
+  module MessageQueue
+    
+    def message_store
+      @message_store ||= {}
+    end
+  
+    def method_missing(method, *args, &block)
+      case method.to_s
+      when /^((\w+)_)?msg(_for_(\w+))?$/
+        (message_store[$4] ||= []) << Message.new(args[0], $2)
+      when /^has_((\w+)_)?msgs\?$/
+        !message_store[$2].empty?
+      when /^((\w+)_)?msgs$/
+        message_store.delete($2) || []
+      else
+        super
+      end
+    end
+  
+  end
+end

data/lib/scintillation/message_queue/message.rb

@@ -0,0 +1,22 @@
+module Scintillation
+  module MessageQueue
+    class Message
+      def initialize(text, tone)
+        self.text, self.tone = text, tone
+      end
+
+      attr_accessor :tone
+      attr_reader :text
+
+      alias_method :to_s, :text
+
+      def text=(val)
+        @text = val.to_s
+      end
+      
+      def ==(message)
+        text == message.text && tone == message.tone
+      end
+    end
+  end
+end

data/lib/scintillation/view.rb

@@ -0,0 +1,16 @@
+module Scintillation
+  module View
+    
+    def method_missing(method, *args, &block)
+      case method.to_s
+      when /^has_((\w+)_)?msgs\?$/
+        message_store[$2] && !message_store[$2].empty?
+      when /^((\w+)_)?msgs$/
+        message_store.delete($2) || []
+      else
+        super
+      end
+    end
+    
+  end
+end

data/scintillation.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scintillation}
-  s.version = "1.0.11"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Austin Schneider"]
-  s.date = %q{2010-04-27}
+  s.date = %q{2010-06-27}
   s.description = %q{A flash messages replacement}
   s.email = %q{soccer022483@gmail.com}
   s.extra_rdoc_files = [
@@ -24,8 +24,13 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/scintillation.rb",
+     "lib/scintillation/controller.rb",
+     "lib/scintillation/message_queue.rb",
+     "lib/scintillation/message_queue/message.rb",
+     "lib/scintillation/view.rb",
      "scintillation.gemspec",
-     "spec/scintillation_spec.rb",
+     "spec/scintillation/controller_spec.rb",
+     "spec/scintillation/message_queue_spec.rb",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/soccer022483/scintillation}
@@ -34,7 +39,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{A flash messages replacement}
   s.test_files = [
-    "spec/scintillation_spec.rb",
+    "spec/scintillation/controller_spec.rb",
+     "spec/scintillation/message_queue_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/scintillation/controller_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'action_controller'
+
+class ControllerTest < ActionController::Base
+  extend Scintillation::Controller
+  
+  def session
+    @session ||= {}
+  end
+end
+
+describe Scintillation::Controller do
+  describe "scintillate" do
+    before do
+      ControllerTest.scintillate(:scope => :messages)
+    end
+    
+    describe "an instance" do
+      before do
+        @ct = ControllerTest.new
+      end
+      
+      it "should be a message queue" do
+        @ct.is_a?(Scintillation::MessageQueue).should be_true
+      end
+
+      it "should have a scintillation_scope" do
+        @ct.scintillation_scope.should == :messages
+      end
+      
+      it "messages should setup the session" do
+        @ct.message_store.should == {}
+        @ct.session.should == {:messages => {}}
+      end
+    end
+  end
+end

data/spec/scintillation/message_queue_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+class MessageQueueTest
+  include Scintillation::MessageQueue
+end
+
+describe Scintillation::MessageQueue do
+  before do
+    @mqt = MessageQueueTest.new
+  end
+  
+  def create_message(text, tone)
+    Scintillation::MessageQueue::Message.new(text, tone)
+  end
+  
+  describe "adding messages" do
+    it "should be able to add messages with no tone or scope" do
+      args = ["msg", nil]
+      msg = create_message(*args)
+      Scintillation::MessageQueue::Message.stub!(:new).with(*args).and_return(msg)
+      @mqt.msg(args[0])
+      @mqt.message_store.should == {nil => [msg]}
+    end
+  
+    it "should be able to add messages with a tone" do
+      args = ["msg", "cool"]
+      msg = create_message(*args)
+      Scintillation::MessageQueue::Message.stub!(:new).with(*args).and_return(msg)
+      @mqt.cool_msg(args[0])
+      @mqt.message_store.should == {nil => [msg]}
+    end
+  
+    it "should be able to add messages with a scope" do
+      args = ["msg", nil]
+      msg = create_message(*args)
+      Scintillation::MessageQueue::Message.stub!(:new).with(*args).and_return(msg)
+      @mqt.msg_for_login(args[0])
+      @mqt.message_store.should == {'login' => [msg]}
+    end
+  
+    it "should be able to add messages with a tone and scope" do
+      args = ["msg", "cool"]
+      msg = create_message(*args)
+      Scintillation::MessageQueue::Message.stub!(:new).with(*args).and_return(msg)
+      @mqt.cool_msg_for_login(args[0])
+      @mqt.message_store.should == {'login' => [msg]}
+    end
+  end
+  
+  describe "with some messages added" do
+    before do
+      @mqt.msg("msg")
+      @mqt.cool_msg("cool msg")
+      @mqt.msg_for_login("msg for login")
+      @mqt.cool_msg_for_login("cool msg for login")
+    end
+    
+    it "should retrieve messages by scope" do
+      @mqt.msgs.should == [
+        create_message("msg", nil),
+        create_message("cool msg", "cool"),
+      ]
+      @mqt.login_msgs.should == [
+        create_message("msg for login", nil),
+        create_message("cool msg for login", "cool"),
+      ]
+      @mqt.message_store.should be_empty
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
-  - 11
-  version: 1.0.11
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Austin Schneider
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -04:00
+date: 2010-06-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,8 +46,13 @@ files:
 - Rakefile
 - VERSION
 - lib/scintillation.rb
+- lib/scintillation/controller.rb
+- lib/scintillation/message_queue.rb
+- lib/scintillation/message_queue/message.rb
+- lib/scintillation/view.rb
 - scintillation.gemspec
-- spec/scintillation_spec.rb
+- spec/scintillation/controller_spec.rb
+- spec/scintillation/message_queue_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/soccer022483/scintillation
@@ -80,5 +85,6 @@ signing_key:
 specification_version: 3
 summary: A flash messages replacement
 test_files: 
-- spec/scintillation_spec.rb
+- spec/scintillation/controller_spec.rb
+- spec/scintillation/message_queue_spec.rb
 - spec/spec_helper.rb

data/spec/scintillation_spec.rb

@@ -1,32 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-module ActiveRecord; Errors = Struct.new(nil); end
-
-describe Scintillation::SessionMessages do
-  it "should add/get messages" do
-    sm = Scintillation::SessionMessages.new({})
-    
-    sm.add("a")
-    sm.add("b", 'x')
-    sm.add("c", nil, 'y')
-    sm.add("d", 'x', 'y')
-    
-    messages = sm.get
-    messages.size.should == 2
-    messages.map { |m| [m.to_s, m.tone] }.should == [['a', nil], ['b', 'x']]
-    
-    messages = sm.get('z')
-    messages.size.should == 0
-    
-    messages = sm.get('y')
-    messages.size.should == 2
-    messages.map { |m| [m.to_s, m.tone] }.should == [['c', nil], ['d', 'x']]
-  end
-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