noodall-core 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/noodall/node.rb

@@ -33,8 +33,6 @@ module Noodall
 
     acts_as_tree :order => "position", :search_class => Noodall::Node
 
-    searchable_keys :title, :description, :keywords, :body
-
     validates_true_for :template,
       :message => "cannot be changed as sub content is not allowed in this template",
       :logic => lambda { children.reject{|c| self._type.constantize.template_classes.include?(c.class)}.empty? }

data/lib/noodall/search.rb

@@ -1,30 +1,30 @@
 module Noodall
   module Search
     STOPWORDS = ["about", "above", "above", "across", "after", "afterwards", "again", "against", "all", "almost", "alone", "along", "already", "also", "although", "always", "among", "amongst", "amoungst", "amount", "and", "another", "any", "anyhow", "anyone", "anything", "anyway", "anywhere", "are", "around", "back", "became", "because", "become", "becomes", "becoming", "been", "before", "beforehand", "behind", "being", "below", "beside", "besides", "between", "beyond", "bill", "both", "bottom", "but", "call", "can", "cannot", "cant", "con", "could", "couldnt", "cry", "describe", "detail", "done", "down", "due", "during", "each", "eight", "either", "eleven", "else", "elsewhere", "empty", "enough", "etc", "even", "ever", "every", "everyone", "everything", "everywhere", "except", "few", "fifteen", "fify", "fill", "find", "fire", "first", "five", "for", "former", "formerly", "forty", "found", "four", "from", "front", "full", "further", "get", "give", "had", "has", "hasnt", "have", "hence", "her", "here", "hereafter", "hereby", "herein", "hereupon", "hers", "herself", "him", "himself", "his", "how", "however", "hundred", "inc", "indeed", "interest", "into", "its", "itself", "keep", "last", "latter", "latterly", "least", "less", "ltd", "made", "many", "may", "meanwhile", "might", "mill", "mine", "more", "moreover", "most", "mostly", "move", "much", "must", "myself", "name", "namely", "neither", "never", "nevertheless", "next", "nine", "nobody", "none", "noone", "nor", "not", "nothing", "now", "nowhere", "off", "often", "once", "one", "only", "onto", "other", "others", "otherwise", "our", "ours", "ourselves", "out", "over", "own", "part", "per", "perhaps", "please", "put", "rather", "same", "see", "seem", "seemed", "seeming", "seems", "serious", "several", "she", "should", "show", "side", "since", "sincere", "six", "sixty", "some", "somehow", "someone", "something", "sometime", "sometimes", "somewhere", "still", "such", "system", "take", "ten", "than", "that", "the", "the", "their", "them", "themselves", "then", "thence", "there", "thereafter", "thereby", "therefore", "therein", "thereupon", "these", "they", "thickv", "thin", "third", "this", "those", "though", "three", "through", "throughout", "thru", "thus", "together", "too", "top", "toward", "towards", "twelve", "twenty", "two", "under", "until", "upon", "very", "via", "was", "well", "were", "what", "whatever", "when", "whence", "whenever", "where", "whereafter", "whereas", "whereby", "wherein", "whereupon", "wherever", "whether", "which", "while", "whither", "who", "whoever", "whole", "whom", "whose", "why", "will", "with", "within", "without", "would", "yet", "you", "your", "yours", "yourself", "yourselves"]
-  
+
     def self.configure(model)
       require 'lingua/stemmer'
-  
+
       model.class_eval do
         key :_keywords, Array, :index => true
         attr_accessor :relevance
-  
+
         before_save :_update_keywords
       end
     end
-  
+
     module ClassMethods
       def searchable_keys(*keys)
-        @@searchable_keys ||= Set.new
-        @@searchable_keys += keys
-  
-        @@searchable_keys
+        @searchable_keys ||= Set.new
+        @searchable_keys += keys
+
+        @searchable_keys
       end
-  
+
       def language(lang = 'en')
         @language ||= lang
       end
-  
+
       def search(query, options = {})
         if options[:per_page] || options[:per_page]
           per_page      = options.delete(:per_page)
@@ -40,10 +40,10 @@ module Noodall
         words = query.downcase.split(/\W/) - STOPWORDS
         words.reject!{|w| w.length < 3}
         criteria.merge!( :_keywords => { :$all => words } )
-  
+
         # The Search result
         search_result = collection.map_reduce(search_map(words), search_reduce, {:query => criteria, :finalize => search_finalize})
-        
+
         # Add value to sort options because model is stored in the value key
         options[:sort].map! do |s,v|
           ["value.#{s}",v]
@@ -57,13 +57,13 @@ module Noodall
           results = search_query.all
         end
         # clean up tmp collection
-        search_result.drop 
+        search_result.drop
         #return results mappped to objects
         results.tap do |docs|
           docs.map! { |hash| load(hash['value']) }
         end
       end
-  
+
       def search_map(words)
         #convert words into Regex OR
         q = words.map do |k|
@@ -77,28 +77,28 @@ module Noodall
           "emit(this._id, this);" +
           "}"
       end
-  
+
       def search_reduce
         "function( key , values ){return { model: values[0]};}"
       end
-  
+
       def search_finalize
         "function( key , values ){return values.model;}"
       end
     end
-  
+
     module InstanceMethods
       protected
       def _update_keywords
         s = Lingua::Stemmer.new(:language => self.class.language)
-  
+
         self._keywords = []
-  
+
         self.class.searchable_keys.each do |search_key|
           self._keywords += keywords_for_value(s, send(search_key)).compact
         end
       end
-  
+
       private
       def keywords_for_value(stemmer, val)
         if val.kind_of?(String)

data/noodall-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{noodall-core}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2010-11-29}
+  s.date = %q{2010-12-09}
   s.description = %q{Core data objects for Noodall}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [

data/spec/factories/node.rb

@@ -1,6 +1,7 @@
 # Dummy node class for the tests
 class Page < Noodall::Node
   #sub_templates PageA, PageB, ArticlesList, LandingPage, EventsList
+  searchable_keys :title, :description, :keywords, :body
   root_template!
 
   main_slots 1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-core
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Steve England
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 +00:00
+date: 2010-12-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency