Tests for the taxon filtering

app/assets/javascripts/darkswarm/directives/shipping_type_selector.js.coffee

@@ -0,0 +1,7 @@
+Darkswarm.directive "shippingTypeSelector", ->
+  restrict: 'E'
+  templateUrl: 'shipping_type_selector.html'
+  link: (scope, elem, attr)->
+    scope.shippingTypes = 
+      pickup: false
+      delivery: false 

app/assets/javascripts/darkswarm/directives/taxon_selector.js.coffee

@@ -1,6 +1,8 @@
 Darkswarm.directive "taxonSelector", (TaxonSelector) ->
   restrict: 'E'
-  scope: {}
+  scope:
+    enterprises: "="
   templateUrl: "taxon_selector.html"
   link: (scope, elem, attr)->
     scope.TaxonSelector = TaxonSelector
+    TaxonSelector.collectTaxons scope.enterprises

app/assets/javascripts/darkswarm/filters/taxons.js.coffee

@@ -3,10 +3,9 @@ Darkswarm.filter 'taxons', (Matcher)->
   (objects, ids) ->
     objects ||= []
     ids ?= []
-    console.log ids
     if ids.length == 0
       objects
     else
       objects.filter (obj)->
-        obj.primary_taxon?.id in ids || obj.taxons.some (taxon)->
+        obj.primary_taxon?.id in ids || (obj.taxons.concat obj.supplied_taxons).some (taxon)->
           taxon.id in ids

app/assets/javascripts/darkswarm/services/enterprises.js.coffee

@@ -18,3 +18,4 @@ Darkswarm.factory 'Enterprises', (enterprises, CurrentHub, Taxons, Dereferencer)
     dereferenceTaxons: ->
       for enterprise in @enterprises 
         Dereferencer.dereference enterprise.taxons, Taxons.taxons_by_id
+        Dereferencer.dereference enterprise.supplied_taxons, Taxons.taxons_by_id

app/assets/javascripts/darkswarm/services/selectors/taxon_selector.js.coffee

@@ -0,0 +1,19 @@
+Darkswarm.factory 'TaxonSelector', ->
+  new class TaxonSelector
+    selectors: []
+    # Collect all taxons on the supplied enterprises
+    collectTaxons: (enterprises)->
+      taxons = {} 
+      for enterprise in enterprises
+        for taxon in (enterprise.taxons.concat enterprise.supplied_taxons)
+          taxons[taxon.id] = taxon
+      for id, taxon of taxons
+        @selectors.push
+          active: false
+          taxon: taxon
+
+    active: ->
+      @selectors.filter (selector)->
+        selector.active
+      .map (selector)->
+        selector.taxon.id

app/assets/javascripts/darkswarm/services/taxon_selector.js.coffee

@@ -1,14 +0,0 @@
-Darkswarm.factory 'TaxonSelector', (Taxons)->
-  new class TaxonSelector
-    selectors: []
-    constructor: ->
-      for taxon in Taxons.taxons
-        @selectors.push
-          active: false
-          taxon: taxon
-
-    active: ->
-      @selectors.filter (selector)->
-        selector.active
-      .map (selector)->
-        selector.taxon.id

app/assets/javascripts/templates/shipping_type_selector.html.haml

@@ -0,0 +1,7 @@
+%ul.small-block-grid-4
+  %li{"ng-class" => "{active: shippingTypes['delivery']}"}
+    %a{"ng-click" => "shippingTypes['delivery'] = !shippingTypes['delivery']"}
+      Delivery
+  %li{"ng-class" => "{active: shippingTypes['pickup']}"}
+    %a{"ng-click" => "shippingTypes['pickup'] = !shippingTypes['pickup']"}
+      Pickup

app/views/producers/_filters.html.haml

@@ -16,4 +16,7 @@
           Something  
     .row
       .small-12.large-6.columns
-        %taxon-selector
+        %taxon-selector{enterprises: "Producers.visible"}
+
+      .small-12.large-6.columns
+        %shipping-type-selector

app/views/producers/index.html.haml

@@ -25,7 +25,7 @@
       .active_table
         %producer.active_table_node.row.animate-repeat{id: "{{producer.path}}",
         "scroll-after-load" => true,
-        "ng-repeat" => "producer in filteredProducers = (Producers.visible | filterProducers:query | taxons:TaxonSelector.active())",
+        "ng-repeat" => "producer in filteredProducers = (Producers.visible | filterProducers:query | taxons:TaxonSelector.active() | shipping:shippingTypes)",
         "ng-controller" => "ProducerNodeCtrl",
         "ng-class" => "{'closed' : !open(), 'open' : open(), 'inactive' : !producer.active}",
         id: "{{producer.hash}}"}

spec/javascripts/unit/darkswarm/filters/shipping_spec.js.coffee

@@ -28,3 +28,6 @@ describe 'filtering by shipping method', ->
 
   it "filters to none", ->
     expect(filterByShippingMethod(objects, {pickup: false, delivery: false})).toBe objects
+
+  it "filters to none with empty", ->
+    expect(filterByShippingMethod(objects, {})).toBe objects

spec/javascripts/unit/darkswarm/filters/taxons_spec.js.coffee

@@ -3,6 +3,7 @@ describe 'filtering by taxons', ->
   objects = [
     {
       taxons: []
+      supplied_taxons: []
       primary_taxon: 
         name: "frogs"
         id: 1
@@ -12,6 +13,7 @@ describe 'filtering by taxons', ->
         {name: "kittens", id: 2}
         {name: "puppies", id: 3}
       ]
+      supplied_taxons: []
     }
   ]