lucid_works 0.6.26 → 0.6.27

data/config/locales/en.yml

@@ -7,7 +7,7 @@ en:
           one: Activity
           other: Activities
           type:
-            autocomplete: Generate autocompete index
+            autocomplete: Generate autocomplete index
             click: Process click logs
             optimize: Optimize index
             spelling: Generate spellcheck index
@@ -130,4 +130,8 @@ en:
           kdcserver: Kerberos KDC server
           useSPSearchVisibility: Use SP Search Visibility
           aliases: Site Aliases Mappings
-            
+#    errors:
+#      models:
+#        lucid_works:
+#          collection:
+#            exclusion: is reserved

data/lib/lucid_works/collection.rb

@@ -13,12 +13,20 @@ module LucidWorks
       attribute :template
     end
 
+    LOGS_COLLECTION_NAME = 'LucidWorksLogs'
+
     validates_presence_of :name
+    validates_exclusion_of :name, :in => [LOGS_COLLECTION_NAME]
 
     def destroyable?
       true
     end
 
+    # is this a 'system' collection
+    def system?
+      name == LOGS_COLLECTION_NAME
+    end
+
     def empty!
       build_index.destroy(:params => {:key => 'iaccepttherisk'})
     end

data/lib/lucid_works/datasource.rb

@@ -86,13 +86,14 @@ module LucidWorks
       build_index.destroy
     end
 
+    # Don't let user edit data sources of system collections
     def editable?
-      true
+      !collection.system?
     end
 
     def destroyable?
-      # Don't let user destroy logs data source
-      type != 'lucidworkslogs'
+      # Don't let user destroy data sources of system collections
+      !collection.system?
     end
 
     def crawlable?

data/lib/lucid_works/gem_version.rb

@@ -1,3 +1,3 @@
 module LucidWorks
-  VERSION = "0.6.26"
+  VERSION = "0.6.27"
 end

data/spec/lib/lucid_works/collection_spec.rb

@@ -55,6 +55,21 @@ describe LucidWorks::Collection do
           c.errors[:name].should include "collection already exists"
         end
       end
+
+      context "with a reserved name" do
+        before do
+          logs = @server.collection(LucidWorks::Collection::LOGS_COLLECTION_NAME) rescue nil
+          logs.destroy if logs
+          @name = LucidWorks::Collection::LOGS_COLLECTION_NAME
+        end
+
+        it "should not create" do
+          c = LucidWorks::Collection.create(:name => @name, :parent => @server)
+          c.should_not be_persisted
+          c.errors.should_not be_empty
+          c.errors[:name].should include "is reserved"
+        end
+      end
     end
 
     describe ".find" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lucid_works
 version: !ruby/object:Gem::Version
-  version: 0.6.26
+  version: 0.6.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-06 00:00:00.000000000 -07:00
+date: 2011-07-07 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2168719880 !ruby/object:Gem::Requirement
+  requirement: &2161089740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2168719880
+  version_requirements: *2161089740
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2168719380 !ruby/object:Gem::Requirement
+  requirement: &2161089240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2168719380
+  version_requirements: *2161089240
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2168718920 !ruby/object:Gem::Requirement
+  requirement: &2161088780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2168718920
+  version_requirements: *2161088780
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2168718540 !ruby/object:Gem::Requirement
+  requirement: &2161088400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168718540
+  version_requirements: *2161088400
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &2168718080 !ruby/object:Gem::Requirement
+  requirement: &2161087940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168718080
+  version_requirements: *2161087940
 - !ruby/object:Gem::Dependency
   name: rsolr-ext
-  requirement: &2168717660 !ruby/object:Gem::Requirement
+  requirement: &2161087520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168717660
+  version_requirements: *2161087520
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2168717240 !ruby/object:Gem::Requirement
+  requirement: &2161087100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168717240
+  version_requirements: *2161087100
 description: Ruby wrapper for the LucidWorks REST API
 email:
 - sam.pierson@lucidimagination.com