RubyGems - campfire_logic - Versions diffs - 1.1.7 → 1.1.8 - Mend

campfire_logic 1.1.7 → 1.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (47) hide show

data/Gemfile +2 -8
data/Gemfile.local +3 -7
data/README.rdoc +2 -2
data/Rakefile +3 -9
data/VERSION +1 -1
data/app/views/layouts/application.html.erb +0 -1
data/campfire_logic.gemspec +16 -38
data/config/application.rb +2 -35
data/config/boot.rb +1 -3
data/config/cucumber.yml +1 -1
data/config/environment.rb +1 -4
data/config/environments/test.rb +1 -26
data/config/initializers/campfire_logic.rb +1 -1
data/config/initializers/metric_fu.rb +3 -3
data/config/initializers/secret_token.rb +1 -7
data/config/initializers/session_store.rb +1 -8
data/config/mongoid.yml +1 -20
data/config/routes.rb +8 -62
data/config.ru +1 -3
data/db/seeds.rb +1 -2
data/features/support/env.rb +37 -17
data/lib/tasks/cucumber.rake +13 -19
data/spec/controllers/directory_controller_spec.rb +1 -1
data/spec/controllers/services_controller_spec.rb +1 -3
data/spec/models/locale_spec.rb +1 -1
data/spec/models/location_import_spec.rb +1 -1
data/spec/models/location_spec.rb +1 -1
metadata +16 -47
data/Capfile +0 -4
data/app/models/google_maps_geocoder.rb +0 -108
data/config/deploy.rb +0 -40
data/config/environments/development.rb +0 -28
data/config/environments/production.rb +0 -49
data/doc/google_maps_response.rb +0 -56
data/init.rb +0 -1
data/public/404.html +0 -26
data/public/422.html +0 -26
data/public/500.html +0 -26
data/public/favicon.ico +0 -0
data/public/javascripts/application.js +0 -2
data/public/javascripts/controls.js +0 -965
data/public/javascripts/dragdrop.js +0 -974
data/public/javascripts/effects.js +0 -1123
data/public/javascripts/prototype.js +0 -6001
data/public/javascripts/rails.js +0 -175
data/public/robots.txt +0 -6
data/spec/models/google_maps_geocoder_spec.rb +0 -62

data/Gemfile CHANGED Viewed

@@ -1,15 +1,13 @@
 source 'http://rubygems.org'
-source 'http://jose.seologic.com:8808/'
 gem 'bson_ext'
 gem 'fastercsv'
+gem 'google_maps_geocoder'
 gem 'mongoid-tree'
-gem 'rake'
-gem 'rails', '>= 3.0'
+gem 'rails', '3.0.10'
 gem 'scaffold_logic'
 gem 'stateflow'
 gem 'stringex'
-gem 'SystemTimer'
 group :development do
   gem 'jeweler'
@@ -17,13 +15,9 @@ end
 group :test do
   gem 'be_valid_asset'
-  gem 'capybara'
   gem 'cucumber-rails'
   gem 'database_cleaner'
   gem 'launchy'
-  gem 'metric_fu'
   gem 'mocha'
-  gem 'nokogiri'
-  gem 'rcov'
   gem 'rspec-rails'
 end

data/Gemfile.local CHANGED Viewed

@@ -1,12 +1,10 @@
 source 'http://rubygems.org'
-source 'http://jose.seologic.com:8808/'
 gem 'bson_ext'
 gem 'fastercsv'
-gem 'mongo', '>= 1.0.7'
-gem 'mongoid', '>= 2.0.0.beta.20'
+gem 'google_maps_geocoder'
 gem 'mongoid-tree'
-gem 'rails'
+gem 'rails', '3.0.10'
 gem 'scaffold_logic', :path => '~/Documents/projects/scaffold_logic'
 gem 'stateflow'
 gem 'stringex'
@@ -16,12 +14,10 @@ group :development do
 end
 group :test do
-  gem 'capybara'
+  gem 'be_valid_asset'
   gem 'cucumber-rails'
   gem 'database_cleaner'
   gem 'launchy'
   gem 'mocha'
-  gem 'nokogiri'
-  gem 'rcov'
   gem 'rspec-rails'
 end

data/README.rdoc CHANGED Viewed

@@ -3,7 +3,7 @@
 The engine that powers CAMP. Provides location browsing, search, and management.
 == Note on Patches/Pull Requests
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
@@ -14,4 +14,4 @@ The engine that powers CAMP. Provides location browsing, search, and management.
 == Copyright
-Copyright (c) 2010 Roderick Monje. See LICENSE for details.
+Copyright © 2010 Roderick Monje. See LICENSE for details.

data/Rakefile CHANGED Viewed

@@ -1,12 +1,10 @@
-require 'metric_fu'
+require 'metric_fu' if Object.const_defined? 'MetricFu'
 require 'rake'
 require 'rspec/core/rake_task'
 require 'rubygems'
 require File.expand_path('../config/application', __FILE__)
 CampfireLogic::Application.load_tasks
 Rspec::Core::RakeTask.new
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -17,27 +15,23 @@ begin
     gem.homepage = 'http://github.com/ivanoblomov/campfire_logic'
     gem.authors = ['Roderick Monje']
     gem.add_development_dependency 'rspec', '>= 1.2.9'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
 end
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ''
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "CampfireLogic #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 namespace :spec do
   desc 'Run specs with RCov'
   RSpec::Core::RakeTask.new('rcov') do |t|
     t.rcov = true
     t.rcov_opts = IO.readlines('spec/rcov.opts').map{ |l| l.chomp.split } * ' '
   end
-end
+end

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 1.1.7
1	+ 1.1.8

data/app/views/layouts/application.html.erb CHANGED Viewed

@@ -11,7 +11,6 @@
     <!--[if IE]>
       <%= stylesheet_link_tag 'core_ie', :media => :all -%>
     <![endif]-->
-    <%= javascript_include_tag :defaults, :cache => true -%>
     <%= csrf_meta_tag -%>
   </head>
   <body>

data/campfire_logic.gemspec CHANGED Viewed

@@ -4,19 +4,18 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
-  s.name = %q{campfire_logic}
-  s.version = "1.1.7"
+  s.name = "campfire_logic"
+  s.version = "1.1.8"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Roderick Monje}]
-  s.date = %q{2011-07-17}
-  s.description = %q{Users can browse locations by country, city, and state and search locations by string or zip code. Administrators can manage locations and the services they offer.}
-  s.email = %q{rod@seologic.com}
+  s.authors = ["Roderick Monje"]
+  s.date = "2011-11-30"
+  s.description = "Users can browse locations by country, city, and state and search locations by string or zip code. Administrators can manage locations and the services they offer."
+  s.email = "rod@seologic.com"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    "Capfile",
     "Gemfile",
     "Gemfile.local",
     "README.rdoc",
@@ -27,7 +26,6 @@ Gem::Specification.new do |s|
     "app/controllers/locations_controller.rb",
     "app/controllers/services_controller.rb",
     "app/helpers/application_helper.rb",
-    "app/models/google_maps_geocoder.rb",
     "app/models/locale.rb",
     "app/models/location.rb",
     "app/models/location_import.rb",
@@ -61,10 +59,7 @@ Gem::Specification.new do |s|
     "config/application.rb",
     "config/boot.rb",
     "config/cucumber.yml",
-    "config/deploy.rb",
     "config/environment.rb",
-    "config/environments/development.rb",
-    "config/environments/production.rb",
     "config/environments/test.rb",
     "config/initializers/campfire_logic.rb",
     "config/initializers/metric_fu.rb",
@@ -75,7 +70,6 @@ Gem::Specification.new do |s|
     "config/routes.rb",
     "db/seeds.rb",
     "db/zip_codes.txt",
-    "doc/google_maps_response.rb",
     "features/admin_manages_locations.feature",
     "features/customer_browses_directory.feature",
     "features/customer_searches_directory.feature",
@@ -85,16 +79,11 @@ Gem::Specification.new do |s|
     "features/support/env.rb",
     "features/support/paths.rb",
     "features/support/selectors.rb",
-    "init.rb",
     "lib/campfire_logic.rb",
     "lib/campfire_logic/engine.rb",
     "lib/campfire_logic/railtie.rb",
     "lib/tasks/campfire_logic.rake",
     "lib/tasks/cucumber.rake",
-    "public/404.html",
-    "public/422.html",
-    "public/500.html",
-    "public/favicon.ico",
     "public/images/icons/collapsed.gif",
     "public/images/icons/delete.png",
     "public/images/icons/drag.png",
@@ -133,13 +122,6 @@ Gem::Specification.new do |s|
     "public/images/layout/th_bg_selected.png",
     "public/images/rails.png",
     "public/index.html",
-    "public/javascripts/application.js",
-    "public/javascripts/controls.js",
-    "public/javascripts/dragdrop.js",
-    "public/javascripts/effects.js",
-    "public/javascripts/prototype.js",
-    "public/javascripts/rails.js",
-    "public/robots.txt",
     "public/sample-locations.xls",
     "public/stylesheets/.gitkeep",
     "public/stylesheets/application.css",
@@ -150,7 +132,6 @@ Gem::Specification.new do |s|
     "script/rails",
     "spec/controllers/directory_controller_spec.rb",
     "spec/controllers/services_controller_spec.rb",
-    "spec/models/google_maps_geocoder_spec.rb",
     "spec/models/locale_spec.rb",
     "spec/models/location_import_spec.rb",
     "spec/models/location_spec.rb",
@@ -158,10 +139,10 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/test-locations.xls"
   ]
-  s.homepage = %q{http://github.com/ivanoblomov/campfire_logic}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{Rails engine that adds a location directory to your web app}
+  s.homepage = "http://github.com/ivanoblomov/campfire_logic"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Rails engine that adds a location directory to your web app"
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -169,38 +150,35 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
       s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
+      s.add_runtime_dependency(%q<google_maps_geocoder>, [">= 0"])
       s.add_runtime_dependency(%q<mongoid-tree>, [">= 0"])
-      s.add_runtime_dependency(%q<rake>, [">= 0"])
-      s.add_runtime_dependency(%q<rails>, [">= 3.0"])
+      s.add_runtime_dependency(%q<rails>, ["= 3.0.10"])
       s.add_runtime_dependency(%q<scaffold_logic>, [">= 0"])
       s.add_runtime_dependency(%q<stateflow>, [">= 0"])
       s.add_runtime_dependency(%q<stringex>, [">= 0"])
-      s.add_runtime_dependency(%q<SystemTimer>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<bson_ext>, [">= 0"])
       s.add_dependency(%q<fastercsv>, [">= 0"])
+      s.add_dependency(%q<google_maps_geocoder>, [">= 0"])
       s.add_dependency(%q<mongoid-tree>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rails>, [">= 3.0"])
+      s.add_dependency(%q<rails>, ["= 3.0.10"])
       s.add_dependency(%q<scaffold_logic>, [">= 0"])
       s.add_dependency(%q<stateflow>, [">= 0"])
       s.add_dependency(%q<stringex>, [">= 0"])
-      s.add_dependency(%q<SystemTimer>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
     s.add_dependency(%q<bson_ext>, [">= 0"])
     s.add_dependency(%q<fastercsv>, [">= 0"])
+    s.add_dependency(%q<google_maps_geocoder>, [">= 0"])
     s.add_dependency(%q<mongoid-tree>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rails>, [">= 3.0"])
+    s.add_dependency(%q<rails>, ["= 3.0.10"])
     s.add_dependency(%q<scaffold_logic>, [">= 0"])
     s.add_dependency(%q<stateflow>, [">= 0"])
     s.add_dependency(%q<stringex>, [">= 0"])
-    s.add_dependency(%q<SystemTimer>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end

data/config/application.rb CHANGED Viewed

@@ -1,44 +1,11 @@
 require File.expand_path('../boot', __FILE__)
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
 require 'active_resource/railtie'
-# If you have a Gemfile, require the gems listed there, including any gems
-# you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 module CampfireLogic
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-    # Configure sensitive parameters which will be filtered from the log file.
+    config.encoding = 'utf-8'
     config.filter_parameters += [:password]
   end
-end
+end

data/config/boot.rb CHANGED Viewed

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

data/config/cucumber.yml CHANGED Viewed

@@ -7,4 +7,4 @@ int_opts = "#{std_opts} -o tmp/feature_results.txt"
 default: <%= std_opts %> features
 wip: --tags @wip:3 --wip features
 rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip
-integration: <%= int_opts %> features
+integration: <%= int_opts %> features

data/config/environment.rb CHANGED Viewed

@@ -1,6 +1,3 @@
-# Load the rails application
 require File.expand_path('../application', __FILE__)
 require File.expand_path('../../lib/campfire_logic', __FILE__)
-# Initialize the rails application
-CampfireLogic::Application.initialize!
+CampfireLogic::Application.initialize!

data/config/environments/test.rb CHANGED Viewed

@@ -1,35 +1,10 @@
 CampfireLogic::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
-  # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
-  # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
-  # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
-  # Raise exceptions instead of rendering exception templates
   config.action_dispatch.show_exceptions = false
-  # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection    = false
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-  # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-end
+end

data/config/initializers/campfire_logic.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 CampfireLogic.setup do |config|
   config.directory_slug = 'directory'
-end
+end

data/config/initializers/metric_fu.rb CHANGED Viewed

@@ -1,9 +1,9 @@
-if Rails.env.test?
+if Rails.env.test? && Object.const_defined?('MetricFu')
   require 'metric_fu'
   MetricFu::Configuration.run do |config|
     config.metrics  = [:churn, :saikuro, :stats, :flog, :flay]
     config.graphs   = [:flog, :flay, :stats]
     config.rcov[:test_files] = ['spec/**/*_spec.rb']
-    config.rcov[:rcov_opts] << '-Ispec' # Needed to find spec_helper
+    config.rcov[:rcov_opts] << '-Ispec'
   end
-end
+end

data/config/initializers/secret_token.rb CHANGED Viewed

@@ -1,7 +1 @@
-# Be sure to restart your server when you modify this file.
-# Your secret key for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-Rails.application.config.secret_token = '7e7d63cc40339d7c0413b464087c8f33c7811b85adc81916521c2b83848407ef03b446f847b08f124f69cb55d81e2232fb718fa08b906e504eb505477b0e9235'
+Rails.application.config.secret_token = '7e7d63cc40339d7c0413b464087c8f33c7811b85adc81916521c2b83848407ef03b446f847b08f124f69cb55d81e2232fb718fa08b906e504eb505477b0e9235'

data/config/initializers/session_store.rb CHANGED Viewed

@@ -1,8 +1 @@
-# Be sure to restart your server when you modify this file.
-Rails.application.config.session_store :cookie_store, :key => '_CampfireLogic_session'
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rake db:sessions:create")
-# Rails.application.config.session_store :active_record_store
+Rails.application.config.session_store :cookie_store, :key => '_CampfireLogic_session'

data/config/mongoid.yml CHANGED Viewed

@@ -1,25 +1,6 @@
 defaults: &defaults
   host: localhost
-  # slaves:
-  #   - host: slave1.local
-  #     port: 27018
-  #   - host: slave2.local
-  #     port: 27019
-  skip_version_check: true
-development:
-  <<: *defaults
-  database: campfire_logic_development
 test:
   <<: *defaults
-  database: campfire_logic_test
-# set these environment variables on your prod server
-production:
-  <<: *defaults
-  host: <%= ENV['MONGOID_HOST'] %>
-  port: <%= ENV['MONGOID_PORT'] %>
-  username: <%= ENV['MONGOID_USERNAME'] %>
-  password: <%= ENV['MONGOID_PASSWORD'] %>
-  database: <%= ENV['MONGOID_DATABASE'] %>
+  database: campfire_logic_test

data/config/routes.rb CHANGED Viewed

@@ -1,17 +1,7 @@
 Rails.application.routes.draw do
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-  match "#{CampfireLogic.directory_slug}" => 'directory#show', :as => :directory, :via => 'get'
-  match "#{CampfireLogic.directory_slug}/search" => 'directory#search', :as => :directory_search_root, :via => 'get'
-  match "#{CampfireLogic.directory_slug}/search/:criteria" => 'directory#search', :as => :directory_search, :via => 'get'
+  get "#{CampfireLogic.directory_slug}" => 'directory#show', :as => :directory
+  get "#{CampfireLogic.directory_slug}/search" => 'directory#search', :as => :directory_search_root
+  get "#{CampfireLogic.directory_slug}/search/:criteria" => 'directory#search', :as => :directory_search
   class DirectoryConstraint
     def initialize; end
@@ -34,27 +24,12 @@ Rails.application.routes.draw do
   end
   constraints(LocaleConstraint.new) do
-    match "#{CampfireLogic.directory_slug}/:country" => 'directory#show', :as => 'directory_show_country', :via => 'get'
-    match "#{CampfireLogic.directory_slug}/:country/:state" => 'directory#show', :as => 'directory_show_state', :via => 'get'
-    match "#{CampfireLogic.directory_slug}/:country/:state/:city" => 'directory#show', :as => 'directory_show_city', :via => 'get'
-    match "#{CampfireLogic.directory_slug}/:country/:state/:city/:location" => 'directory#show', :as => 'directory_show_location', :via => 'get'
+    get "#{CampfireLogic.directory_slug}/:country" => 'directory#show', :as => 'directory_show_country'
+    get "#{CampfireLogic.directory_slug}/:country/:state" => 'directory#show', :as => 'directory_show_state'
+    get "#{CampfireLogic.directory_slug}/:country/:state/:city" => 'directory#show', :as => 'directory_show_city'
+    get "#{CampfireLogic.directory_slug}/:country/:state/:city/:location" => 'directory#show', :as => 'directory_show_location'
   end
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-  resources :services
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
   resources :locations do
     collection do
       get 'import'
@@ -63,34 +38,5 @@ Rails.application.routes.draw do
     end
   end
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-#  root :to => "directory#show", :via => 'get'
-  # See how all your routes lay out with "rake routes"
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id(.:format)))'
+  resources :services
 end

data/config.ru CHANGED Viewed

@@ -1,4 +1,2 @@
-# This file is used by Rack-based servers to start the application.
 require ::File.expand_path('../config/environment',  __FILE__)
-run CampfireLogic::Application
+run CampfireLogic::Application

data/db/seeds.rb CHANGED Viewed

@@ -1,5 +1,4 @@
 puts 'Importing zip codes...'
 ZipCodeImport.test
 puts 'Importing locations...'
-LocationImport.test
+LocationImport.test

data/features/support/env.rb CHANGED Viewed

@@ -4,28 +4,48 @@
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
-require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
-require 'cucumber/rails/rspec'
-require 'cucumber/rails/world'
-require 'cucumber/web/tableish'
-require 'capybara/rails'
-require 'capybara/cucumber'
-require 'capybara/session'
-require 'be_valid_asset'
-require 'mongoid'
-require 'database_cleaner'
-require 'database_cleaner/cucumber'
+require 'cucumber/rails'
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
 # order to ease the transition to Capybara we set the default here. If you'd
 # prefer to use XPath just remove this line and adjust any selectors in your
 # steps to use the XPath syntax.
 Capybara.default_selector = :css
-Capybara.save_and_open_page_path = Rails.root + 'tmp'
-# How to clean your database when transactions are turned off. See
-# http://github.com/bmabey/database_cleaner for more info.
+# By default, any exception happening in your Rails application will bubble up
+# to Cucumber so that your scenario will fail. This is a different from how
+# your application behaves in the production environment, where an error page will
+# be rendered instead.
+#
+# Sometimes we want to override this default behaviour and allow Rails to rescue
+# exceptions and display an error page (just like when the app is running in production).
+# Typical scenarios where you want to do this is when you test your error pages.
+# There are two ways to allow Rails to rescue exceptions:
+#
+# 1) Tag your scenario (or feature) with @allow-rescue
+#
+# 2) Set the value below to true. Beware that doing this globally is not
+# recommended as it will mask a lot of errors for you!
+#
+ActionController::Base.allow_rescue = false
+# Remove/comment out the lines below if your app doesn't have a database.
+# For some databases (like MongoDB and CouchDB) you may need to use :truncation instead.
 DatabaseCleaner.strategy = :truncation
+# You may also want to configure DatabaseCleaner to use different strategies for certain features and scenarios.
+# See the DatabaseCleaner documentation for details. Example:
+#
+#   Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
+#     DatabaseCleaner.strategy = :truncation, {:except => %w[widgets]}
+#   end
+#
+#   Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do
+#     DatabaseCleaner.strategy = :transaction
+#   end
+#
+# Possible values are :truncation and :transaction
+# The :transaction strategy is faster, but might give you threading problems.
+# See https://github.com/cucumber/cucumber-rails/blob/master/features/choose_javascript_database_strategy.feature
+Cucumber::Rails::Database.javascript_strategy = :truncation