ferret 0.11.4 → 0.11.5

data/ext/r_store.c

@@ -213,7 +213,7 @@ frt_dir_touch(VALUE self, VALUE rfname)
  *  call-seq:
  *     dir.delete(file_name) -> nil
  *
- *  Remove file +file_name+ from the directory. Returns true if succussful. 
+ *  Remove file +file_name+ from the directory. Returns true if successful.
  */
 static VALUE
 frt_dir_delete(VALUE self, VALUE rfname)

data/ext/r_utils.c

@@ -40,7 +40,7 @@ frt_get_bv(BitVector *bv)
  *  call-seq:
  *     BitVector.new() -> new_bv
  *  
- *  Returns a new empty bit-vector object
+ *  Returns a new empty bit vector object
  */
 static VALUE 
 frt_bv_init(VALUE self)
@@ -124,7 +124,7 @@ frt_bv_get(VALUE self, VALUE rindex)
  *  call-seq:
  *     bv.count -> bit_count
  *  
- *  Count the number of bits set in the bit-vector. If the bit-vector has been
+ *  Count the number of bits set in the bit vector. If the bit vector has been
  *  negated using +#not+ then count the number of unset bits
  *  instead.
  */
@@ -140,7 +140,7 @@ frt_bv_count(VALUE self)
  *  call-seq:
  *     bv.clear -> self
  *  
- *  Clears all set bits in the bit-vector. Negated bit-vectors will still have
+ *  Clears all set bits in the bit vector. Negated bit vectors will still have
  *  all bits set to *off*.
  */
 VALUE
@@ -159,7 +159,7 @@ frt_bv_clear(VALUE self)
  *     bv1 != bv2    -> bool
  *     bv1.eql(bv2)  -> bool
  *  
- *  Compares two bit vectors and returns true if both bitvectors have the same
+ *  Compares two bit vectors and returns true if both bit vectors have the same
  *  bits set.
  */
 VALUE
@@ -339,10 +339,10 @@ frt_bv_reset_scan(VALUE self)
  *  call-seq:
  *     bv.next -> bit_num
  *  
- *  Returns the next set bit in the bit-vector scanning from low order to high
+ *  Returns the next set bit in the bit vector scanning from low order to high
  *  order. You should call +#reset_scan+ before calling this method
  *  if you want to scan from the beginning. It is automatically reset when you
- *  first create the bit-vector.
+ *  first create the bit vector.
  */
 VALUE
 frt_bv_next(VALUE self)
@@ -356,11 +356,11 @@ frt_bv_next(VALUE self)
  *  call-seq:
  *     bv.next_unset -> bit_num
  *  
- *  Returns the next unset bit in the bit-vector scanning from low order to
- *  high order. This method should only be called on bit-vectors which have
+ *  Returns the next unset bit in the bit vector scanning from low order to
+ *  high order. This method should only be called on bit vectors which have
  *  been flipped (negated). You should call +#reset_scan+ before
  *  calling this method if you want to scan from the beginning. It is
- *  automatically reset when you first create the bit-vector.
+ *  automatically reset when you first create the bit vector.
  */
 VALUE
 frt_bv_next_unset(VALUE self)
@@ -374,10 +374,10 @@ frt_bv_next_unset(VALUE self)
  *  call-seq:
  *     bv.next_from(from) -> bit_num
  *  
- *  Returns the next set bit in the bit-vector scanning from low order to
+ *  Returns the next set bit in the bit vector scanning from low order to
  *  high order and starting at +from+. The scan is inclusive so if
  *  +from+ is equal to 10 and +bv[10]+ is set it will
- *  return the number 10. If the bit-vector has been negated than you should
+ *  return the number 10. If the bit vector has been negated than you should
  *  use the +#next_unset_from+ method.
  */
 VALUE
@@ -396,10 +396,10 @@ frt_bv_next_from(VALUE self, VALUE rfrom)
  *  call-seq:
  *     bv.next_unset_from(from) -> bit_num
  *  
- *  Returns the next unset bit in the bit-vector scanning from low order to
+ *  Returns the next unset bit in the bit vector scanning from low order to
  *  high order and starting at +from+. The scan is inclusive so if
  *  +from+ is equal to 10 and +bv[10]+ is unset it will
- *  return the number 10. If the bit-vector has not been negated than you
+ *  return the number 10. If the bit vector has not been negated than you
  *  should use the +#next_from+ method.
  */
 VALUE
@@ -418,7 +418,7 @@ frt_bv_next_unset_from(VALUE self, VALUE rfrom)
  *  call-seq:
  *     bv.each { |bit_num| }
  *  
- *  Iterate through all the set bits in the bit-vector yeilding each one in
+ *  Iterate through all the set bits in the bit vector yielding each one in
  *  order
  */
 VALUE
@@ -445,9 +445,9 @@ frt_bv_each(VALUE self)
  *  call-seq:
  *     bv.to_a
  *  
- *  Iterate through all the set bits in the bit-vector adding the index of
+ *  Iterate through all the set bits in the bit vector adding the index of
  *  each set bit to an array. This is useful if you want to perform array
- *  methods on the bit-vecter. If you want to convert an array to a bit_vector
+ *  methods on the bit vector. If you want to convert an array to a bit_vector
  *  simply do this;
  *
  *    bv = [1, 12, 45, 367, 455].inject(BitVector.new) {|bv, i| bv.set(i)}
@@ -896,7 +896,7 @@ frt_pq_capa(VALUE self)
  *
  *  == Example
  *  
- *  Here is a toy example that sorts strings by their lenth and has a capicity
+ *  Here is a toy example that sorts strings by their length and has a capacity
  *  of 5;
  *    
  *    q = PriorityQueue.new(5) {|a, b| a.size < b.size}

data/ext/search.c

@@ -623,13 +623,18 @@ MatchVector *searcher_get_match_vector(Searcher *self,
                                        const char *field)
 {
     MatchVector *mv = matchv_new();
-    Query *rewritten_query = self->rewrite(self, query);
+    bool rewrite = query->get_matchv_i == q_get_matchv_i;
     TermVector *tv = self->get_term_vector(self, doc_num, field);
+    if (rewrite) {
+        query = self->rewrite(self, query);
+    }
     if (tv && tv->term_cnt > 0 && tv->terms[0].positions != NULL) {
-        mv = rewritten_query->get_matchv_i(rewritten_query, mv, tv);
+        mv = query->get_matchv_i(query, mv, tv);
         tv_destroy(tv);
     }
-    q_deref(rewritten_query);
+    if (rewrite) {
+        q_deref(query);
+    }
     return mv;
 }
 
@@ -846,6 +851,7 @@ char **searcher_highlight(Searcher *self,
         MatchVector *mv;
         query = self->rewrite(self, query);
         mv = query->get_matchv_i(query, matchv_new(), tv);
+        q_deref(query);
         if (lazy_df->len < (excerpt_len * num_excerpts)) {
             excerpt_strs = ary_new_type_capa(char *, 1);
             ary_push(excerpt_strs,
@@ -947,7 +953,6 @@ char **searcher_highlight(Searcher *self,
             pq_destroy(excerpt_pq);
         }
         matchv_destroy(mv);
-        q_deref(query);
     }
     if (tv) tv_destroy(tv);
     if (lazy_doc) lazy_doc_close(lazy_doc);
@@ -1371,7 +1376,7 @@ static Searcher *cdfsea_new(HashTable *df_map, int max_doc)
  ***************************************************************************/
 
 #define MSEA(searcher) ((MultiSearcher *)(searcher))
-static __inline int msea_get_searcher_index(Searcher *self, int n)
+static INLINE int msea_get_searcher_index(Searcher *self, int n)
 {
     MultiSearcher *msea = MSEA(self);
     int lo = 0;                 /* search starts array */

data/ext/search.h

@@ -408,6 +408,7 @@ typedef struct ConstantScoreQuery
 {
     Query   super;
     Filter *filter;
+    Query  *original;
 } ConstantScoreQuery;
 
 extern Query *csq_new(Filter *filter);
@@ -713,7 +714,7 @@ typedef struct FieldDoc
 {
     Hit hit;
     int size;
-    Comparable comparables[];
+    Comparable comparables[1];
 } FieldDoc;
 
 extern void fd_destroy(FieldDoc *fd);
@@ -872,6 +873,7 @@ typedef struct QParser
     bool close_def_fields : 1;
     bool destruct : 1;
     bool recovering : 1;
+    bool use_keywords : 1;
 } QParser;
 
 extern QParser *qp_new(HashSet *all_fields, HashSet *def_fields,

data/ext/sort.c

@@ -675,7 +675,7 @@ bool fshq_less_than(const void *hit1, const void *hit2)
     }
 }
 
-__inline bool fshq_lt(Sorter *sorter, Hit *hit1, Hit *hit2)
+INLINE bool fshq_lt(Sorter *sorter, Hit *hit1, Hit *hit2)
 {
     Comparator *comp;
     int diff = 0, i;
@@ -734,7 +734,7 @@ Hit *fshq_pq_pop(PriorityQueue *pq)
     }
 }
 
-__inline void fshq_pq_up(PriorityQueue *pq)
+INLINE void fshq_pq_up(PriorityQueue *pq)
 {
     Hit **heap = (Hit **)pq->heap;
     Hit *node;

data/ext/stopwords.c

@@ -371,40 +371,29 @@ const char *FULL_DANISH_STOP_WORDS[] = {
 };
 
 const char *FULL_RUSSIAN_STOP_WORDS[] = {
-    "É", "×", "×Ï", "ÎÅ", "ÞÔÏ", "ÏÎ", "ÎÁ", "Ñ", "Ó", "ÓÏ",
-        "ËÁË", "Á", "ÔÏ",
-    "×ÓÅ", "ÏÎÁ", "ÔÁË", "ÅÇÏ", "ÎÏ", "ÄÁ", "ÔÙ", "Ë",
-        "Õ", "ÖÅ", "×Ù", "ÚÁ",
-    "ÂÙ", "ÐÏ", "ÔÏÌØËÏ", "ÅÅ", "ÍÎÅ", "ÂÙÌÏ", "×ÏÔ",
-        "ÏÔ", "ÍÅÎÑ", "ÅÝÅ",
-    "ÎÅÔ", "Ï", "ÉÚ", "ÅÍÕ", "ÔÅÐÅÒØ", "ËÏÇÄÁ",
-        "ÄÁÖÅ", "ÎÕ", "×ÄÒÕÇ", "ÌÉ",
-    "ÅÓÌÉ", "ÕÖÅ", "ÉÌÉ", "ÎÉ", "ÂÙÔØ", "ÂÙÌ", "ÎÅÇÏ",
-        "ÄÏ", "×ÁÓ", "ÎÉÂÕÄØ",
-    "ÏÐÑÔØ", "ÕÖ", "×ÁÍ", "ÓËÁÚÁÌ", "×ÅÄØ", "ÔÁÍ",
-        "ÐÏÔÏÍ", "ÓÅÂÑ", "ÎÉÞÅÇÏ",
-    "ÅÊ", "ÍÏÖÅÔ", "ÏÎÉ", "ÔÕÔ", "ÇÄÅ", "ÅÓÔØ",
-        "ÎÁÄÏ", "ÎÅÊ", "ÄÌÑ", "ÍÙ",
-    "ÔÅÂÑ", "ÉÈ", "ÞÅÍ", "ÂÙÌÁ", "ÓÁÍ", "ÞÔÏÂ", "ÂÅÚ",
-        "ÂÕÄÔÏ", "ÞÅÌÏ×ÅË",
-    "ÞÅÇÏ", "ÒÁÚ", "ÔÏÖÅ", "ÓÅÂÅ", "ÐÏÄ", "ÖÉÚÎØ",
-        "ÂÕÄÅÔ", "Ö", "ÔÏÇÄÁ", "ËÔÏ",
-    "ÜÔÏÔ", "ÇÏ×ÏÒÉÌ", "ÔÏÇÏ", "ÐÏÔÏÍÕ", "ÜÔÏÇÏ",
-        "ËÁËÏÊ", "ÓÏ×ÓÅÍ", "ÎÉÍ",
-    "ÚÄÅÓØ", "ÜÔÏÍ", "ÏÄÉÎ", "ÐÏÞÔÉ", "ÍÏÊ", "ÔÅÍ",
-        "ÞÔÏÂÙ", "ÎÅÅ", "ËÁÖÅÔÓÑ",
-    "ÓÅÊÞÁÓ", "ÂÙÌÉ", "ËÕÄÁ", "ÚÁÞÅÍ", "ÓËÁÚÁÔØ",
-        "×ÓÅÈ", "ÎÉËÏÇÄÁ", "ÓÅÇÏÄÎÑ",
-    "ÍÏÖÎÏ", "ÐÒÉ", "ÎÁËÏÎÅÃ", "Ä×Á", "ÏÂ",
-        "ÄÒÕÇÏÊ", "ÈÏÔØ", "ÐÏÓÌÅ", "ÎÁÄ",
-    "ÂÏÌØÛÅ", "ÔÏÔ", "ÞÅÒÅÚ", "ÜÔÉ", "ÎÁÓ", "ÐÒÏ",
-        "×ÓÅÇÏ", "ÎÉÈ", "ËÁËÁÑ",
-    "ÍÎÏÇÏ", "ÒÁÚ×Å", "ÓËÁÚÁÌÁ", "ÔÒÉ", "ÜÔÕ",
-        "ÍÏÑ", "×ÐÒÏÞÅÍ", "ÈÏÒÏÛÏ",
-    "Ó×ÏÀ", "ÜÔÏÊ", "ÐÅÒÅÄ", "ÉÎÏÇÄÁ", "ÌÕÞÛÅ",
-        "ÞÕÔØ", "ÔÏÍ", "ÎÅÌØÚÑ",
-    "ÔÁËÏÊ", "ÉÍ", "ÂÏÌÅÅ", "×ÓÅÇÄÁ", "ËÏÎÅÞÎÏ",
-        "×ÓÀ", "ÍÅÖÄÕ", NULL
+    "а", "без", "более", "бы", "был", "была", "были", "было", "быть", "в",
+    "вам", "вас", "весь", "во", "вот", "все", "всего", "всех", "вы", "где",
+    "да", "даже", "для", "до", "его", "ее", "ей", "ею", "если", "есть", "еще",
+    "же", "за", "здесь", "и", "из", "или", "им", "их", "к", "как", "ко",
+    "когда", "кто", "ли", "либо", "мне", "может", "мы", "на", "надо", "наш",
+    "не", "него", "нее", "нет", "ни", "них", "но", "ну", "о", "об", "однако",
+    "он", "она", "они", "оно", "от", "очень", "по", "под", "при", "с", "со",
+    "так", "также", "такой", "там", "те", "тем", "то", "того", "тоже", "той",
+    "только", "том", "ты", "у", "уже", "хотя", "чего", "чей", "чем", "что",
+    "чтобы", "чье", "чья", "эта", "эти", "это", "я", NULL
+};
+
+const char *FULL_RUSSIAN_STOP_WORDS_KOI8_R[] = {
+    "Á", "ÂÅÚ", "ÂÏÌÅÅ", "ÂÙ", "ÂÙÌ", "ÂÙÌÁ", "ÂÙÌÉ", "ÂÙÌÏ", "ÂÙÔØ", "×",
+    "×ÁÍ", "×ÁÓ", "×ÅÓØ", "×Ï", "×ÏÔ", "×ÓÅ", "×ÓÅÇÏ", "×ÓÅÈ", "×Ù", "ÇÄÅ",
+    "ÄÁ", "ÄÁÖÅ", "ÄÌÑ", "ÄÏ", "ÅÇÏ", "ÅÅ", "ÅÊ", "ÅÀ", "ÅÓÌÉ", "ÅÓÔØ", "ÅÝÅ",
+    "ÖÅ", "ÚÁ", "ÚÄÅÓØ", "É", "ÉÚ", "ÉÌÉ", "ÉÍ", "ÉÈ", "Ë", "ËÁË", "ËÏ",
+    "ËÏÇÄÁ", "ËÔÏ", "ÌÉ", "ÌÉÂÏ", "ÍÎÅ", "ÍÏÖÅÔ", "ÍÙ", "ÎÁ", "ÎÁÄÏ", "ÎÁÛ",
+    "ÎÅ", "ÎÅÇÏ", "ÎÅÅ", "ÎÅÔ", "ÎÉ", "ÎÉÈ", "ÎÏ", "ÎÕ", "Ï", "ÏÂ", "ÏÄÎÁËÏ",
+    "ÏÎ", "ÏÎÁ", "ÏÎÉ", "ÏÎÏ", "ÏÔ", "ÏÞÅÎØ", "ÐÏ", "ÐÏÄ", "ÐÒÉ", "Ó", "ÓÏ",
+    "ÔÁË", "ÔÁËÖÅ", "ÔÁËÏÊ", "ÔÁÍ", "ÔÅ", "ÔÅÍ", "ÔÏ", "ÔÏÇÏ", "ÔÏÖÅ", "ÔÏÊ",
+    "ÔÏÌØËÏ", "ÔÏÍ", "ÔÙ", "Õ", "ÕÖÅ", "ÈÏÔÑ", "ÞÅÇÏ", "ÞÅÊ", "ÞÅÍ", "ÞÔÏ",
+    "ÞÔÏÂÙ", "ÞØÅ", "ÞØÑ", "ÜÔÁ", "ÜÔÉ", "ÜÔÏ", "Ñ", NULL
 };
 
 const char *FULL_FINNISH_STOP_WORDS[] = {

data/ext/store.c

@@ -104,7 +104,7 @@ OutStream *os_new()
  *
  * @param the OutStream to flush
  */
-__inline void os_flush(OutStream *os)
+INLINE void os_flush(OutStream *os)
 {
     os->m->flush_i(os, os->buf.buf, os->buf.pos);
     os->buf.start += os->buf.pos;
@@ -143,7 +143,7 @@ void os_seek(OutStream *os, off_t new_pos)
  * @param b  the byte to write
  * @raise IO_ERROR if there is an IO error writing to the filesystem
  */
-__inline void os_write_byte(OutStream *os, uchar b)
+INLINE void os_write_byte(OutStream *os, uchar b)
 {
     if (os->buf.pos >= BUFFER_SIZE) {
         os_flush(os);
@@ -237,7 +237,7 @@ void is_refill(InStream *is)
  * @raise IO_ERROR if there is a error reading from the filesystem
  * @raise EOF_ERROR if there is an attempt to read past the end of the file
  */
-__inline uchar is_read_byte(InStream *is)
+INLINE uchar is_read_byte(InStream *is)
 {
     if (is->buf.pos >= is->buf.len) {
         is_refill(is);
@@ -344,7 +344,7 @@ f_u64 is_read_u64(InStream *is)
 }
 
 /* optimized to use unchecked read_byte if there is definitely space */
-__inline unsigned int is_read_vint(InStream *is)
+INLINE unsigned int is_read_vint(InStream *is)
 {
     register unsigned int res, b;
     register int shift = 7;
@@ -374,7 +374,7 @@ __inline unsigned int is_read_vint(InStream *is)
 }
 
 /* optimized to use unchecked read_byte if there is definitely space */
-__inline off_t is_read_voff_t(InStream *is)
+INLINE off_t is_read_voff_t(InStream *is)
 {
     register off_t res, b;
     register int shift = 7;
@@ -403,7 +403,7 @@ __inline off_t is_read_voff_t(InStream *is)
     return res;
 }
 
-__inline void is_skip_vints(InStream *is, register int cnt)
+INLINE void is_skip_vints(InStream *is, register int cnt)
 {
     for (; cnt > 0; cnt--) {
         while ((is_read_byte(is) & 0x80) != 0) {
@@ -411,7 +411,7 @@ __inline void is_skip_vints(InStream *is, register int cnt)
     }
 }
 
-__inline void is_read_chars(InStream *is, char *buffer,
+INLINE void is_read_chars(InStream *is, char *buffer,
                                   int off, int len)
 {
     int end, i;
@@ -508,7 +508,7 @@ void os_write_u64(OutStream *os, f_u64 num)
 }
 
 /* optimized to use an unchecked write if there is space */
-__inline void os_write_vint(OutStream *os, register unsigned int num)
+INLINE void os_write_vint(OutStream *os, register unsigned int num)
 {
     if (os->buf.pos > VINT_END) {
         while (num > 127) {
@@ -527,7 +527,7 @@ __inline void os_write_vint(OutStream *os, register unsigned int num)
 }
 
 /* optimized to use an unchecked write if there is space */
-__inline void os_write_voff_t(OutStream *os, register off_t num)
+INLINE void os_write_voff_t(OutStream *os, register off_t num)
 {
     if (os->buf.pos > VINT_END) {
         while (num > 127) {

data/ext/store.h

@@ -176,6 +176,7 @@ struct Store
         CompoundStore *cmpd;    /* for compound_store only */
     } dir;
 
+    mode_t file_mode;
     HashSet *locks;
 
     /**
@@ -605,7 +606,7 @@ extern InStream *is_clone(InStream *is);
  * @raise IO_ERROR if there is a error reading from the file-system
  * @raise EOF_ERROR if there is an attempt to read past the end of the file
  */
-extern __inline uchar is_read_byte(InStream *is);
+extern INLINE uchar is_read_byte(InStream *is);
 
 /**
  * Read +len+ bytes from InStream +is+ and write them to buffer +buf+
@@ -668,7 +669,7 @@ extern f_u64 is_read_u64(InStream *is);
  * @raise IO_ERROR if there is a error reading from the file-system
  * @raise EOF_ERROR if there is an attempt to read past the end of the file
  */
-extern __inline unsigned int is_read_vint(InStream *is);
+extern INLINE unsigned int is_read_vint(InStream *is);
 
 /**
  * Skip _cnt_ vints. This is a convenience method used for performance reasons
@@ -680,7 +681,7 @@ extern __inline unsigned int is_read_vint(InStream *is);
  * @raise IO_ERROR if there is a error reading from the file-system
  * @raise EOF_ERROR if there is an attempt to read past the end of the file
  */
-extern __inline void is_skip_vints(InStream *is, register int cnt);
+extern INLINE void is_skip_vints(InStream *is, register int cnt);
 
 /**
  * Read a compressed (VINT) unsigned off_t from the InStream.
@@ -691,7 +692,7 @@ extern __inline void is_skip_vints(InStream *is, register int cnt);
  * @raise IO_ERROR if there is a error reading from the file-system
  * @raise EOF_ERROR if there is an attempt to read past the end of the file
  */
-extern __inline off_t is_read_voff_t(InStream *is);
+extern INLINE off_t is_read_voff_t(InStream *is);
 
 /**
  * Read a string from the InStream. A string is an integer +length+ in vint

data/lib/ferret/document.rb

@@ -25,7 +25,7 @@ module Ferret
   # textual values. If you are coming from a Lucene background you should note
   # that Fields don't have any properties except for the boost property. You
   # should use the Ferret::Index::FieldInfos class to set field properties
-  # accross the whole index instead.
+  # across the whole index instead.
   # 
   # === Boost
   #
@@ -57,7 +57,7 @@ module Ferret
     end
     alias :== :eql?
 
-    # Create a string represention of the document
+    # Create a string representation of the document
     def to_s
       buf = ["Document {"]
       self.keys.sort_by {|key| key.to_s}.each do |key|

data/lib/ferret/field_infos.rb

@@ -1,41 +1,43 @@
 require 'yaml'
 
-class Ferret::Index::FieldInfos
-  # Load FieldInfos from a YAML file. The YAML file should look something like
-  # this:
-  # default:
-  #   store: :yes
-  #   index: :yes
-  #   term_vector: :no
-  #
-  # fields:
-  #   id:
-  #     index: :untokenized
-  #     term_vector: :no
-  # 
-  #   title:
-  #     boost: 20.0
-  #     term_vector: :no
-  # 
-  #   content:
-  #     term_vector: :with_positions_offsets
-  #  
-  def self.load(yaml_str)
-    info = YAML.load(yaml_str)
-    convert_strings_to_symbols(info)
-    fis = FieldInfos.new(info[:default])
-    fields = info[:fields]
-    fields.keys.each {|key| fis.add_field(key, fields[key])} if fields
-    fis
-  end
+module Ferret::Index
+  class FieldInfos
+    # Load FieldInfos from a YAML file. The YAML file should look something like
+    # this:
+    # default:
+    #   store: :yes
+    #   index: :yes
+    #   term_vector: :no
+    #
+    # fields:
+    #   id:
+    #     index: :untokenized
+    #     term_vector: :no
+    # 
+    #   title:
+    #     boost: 20.0
+    #     term_vector: :no
+    # 
+    #   content:
+    #     term_vector: :with_positions_offsets
+    #  
+    def self.load(yaml_str)
+      info = YAML.load(yaml_str)
+      convert_strings_to_symbols(info)
+      fis = FieldInfos.new(info[:default])
+      fields = info[:fields]
+      fields.keys.each {|key| fis.add_field(key, fields[key])} if fields
+      fis
+    end
 
-  private
-  def self.convert_strings_to_symbols(hash)
-    hash.keys.each do |key|
-      convert_strings_to_symbols(hash[key]) if hash[key].is_a?(Hash)
-      if key.is_a?(String)
-        hash[key.intern] = hash[key]
-        hash.delete(key)
+    private
+    def self.convert_strings_to_symbols(hash)
+      hash.keys.each do |key|
+        convert_strings_to_symbols(hash[key]) if hash[key].is_a?(Hash)
+        if key.is_a?(String)
+          hash[key.intern] = hash[key]
+          hash.delete(key)
+        end
       end
     end
   end