stellr 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.2 / 2008-08-21
+
+* Add json serialization support to search results
+
 == 0.1.1 / 2008-08-06
 
 * Add support for bulk indexing of multiple records

data/lib/stellr.rb

@@ -18,7 +18,7 @@ require 'stellr/search'
 $SAFE = 1
 
 module Stellr
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   
   def self.start_server( config )
     if config.script

data/lib/stellr/collections/searchable_collection.rb

@@ -28,7 +28,7 @@ module Stellr
 
         if options[:page]
           results.current_page = options.delete(:page).to_i
-          options[:limit] = results.per_page = options.delete(:per_page) || 10
+          options[:limit] = results.per_page = (options.delete(:per_page).to_i rescue nil) || 10
           options[:offset] = (p = results.current_page - 1) <= 0 ? 0 : p * results.per_page
         end
 

data/lib/stellr/search.rb

@@ -1,2 +1,3 @@
+require 'json'
 require 'stellr/search/search_result'
 require 'stellr/search/search_results'

data/lib/stellr/search/search_result.rb

@@ -16,6 +16,14 @@ module Stellr
         @field_data[name]
       end
       alias [] field
+      
+      def to_json
+        {
+          :doc_id => @doc_id,
+          :score => @score,
+          :data => @field_data
+        }.to_json
+      end
     end
   end
 end

data/lib/stellr/search/search_results.rb

@@ -9,6 +9,15 @@ module Stellr
       def initialize
         @results = []
       end
+      
+      def to_json
+        {
+          :results => @results,
+          :total_hits => total_hits,
+          :current_page => current_page,
+          :per_page => per_page
+        }.to_json
+      end
 
       def method_missing(symbol, *args, &block)
         @results.send(symbol, *args, &block)

data/lib/stellr/server.rb

@@ -68,8 +68,7 @@ module Stellr
     #
     #
     def register( name, options = {} )
-      raise "invalid collection name >#{name}<, may only contain a-zA-Z0-9_-" unless name =~ /^([a-zA-Z0-9_-]+)$/
-      name.untaint
+      untaint_collection_name name
       @collections.synchronize do
         collection = (@collections[name] ||= create_collection( name, options ))
         save_collection_config name, options unless options.nil? or options.empty?
@@ -138,13 +137,25 @@ module Stellr
 
     def load_collection_config( name )
       path = collection_config_path name
-      conf = YAML.load( File.read(path) ) if File.readable?(path) rescue nil
+      @logger.debug "trying to load collection config from #{path}"
+      conf = begin
+        YAML.load( File.read(path) ) if File.readable?(path)
+      rescue
+        @logger.error "error loading config: #{$!}\n#{$!.backtrace.join "\n"}"
+        nil
+      end
       @logger.info "loaded collection config from #{path}" unless conf.nil?
       return conf
     end
 
     def collection_config_path( name )
-      File.join @config.conf_dir, "#{name}.yml"
+      untaint_collection_name name
+      File.join @config.conf_dir, "#{name.untaint}.yml"
+    end
+    
+    def untaint_collection_name(name)
+      raise "invalid collection name >#{name}<, may only contain a-zA-Z0-9_-" unless name =~ /^([a-zA-Z0-9_-]+)$/
+      name.untaint
     end
 
     # called by shutdown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stellr
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Benjamin Krause
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 +02:00
+date: 2008-08-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency