spree_retailers 0.40.0.2 → 0.40.0.4

data/README.md

@@ -4,6 +4,18 @@ Spree Retailers
 Spree Retailers is a simple Spree Extension that adds a retailers page as well as a retailers admin.
 
 
+Installation
+------------
+
+As usual, add 'spree_retalers' to your Gemfile or install directly.
+
+    gem 'spree_retailers', '0.40.0.4'
+    
+    # or
+    
+    (sudo) gem install spree_retailers
+
+
 Demo
 ----
 
@@ -11,7 +23,7 @@ To create a spree retailers demo app, run the following:
   
     rails new spree_retailers_example 
     cd spree_retailers_example 
-    echo "gem 'spree', '0.40.2'" >> Gemfile 
+    echo "gem 'spree', '0.40.3'" >> Gemfile 
     echo "gem 'spree_retailers'" >> Gemfile 
     rm public/index.html
     bundle install
@@ -19,7 +31,7 @@ To create a spree retailers demo app, run the following:
 
 Or all at once:
 
-    rails new spree_retailers_example; cd spree_retailers_example; echo "gem 'spree', '0.40.2'" >> Gemfile; echo "gem 'spree_retailers'" >> Gemfile; rm public/index.html; bundle install; rake spree:install spree_retailers:install db:migrate db:seed db:admin:create
+    rails new spree_retailers_example; cd spree_retailers_example; echo "gem 'spree', '0.40.3'" >> Gemfile; echo "gem 'spree_retailers'" >> Gemfile; rm public/index.html; bundle install; rake spree:install spree_retailers:install db:migrate db:seed db:admin:create
 
 `rake spree_sample:install db:sample` if you want to...
 
@@ -30,6 +42,10 @@ To Do
 -----
 
 * Write controller tests
+* Write admin tests
+* Google map integration (we're already geocoding, so why not?)
+* Add International Support
+
 
 License
 -------

data/Rakefile

@@ -26,26 +26,4 @@ desc "Builds dummy app for testing"
 task :test_app do
   require 'spree_retailers/generators/test_app_generator'
   SpreeRetailers::Generators::TestAppGenerator.start
-end
-
-
-
-#require 'bundler'
-#require 'rake/testtask'
-#Bundler::GemHelper.install_tasks
-#
-#Rake::TestTask.new do |t|
-#  t.libs << "lib"
-#  t.pattern = 'test/**/*_test.rb'
-#  t.verbose = true
-#end
-#
-#desc "Default Task"
-#task :default => [ :test ]
-#
-#
-#desc "Builds dummy app for testing"
-#task :test_app do
-#  require 'spree_retailers/generators/test_app_generator'
-#  SpreeRetailers::Generators::TestAppGenerator.start
-#end
+end

data/app/controllers/admin/retailers_controller.rb

@@ -46,7 +46,7 @@ class Admin::RetailersController < Admin::BaseController
   end
 
   def get_states
-    @states = State.where(:country_id => 214).collect{|state| state.name }.sort
+    @states = State.where(:country_id => 214).collect{|state| [state.name, state.abbr] }.sort
   end
   
 end

data/app/controllers/retailers_controller.rb

@@ -2,6 +2,10 @@ class RetailersController < Spree::BaseController
 
   def index
     @retailers = Retailer.order(:state, :name)
+    @states = {}
+    State.where(:abbr => @retailers.collect(&:state).uniq).all.each do |state|
+      @states[state.abbr] = state.name
+    end
   end
 
 end

data/app/helpers/retailers_helper.rb

@@ -1,9 +1,9 @@
 module RetailersHelper
   
   def state_nav_helper
-    retailers = Retailer.select(:state).group(:state).order(:state).all
-    return "" unless 1 < retailers.length
-    retailers.collect{|retailer| link_to(retailer.state, "##{retailer.state.downcase}") }.join(" | ").html_safe 
+    states = (@retailers || Retailer.select(:state).group(:state).all).collect(&:state).uniq
+    return "" unless 1 < states.length
+    states.collect{|state| link_to(state, "##{state.downcase}") }.join(" | ").html_safe 
   end 
 
 end 

data/app/models/retailer.rb

@@ -55,11 +55,7 @@ class Retailer < ActiveRecord::Base
     def geocode
       geo = Geokit::Geocoders::MultiGeocoder.geocode(full_address)
       if geo.success
-        self.attributes = {
-          :address          => geo.street_address,
-          :city             => geo.city,
-          :state            => geo.state,
-          :zipcode          => geo.zip,  
+        self.attributes = {  
           :latitude         => geo.lat,
           :longitude        => geo.lng,
           :geokit_provider  => geo.provider,
@@ -69,8 +65,8 @@ class Retailer < ActiveRecord::Base
         }
       else
         self.attributes = {
-          :latitude => nil,
-          :longitude => nil,
+          :latitude         => nil,
+          :longitude        => nil,
           :geokit_provider  => nil,
           :geokit_precision => nil,
           :geokit_accuracy  => nil,

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

@@ -15,6 +15,7 @@
 	<tr>
     	<th><%= order @search, :by => :name %></th>
     	<th><%= order @search, :by => :address %></th>
+    	<th><%= order @search, :by => :state %></th>
     	<th><%= order @search, :by => :email %></th>
     	<th><%= order @search, :by => :phone %></th>
     	<th><%= t("action") %></th>
@@ -25,6 +26,7 @@
     <tr id="<%= dom_id retailer %>">
       <td width="200px"><%= link_to retailer.name, object_url(retailer) %></td>
       <td><%= retailer.address %></td>
+      <td><%= retailer.state %></td>
       <td><%= retailer.email %></td>
       <td><%= retailer.phone %></td>
       <td>

data/app/views/retailers/_list.html.erb

@@ -8,7 +8,7 @@
     
     <% retailers.group_by(&:state).each do |state, state_retailers| %>
       <hr/>
-      <h4 id="<%= state.downcase %>"><%= state %></h4>
+      <h4 id="<%= state.downcase %>"><%= @states[state] %></h4>
       <%= render :partial => 'retailer', :collection => state_retailers %>
     <% end %>
     

data/app/views/retailers/_retailer.html.erb

@@ -1,35 +1,39 @@
 <% if defined? retailer %>
   <div class="retailer">
-    <%= image_tag retailer.logo.url, :alt => retailer.name, :class => 'thumb' if retailer.has_logo? %>
-    <p>
-      <b><%= retailer.has_url? ? link_to(retailer.name, retailer.url, :class => 'popup') : retailer.name %></b><br/>
-      <%= retailer.address %>
-      
-      <% if retailer.has_address2? %>
-        <br/>
-        <%= retailer.address2 %>
-      <% end %>
-      
-      <br/>
-      
-      <%= retailer.city %>, 
-      <%= retailer.state %> 
-      <%= retailer.zipcode %> 
-    
-      <% if retailer.has_phone? %>
+    <div class="retailer-logo">
+      <%= image_tag retailer.logo.url, :alt => retailer.name, :class => 'thumb' if retailer.has_logo? %>
+    </div>
+    <div class="retailer-info">
+      <p>
+        <b><%= retailer.has_url? ? link_to(retailer.name, retailer.url, :class => 'popup') : retailer.name %></b><br/>
+        <%= retailer.address %>
+        
+        <% if retailer.has_address2? %>
+          <br/>
+          <%= retailer.address2 %>
+        <% end %>
+        
         <br/>
-        <%= retailer.phone %>
-      <% end %>
+        
+        <%= retailer.city %>, 
+        <%= retailer.state %> 
+        <%= retailer.zipcode %> 
       
-      <% if retailer.has_email? %>
-        <br/>
-        <%= mail_to retailer.email %>
-      <% end %>
-      
-      <% if retailer.has_url? %>
-        <br/>
-        <%= link_to retailer.url, retailer.url, :class => 'popup' %>
-      <% end %>
-    </p>
+        <% if retailer.has_phone? %>
+          <br/>
+          <%= retailer.phone %>
+        <% end %>
+        
+        <% if retailer.has_email? %>
+          <br/>
+          <%= mail_to retailer.email %>
+        <% end %>
+        
+        <% if retailer.has_url? %>
+          <br/>
+          <%= link_to retailer.url, retailer.url, :class => 'popup' %>
+        <% end %>
+      </p>
+    </div>
   </div>
 <% end %>

data/lib/spree_retailers/version.rb

@@ -1,3 +1,3 @@
 module SpreeRetailers
-  VERSION = "0.40.0.2"
+  VERSION = "0.40.0.4"
 end

metadata

@@ -2,7 +2,7 @@
 name: spree_retailers
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.40.0.2
+  version: 0.40.0.4
 platform: ruby
 authors: 
 - Spencer Steffen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,7 +90,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id007
-description: Spree Retailers adds a retailer page and admin to Spree.
+description: Spree Retailers adds a retailer page and admin to Spree Commerce.
 email: 
 - spencer@citrusme.com
 executables: []
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1791211122067461475
+      hash: -1846554186713783098
       segments: 
       - 0
       version: "0"
@@ -148,14 +148,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1791211122067461475
+      hash: -1846554186713783098
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Spree Retailers adds a retailer admin to Spree.