diff --git a/app/controllers/spree/home_controller_decorator.rb b/app/controllers/spree/home_controller_decorator.rb index 7eb3e3e351..ba605ceca0 100644 --- a/app/controllers/spree/home_controller_decorator.rb +++ b/app/controllers/spree/home_controller_decorator.rb @@ -1,10 +1,10 @@ -require 'open_food_web/split_products_by_distributor' +require 'open_food_web/split_products_by_distribution' Spree::HomeController.class_eval do include EnterprisesHelper - include OpenFoodWeb::SplitProductsByDistributor + include OpenFoodWeb::SplitProductsByDistribution respond_override :index => { :html => { :success => lambda { - @products, @products_local, @products_remote = split_products_by_distributor @products, current_distributor + @products, @products_local, @products_remote = split_products_by_distribution @products, current_distributor } } } end diff --git a/app/controllers/spree/products_controller_decorator.rb b/app/controllers/spree/products_controller_decorator.rb index 913b7f4dee..e9a99b7a5d 100644 --- a/app/controllers/spree/products_controller_decorator.rb +++ b/app/controllers/spree/products_controller_decorator.rb @@ -1,11 +1,11 @@ -require 'open_food_web/split_products_by_distributor' +require 'open_food_web/split_products_by_distribution' Spree::ProductsController.class_eval do include EnterprisesHelper - include OpenFoodWeb::SplitProductsByDistributor + include OpenFoodWeb::SplitProductsByDistribution respond_override :index => { :html => { :success => lambda { - @products, @products_local, @products_remote = split_products_by_distributor @products, current_distributor + @products, @products_local, @products_remote = split_products_by_distribution @products, current_distributor } } } end diff --git a/app/controllers/spree/taxons_controller_decorator.rb b/app/controllers/spree/taxons_controller_decorator.rb index 1d0fe7a7a5..9577df246e 100644 --- a/app/controllers/spree/taxons_controller_decorator.rb +++ b/app/controllers/spree/taxons_controller_decorator.rb @@ -1,10 +1,10 @@ -require 'open_food_web/split_products_by_distributor' +require 'open_food_web/split_products_by_distribution' Spree::TaxonsController.class_eval do include EnterprisesHelper - include OpenFoodWeb::SplitProductsByDistributor + include OpenFoodWeb::SplitProductsByDistribution respond_override :show => { :html => { :success => lambda { - @products, @products_local, @products_remote = split_products_by_distributor @products, current_distributor + @products, @products_local, @products_remote = split_products_by_distribution @products, current_distributor } } } end diff --git a/app/helpers/spree/base_helper_decorator.rb b/app/helpers/spree/base_helper_decorator.rb index 2d82170930..2f87015d42 100644 --- a/app/helpers/spree/base_helper_decorator.rb +++ b/app/helpers/spree/base_helper_decorator.rb @@ -8,7 +8,7 @@ module Spree # The concern of separating products by distributor and order cycle is dealt with in # a few other places: OpenFoodWeb::Searcher (for searching over products) and in - # OpenFoodWeb::SplitProductsByDistributor (for splitting the main product display). + # OpenFoodWeb::SplitProductsByDistribution (for splitting the main product display). products = Product.in_taxon(taxon) products = products.in_distributor(current_distributor) if current_distributor diff --git a/lib/open_food_web/searcher.rb b/lib/open_food_web/searcher.rb index 46cf3337cd..8aba847373 100644 --- a/lib/open_food_web/searcher.rb +++ b/lib/open_food_web/searcher.rb @@ -15,7 +15,7 @@ module OpenFoodWeb base_scope = super # The concern of separating products by distributor and order cycle is dealt with in - # a few other places: OpenFoodWeb::SplitProductsByDistributor (for splitting the main + # a few other places: OpenFoodWeb::SplitProductsByDistribution (for splitting the main # product display) and Spree::BaseHelper decorator (for taxon counts). base_scope = base_scope.in_supplier_or_distributor(enterprise_id) if enterprise_id diff --git a/lib/open_food_web/split_products_by_distributor.rb b/lib/open_food_web/split_products_by_distribution.rb similarity index 88% rename from lib/open_food_web/split_products_by_distributor.rb rename to lib/open_food_web/split_products_by_distribution.rb index 7037d351da..736a5b2fea 100644 --- a/lib/open_food_web/split_products_by_distributor.rb +++ b/lib/open_food_web/split_products_by_distribution.rb @@ -4,11 +4,11 @@ module OpenFoodWeb # other places: OpenFoodWeb::Searcher (for searching over products) and in # Spree::BaseHelper decorator (for taxon counts). - module SplitProductsByDistributor + module SplitProductsByDistribution # If a distributor is provided, split the list of products into local (at that # distributor) and remote (at another distributor). If a distributor is not # provided, perform no split. - def split_products_by_distributor(products, distributor) + def split_products_by_distribution(products, distributor) products_local = products_remote = nil if distributor diff --git a/spec/lib/open_food_web/split_products_by_distributor_spec.rb b/spec/lib/open_food_web/split_products_by_distribution_spec.rb similarity index 84% rename from spec/lib/open_food_web/split_products_by_distributor_spec.rb rename to spec/lib/open_food_web/split_products_by_distribution_spec.rb index b4a7a7b145..fc588106a7 100644 --- a/spec/lib/open_food_web/split_products_by_distributor_spec.rb +++ b/spec/lib/open_food_web/split_products_by_distribution_spec.rb @@ -1,14 +1,14 @@ require 'spec_helper' -describe OpenFoodWeb::SplitProductsByDistributor do - let(:products_splitter) { Class.new { include OpenFoodWeb::SplitProductsByDistributor } } +describe OpenFoodWeb::SplitProductsByDistribution do + let(:products_splitter) { Class.new { include OpenFoodWeb::SplitProductsByDistribution } } let(:subject) { products_splitter.new } it "does nothing when no distributor is selected" do orig_products = (1..3).map { |i| build(:product) } - products, products_local, products_remote = subject.split_products_by_distributor orig_products, nil + products, products_local, products_remote = subject.split_products_by_distribution orig_products, nil products.should == orig_products products_local.should be_nil @@ -21,7 +21,7 @@ describe OpenFoodWeb::SplitProductsByDistributor do orig_products = [build(:product, :distributors => [d1]), build(:product, :distributors => [d2])] - products, products_local, products_remote = subject.split_products_by_distributor orig_products, d1 + products, products_local, products_remote = subject.split_products_by_distribution orig_products, d1 products.should be_nil products_local.should == [orig_products[0]]