sooner 0.0.6 → 0.0.7

data/app/controllers/sooner/subscribers_controller.rb

@@ -1,6 +1,6 @@
 module Sooner
   class SubscribersController < ApplicationController
-
+    
     unloadable
     
     def new
@@ -9,19 +9,23 @@ module Sooner
 
     def create
       @subscriber = Subscriber.new(params[:sooner_subscriber])
-
-      respond_to do |format|
+      if @subscriber.valid?
         if Sooner.csv_store
-          result = @subscriber.save_csv
+          @subscriber.save_csv
         end
         if Sooner.db_store
-          result = @subscriber.save
+          @subscriber.save
+        end
+        render :update do |page|
+          page.replace_html 'sooner_subscriber', Sooner.subscribed
         end
-        if result
-          format.html { render :partial => "subscribed" }
-        else
-          format.html { render :partial => "already_subscribed" }
+      elsif @subscriber.errors[:name].include?('has already been taken') || @subscriber.errors[:email].include?('has already been taken')
+        render :update do |page|
+          page.replace_html 'sooner_subscriber', Sooner.already_subscribed
         end
+      else
+        flash[:notice] = Sooner.error_subscribed
+        redirect_to new_subscriber_path
       end
     end
   end

data/app/models/sooner/subscriber.rb

@@ -8,7 +8,7 @@ module Sooner
     def save_csv
       begin
         file = File.open("public/#{ Sooner.csv_file.nil? ? 'subscribers.csv' : Sooner.csv_file }", "a")
-        file << "#{ email }\n"
+        file << "#{ name },#{ email }\n"
         file.close
         return true
       rescue Exception => e

data/app/views/sooner/subscribers/new.html.erb

@@ -1,11 +1,11 @@
-<h2>Add to subscriber List</h2>
+<div id="sooner_subscriber">
+  <%= form_for @subscriber, :url => subscribers_path, :remote => true do |f| %>
+    <%= f.label :name %>
+    <%= f.text_field :name %>
+    <br />
+    <%= f.label :email %>
+    <%= f.text_field :email %>
 
-<%= form_for @subscriber, :url => subscribers_path do |f| %>
-  <%= f.label :name %>
-  <%= f.text_field :name %>
-  <br />
-  <%= f.label :email %>
-  <%= f.text_field :email %>
-
-  <%= f.submit "Subscribe" %>
-<% end %>
+    <%= f.submit "Subscribe" %>
+  <% end %>
+</div>

data/lib/generators/sooner_install/sooner_install_generator.rb

@@ -1,7 +1,7 @@
 class SoonerInstallGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
 
-  desc "Creates a Sooner initializer and copy locale files to your application."
+  desc "Creates a Sooner initializer and migration to your application."
 
   def self.source_root
     @_sooner_source_root ||= File.expand_path("../templates", __FILE__)
@@ -30,10 +30,6 @@ class SoonerInstallGenerator < Rails::Generators::Base
     template "sooner.rb", "config/initializers/sooner.rb"
   end
 
-  #  def copy_locale
-  #    copy_file "../../../../config/locales/en.yml", "config/locales/sooner.en.yml"
-  #  end
-
   def show_readme
     readme "README"
   end

data/lib/generators/sooner_install/templates/README

@@ -7,4 +7,17 @@ Some setup you must do manually if you haven't yet:
 
        root :to => "sooner/subscribers#new"
 
+  2. Ensure you have defined javascript in app/views/layouts/application.html.erb
+
+        <%= javascript_include_tag :defaults %>
+            <!-- or -->
+        <%= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js", "jquery.rails.js" %>
+
+        <%= csrf_meta_tag %>
+
+  3. Ensure you have flash messages in app/views/layouts/application.html.erb.
+     For example:
+
+       <p class="notice"><%= notice %></p>
+
 ===============================================================================

data/lib/generators/sooner_install/templates/sooner.rb

@@ -5,4 +5,9 @@ Sooner.setup do |config|
   config.db_store = true
   config.csv_store = true
   config.csv_file = "subscribers.csv"
-end
+
+  # Messages.
+  config.subscribed = 'Subscribed Successfully.'
+  config.already_subscribed = 'Already Subscribed.'
+  config.error_subscribed = 'Please Try to subscribe again.'
+end

data/lib/sooner/rails.rb

@@ -1,33 +1,5 @@
-#require 'devise/rails/routes'
-#require 'devise/rails/warden_compat'
-
-# Include UrlHelpers in ActionController and ActionView as soon as they are loaded.
-#ActiveSupport.on_load(:action_controller) { include Devise::Controllers::UrlHelpers }
-#ActiveSupport.on_load(:action_view) { include Devise::Controllers::UrlHelpers }
-
 module Sooner
   class Engine < ::Rails::Engine
     config.sooner = Sooner
-
-    config.after_initialize do
-      flash = [:successfull, :unsuccessful]
-
-      translations = begin
-        I18n.available_locales
-        I18n.backend.send(:translations)
-      rescue Exception => e # Do not care if something fails
-        {}
-      end
-
-      translations.each do |locale, translations|
-        keys = flash & (translations[:sooner][:sessions].keys) rescue []
-
-        if keys.any?
-          ActiveSupport::Deprecation.warn "The following I18n messages in 'devise.sessions' " <<
-            "for locale '#{locale}' are deprecated: #{keys.to_sentence}. Please move them to " <<
-            "'sooner.failure' instead."
-        end
-      end
-    end
   end
 end

data/lib/sooner/version.rb

@@ -1,3 +1,3 @@
 module Sooner
-  VERSION = "0.0.6".freeze
+  VERSION = "0.0.7".freeze
 end

data/lib/sooner.rb

@@ -1,8 +1,5 @@
 module Sooner
 
-  # True values used to check params
-  TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE']
-
   # Custom domain for cookies. Not set by default
   mattr_accessor :db_store
   @@db_store = true
@@ -19,6 +16,16 @@ module Sooner
   mattr_accessor :mailer_sender
   @@mailer_sender = nil
 
+  # Messages
+  mattr_accessor :subscribed
+  @@subscribed = 'Subscribed Successfully.'
+
+  mattr_accessor :already_subscribed
+  @@already_subscribed = 'Already Subscribed.'
+
+  mattr_accessor :error_subscribed
+  @@error_subscribed = 'Please Try to subscribe again.'
+
   # Default way to setup Sooner. Run rails generate sooner_install to create
   # a fresh initializer with all configuration values.
   def self.setup

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Shenouda Bertel
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 +03:00
+date: 2010-06-08 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -33,12 +33,8 @@ files:
 - MIT-LICENSE
 - Rakefile
 - app/controllers/sooner/subscribers_controller.rb
-- app/views/sooner/subscribers/_subscribed.html.erb
 - app/views/sooner/subscribers/new.html.erb
-- app/views/sooner/subscribers/_already_subscribed.html.erb
-- app/views/sooner/subscribers/_unsubscribed.html.erb
 - app/models/sooner/subscriber.rb
-- config/locales/en.yml
 - config/routes.rb
 - lib/generators/sooner_install/templates/sooner.rb
 - lib/generators/sooner_install/templates/migration.rb

data/app/views/sooner/subscribers/_already_subscribed.html.erb

@@ -1 +0,0 @@
-<%= "Already Subscribed" %>

data/app/views/sooner/subscribers/_subscribed.html.erb

@@ -1 +0,0 @@
-<%= "Subscribed" %>

data/app/views/sooner/subscribers/_unsubscribed.html.erb

@@ -1 +0,0 @@
-<%= "UnSubscribed" %>

data/config/locales/en.yml

@@ -1,10 +0,0 @@
-en:
-  errors:
-    messages:
-      not_found: "not found"
-      already_confirmed: "was already confirmed"
-      not_locked: "was not locked"
-
-  sooner:
-      succesfull: 'You need to sign in or sign up before continuing.'
-      unsuccessfull: 'You have to confirm your account before continuing.'