spree_contact_form 3.0.4 → 3.0.6

data/README.md

@@ -1,13 +1,28 @@
-ContactForm
-===========
+Spree Contact Form Extension
+=========
 
-Introduction goes here.
+An spree extension for contact forms.
 
+Installation
+============
 
-Example
-=======
+1) add the gem to your `Gemfile`:
 
-Example goes here.
+`gem 'spree_contact_form'`
 
+2) run bundler:
 
-Copyright (c) 2010 [name of extension creator], released under the New BSD License
+`bundle install`
+
+3) install it:
+
+`rails generate spree_contact_form:install`
+
+3) migrate your database:
+
+`rake db:migrate`
+
+Viewing Contact Form
+======================
+
+`http://yourdomain.tld/contact`

data/app/models/contact_topic.rb

@@ -1,4 +1,4 @@
 class ContactTopic < ActiveRecord::Base
-  validates_presence_of :name, :emails
-  validates_uniqueness_of :name
+  validates :name, :emails, :presence => true
+  validates :name,          :uniqueness => true
 end

data/app/models/message.rb

@@ -1,8 +1,8 @@
 class Message < ActiveRecord::Base
-  validates_presence_of :name, :message, :topic_id
+  validates :name, :message, :topic_id, :presence => true
 
-  validates_format_of   :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
-  validates_format_of   :order_number, :with => /(^$)|(^R\d{9}$)/i, :message => I18n.t("invalid_order_number")
+  validates :email,        :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
+  validates :order_number, :format => /(^$)|(^R\d{9}$)/i
   
   belongs_to :topic, :class_name => 'ContactTopic'
 end

data/app/overrides/admin.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path => "admin/configurations/index",
+                     :name => "converted_admin_configurations_menu_394888068",
+                     :insert_after => "[data-hook='admin_configurations_menu'], #admin_configurations_menu[data-hook]",
+                     :text => "<%= configurations_menu_item(I18n.t('contact_topics'), admin_contact_topics_path, I18n.t('contact_topics_description')) %>",
+                     :disabled => false)

data/app/views/admin/contact_topics/_form.html.erb

@@ -2,7 +2,7 @@
 
 <%= render "shared/error_messages", :target => f.object %>
 
-<%= hook :admin_contact_topic_form, locals do %>
+<div data-hook="admin_contact_topic_form">
 
   <%= f.field_container :name do %>
     <%= f.label :name, t("name") %> <span class="required">*</span><br />
@@ -16,4 +16,4 @@
     <%= f.error_message_on :emails %>
   <% end %>
 
-<% end %>
+</div>

data/app/views/admin/contact_topics/index.html.erb

@@ -12,28 +12,21 @@
 <div id="new_contact_topic"></div>
 
 <table class="index">
-  <tr>
-    <%= hook :admin_contact_topic_index_headers do %>
-      <th><%= t("name") %></th>
-      <th><%= t("emails") %></th>
-    <% end %>
-    <th>
-      <%= hook :admin_contact_topic_index_header_actions %>
+  <tr data-hook='admin_contact_topic_index_headers'>
+    <th><%= t("name") %></th>
+    <th><%= t("emails") %></th>
+    <th data-hook='admin_contact_topic_index_header_actions'>
     </th>
   </tr>
   <% @contact_topics.each do |topic| %>
-    <tr id="<%= dom_id topic %>">
-      <%- locals = {:topic => topic} %>
-      <%= hook :admin_contact_topics_index_rows, locals do %>
-        <td><%= topic.name %></td>
-        <td><%= topic.emails %></td>
-      <% end %>
-      <td class="actions">
-        <%= hook :admin_contact_topics_index_row_actions, locals do %>
-          <%= link_to_edit topic  %>
-          &nbsp;
-          <%= link_to_delete topic  %>
-        <% end %>
+    <%- locals = {:topic => topic} %>
+    <tr id="<%= dom_id topic %>" data-hook="admin_contact_topics_index_rows">
+      <td><%= topic.name %></td>
+      <td><%= topic.emails %></td>
+      <td class="actions" data-hook="admin_contact_topic_index_header_actions">
+        <%= link_to_edit topic  %>
+        &nbsp;
+        <%= link_to_delete topic  %>
       </td>
     </tr>
   <% end %>

data/app/views/contact/show.html.erb

@@ -4,14 +4,12 @@
 <div id="contact-us">
   <h1><%= t("contact_us") %></h1>
 
-  <%= hook :contact do %>
-
+  <div data-hook='contact'>
     <%= render "shared/error_messages", :target => @message %>
 
-    <%= form_for(:message, @message, :url => contact_path) do |f| %>
-
-      <%= hook :contact_inside_form do %>
+    <%= form_for(:message, :url => contact_path) do |f| %>
 
+      <div data-hook="contact_inside_form">
         <p>
           <%= f.label :topic_id, t("subject") %><br />
           <%= f.collection_select :topic_id, @topics, :id, :name  %>  
@@ -38,11 +36,7 @@
         </p>
 
         <p><%= submit_tag t("send_message"), :class => 'button primary' %></p>
-      <% end %>
-
+      </div>
     <% end %>
-
-  <% end %>
-
+  </div>
 </div>
-

data/lib/generators/spree_contact_form/install/install_generator.rb

@@ -0,0 +1,29 @@
+module SpreeContactForm
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+
+      def add_javascripts
+        append_file "app/assets/javascripts/store/all.js", "//= require store/spree_contact_form\n"
+        append_file "app/assets/javascripts/admin/all.js", "//= require admin/spree_contact_form\n"
+      end
+
+      def add_stylesheets
+        inject_into_file "app/assets/stylesheets/store/all.css", " *= require store/spree_contact_form\n", :before => /\*\//, :verbose => true
+        inject_into_file "app/assets/stylesheets/admin/all.css", " *= require admin/spree_contact_form\n", :before => /\*\//, :verbose => true
+      end
+
+      def add_migrations
+        run 'bundle exec rake railties:install:migrations FROM=spree_contact_form'
+      end
+
+      def run_migrations
+         res = ask "Would you like to run the migrations now? [Y/n]"
+         if res == "" || res.downcase == "y"
+           run 'bundle exec rake db:migrate'
+         else
+           puts "Skiping rake db:migrate, don't forget to run it!"
+         end
+      end
+    end
+  end
+end

data/lib/spree_contact_form/engine.rb

@@ -1,12 +1,26 @@
 require "spree_contact_form"
 
 module SpreeContactForm
-
   class Engine < Rails::Engine
+    engine_name 'spree_contact_form'
+
+    config.autoload_paths += %W(#{config.root}/lib)
+
+    # use rspec for tests
+    config.generators do |g|
+      g.test_framework :rspec
+    end
 
     def self.activate
+      Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
+
+      Dir.glob(File.join(File.dirname(__FILE__), "../../app/overrides/*.rb")) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
     end
 
+    config.to_prepare &method(:activate).to_proc
   end
-
 end

data/lib/spree_contact_form.rb

@@ -1,3 +1,2 @@
 require 'spree_core'
-require 'spree_contact_form_hooks'
 require 'spree_contact_form/engine'

metadata

@@ -1,105 +1,77 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spree_contact_form
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 3
-  - 0
-  - 4
-  version: 3.0.4
+version: !ruby/object:Gem::Version
+  version: 3.0.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Josh Nussbaum
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-13 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-11 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: spree_core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &77798830 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 101
-        segments: 
-        - 0
-        - 30
-        - 1
-        version: 0.30.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.70.RC1
   type: :runtime
-  version_requirements: *id001
-description: Add a contact form for your spree website, you can setup topics and when the user submits the form, it is emailed to the site admin
+  prerelease: false
+  version_requirements: *77798830
+description: Add a contact form for your spree website, you can setup topics and when
+  the user submits the form, it is emailed to the site admin
 email: joshnuss@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
-- lib/spree_contact_form_hooks.rb
+- lib/generators/spree_contact_form/install/install_generator.rb
 - lib/spree_contact_form.rb
 - lib/spree_contact_form/engine.rb
-- lib/generators/spree_contact_form/install_generator.rb
-- lib/generators/templates/db/migrate/20101122153512_create_contact_topics.rb
-- lib/generators/templates/db/migrate/20101122153513_create_messages.rb
 - app/views/contact_mailer/message_email.text.erb
-- app/views/contact/show.html.erb
 - app/views/admin/contact_topics/edit.html.erb
-- app/views/admin/contact_topics/new.html.erb
 - app/views/admin/contact_topics/_form.html.erb
 - app/views/admin/contact_topics/index.html.erb
+- app/views/admin/contact_topics/new.html.erb
+- app/views/contact/show.html.erb
+- app/mailers/contact_mailer.rb
+- app/overrides/admin.rb
+- app/models/message.rb
+- app/models/contact_topic.rb
 - app/helpers/contact_helper.rb
 - app/helpers/admin/contact_topics_helper.rb
 - app/controllers/contact_controller.rb
 - app/controllers/admin/contact_topics_controller.rb
-- app/mailers/contact_mailer.rb
-- app/models/contact_topic.rb
-- app/models/message.rb
 - config/routes.rb
 - config/locales/en.yml
-has_rdoc: true
 homepage: http://spreecommerce.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - none
 rubyforge_project: spree_contact_form
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Adds a contact form for your spree site
 test_files: []
-

data/lib/generators/spree_contact_form/install_generator.rb

@@ -1,13 +0,0 @@
-module SpreeContactForm
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
-
-      desc "Configures your Rails application for use with spree_contact_form"
-      def copy_migrations
-        directory "db"
-      end
-
-    end
-  end
-end

data/lib/generators/templates/db/migrate/20101122153512_create_contact_topics.rb

@@ -1,14 +0,0 @@
-class CreateContactTopics < ActiveRecord::Migration
-  def self.up
-    create_table :contact_topics do |t|
-      t.string :name
-      t.string :emails
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :contact_topics
-  end
-end

data/lib/generators/templates/db/migrate/20101122153513_create_messages.rb

@@ -1,17 +0,0 @@
-class CreateMessages < ActiveRecord::Migration
-  def self.up
-    create_table :messages do |t|
-      t.belongs_to :topic
-      t.string :name,  :null => false
-      t.string :email,    :null => false
-      t.string :order_number
-      t.text   :message,  :null => false
-      
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :messages
-  end
-end

data/lib/spree_contact_form_hooks.rb

@@ -1,7 +0,0 @@
-class SpreeContactFormHooks < Spree::ThemeSupport::HookListener
-  insert_after :admin_configurations_menu do
-    "<%= configurations_menu_item(I18n.t('contact_topics'), admin_contact_topics_path, I18n.t('contact_topics_description')) %>"
-  end
-
-end
-