jgm-cloudlib 0.3.3 → 0.3.4

data/cloudlib.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "cloudlib"
-  s.version  = "0.3.3"
+  s.version  = "0.3.4"
   s.date     = "2008-12-29"
   s.summary  = "Tools for maintaining a library of books and articles in Amazon S3 and SimpleDB"
   s.email    = "jgm@berkeley.edu"

data/lib/cloudlib.rb

@@ -168,12 +168,14 @@ class Entry
                  else
                    'all'
                  end
-      vals = val.split
+      # split hyphenated names into components, since a query might just have one
+      vals = val.split(/[-[:space:]]+/)
       vals.map do |v|
         if key_full == 'year'    # there is no year_words field
            "['year' #{comparison} '#{v}']"
         else
-           "['#{key_full}_words' = '#{v}']"
+           v_escaped = v.gsub(/\\/,"\\\\\\\\").gsub(/'/,"\\\\'")
+           "['#{key_full}_words' = '#{v_escaped}']"
         end
       end.join(" intersection ")
     end.join(" intersection ")
@@ -315,7 +317,7 @@ class Entry
       self.attributes[attribute] = newval
       unless ['url', 'doi', 'keywords'].member?(attribute)
         self.attributes[attribute + "_lowercase"] = newval.map {|a| a.downcase}
-        self.attributes[attribute + "_words"] = self.attributes[attribute + "_lowercase"].map {|a| a.split(/[[:space:][:punct:]] */)}.flatten
+        self.attributes[attribute + "_words"] = self.attributes[attribute + "_lowercase"].map {|a| a.split(/[[:punct:]]*[[:space:]]+|-+/)}.flatten.reject {|a| a.empty?}
       end
       # recalculate all_words
       tit_auth_words = ['title', 'authors', 'editors', 'booktitle'].map {|att| self.attributes[att + "_words"] || []}.flatten

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jgm-cloudlib
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - John MacFarlane