supernova 0.6.7 → 0.6.8

data/Gemfile

@@ -6,22 +6,21 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 
-gem "rsolr"
 gem "will_paginate"
 gem "json"
 gem "activesupport"
-gem "typhoeus"
+gem "typhoeus", '0.3.3'
 
 group :development do
   gem "i18n"
   gem 'activerecord', '~>3.0.7', :require => "active_record"
-  gem "ruby-debug"
-  gem "mysql2", "~> 0.2.7"
+  gem "ruby-debug#{RUBY_VERSION != "1.8.7" ? "19" : ""}"
+  gem "mysql2", "~> 0.2.18"
   gem "ZenTest", "4.5.0"
   gem "geokit"
   gem "autotest"
   gem "autotest-growl"
-  gem "rspec", "~> 2.3.0"
+  gem "rspec", "~> 2.8.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.0"
   gem "rcov", ">= 0"

data/Gemfile.lock

@@ -12,13 +12,14 @@ GEM
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
     activesupport (3.0.9)
+    archive-tar-minitar (0.5.2)
     arel (2.0.10)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     autotest-growl (0.2.9)
     builder (2.1.2)
-    columnize (0.3.4)
-    diff-lcs (1.1.2)
+    columnize (0.3.6)
+    diff-lcs (1.1.3)
     geokit (1.6.0)
     git (1.2.5)
     i18n (0.5.0)
@@ -27,33 +28,34 @@ GEM
       git (>= 1.2.5)
       rake
     json (1.5.3)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    mime-types (1.16)
-    mysql2 (0.2.11)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    mime-types (1.17.2)
+    mysql2 (0.2.18)
     rake (0.9.2)
-    rbx-require-relative (0.0.5)
     rcov (0.9.9)
-    rsolr (1.0.2)
-      builder (>= 2.1.2)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    typhoeus (0.2.4)
-      mime-types
+    rspec-mocks (2.8.0)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+    typhoeus (0.3.3)
       mime-types
     tzinfo (0.3.29)
-    will_paginate (2.3.15)
+    will_paginate (3.0.3)
 
 PLATFORMS
   ruby
@@ -69,10 +71,9 @@ DEPENDENCIES
   i18n
   jeweler (~> 1.6.0)
   json
-  mysql2 (~> 0.2.7)
+  mysql2 (~> 0.2.18)
   rcov
-  rsolr
-  rspec (~> 2.3.0)
-  ruby-debug
-  typhoeus
+  rspec (~> 2.8.0)
+  ruby-debug19
+  typhoeus (= 0.3.3)
   will_paginate

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

data/lib/supernova.rb

@@ -1,6 +1,7 @@
-require "rsolr"
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/hash"
+require "will_paginate/collection"
+require "will_paginate/array"
 
 module Supernova
   KM_TO_METER = 1000.0

data/lib/supernova/criteria.rb

@@ -17,12 +17,33 @@ class Supernova::Criteria
     def select(*args)
       self.new.send(:select, *args)
     end
+    
+    def immutable_by_default!
+      @immutable_by_default = true
+    end
+    
+    def mutable_by_default!
+      @immutable_by_default = false
+    end
+    
+    def immutable_by_default?
+      @immutable_by_default == true
+    end
   end
 
   def initialize(clazz = nil)
     self.clazz = clazz
     self.filters = {}
     self.search_options = {}
+    self.immutable! if self.class.immutable_by_default?
+  end
+  
+  def immutable!
+    @immutable = true
+  end
+  
+  def immutable?
+    @immutable == true
   end
 
   def for_classes(clazzes)
@@ -33,8 +54,8 @@ class Supernova::Criteria
     merge_search_options :attribute_mapping, mapping
   end
 
-  def order(order_option)
-    merge_search_options :order, order_option
+  def order(*order_options)
+    merge_search_options :order, order_options
   end
 
   def limit(limit_option)
@@ -58,12 +79,13 @@ class Supernova::Criteria
   end
   
   def without(filters)
-    self.filters[:without] ||= Hash.new
-    filters.each do |key, value|
-      self.filters[:without][key] ||= Array.new
-      self.filters[:without][key] << value if !self.filters[:without][key].include?(value)
+    self_or_clone.tap do |soc|
+      soc.filters[:without] ||= Hash.new
+      filters.each do |key, value|
+        soc.filters[:without][key] ||= Array.new
+        soc.filters[:without][key] << value if !soc.filters[:without][key].include?(value)
+      end
     end
-    self
   end
 
   def select(*fields)
@@ -115,32 +137,49 @@ class Supernova::Criteria
   end
 
   def merge_filters(key, value)
-    merge_filters_or_search_options(self.filters, key, value)
+    merge_filters_or_search_options(:filters, key, value)
   end
   
   def merge_filters_array(key, fields)
-    self.search_options[key] ||= Array.new
-    fields.flatten.each do |field|
-      self.search_options[key] << field if !self.search_options[key].include?(field)
+    self_or_clone.tap do |soc|
+      soc.search_options[key] ||= Array.new
+      fields.flatten.each do |field|
+        soc.search_options[key] << field if !soc.search_options[key].include?(field)
+      end
     end
-    self
+  end
+  
+  def clone
+    Marshal.load(Marshal.dump(self))
+  end
+  
+  def self_or_clone
+    immutable? ? clone : self
   end
 
   def merge_search_options(key, value)
-    merge_filters_or_search_options(self.search_options, key, value)
+    merge_filters_or_search_options(:search_options, key, value)
+  end
+  
+  def except(key)
+    self_or_clone.tap do |soc|
+      soc.search_options.delete(key)
+    end
   end
 
-  def merge_filters_or_search_options(reference, key, value)
-    if value.is_a?(Hash)
-      reference[key] ||= Hash.new
-      reference[key].merge!(value)
-    elsif key == :select
-      reference[key] ||= Array.new
-      reference[key] += (value || [])
-    else
-      reference[key] = value
+  def merge_filters_or_search_options(reference_method, key, value)
+    self_or_clone.tap do |soc|
+      reference = soc.send(reference_method)
+      if value.is_a?(Hash)
+        reference[key] ||= Hash.new
+        reference[key].merge!(value)
+      elsif [:select, :order].include?(key)
+        reference[key] ||= Array.new
+        reference[key] += (value || [])
+      else
+        reference[key] = value
+      end
     end
-    self
   end
 
   def to_parameters
@@ -158,7 +197,7 @@ class Supernova::Criteria
   end
   
   def populated?
-    instance_variables.include?("@results")
+    instance_variables.map(&:to_s).include?("@results")
   end
   
   def execute
@@ -186,17 +225,18 @@ class Supernova::Criteria
   end
   
   def merge(other_criteria)
+    ret = self_or_clone
     other_criteria.filters.each do |key, value|
-      self.merge_filters(key, value)
+      ret = ret.merge_filters(key, value)
     end
     other_criteria.search_options.each do |key, value|
-      self.merge_search_options(key, value)
+      ret = ret.merge_search_options(key, value)
     end
-    self
+    ret
   end
 
   def method_missing(*args, &block)
-    if Supernova::Collection.instance_methods.include?(args.first.to_s)
+    if Supernova::Collection.instance_methods.map(&:to_s).include?(args.first.to_s)
       populate
       @results.send(*args, &block)
     elsif self.named_scope_defined?(args.first)

data/lib/supernova/solr.rb

@@ -1,15 +1,54 @@
 require "supernova/solr_criteria"
 
 module Supernova::Solr
+  class ConnectionDummy
+    def add(row)
+      deprication_warning("add")
+      Supernova::Solr.add(row)
+    end
+    
+    def commit
+      deprication_warning("commit!")
+      Supernova::Solr.commit!
+    end
+    
+    def deprication_warning(instead)
+      puts "DEPRICATION WARNING: calling #{caller.first[/\`(.*?)\'/, 1]} is depricated. Use Supernova::Solr.#{instead} instead. Called from #{filter_callers(caller).at(1)}"
+    end
+    
+    def filter_callers(callers)
+      callers.reject { |c| c.include?("/gems/")}
+    end
+  end
+  
   class << self
     attr_accessor :url
     
+    def select_url
+      "#{url}/select"
+    end
+    
     def connection
-      @connection ||= RSolr.connect(:url => self.url)
+      ConnectionDummy.new
+    end
+    
+    def update_request(payload)
+      Typhoeus::Request.post("#{url}/update", 
+        :body => %(<?xml version="1.0" encoding="UTF-8"?>#{payload}), :headers => { "Content-Type" => "text/xml"}
+      )
     end
     
     def truncate!
-      connection.delete_by_query("*:*")
+      update_request("<delete><query>*:*</query></delete>")
+    end
+    
+    def commit!
+      update_request("<commit />")
+    end
+    
+    # only to be used for testing
+    def add(row)
+      Supernova::SolrIndexer.new.index_with_json([row])
     end
   end
   

data/lib/supernova/solr_criteria.rb

@@ -1,16 +1,17 @@
-require "rsolr"
+# -*- encoding : utf-8 -*-
 
 class Supernova::SolrCriteria < Supernova::Criteria
   # move this into separate methods (test each separatly)
   def to_params
     solr_options = { :fq => [], :q => "*:*" }
+    solr_options[:wt] = search_options[:wt] if search_options[:wt]
     solr_options[:fq] += fq_from_with(self.filters[:with])
     if self.filters[:without]
      self.filters[:without].each do |field, values| 
        solr_options[:fq] += values.map { |value| "!#{solr_field_from_field(field)}:#{value}" }
      end
     end
-    solr_options[:sort] = convert_search_order(self.search_options[:order]) if self.search_options[:order]
+    solr_options[:sort] = convert_search_order(self.search_options[:order].join(", ")) if self.search_options[:order]
     if self.search_options[:search].is_a?(Array)
       solr_options[:q] = self.search_options[:search].map { |query| "(#{query})" }.join(" AND ")
     end
@@ -22,7 +23,7 @@ class Supernova::SolrCriteria < Supernova::Criteria
       solr_options[:fq] << "{!geofilt}"
     end
     if self.search_options[:select]
-      self.search_options[:select] << :id
+      self.search_options[:select] << "id" if !self.search_options[:select].map(&:to_s).include?("id")
       solr_options[:fl] = self.search_options[:select].compact.map { |field| solr_field_from_field(field) }.join(",") 
     end
     solr_options[:fq] << "type:#{self.clazz}" if self.clazz
@@ -40,13 +41,13 @@ class Supernova::SolrCriteria < Supernova::Criteria
   end
   
   def convert_search_order(order)
-    asc_or_desc = nil
-    field = solr_field_from_field(order)
-    if order.match(/^(.*?) (asc|desc)/i)
-      field = solr_field_from_field($1)
-      asc_or_desc = $2
-    end
-    [field, asc_or_desc].compact.join(" ")
+    order.split(/\s*,\s*/).map do |chunk|
+      if chunk.match(/(.*?) (asc|desc)/i)
+        "#{solr_field_from_field($1)} #{$2}"
+      else
+        chunk
+      end
+    end.join(",")
   end
   
   def solr_field_from_field(field)
@@ -147,6 +148,10 @@ class Supernova::SolrCriteria < Supernova::Criteria
     end
   end
   
+  def format(the_format)
+    merge_search_options(:wt, the_format)
+  end
+  
   def set_first_responding_attribute(doc, solr_key, value)
     [reverse_lookup_solr_field(solr_key), solr_key].each do |key|
       meth = :"#{key}="
@@ -166,8 +171,12 @@ class Supernova::SolrCriteria < Supernova::Criteria
     end
   end
   
+  def execute_raw
+    JSON.parse(Typhoeus::Request.post(Supernova::Solr.select_url, :params => to_params.merge(:wt => "json")).body)
+  end
+  
   def execute
-    response = Supernova::Solr.connection.post("select", :data => to_params)
+    response = execute_raw
     collection = Supernova::Collection.new(current_page, per_page == 0 ? 1 : per_page, response["response"]["numFound"])
     collection.original_response = response
     collection.facets = hashify_facets_from_response(response)
@@ -175,8 +184,13 @@ class Supernova::SolrCriteria < Supernova::Criteria
     collection
   end
   
+  def only_ids
+    self_or_clone.except(:select).select("id")
+  end
+  
   def ids
-    select("id")
-    execute.map! { |h| h["id"].split("/").last.to_i }
+    only_ids.execute.tap do |col|
+      col.replace(col.map { |h| h["id"].split("/").last.to_i })
+    end
   end
 end

data/lib/supernova/solr_indexer.rb

@@ -232,6 +232,7 @@ class Supernova::SolrIndexer
   end
   
   def index_with_json(rows)
+    return false if rows.empty?
     options && options[:use_json_file] ? index_with_json_file(rows) : index_with_json_string(rows)
   end
   
@@ -246,11 +247,13 @@ class Supernova::SolrIndexer
     index_rows(query_db(query))
   end
   
+  # just to be backwards compatible
   def index_directly(rows)
-    rows.each do |row|
-      row = Supernova::Solr.connection.add(row)
-    end
-    Supernova::Solr.connection.commit if rows.any?
+    index_with_json(rows)
+    # rows.each do |row|
+    #   row = Supernova::Solr.connection.add(row)
+    # end
+    # Supernova::Solr.connection.commit if rows.any?
   end
   
   def index_with_json_file(rows)