spree_retailers 0.40.0.1 → 0.40.0.2

data/README.md

@@ -1,7 +1,7 @@
 Spree Retailers
----------------
+===============
 
-Spree Retailers is a simple Spree Extension.
+Spree Retailers is a simple Spree Extension that adds a retailers page as well as a retailers admin.
 
 
 Demo
@@ -12,26 +12,24 @@ 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_retailers', :git => 'git://github.com/citrus/spree_retailers.git'" >> Gemfile 
-    rm public/index.html 
-    bundle install 
+    echo "gem 'spree_retailers'" >> Gemfile 
+    rm public/index.html
+    bundle install
     rake spree:install spree_retailers:install db:migrate db:seed db:admin:create
 
-
 Or all at once:
 
-    rails new spree_retailers_example; cd spree_retailers_example; echo "gem 'spree', '0.40.2'" >> Gemfile; echo "gem 'spree_retailers', :git => 'git://github.com/citrus/spree_retailers.git'" >> 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.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
 
-`rake db:sample` if you want to...
+`rake spree_sample:install db:sample` if you want to...
 
 Then start the server with `rails s`
 
 
-
 To Do
 -----
 
-* Write real tests 
+* Write controller tests
 
 License
 -------

data/Rakefile

@@ -1,75 +1,51 @@
-require 'bundler'
+# encoding: UTF-8
+require 'rubygems'
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+require 'rake'
 require 'rake/testtask'
+#require 'rake/rdoctask'
+
 Bundler::GemHelper.install_tasks
 
-Rake::TestTask.new do |t|
-  t.libs << "lib"
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+  t.verbose = false
 end
 
-desc "Default Task"
-task :default => [ :test ]
-
-
-
+task :default => :test
 
 
-
-
-
-# TODO: pull in the spree/core/Rakefile bits that set up for testing
-desc "Regenerates a Rails 3 app for testing"
+desc "Builds dummy app for testing"
 task :test_app do
-# TODO - this path requires a certain directory structure -- need
-# to think about how to refactor
-  
-  
-  files = `gem contents spree`.split("\n").select{|file| file.match("test_app_generator")}
-  if files.length == 1
-    require files.first
-    class SpreeRetailersTestAppGenerator < Spree::Generators::TestAppGenerator
-      def tweak_gemfile
-        append_file "Gemfile" ,
-          <<-gems
-gem 'activemerchant'
-gem 'spree_core', '>=0.40.2'
-gem 'spree_auth', '>=0.40.2'
-gem 'spree_retailers', :path => "#{File.dirname(__FILE__)}"  
-          gems
-      end
-  
-      def install_spree_gems
-      
-        puts "-----------------------------------------"
-        puts "Installing gems..."
-        `bundle install --gemfile=spec/test_app/Gemfile`
-        puts "-----------------------------------------"
-      
-        inside "test_app" do
-          run 'rake spree_core:install'
-          run 'rake spree_auth:install'
-          run 'rake spree_retailers:install'
-        end
-      end
-    
-      def migrate_db
-        run_migrations
-      end
-    end
-    
-    SpreeRetailersTestAppGenerator.start
-    
-    puts "spec/test_app created. "
-           
-  else
-    puts "Failed: Could not find lib/generators/spree/test_app_generator.rb"
-  end
+  require 'spree_retailers/generators/test_app_generator'
+  SpreeRetailers::Generators::TestAppGenerator.start
 end
 
-namespace :test_app do
-  desc 'Rebuild test database'
-  task :rebuild_db do
-    system("cd spec/test_app && rake db:drop db:migrate RAILS_ENV=test")
-  end
-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

data/app/controllers/retailers_controller.rb

@@ -1,10 +1,7 @@
 class RetailersController < Spree::BaseController
 
   def index
-    @retailers = Retailer.order(:name) 
-    #if request.xhr? 
-    #  render :partial => 'list', :layout => false, :locals => { :retailers => @retailers }      
-    #end
+    @retailers = Retailer.order(:state, :name)
   end
 
 end

data/app/helpers/retailers_helper.rb

@@ -0,0 +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 
+  end 
+
+end 

data/app/models/retailer.rb

@@ -1,6 +1,19 @@
 class Retailer < ActiveRecord::Base
   
   validates_presence_of :name, :address, :city, :state, :zipcode
+  validates :email, :email => true, :allow_blank => true
+  
+  validates_numericality_of :latitude, :longitude, :allow_blank => true
+  
+  before_validation :geocode, :if => :geocode?
+
+
+  has_attached_file :logo, 
+                    :styles => { :mini => '48x48>', :thumb => '120x100#', :large => '450x400#' },
+                    :default_style => :thumb,
+                    :url => "/assets/retailers/:id/:style/:basename.:extension",
+                    :path => ":rails_root/public/assets/retailers/:id/:style/:basename.:extension"
+  
   
   [:address2, :phone, :email].each do |property|
     define_method "has_#{property.to_s}?" do
@@ -10,16 +23,60 @@ class Retailer < ActiveRecord::Base
   end
   
   def has_url?
-    (self.url.nil? || self.url.empty?) && self.url != "http://" 
+    !(self.url.nil? || self.url.empty? || self.url == "http://")
   end
   
+  def has_logo?
+    !self.logo_file_name.blank?
+  end
 
   def url=(value)
-    val = value.strip.downcase
+    val = value.to_s.strip.downcase
     if val.match(/^http(s)?:\/\//) == nil
       val = "http://" + val
     end
     write_attribute :url, val
   end
   
+  def full_address
+    "#{address} #{address2} #{city}, #{state} #{zipcode}"
+  end
+  
+  def geocode?
+    (new_record? || changed?) && !address.blank?
+  end
+  
+  def geocoded?
+    geokit_success && !(latitude.nil? || longitude.nil?)
+  end
+  
+  private
+  
+    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,  
+          :latitude         => geo.lat,
+          :longitude        => geo.lng,
+          :geokit_provider  => geo.provider,
+          :geokit_precision => geo.precision,
+          :geokit_accuracy  => geo.accuracy,
+          :geokit_success   => true
+        }
+      else
+        self.attributes = {
+          :latitude => nil,
+          :longitude => nil,
+          :geokit_provider  => nil,
+          :geokit_precision => nil,
+          :geokit_accuracy  => nil,
+          :geokit_success   => false
+        }
+      end
+    end
+  
 end

data/app/validators/email_validator.rb

@@ -0,0 +1,20 @@
+class EmailValidator < ActiveModel::EachValidator
+  def validate_each(record,attribute,value)
+    begin
+      m = Mail::Address.new(value)
+      # We must check that value contains a domain and that value is an email address
+      r = m.domain && m.address == value
+      t = m.__send__(:tree)
+      # We need to dig into treetop
+      # A valid domain must have dot_atom_text elements size > 1
+      # user@localhost is excluded
+      # treetop must respond to domain
+      # We exclude valid email values like <user@localhost.com>
+      # Hence we use m.__send__(tree).domain
+      r &&= (t.domain.dot_atom_text.elements.size > 1)
+    rescue Exception => e   
+      r = false
+    end
+    record.errors[attribute] << (options[:message] || I18n.t(:invalid_email, :scope => [:activerecord, :errors, :messages])) unless r
+  end
+end

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

@@ -1,6 +1,6 @@
 <%= f.field_container :name do %>
   <%= f.label :name, "Name" %><br />
-  <%= f.text_field :name %>
+  <%= f.text_field :name, :class => 'title' %>
   <%= error_message_on :retailer, :name %>
 <% end %>
 
@@ -55,3 +55,9 @@
   <%= f.text_field :url  %>
   <%= error_message_on :retailer, :url %>
 <% end %>
+
+<%= f.field_container :logo do %>
+  <%= f.label :logo, "Logo Image:" %><br />
+  <%= f.file_field :logo  %>
+  <%= error_message_on :retailer, :logo %>
+<% end %>

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

@@ -45,7 +45,7 @@
     <div class="box">
       <h3><%= t(:search) %></h3>
       <p>
-        <%= t("title") %><br />
+        <%= t("name") %><br />
         <%= f.text_field :name_contains, :size=> 18 %>
       </p>
       <p><%= button t("search") %></p>

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

@@ -1,33 +1,48 @@
 <h1><%= @retailer.name %></h1>
+
+<%= image_tag @retailer.logo.url if @retailer.has_logo? %>
+
 <p>
-  <%= @retailer.address %>
-  
+  <b>Address:</b><br/>
+  <%= @retailer.address %>  
   <% if @retailer.has_address2? %>
     <br/>
     <%= @retailer.address2 %>
   <% end %>
-  
   <br/>
-  
   <%= @retailer.city %>, 
-  <%= @retailer.state %> 
-  <%= @retailer.zipcode %> 
-
-  <% if @retailer.has_phone? %>
-    <br/>
-    <%= @retailer.phone %>
-  <% end %>
+  <%= @retailer.state %> <%= @retailer.zipcode %>
+</p>  
+<% if @retailer.has_phone? %>
+  <p>
+    <b>Phone:</b> <%= @retailer.phone %>
+  </p>
+<% end %>
+  
+<% if @retailer.has_email? %>
+  <p>
+    <b>Email:</b> <%= mail_to @retailer.email %>
+  </p>
+<% end %>
+  
+<% if @retailer.has_url? %>
+  <p>
+    <b>Website URL:</b>: <%= link_to @retailer.url, @retailer.url, :class => 'popup' %>
+  </p>
+<% end %>
   
-  <% if @retailer.has_email? %>
-    <br/>
-    <%= mail_to @retailer.email %>
-  <% end %>
   
-  <% if @retailer.has_url? %>
+<% if @retailer.geocoded? %>
+  <p>
+    <b>Latitude:</b> <%= @retailer.latitude %>&deg;
     <br/>
-    <%= link_to @retailer.url, @retailer.url, :class => 'popup' %>
-  <% end %>
-</p>
+    <b>Longitude:</b> <%= @retailer.longitude %>&deg;
+    <br/>
+    <b>Precision:</b> <%= @retailer.geokit_precision %>
+    <br/>
+    <b>Provider:</b> <%= @retailer.geokit_provider %>
+  </p>
+<% end %>
 
 
 <p>

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

@@ -1,6 +1,16 @@
 <% if defined? retailers %>  
   <div class="retailers">
     <h3>Find <%= Spree::Config[:site_name] %> at the following retail locations:</h3>
-    <%= render :partial => 'retailer', :collection => retailers %>
+    
+    <div class="state-nav">
+      <%= state_nav_helper %>
+    </div>
+    
+    <% retailers.group_by(&:state).each do |state, state_retailers| %>
+      <hr/>
+      <h4 id="<%= state.downcase %>"><%= state %></h4>
+      <%= render :partial => 'retailer', :collection => state_retailers %>
+    <% end %>
+    
   </div>
 <% end %>

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

@@ -1,5 +1,6 @@
 <% 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 %>

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

@@ -1,18 +1,17 @@
+<h1><%= t('retailers') %></h1>
+
 <div class="left">
   <%= hook :retailers_static_content do %>
-    <h1><%= t('retailers') %></h1>
     <p>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Proin vel ante a orci tempus eleifend ut et magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus luctus urna sed urna ultricies ac tempor dui sagittis. In condimentum facilisis porta. Sed nec diam eu diam mattis viverra. Nulla fringilla, orci ac euismod semper, magna diam porttitor mauris, quis sollicitudin sapien justo in libero. Vestibulum mollis mauris enim. Morbi euismod magna ac lorem rutrum elementum. Donec viverra auctor lobortis. Pellentesque eu est.</p>
   <% end %>  
 </div>
      
 <div class="right">
-  
   <%= hook :retailers_list do %>
     <% unless !@retailers || @retailers.empty? %>
       <%= render 'list', :retailers => @retailers %> 
     <% end %>
   <% end %>
-  
 </div>
 
 <div class="clear">&nbsp;</div>

data/db/migrate/install_spree_retailers.rb

@@ -11,6 +11,19 @@ class InstallSpreeRetailers < ActiveRecord::Migration
       t.string    :phone
       t.string    :email
       t.string    :url
+      
+      # geokit
+      t.float     :latitude
+      t.float     :longitude
+      t.string    :geokit_precision, :geokit_provider, :geokit_accuracy
+      t.boolean   :geokit_success, :default => false
+      
+      # paperclip
+      t.string     :logo_file_name
+	    t.string     :logo_content_type
+	    t.string     :logo_file_size
+	    t.datetime   :logo_updated_at
+      
       t.timestamps
     end
   end

data/lib/spree_retailers/generators/test_app_generator.rb

@@ -0,0 +1,69 @@
+require 'spree'
+require 'generators/spree/test_app_generator'
+
+module SpreeRetailers
+  module Generators
+    class TestAppGenerator < Spree::Generators::TestAppGenerator
+      
+      class_option :app_name, :type => :string,
+                        :desc => "The name of the test rails app to generate. Defaults to test_app.",
+                        :default => "dummy"
+
+
+      source_paths << File.expand_path("../../templates", __FILE__)
+      
+      def install_spree_core
+        inside "test/#{test_app}" do
+          run 'rake spree_core:install'
+          run 'rake spree_auth:install'
+          run 'rake spree_retailers:install'
+        end
+      end
+      
+      def generate_app
+        silence_stream(STDOUT) {
+          remove_directory_if_exists("test/#{test_app}")
+          inside "test" do
+            run "rails new #{test_app} -GJTq --skip-gemfile"
+          end
+        }
+      end
+      
+      def replace_gemfile
+        true
+      end
+      
+      def setup_environments
+        remove_file 'config/boot.rb'
+        template 'config/boot.rb'
+      end
+      
+      def tweak_gemfile
+        true
+      end
+      
+      def create_rspec_gemfile
+        true
+      end
+      
+      def create_root
+        self.destination_root = File.expand_path("test/#{test_app}", destination_root)
+      end
+    
+      def migrate_db  
+        run_migrations
+      end
+    
+      protected
+      
+      def full_path_for_local_gems
+        <<-gems
+gem 'spree_core', '>= 0.40.2'
+gem 'spree_auth', '>= 0.40.2'
+gem 'spree_retailers', :path => File.expand_path('../../../../', __FILE__)
+gem 'geokit',     '>= 1.5.0'
+        gems
+      end
+    end
+  end
+end

data/lib/spree_retailers/templates/config/boot.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+begin
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end if File.exist?(gemfile)

data/lib/spree_retailers/version.rb

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

data/lib/spree_retailers.rb

@@ -1,3 +1,9 @@
+if ENV["RAILS_ENV"] != "production"
+  require 'spree_core'
+  require 'spree_auth'
+  require 'geokit'
+end
+
 require 'spree_retailers/version'
 require 'spree_retailers/custom_hooks'
 
@@ -7,17 +13,5 @@ module SpreeRetailers
 
     config.autoload_paths += %W(#{config.root}/lib)
 
-    #initializer "static assets" do |app|
-    #  app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{config.root}/public"
-    #end
-
-    #def self.activate
-    #  #Dir["../app/**/*.rb"].each do |c|
-    #  #  puts c
-    #  #  #Rails.env.production? ? require(c) : load(c)
-    #  #end
-    #end
-
-    #config.to_prepare &method(:activate).to_proc
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: spree_retailers
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 40
-  - 0
-  - 1
-  version: 0.40.0.1
+  prerelease: 
+  version: 0.40.0.2
 platform: ruby
 authors: 
 - Spencer Steffen
@@ -15,40 +10,87 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 -08:00
+date: 2011-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 40
-        - 2
         version: 0.40.2
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: spree_auth
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 40
-        - 2
         version: 0.40.2
   type: :runtime
+  prerelease: false
   version_requirements: *id002
-description: ""
+- !ruby/object:Gem::Dependency 
+  name: mail
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: geokit
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: spree
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.40.2
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.11.3
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.2
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+description: Spree Retailers adds a retailer page and admin to Spree.
 email: 
 - spencer@citrusme.com
 executables: []
@@ -62,12 +104,16 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - lib/spree_retailers/custom_hooks.rb
+- lib/spree_retailers/generators/test_app_generator.rb
+- lib/spree_retailers/templates/config/boot.rb
 - lib/spree_retailers/version.rb
 - lib/spree_retailers.rb
 - lib/tasks/install.rake
 - app/controllers/admin/retailers_controller.rb
 - app/controllers/retailers_controller.rb
+- app/helpers/retailers_helper.rb
 - app/models/retailer.rb
+- app/validators/email_validator.rb
 - app/views/admin/hooks/_retailers_tab.html.erb
 - app/views/admin/retailers/_form.html.erb
 - app/views/admin/retailers/edit.html.erb
@@ -79,7 +125,7 @@ files:
 - app/views/retailers/index.html.erb
 - db/migrate/install_spree_retailers.rb
 - Rakefile
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/citrus/spree_retailers
 licenses: []
 
@@ -93,6 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 1791211122067461475
       segments: 
       - 0
       version: "0"
@@ -101,13 +148,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 1791211122067461475
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Spree Retailers adds a retailer admin to Spree.