spree_retailers 0.70.0.0 → 1.0.0.0

data/.travis.yml

@@ -5,4 +5,8 @@ rvm:
   - rbx
   - ree
 
-script: "bundle exec dummier && bundle exec rake test"
+before_script:
+  - "sh -e /etc/init.d/xvfb start"
+  - "bundle exec dummier"
+
+script: "DISPLAY=:99.0 bundle exec rake"

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Spencer Steffen and Citrus Media Group.
+Copyright (c) 2011 - 2012 Spencer Steffen and Citrus Media Group.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/README.md

@@ -1,51 +1,91 @@
-Spree Retailers
-===============
+# Spree Retailers [![Build Status](https://secure.travis-ci.org/citrus/spree_retailers.png)](http://travis-ci.org/citrus/spree_retailers)
 
 Spree Retailers is a Spree extension for listing your company's retail stores on your web site.
 
 
+------------------------------------------------------------------------------
 Installation
-------------
+------------------------------------------------------------------------------
 
 As usual, add 'spree_retailers' to your Gemfile and run bundle install:
-    
-    # Spree 0.70.x
-    gem 'spree_retailers', '0.70.0.0'
-     
-    # Spree 0.50.x, 0.60.x
-    gem 'spree_retailers', '0.50.0.0'
-    
-    # Spree 0.40.x 
-    gem 'spree_retailers', '0.40.0.4'
-    
-    # install from git
-    gem 'spree_retailers', :git => 'git://github.com/citrus/spree_retailers.git'
+  
+```ruby  
+# Spree 1.0.x
+gem 'spree_retailers', '1.0.0.0'
+
+# Spree 0.70.x
+gem 'spree_retailers', '0.70.0.0'
+
+# Spree 0.50.x, 0.60.x
+gem 'spree_retailers', '0.50.0.0'
+
+# Spree 0.40.x 
+gem 'spree_retailers', '0.40.0.4'
+
+# install from source
+gem 'spree_retailers', :git => 'git://github.com/citrus/spree_retailers.git'
+```
 
 
 Next, copy the migration file to your project:
 
-    # Spree 0.40.x, 0.50.x and 0.60.x
-    rake spree_retailers:install
-    
-    # 0.70.x and above
-    rails g spree_retailers:install
+```bash
+# Spree 0.40.x, 0.50.x and 0.60.x
+rake spree_retailers:install
+
+# 0.70.x and above
+rails g spree_retailers:install
+```
 
 
 Now, migrate your database with:
 
-    rake db:migrate
+```bash
+rake db:migrate
+```
+
+------------------------------------------------------------------------------
+Testing
+------------------------------------------------------------------------------
+
+If you'd like to run tests:
+
+```bash    
+git clone git://github.com/citrus/spree_retailers.git
+cd spree_retailers
+bundle install
+bundle exec dummier
+bundle exec rake
+```
+
+
+------------------------------------------------------------------------------
+Demo
+------------------------------------------------------------------------------
+
+If you'd like a demo of spree_retailers:
+
+```bash
+git clone git://github.com/citrus/spree_retailers.git
+cd spree_retailers
+cp test/dummy_hooks/after_migrate.rb.sample test/dummy_hooks/after_migrate.rb
+bundle install
+bundle exec dummier
+cd test/dummy
+rails s
+```  
 
 
+------------------------------------------------------------------------------
 To Do
------
+------------------------------------------------------------------------------
 
-* Write controller tests
-* Write admin tests
 * Google map integration (we're already geocoding, so why not?)
 * Add (better) International Support
 
 
+------------------------------------------------------------------------------
 License
--------
+------------------------------------------------------------------------------
 
-Copyright (c) 2011 Spencer Steffen and Citrus, released under the New BSD License All rights reserved.
+Copyright (c) 2011 - 2012 Spencer Steffen and Citrus, released under the New BSD License All rights reserved.

data/Versionfile

@@ -1,3 +1,4 @@
+"1.0.x" => { :version => "1.0.0.0" }
 "0.70.x" => { :version => "0.70.0.0" }
 "0.60.x" => { :version => "0.50.0.0" }
 "0.50.x" => { :version => "0.50.0.0" }

data/app/controllers/spree/admin/retailers_controller.rb

@@ -0,0 +1,19 @@
+class Spree::Admin::RetailersController < Spree::Admin::ResourceController
+
+  before_filter :get_locations, :except => [:index, :destroy]
+
+  private
+  
+    def collection
+      params[:search] ||= {}
+      params[:search][:meta_sort] ||= "name.asc"
+      @search = super.search(params[:search])
+      @collection = @search.page(params[:page]).per(Spree::Config[:orders_per_page])
+    end
+  
+    def get_locations
+      @countries = Spree::Country.all.collect{|country| country.name }.sort
+      @states = Spree::State.where(:country_id => 214).collect{|state| [state.name, state.abbr] }.sort
+    end
+  
+end

data/app/controllers/spree/retailers_controller.rb

@@ -0,0 +1,11 @@
+class Spree::RetailersController < Spree::BaseController
+
+  def index
+    @retailers = Spree::Retailer.order(:country, :state, :name)
+    @states = {}
+    Spree::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 → spree/retailers_helper.rb}

@@ -1,12 +1,9 @@
-module RetailersHelper
+module Spree::RetailersHelper
   
   def state_nav_helper(retailers=[])
     states = retailers.collect(&:state).uniq
-    
-    puts states
-    
-    return "" unless 1 < states.length
+    return "" if states.empty?
     states.collect{|state| link_to(state, "##{state.downcase}") }.join(" | ").html_safe 
-  end 
+  end
 
-end 
+end

data/app/models/{retailer.rb → spree/retailer.rb}

@@ -1,4 +1,4 @@
-class Retailer < ActiveRecord::Base
+class Spree::Retailer < ActiveRecord::Base
   
   validates :name, :address, :city, :presence => true
   validates :state, :zipcode, :presence => true, :if => Proc.new{|record| record.country == "United States" }

data/app/overrides/spree_retailers.rb

@@ -1,5 +1,5 @@
-Deface::Override.new(:virtual_path  => "layouts/admin",
+Deface::Override.new(:virtual_path  => "spree/layouts/admin",
                      :name          => "converted_admin_tabs_for_spree_retailers",
                      :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
-                     :partial       => "admin/hooks/retailers_tab",
+                     :partial       => "spree/admin/hooks/retailers_tab",
                      :disabled      => false)

data/app/views/{admin → spree/admin}/retailers/edit.html.erb

@@ -1,5 +1,7 @@
 <h1>Edit Retailer</h1>
 
+<%= render "spree/shared/error_messages", :target => @retailer %>
+
 <%= form_for(@retailer, :url => object_url, :html => { :multipart => true, :method => :put }) do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>
   <p class="form-buttons">

data/app/views/{admin → spree/admin}/retailers/index.html.erb

@@ -29,7 +29,7 @@
       <td><%= retailer.state %></td>
       <td><%= retailer.email %></td>
       <td><%= number_to_phone retailer.phone %></td>
-      <td>
+      <td class="actions">
       	<%= link_to_edit retailer %> &nbsp;
       	<%= link_to_delete retailer %> &nbsp;
       </td>
@@ -41,13 +41,11 @@
 <%= paginate @collection %>
 
 
-
-
 <% content_for :sidebar do %>
 <div class="box">
   <h3><%= t(:search) %></h3>
 
-  <% @retailer = Retailer.metasearch %>
+  <% @retailer = Spree::Retailer.metasearch %>
   <%= form_for [:admin, @retailer] do |f| %>
     <p>
       <label><%= t '.name_contains' %></label><br />
@@ -68,4 +66,4 @@
     <p><%= button t("search") %></p>
   <% end %>
 </div>
-<% end %>
+<% end %>

data/app/views/{admin → spree/admin}/retailers/new.html.erb

@@ -1,5 +1,7 @@
 <h1>New Retailer</h1>
 
+<%= render "spree/shared/error_messages", :target => @retailer %>
+
 <%= form_for(@retailer, :url => collection_url, :html => { :multipart => true }) do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>
 
@@ -7,4 +9,3 @@
     <%= button t("create") %> <%= link_to t('cancel'), collection_url %>
   </p>
 <% end %>
-

data/app/views/{retailers → spree/retailers}/index.html.erb

@@ -1,6 +1,6 @@
 <h1><%= t('retailers') %></h1>
 
-<div class="left">
+<div class="left" data-hook="retailers-index">
   <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>
 </div>
      

data/config/locales/en.yml

@@ -2,16 +2,12 @@ en:
 
   retailer: Retailer
   retailers: Retailers
-  
-  successfully_created: "%{resource} was successfully created."
-  successfully_updated: "%{resource} was successfully updated."
-  successfully_removed: "%{resource} was successfully removed."
 
-  
-  admin:
-    retailers:
-      index:
-        name_contains: Name Contains
-        email_contains: Email Contains
-        country_contains: Country Contains
-        state_contains: State Contains
+  spree:
+    admin:
+      retailers:
+        index:
+          name_contains: Name Contains
+          email_contains: Email Contains
+          country_contains: Country Contains
+          state_contains: State Contains

data/config/routes.rb

@@ -1,10 +1,10 @@
-Rails.application.routes.draw do
-  
-  get '/retailers/:id/:country' => 'retailers#index', :as => :country_retailers
-  resources :retailers, :only => :index
+Spree::Core::Engine.routes.draw do
 
   namespace :admin do
     resources :retailers
   end
 
-end
+  get '/retailers/:id/:country' => 'retailers#index', :as => :country_retailers
+  resources :retailers, :only => :index
+  
+end

data/db/migrate/20111213000450_add_spree_namespace_to_retailers.rb

@@ -0,0 +1,5 @@
+class AddSpreeNamespaceToRetailers < ActiveRecord::Migration
+  def change
+    rename_table :retailers, :spree_retailers
+  end
+end

data/lib/generators/spree_retailers/install_generator.rb

@@ -2,31 +2,13 @@ module SpreeRetailers
   module Generators
     class InstallGenerator < Rails::Generators::Base
       
-      include Rails::Generators::Migration      
-
-      def self.count
-        @count ||= 0
-        (@count += 1) * 3
-      end
-
-      def self.next_migration_number(path)
-        @time ||= Time.new.utc
-        if ActiveRecord::Base.timestamped_migrations
-          (@time + self.count).strftime("%Y%m%d%H%M%S")
-        else
-          "%.3d" % (current_migration_number(dirname) + 1)
-        end
-      end
-      
       desc "Installs required migrations for spree_retailers"
       source_root File.expand_path("../../templates/db/migrate", __FILE__)
       
       def copy_migrations
-        
-        migration_template "install_spree_retailers.rb", "db/migrate/install_spree_retailers.rb"
-        
+        rake "spree_retailers:install:migrations"        
       end
 
     end
   end
-end
+end

data/lib/spree_retailers.rb

@@ -1,25 +1,8 @@
-require 'spree_core'
+require "spree_core"
+require "geokit"
 
-require 'geokit'
-require 'spree_retailers/version'
+require "spree_retailers/version"
+require "spree_retailers/engine"
 
 module SpreeRetailers
-  
-  class Engine < Rails::Engine
-    
-    config.to_prepare do
-      #loads application's model / class decorators
-      Dir.glob File.expand_path("../../app/**/*_decorator*.rb") do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
-      end
-
-      #loads application's deface view overrides
-      Dir.glob File.expand_path("../../app/overrides/*.rb", __FILE__) do |c|
-        Rails.application.config.cache_classes ? require(c) : load(c)
-      end
-    end
-
-    config.autoload_paths += %W(#{config.root}/lib)
-
-  end
 end

data/lib/spree_retailers/engine.rb

@@ -0,0 +1,21 @@
+module SpreeRetailers
+  class Engine < Rails::Engine
+    
+    engine_name "spree_retailers"
+    
+    config.to_prepare do
+      #loads application's model / class decorators
+      Dir.glob File.expand_path("../../../app/**/*_decorator.rb", __FILE__) do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
+      end
+
+      #loads application's deface view overrides
+      Dir.glob File.expand_path("../../../app/overrides/**/*.rb", __FILE__) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
+    end
+
+    config.autoload_paths += %W(#{config.root}/lib)
+
+  end
+end

data/lib/spree_retailers/version.rb

@@ -1,3 +1,3 @@
 module SpreeRetailers
-  VERSION = "0.70.0.0"
+  VERSION = "1.0.0.0"
 end

data/spree_retailers.gemspec

@@ -20,12 +20,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency('spree_core', '>= 0.70.0')
-  s.add_dependency('mail',       '>= 2.2.0')
-  s.add_dependency('geokit',     '>= 1.5.0')
+  s.add_dependency('spree_core', '~> 1.0.0')
+  s.add_dependency('geokit',     '~> 1.6.5')
   
-  s.add_development_dependency('dummier', '>= 0.2.4')
-	s.add_development_dependency('shoulda', '>= 3.0.0.beta2')
-	s.add_development_dependency('sqlite3', '>= 1.3.2')
+  s.add_development_dependency('dummier',  '>= 0.3.0')
+	s.add_development_dependency('shoulda',  '>= 3.0.0.beta2')
+  s.add_development_dependency('capybara', '>= 1.1.2')
+	s.add_development_dependency('sqlite3',  '>= 1.3.5')
   
 end

data/test/dummy_hooks/before_migrate.rb

@@ -1,13 +1,22 @@
-# run installer generators
-run "rails g spree_retailers:install"
-run "rails g spree:site"
+# Install spree core and migrate db
+rake "spree:install:migrations"
+
+# Mount the spree core engine routes
+insert_into_file File.join('config', 'routes.rb'), :after => "Application.routes.draw do\n" do
+  "  # Mount Spree's routes\n  mount Spree::Core::Engine, :at => '/'\n"
+end
+
+# Fix uninitialized constant Spree::User::DestroyWithOrdersError 
+template "spree_user_error_fix.rb", "config/initializers/spree_user_error_fix.rb"
 
-# remove all stylesheets except core  
+# Remove all stylesheets except core  
 %w(admin store).each do |ns|
-  js  = "app/assets/javascripts/#{ns}/all.js"
-  css = "app/assets/stylesheets/#{ns}/all.css"
-  remove_file js
-  remove_file css
-  template "#{ns}/all.js", js
-  template "#{ns}/all.css", css
+  template "#{ns}/all.js", "app/assets/javascripts/#{ns}/all.js", :force => true
+  template "#{ns}/all.css", "app/assets/stylesheets/#{ns}/all.css", :force => true
 end
+
+# Fix sass load error by using the converted css file
+template "store/screen.css", "app/assets/stylesheets/store/screen.css"
+
+# Install spree_retailers
+run "rails g spree_retailers:install"