gritter_notices 0.3.1 → 0.3.2

data/.watchr

@@ -0,0 +1,99 @@
+
+# https://github.com/rspec/rspec-rails/blob/master/specs.watchr
+
+# Other examples:
+# https://gist.github.com/298168
+
+# --------------------------------------------------
+# Convenience Methods
+# --------------------------------------------------
+
+def all_spec_files
+  'spec/**/*_spec.rb'
+end
+
+def run_spec_matching(thing_to_match)
+  puts "Matching #{thing_to_match}"
+  matches = Dir[all_spec_files].grep(/#{thing_to_match}_spec/i)
+  if matches.empty?
+    puts "Sorry, thanks for playing, but there were no matches for #{thing_to_match}"
+  else
+    run matches.join(' ')
+  end
+end
+
+def run(files_to_run)
+  puts "Running #{files_to_run}"
+  system "bundle exec rspec -d #{files_to_run}"
+  no_int_for_you
+  notify
+  puts
+end
+
+def notify message=''
+  # message = message.split('---------------------------------------------------------------')[3].split('Time taken by tests')[0]
+  # image = message.include?('fails') ? "~/.watchr_images/failed.png" : "~/.watchr_images/passed.png"
+
+  # Grub images from autotest-growl
+  image = $?.success? ? "~/.watchr_images/passed.png" : "~/.watchr_images/failed.png"
+  message = $?.success? ? "success" : "failed"
+
+  options = "-i #{File.expand_path(image)} "
+  options += '-u critical -t 10000 ' unless $?.success?
+
+  notify_send = `which notify-send`.chomp
+  cmd = "#{notify_send} #{options} 'Watchr Test Results: #{message}'"
+  system cmd
+end
+
+def run_all_specs
+  run('spec/') #all_spec_files
+end
+
+
+# def run_suite
+#   system "clear"
+#   run_spec('spec/*/*_spec.rb spec/*/*/*_spec.rb')
+# end
+
+
+
+# --------------------------------------------------
+# Watchr Rules
+# --------------------------------------------------
+watch('^app/(.*)\.(.*)') { |m| run_spec_matching(m[1]) }
+watch('^lib\/(.*)\.rb') { |m| run_spec_matching(m[1]) }
+watch('^spec\/(.*)_spec\.rb') { |m| run_spec_matching(m[1]) }
+watch('^spec\/factories/(.*)_factory\.rb') { |m| run_spec_matching(m[1]) }
+watch('^spec/spec_helper\.rb') { run_all_specs }
+watch('^spec/support/.*\.rb') { run_all_specs }
+
+# --------------------------------------------------
+# Signal Handling
+# --------------------------------------------------
+
+def no_int_for_you
+  @sent_an_int = nil
+end
+
+# Ctrl-C
+Signal.trap 'INT' do
+  if @sent_an_int then
+    puts " A second INT? Ok, I get the message. Shutting down now."
+    exit
+  else
+    puts " Did you just send me an INT? Ugh. I'll quit for real if you do it again."
+    @sent_an_int = true
+    Kernel.sleep 1.5
+    run_all_specs
+  end
+end
+
+
+# Ctrl-\
+Signal.trap 'QUIT' do
+  puts " --- Running all tests ---\n\n"
+  run_suite
+end
+
+puts "Watching.."

data/Gemfile

@@ -10,7 +10,9 @@ gem 'actionpack', "~> 3.0"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development, :test do
+  gem 'ruby-debug'
   gem 'sqlite3'
+  gem 'watchr'
   gem 'factory_girl'
   gem 'shoulda'
   gem "rspec", "~> 2.5.0"

data/README.rdoc

@@ -67,6 +67,8 @@
     notice_progress
     notice_notice    # синоним просто `notice`
 
+Также есть алиас gritter_notice со всеми вышеперечисленными типами сообщений.
+
 Далее во вьюхе вызываем:
 
    = gritter_flash_messages
@@ -91,6 +93,13 @@
 
 2. Показывать push-сообщения
 
+== Нечто отдаленно подобное:
+
+ Вместо flash_conductor-а
+ https://github.com/mattpolito/flash-message-conductor
+ https://rubygems.org/gems/glennr-flash-message-conductor
+ https://github.com/QuBiT/universal_flash_messages
+
 
 == Credits
 * Robin Brouwer https://github.com/RobinBrouwer/gritter

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/app/models/gritter_notice.rb

@@ -20,7 +20,7 @@ class GritterNotice < ActiveRecord::Base
   serialize :options, Hash
 
   before_validation :set_options
-  validates_presence_of :owner, :message
+  validates_presence_of :owner, :text
 
   def fresh?
     delivered_at.blank?

data/gritter_notices.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gritter_notices}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danil Pismenny"]
-  s.date = %q{2011-03-29}
+  s.date = %q{2011-04-01}
   s.description = %q{Provide `notice` method to user model to save notices and to shows them later in views with Gritter (growl-like jQuery plugin). Fully support of Rails flash messages also. Helpful to send flash messages from background jobs.}
   s.email = %q{danil@orionet.ru}
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    ".watchr",
     "Gemfile",
     "LICENSE.txt",
     "README.rdoc",
@@ -32,12 +33,12 @@ Gem::Specification.new do |s|
     "lib/gritter_notices/rspec_matcher.rb",
     "lib/gritter_notices/view_helpers.rb",
     "spec/gritter_notice_spec.rb",
-    "spec/owner_spec.rb",
+    "spec/gritter_notices/active_record_spec.rb",
+    "spec/gritter_notices/view_helpers_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/factories.rb",
     "spec/support/migration.rb",
-    "spec/support/user.rb",
-    "spec/view_helpers_spec.rb"
+    "spec/support/user.rb"
   ]
   s.homepage = %q{http://github.com/dapi/gritter_notices}
   s.licenses = ["MIT"]
@@ -46,12 +47,12 @@ Gem::Specification.new do |s|
   s.summary = %q{Show growl-like  flashes and saved user's notices with Gritter}
   s.test_files = [
     "spec/gritter_notice_spec.rb",
-    "spec/owner_spec.rb",
+    "spec/gritter_notices/active_record_spec.rb",
+    "spec/gritter_notices/view_helpers_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/factories.rb",
     "spec/support/migration.rb",
-    "spec/support/user.rb",
-    "spec/view_helpers_spec.rb"
+    "spec/support/user.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -61,7 +62,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<gritter>, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>, ["~> 3.0"])
       s.add_runtime_dependency(%q<actionpack>, ["~> 3.0"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<watchr>, [">= 0"])
       s.add_development_dependency(%q<factory_girl>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
@@ -74,7 +77,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<gritter>, [">= 0"])
       s.add_dependency(%q<activerecord>, ["~> 3.0"])
       s.add_dependency(%q<actionpack>, ["~> 3.0"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<watchr>, [">= 0"])
       s.add_dependency(%q<factory_girl>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.5.0"])
@@ -88,7 +93,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<gritter>, [">= 0"])
     s.add_dependency(%q<activerecord>, ["~> 3.0"])
     s.add_dependency(%q<actionpack>, ["~> 3.0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<watchr>, [">= 0"])
     s.add_dependency(%q<factory_girl>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.5.0"])

data/lib/generators/templates/migration.rb

@@ -1,9 +1,9 @@
 class CreateGritterNoticesTable < ActiveRecord::Migration
   def self.up
     create_table :gritter_notices, :force => true do |t|
-      t.integer  :owner_id,                           :null => false
-      t.string  :owner_type,                          :null => false
-      t.text     :message,                            :null => false
+      t.integer  :owner_id,                            :null => false
+      t.string   :owner_type,                          :null => false
+      t.text     :text,                                :null => false
       # t.string   :level,        :default => "notice", :null => false
       # t.string   :title
       # t.string   :image

data/lib/gritter_notices/active_record.rb

@@ -1,6 +1,6 @@
 module GritterNotices::ActiveRecord
 
-  ValidMethods = Hash[*GritterNotices::KEYS.map { |key| ["notice_#{key}".to_sym, key] }.flatten]
+  ValidMethods = Hash[*GritterNotices::KEYS.map { |key| ["gritter_notice_#{key}", key] }.flatten]
 
   # :level => [:success, :warning, :notice, :error, :progress]
   def has_gritter_notices
@@ -13,35 +13,37 @@ module GritterNotices::ActiveRecord
     #
     # Examples:
     #
-    # notice :message=>'asdsad', :image=>:notice
+    # notice :text=>'asdsad', :image=>:notice
     # notice 'message', :level=>:success
     #
-
-    def notice *args
+    def gritter_notice *args
       options = args.extract_options!
-      message = args.first || options[:message]
+      text = args.first || options[:text]
       options = {:scope=>:gritter_notices}.merge options
-      if message.is_a? Symbol
-        options[:gritter_message_key] = message
-        options[:level] = message unless options[:level]
-        message = I18n::translate(message, options)
+      if text.is_a? Symbol
+        options[:gritter_key] = text
+        options[:level] = text unless options[:level]
+        text = options[:text] || I18n::translate(text, options)
       end
       options[:level]=:notice unless options[:level]
-      gritter_notices.create! :message=>message, :options=>options
+      gritter_notices.create! :text=>text, :options=>options
     end
 
+    alias_method :notice, :gritter_notice
+
+    #
     # notice_success
     # notice_error
     # notice_warning
     # notice_progress
     # notice_notice    - default. An alias for `notice`
-
+    #
     def method_missing(method_name, *args, &block)
-      if level = ValidMethods[method_name]
+      if level = ValidMethods[method_name.to_s] or level = ValidMethods["gritter_#{method_name}"]
         options = args.extract_options!
         options[:level] = level
         args << options
-        notice *args
+        gritter_notice *args
       else
         super(method_name, *args, &block)
       end

data/lib/gritter_notices/rspec_matcher.rb

@@ -1,24 +1,24 @@
 module GritterNotices
   module RSpecMatcher
-    def have_gritter_notice(message=nil)
-      HaveGritterNotice.new(message)
+    def have_gritter_notice(text=nil)
+      HaveGritterNotice.new(text)
     end
 
     class HaveGritterNotice
-      def initialize(message)
-        @message = message
+      def initialize(text)
+        @text = text
       end
 
       def description
-        "send gritter notice '#{@message}' to '#{@model}"
+        "send gritter notice '#{@text}' to '#{@model}"
       end
 
-      def failure_message_for_should
-        "#{@model.class} should have gritter_notice with message '#{@message}'"
+      def failure_text_for_should
+        "#{@model.class} should have gritter_notice with text '#{@text}'"
       end
 
-      def failure_message_for_should_not
-        "#{@model.class} should not have an gritter_notice with message '#{@message}'"
+      def failure_text_for_should_not
+        "#{@model.class} should not have an gritter_notice with text '#{@text}'"
       end
 
       # def from(value)
@@ -33,7 +33,7 @@ module GritterNotices
 
       def matches?(model)
         @model = model
-        not model.gritter_notices.select { |g| !@message or g.message == @message or g.options[:gritter_message_key] == @message }.empty?
+        not model.gritter_notices.select { |g| !@text or g.text == @text or g.options[:gritter_key] == @text }.empty?
       end
     end
   end

data/lib/gritter_notices/view_helpers.rb

@@ -34,7 +34,7 @@ module GritterNotices::ViewHelpers
       gritter_key = GRITTER_CONVERT_KEYS[options[:level]] || GRITTER_CONVERT_KEYS[:other] || options[:level]
       options[:title] = titles[gritter_key] || options[:level].to_s  unless options[:title]
       options[:image] = gritter_key unless options[:image]
-      gritters << add_gritter(notice.message, options)
+      gritters << add_gritter(notice.text, options)
       notice.mark_as_delivered
     end
   end
@@ -57,7 +57,7 @@ module GritterNotices::ViewHelpers
   def move_gritter_notices_to_flashes
     return unless current_user
     current_user.gritter_notices.fresh.each do |notice|
-      append_flash_message notice.level, notice.message
+      append_flash_message notice.level, notice.text
       notice.mark_as_delivered
     end
   end

data/spec/gritter_notice_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe GritterNotice do
   it { should belong_to(:owner) }
   it { should validate_presence_of(:owner) }
-  it { should validate_presence_of(:message) }
+  it { should validate_presence_of(:text) }
   it { should be_fresh }
   it { should_not be_delivered }
 

data/spec/{owner_spec.rb → gritter_notices/active_record_spec.rb}

@@ -4,6 +4,7 @@ require 'spec_helper'
 describe User do
   specify { User.should respond_to(:has_gritter_notices) }
   it { should have_many(:gritter_notices) }
+  it { should respond_to(:gritter_notice) }
 
   describe '#notice' do
     subject { Factory :user }
@@ -12,21 +13,21 @@ describe User do
       subject.notice 'some text'
       subject.should have_gritter_notice('some text')
       subject.gritter_notices.last.options[:level].should == :notice
-      subject.gritter_notices.last.options[:gritter_message_key].should == nil
+      subject.gritter_notices.last.options[:gritter_key].should == nil
     end
 
     it 'gets message with attribute' do
-      subject.notice :message=>'some text2', :level=>:success
+      subject.notice :text=>'some text2', :level=>:success
       subject.should have_gritter_notice('some text2')
-      subject.gritter_notices.last.options[:gritter_message_key].should be_nil
+      subject.gritter_notices.last.options[:gritter_key].should be_nil
       subject.gritter_notices.last.options[:level].should == :success
     end
 
     it 'gets message with symbol' do
       subject.notice :warning
       last = subject.gritter_notices.last
-      last.message.should == 'translation missing: en.gritter_notices.warning'
-      last.options[:gritter_message_key].should == :warning
+      last.text.should == 'translation missing: en.gritter_notices.warning'
+      last.options[:gritter_key].should == :warning
       last.options[:level].should == :warning
     end
 
@@ -35,5 +36,14 @@ describe User do
       subject.should have_gritter_notice('big problem')
       subject.gritter_notices.last.options[:level].should == :error
     end
+
+    it do
+      subject.gritter_notice :progress, :title=>'Supertitle', :text=>'Supertext'
+      last = subject.gritter_notices.last
+      last.options[:level].should == :progress
+      last.options[:title].should == 'Supertitle'
+      last.text.should == 'Supertext'
+    end
+
   end
 end

data/spec/{view_helpers_spec.rb → gritter_notices/view_helpers_spec.rb}

@@ -26,23 +26,28 @@ describe GritterNotices::ViewHelpers, :type => :helper  do
       flash[:error]='Error'
       flash[:success]=['Success1','Success2']
       flash[:info]=nil
-      current_user.notice :progress
-      current_user.notice_warning 'Warning'
+      current_user.gritter_notice :progress, :title=>'Supertitle', :text=>'Supertext'
+      current_user.notice_warning 'Warning Warning'
 
       compiled_gritters = [
         "$.gritter.add({image:'/images/gritter/error.png',title:'translation missing: en.gflash.titles.error',text:'Error'});",
+        "$.gritter.add({image:'/images/gritter/progress.png',title:'Supertitle',text:'Supertext'});",
         "$.gritter.add({image:'/images/gritter/success.png',title:'translation missing: en.gflash.titles.success',text:'Success1'});",
         "$.gritter.add({image:'/images/gritter/success.png',title:'translation missing: en.gflash.titles.success',text:'Success2'});",
-        "$.gritter.add({image:'/images/gritter/progress.png',title:'translation missing: en.gflash.titles.progress',text:'translation missing: en.gritter_notices.progress'});",
-        "$.gritter.add({image:'/images/gritter/warning.png',title:'translation missing: en.gflash.titles.warning',text:'Warning'});"]
-      helper.should_receive(:js).with(compiled_gritters) { mock :html_safe=>true }
+        "$.gritter.add({image:'/images/gritter/warning.png',title:'translation missing: en.gflash.titles.warning',text:'Warning Warning'});"
+    ].sort
+      #helper.should_receive(:js).with(compiled_gritters) { mock :html_safe=>true }
+      helper.should_receive(:js) do |args|
+        args.sort.should == compiled_gritters
+        mock :html_safe=>true
+      end
       helper.gritter_flash_messages
     end
   end
 
   describe '#move_gritter_notices_to_flashes' do
     specify do
-      notice = mock :level=>:level, :message=>:message
+      notice = mock :level=>:level, :text=>'text'
       notice.should_receive(:mark_as_delivered).twice
       current_user.stub_chain('gritter_notices.fresh') {[notice,notice]}
       helper.should_receive(:append_flash_message).twice

data/spec/support/factories.rb

@@ -4,5 +4,5 @@ end
 
 Factory.define :notice, :class=>'GritterNotice' do |f|
   f.association :owner, :factory=>:user
-  f.message "MyText"
+  f.text "MyText"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gritter_notices
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Danil Pismenny
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +04:00
+date: 2011-04-01 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,7 +73,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id004
-  name: sqlite3
+  name: ruby-debug
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -87,7 +87,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id005
-  name: factory_girl
+  name: sqlite3
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -101,11 +101,39 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id006
-  name: shoulda
+  name: watchr
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id007
+  name: factory_girl
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id008
+  name: shoulda
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -116,12 +144,12 @@ dependencies:
         - 5
         - 0
         version: 2.5.0
-  version_requirements: *id007
+  version_requirements: *id009
   name: rspec
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -130,12 +158,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id008
+  version_requirements: *id010
   name: rspec-rails
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -146,12 +174,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id009
+  version_requirements: *id011
   name: bundler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -162,12 +190,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  version_requirements: *id010
+  version_requirements: *id012
   name: jeweler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -176,12 +204,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id011
+  version_requirements: *id013
   name: rcov
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -191,7 +219,7 @@ dependencies:
         - 0
         - 6
         version: "0.6"
-  version_requirements: *id012
+  version_requirements: *id014
   name: gritter
   prerelease: false
   type: :runtime
@@ -205,6 +233,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files: 
+- .watchr
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -220,12 +249,12 @@ files:
 - lib/gritter_notices/rspec_matcher.rb
 - lib/gritter_notices/view_helpers.rb
 - spec/gritter_notice_spec.rb
-- spec/owner_spec.rb
+- spec/gritter_notices/active_record_spec.rb
+- spec/gritter_notices/view_helpers_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories.rb
 - spec/support/migration.rb
 - spec/support/user.rb
-- spec/view_helpers_spec.rb
 has_rdoc: true
 homepage: http://github.com/dapi/gritter_notices
 licenses: 
@@ -262,9 +291,9 @@ specification_version: 3
 summary: Show growl-like  flashes and saved user's notices with Gritter
 test_files: 
 - spec/gritter_notice_spec.rb
-- spec/owner_spec.rb
+- spec/gritter_notices/active_record_spec.rb
+- spec/gritter_notices/view_helpers_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories.rb
 - spec/support/migration.rb
 - spec/support/user.rb
-- spec/view_helpers_spec.rb