gsa 0.9.1 → 0.10.0

data/fixtures/uids/many.txt

@@ -1 +1 @@
-["53604", "53602", "53606", "53605", "59632", "55219", "54611", "36843", "7965", "36628", "7903", "836", "59464", "56304", "53618", "55252", "752", "8014", "8012", "6194", "8013", "63361", "36824", "54154", "10327", "8000", "36777", "71083", "36687", "36793", "7997", "8248", "59564", "1947", "53957", "56201", "56205", "56206", "61168", "88504", "7744", "8369", "70948", "71481", "7963", "557", "86102", "56199", "6200", "36757", "54713", "36756", "36685", "56045", "3122", "59349", "56084", "63329", "36758", "36837", "36838", "86100", "36835", "59457"]
+["7903", "836", "68999", "63598", "69030", "8248", "56304", "53618", "8014", "8012", "6194", "8013", "54154", "8000", "68579", "53604", "68840", "68843", "68846", "68841", "68848", "67202", "66890", "67214", "67209", "1947", "53602", "53606", "53605"]

data/lib/defaults.rb

@@ -21,6 +21,7 @@ module Defaults
   DEFAULT_OUTPUT         = "xml_no_dtd"  # OPTIONS: xml_no_dtd, xml
   DEFAULT_START          = "0"           # OPTIONS: 0..max_search_results
   DEFAULT_CLIENT         = "default_frontend"
+  DEFAULT_COLLECTION     = "default_collection" # maps to 'site'
   NO_RESULTS             = 0
 
   # values for making xml files

data/lib/gsa/searcher.rb

@@ -2,16 +2,17 @@ module GSA
   class Searcher
     def self.search(query, args={})
       query           = clean_query(query)
-      filter          = args[:filter]    || GSA::DEFAULT_FILTER
-      getfields       = args[:getfields] || GSA::DEFAULT_GETFIELDS
-      sort            = args[:sort]      || GSA::DEFAULT_SORT
-      num             = args[:num]       || GSA::DEFAULT_NUM  
-      output          = args[:output]    || GSA::DEFAULT_OUTPUT
-      start           = args[:start]     || GSA::DEFAULT_START
-      client          = args[:client]    || GSA::DEFAULT_CLIENT
-      requiredfields  = args[:filters]   || nil
+      filter          = args[:filter]     || GSA::DEFAULT_FILTER
+      getfields       = args[:getfields]  || GSA::DEFAULT_GETFIELDS
+      sort            = args[:sort]       || GSA::DEFAULT_SORT
+      num             = args[:num]        || GSA::DEFAULT_NUM  
+      output          = args[:output]     || GSA::DEFAULT_OUTPUT
+      start           = args[:start]      || GSA::DEFAULT_START
+      client          = args[:client]     || GSA::DEFAULT_CLIENT
+      site            = args[:collection] || GSA::DEFAULT_COLLECTION
+      requiredfields  = args[:filters]    || nil
 
-      search = "#{GSA.base_uri}/search?q=#{query}&filter=#{filter}&getfields=#{getfields}&sort=#{sort}&num=#{num}&start=#{start}&output=#{output}&client=#{client}"
+      search = "#{GSA.base_uri}/search?q=#{query}&filter=#{filter}&site=#{site}&getfields=#{getfields}&sort=#{sort}&num=#{num}&start=#{start}&output=#{output}&client=#{client}"
       search = "#{search}&requiredfields=#{clean_query(requiredfields)}" if requiredfields
 
       search_results = parsed_json( RestClient.get(search) )

data/lib/gsa/version.rb

@@ -1,3 +1,3 @@
 module GSA
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

data/spec/fixtures.rb

@@ -60,7 +60,7 @@ module Fixtures
   end
 
   def gsa_base_uri
-    "http://dev-gsa.1000bulbs.com"
+    "https://dev-gsa.1000bulbs.com"
   end
 
   #######

data/spec/lib/gsa_spec.rb

@@ -20,7 +20,7 @@ describe GSA do
               :records         => many_records, 
               :searchable      => [:name, :description], 
               :datasource_name => "products",
-              :datasource_uri  => "http://0.0.0.0:3000/products",
+              :datasource_uri  => "https://0.0.0.0:3000/products",
               :datasource_uid  => "id"
             )
             results.should eq success_text
@@ -37,7 +37,7 @@ describe GSA do
               :records         => many_records, 
               :searchable      => [:name, :description], 
               :datasource_name => "products",
-              :datasource_uri  => "http://0.0.0.0:3000/products",
+              :datasource_uri  => "https://0.0.0.0:3000/products",
               :datasource_uid  => "id"
             )
             results.should eq success_text
@@ -57,7 +57,7 @@ describe GSA do
               :records         => many_records, 
               :searchable      => [:name, :description], 
               :datasource_name => "products",
-              :datasource_uri  => "http://0.0.0.0:3000/products",
+              :datasource_uri  => "https://0.0.0.0:3000/products",
               :datasource_uid  => "id",
               :delete?         => true
             )
@@ -75,7 +75,7 @@ describe GSA do
               :records         => one_records, 
               :searchable      => [:name, :description], 
               :datasource_name => "products",
-              :datasource_uri  => "http://0.0.0.0:3000/products",
+              :datasource_uri  => "https://0.0.0.0:3000/products",
               :datasource_uid  => "id",
               :delete?         => true
             )
@@ -98,7 +98,7 @@ describe GSA do
             :records         => one_records, 
             :searchable      => [:name, :description], 
             :datasource_name => "products",
-            :datasource_uri  => "http://0.0.0.0:3000/products",
+            :datasource_uri  => "https://0.0.0.0:3000/products",
             :datasource_uid  => "id",
             :delete?         => true
           ) 
@@ -134,28 +134,6 @@ describe GSA do
         end
       end
 
-      context "with a query yielding a single match" do
-
-        let(:query)      { one_query }
-        let(:result_set) { one_results }
-
-        it "returns a single record" do
-
-          VCR.use_cassette("single_result_no_filters") do
-            results = GSA.search(query)
-            results[:result_sets].count.should eq 1
-          end
-        end
-
-        it "returns the single result in the expected 'pretty' format" do
-
-          VCR.use_cassette("single_result_no_filters") do
-            results = GSA.search(query)
-            results[:result_sets].should eq result_set[:result_sets]
-          end
-        end
-      end
-
       context "with a query yielding no matches" do
 
         let(:query) { none_query }
@@ -187,59 +165,6 @@ describe GSA do
             results[:result_sets].count.should be < results_set[:result_sets].count
           end
         end
-
-        it "should only contain results matched in the unfiltered results" do
-
-          VCR.use_cassette("many_results_with_filters") do
-            results = GSA.search(query, :filters => filters)
-
-            filtered_results = []
-            results_set[:result_sets].each {|result| 
-              result[:metatags].each {|tag| 
-                if tag[:meta_name] == filter_name && tag[:meta_value] == filter_value
-                  filtered_results << result
-                end
-              }
-            }
-
-            result_uids   = GSA.uids(results[:result_sets], uid)
-            filtered_uids = GSA.uids(filtered_results, uid)
-            result_uids.should eq filtered_uids
-          end
-        end
-      end
-
-      context "with a query yielding a single result" do
-
-        let(:query)          { many_query }
-        let(:results_set)    { many_results }
-        let(:filter_1_name)  { "attribute_color" }
-        let(:filter_1_value) { "Red" }
-        let(:filter_2_name)  { "attribute_brand" }
-        let(:filter_2_value) { "Vickerman" }
-        let(:filters)        { "#{filter_1_name}:#{filter_1_value}.#{filter_2_name}:#{filter_2_value}" }
-
-        it "returns a single filtered result" do
-
-          VCR.use_cassette("single_result_with_filters") do
-            results = GSA.search(query, :filters => filters)
-            results[:result_sets].count.should eq 1
-          end
-        end
-
-        it "returns a result with the expected matching filters" do
-
-          VCR.use_cassette("single_result_with_filters") do
-            results = GSA.search(query, :filters => filters)
-
-            results[:result_sets].each.inject([]) {|flags, result| result[:metatags].each {|tag|
-                flags << 1 if tag[:meta_name] == filter_1_name && tag[:meta_value] == filter_1_value
-                flags << 1 if tag[:meta_name] == filter_2_name && tag[:meta_value] == filter_2_value
-              }
-              flags
-            }.should eq [1, 1]
-          end
-        end
       end
 
       context "with a query yielding no results" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gsa
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Daniel J. Long
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler