noodnik 0.1.1 → 0.2.0

data/test/dummy/spec/controllers/noodnik_nags_controller_spec.rb

@@ -32,7 +32,7 @@ describe Noodnik::NagsController do
       end
 
       it "sets the provided topic as the cookie name" do
-        @cookies.should_receive(:[]=).with(@topic.to_s, anything)
+        @cookies.should_receive(:[]=).with("noodnik_#{@topic}", anything)
         get :postpone, @attr
       end
 
@@ -44,7 +44,7 @@ describe Noodnik::NagsController do
 
     describe "GET 'complete'" do
       it "removes the nag cookie" do
-        @cookies.should_receive(:delete).with(@topic.to_s)
+        @cookies.should_receive(:delete).with("noodnik_#{@topic}")
         get :complete, @attr
       end
     end
@@ -108,12 +108,6 @@ describe Noodnik::NagsController do
     end
   end
 
-  def set_current_user_id(user_id)
-    Noodnik.setup do |config|
-      config.current_user_id = lambda { user_id }
-    end
-  end
-
   def stub_time
     t = Time.parse("01/01/2010 10:00")
     Time.stub!(:now).and_return(t)

data/test/dummy/spec/helpers/nags_helper_spec.rb

@@ -10,9 +10,7 @@ describe Noodnik::NagsHelper do
     describe "when signed in" do
       before :each do
         @user_id = 1
-        Noodnik.setup do |config|
-          config.current_user_id = lambda { @user_id }
-        end
+        set_current_user_id(@user_id)
       end
 
       after :each do
@@ -25,13 +23,13 @@ describe Noodnik::NagsHelper do
         end.should match(%r[<div class="noodnik-nag">.*</div>])
       end
 
-      it "should yield the block for a new topic" do
+      it "yields the block for a new topic" do
         helper.nag_user_to :register do |nag|
           "Register!"
         end.should include("Register!")
       end
 
-      it "should not yield the block if postponed" do
+      it "does not yield the block if topic has been postponed" do
         Noodnik::Nag.create! user_id: @user_id, topic: @topic, next_nag: 2.weeks.from_now
 
         helper.nag_user_to :register do |nag|
@@ -39,7 +37,7 @@ describe Noodnik::NagsHelper do
         end.should be_nil
       end
 
-      it "should yield the block if postpone expired" do
+      it "yields the block if postpone expired" do
         Noodnik::Nag.create! user_id: @user_id, topic: @topic, next_nag: 1.week.ago
 
         helper.nag_user_to :register do |nag|
@@ -47,27 +45,72 @@ describe Noodnik::NagsHelper do
         end.should include("Register!")
       end
 
-      it "should not yield the block if completed" do
+      it "does not yield the block if topic was completed" do
         Noodnik::Nag.create! user_id: @user_id, topic: @topic, next_nag: 10.weeks.ago, completed: true
 
         helper.nag_user_to :register do |nag|
           "I should not be returned!"
         end.should be_nil
       end
+    end
 
+    describe "when not signed in" do
+      before :each do
+        set_current_user_id(nil)
+        @cookies = mock('cookies')
+        helper.stub!(:cookies).and_return(@cookies)
+      end
+
+      it "yields the block in a div with class 'noodnik-nag'" do
+        @cookies.should_receive(:[]).with(:register).and_return(nil)
+        helper.nag_user_to :register do |nag|
+          "I should be in a <div>!"
+        end.should match(%r[<div class="noodnik-nag">.*</div>])
+      end
+
+      it "yields the block for a new topic" do
+        @cookies.should_receive(:[]).with(:register).and_return(nil)
+        helper.nag_user_to :register do |nag|
+          "Register!"
+        end.should include("Register!")
+      end
+
+      it "does not yield the block if topic has been postponed" do
+        @cookies.should_receive(:[]).with(:register).and_return(2.weeks.from_now.to_s)
+        helper.nag_user_to :register do |nag|
+          "I should not be returned!"
+        end.should be_nil
+      end
+
+      it "yields the block if postpone expired" do
+        @cookies.should_receive(:[]).with(:register).and_return(2.weeks.ago.to_s)
+
+        helper.nag_user_to :register do |nag|
+          "Register!"
+        end.should include("Register!")
+      end
+
+      it "does not yield the block if topic was completed" do
+        @cookies.should_receive(:[]).with(:register).and_return('complete')
+
+        helper.nag_user_to :register do |nag|
+          "I should not be returned!"
+        end.should be_nil
+      end
     end
+
   end
 
   describe "link_to" do
     describe "with html_options provided" do
       before :each do
         @link = nag_user_to :register do
-           link_to 'google.com', 'www.google.com', class: 'foo'
+          link_to 'google.com', 'www.google.com', class: 'foo'
         end     
       end
 
-      it "adds 'data-noodnik-topic' with the correct topic" do
-        @link.should include('data-noodnik-topic="register"')
+      it "adds 'data-noodnik-complete-path' with the correct topic" do
+        @link.should include('data-noodnik-complete-path="/noodnik/complete?topic=register"')
       end
 
       it "adds class 'noodnik-complete'" do
@@ -82,8 +125,8 @@ describe Noodnik::NagsHelper do
         end      
       end
 
-      it "adds 'data-noodnik-topic' with the correct topic when no html_options provided" do
-        @link.should include('data-noodnik-topic="register"')
+      it "adds 'data-noodnik-complete-path' with the correct topic" do
+        @link.should include('data-noodnik-complete-path="/noodnik/complete?topic=register"')
       end
 
       it "adds class 'noodnik-complete'" do
@@ -98,7 +141,7 @@ describe Noodnik::NagsHelper do
         postpone_for 14.days
       end
     end
-    
+
     it "prompts a default message of 'Remind me in 14 days'" do
       @link.should include('Remind me in 14 days')
     end
@@ -115,10 +158,11 @@ describe Noodnik::NagsHelper do
       @link.should include("topic=register")
     end
 
-    it "should have class 'noodnik-postpone'" do
+    it "has class 'noodnik-postpone'" do
       @link.should include("noodnik-postpone")
     end
 
+    # postpone_for is the only type of link inside a nag_user_to block that *should'nt* get class 'noodnik-complete'
     it "does not add class 'noodnik-complete'" do
       @link.should_not include("noodnik-complete")
     end

data/test/dummy/spec/spec_helper.rb

@@ -1,6 +1,13 @@
 require 'rubygems'
 require 'spork'
 
+
+def set_current_user_id(user_id)
+  Noodnik.setup do |config|
+    config.current_user_id = lambda { user_id }
+  end
+end
+
 Spork.prefork do
   # Loading more in this block will cause your tests to run faster. However,
   # if you change any configuration or code from libraries loaded here, you'll

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noodnik
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-03 00:00:00.000000000Z
+date: 2011-09-22 00:00:00.000000000Z
 dependencies: []
 description: A simple Rails solution for reminding users to do stuff.
 email: rauchy@gmail.com
@@ -25,11 +25,14 @@ files:
 - app/assets/stylesheets/noodnik/nags.css
 - app/views/layouts/application.html.erb
 - app/views/layouts/noodnik/application.html.erb
+- app/models/noodnik/cookie_nag.rb
 - app/models/noodnik/nag.rb
 - app/helpers/noodnik/nags_helper.rb
 - app/helpers/noodnik/application_helper.rb
 - config/routes.rb
 - db/migrate/20110813042447_create_noodnik_nags.rb
+- lib/generators/noodnik/install/install_generator.rb
+- lib/generators/noodnik/install/templates/initializer.rb
 - lib/noodnik.rb
 - lib/noodnik/engine.rb
 - lib/noodnik/railtie.rb