lucid_works 0.7.9 → 0.7.10

data/lib/lucid_works/collection.rb

@@ -20,7 +20,8 @@ module LucidWorks
       "filterer.class" => "com.lucid.security.WindowsACLQueryFilterer",
       "provider.class" => "com.lucid.security.ad.ADACLTagProvider",
     }
-
+    MAGIC_ACL_ONLY_FILTER_SETTING = {'should.clause' => '*:* -data_source_type:smb'}
+    
     validates_presence_of :name
 
     def destroyable?
@@ -140,6 +141,12 @@ module LucidWorks
       assert_components_include_ad_xor_role
       return self.components.include?(AD_FILTERING)
     end
+    
+    def acl_only?
+      filterer_config = self.filtering_settings['filterer.config']
+      return false if filterer_config.nil?
+      return self.filtering_settings['filterer.config'] != MAGIC_ACL_ONLY_FILTER_SETTING #rescue false
+    end
 
     def assert_components_include_ad_xor_role
       # require 'ruby-debug'; debugger
@@ -163,7 +170,8 @@ module LucidWorks
         opts[:config]['java.naming.provider.url'] = "ldap://#{opts[:config]['java.naming.provider.url']}" 
       end
       filtering_settings = STATIC_ACL_CONFIG.merge('provider.config' => opts[:config])
-
+      filtering_settings["filterer.config"] = opts[:acl_only] ? {} : MAGIC_ACL_ONLY_FILTER_SETTING
+      
       errors = {}
       method = RestClient.send(:get, uri+'/filtering')['adfiltering'] ? :put : :post
       begin

data/lib/lucid_works/gem_version.rb

@@ -1,3 +1,3 @@
 module LucidWorks
-  VERSION = "0.7.9"
+  VERSION = "0.7.10"
 end

data/spec/lib/lucid_works/collection/acl_config_spec.rb

@@ -7,6 +7,7 @@ describe "LucidWorks::Collection ACL configuration utility methods" do
   end
   
   describe "ACL filtering configuration" do
+    MAGIC_ACL_ONLY_FILTER_SETTING = {'should.clause' => '*:* -data_source_type:smb'}
     before :all do
       @collection = @server.create_collection(:name => 'collection_for_acl_config_testing', :parent => @server)
       @initial_components = [
@@ -135,7 +136,7 @@ describe "LucidWorks::Collection ACL configuration utility methods" do
         }
         
         @collection_for_configure.filtering_settings.should be_blank
-        @collection_for_configure.configure_filtering(:config => @settings, :enabled =>  'true')
+        @collection_for_configure.configure_filtering(:config => @settings, :enabled =>  'true', :acl_only => true)
         @collection_for_configure.filtering_settings.should == final_settings
       end
       
@@ -160,6 +161,52 @@ describe "LucidWorks::Collection ACL configuration utility methods" do
           @collection_for_configure.configure_filtering(:config => settings, :enabled =>  'true')
         }.should raise_error {|e| e.messages.keys.first.should =~ /url\.no_url/} # because url is required
       end
+      
+      it "should add the filterer.config parameter if acl_only is false" do
+        settings = @settings.clone
+        
+        @collection_for_configure.configure_filtering(:config => settings, :enabled =>  'true', :acl_only => false)
+        @collection_for_configure.filtering_settings['filterer.config'].should == MAGIC_ACL_ONLY_FILTER_SETTING
+      end
+      
+      it "should remove the filterer.config parameter if acl_only is true" do
+        settings = @settings.clone
+        filterer_config = {}
+        
+        @collection_for_configure.configure_filtering(:config => settings, :enabled =>  'true', :acl_only => true)
+        @collection_for_configure.filtering_settings['filterer.config'].should == filterer_config
+      end
+    end
+    
+    describe '#acl_only?' do
+      before :all do
+        @collection_for_acl_only = @server.create_collection(:name => 'collection_for_acl_only_testing', :parent => @server)
+        @settings = {
+          "java.naming.provider.url"=>"ldap://184.72.197.18/", 
+          "java.naming.security.principal"=>"wma@corp.lucid.com", 
+          "java.naming.security.credentials"=>"secret", 
+        }
+      end
+
+      it "should default to false for a new collection" do
+        @collection_for_acl_only_default = @server.create_collection(:name => 'collection_for_acl_only_default_testing', :parent => @server)
+        @collection_for_acl_only.acl_only?.should be_false
+      end
+
+      it "should return true if the if configured with acl_only => true" do
+        settings = @settings.clone
+        
+        @collection_for_acl_only.configure_filtering(:config => settings, :enabled =>  'true', :acl_only => true)
+        @collection_for_acl_only.acl_only?.should be_true
+      end
+      
+      it "should return false if  configured with acl_only => false" do
+        settings = @settings.clone
+        
+        @collection_for_acl_only.configure_filtering(:config => settings, :enabled =>  'true', :acl_only => false)
+        @collection_for_acl_only.acl_only?.should be_false        
+      end
+      
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: lucid_works
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors: 
 - Sam Pierson