solr_mapper 0.1.4 → 0.1.5

data/Manifest

@@ -6,8 +6,10 @@ lib/solr_mapper/calculations.rb
 lib/solr_mapper/locators.rb
 lib/solr_mapper/relations.rb
 lib/solr_mapper/solr_document.rb
+solr_mapper.gemspec
 spec/base.rb
 spec/calculations_spec.rb
+spec/facets_spec.rb
 spec/locators_spec.rb
 spec/misc_spec.rb
 spec/paginated_spec.rb

data/Rakefile

@@ -16,7 +16,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('solr_mapper', '0.1.4') do |p|
+Echoe.new('solr_mapper', '0.1.5') do |p|
   p.description    = "Object Document Mapper for the Apache Foundation's Solr search platform"
   p.url            = "http://github.com/skunkworx/solr_mapper"
   p.author         = "Chris Umbel"

data/lib/solr_mapper/relations.rb

@@ -19,14 +19,13 @@ module SolrMapper
 
       def has_one(target, opts = {})
         class_name, field_name, variable_name, id_field = determine_names(target, opts)
-        id_field = foreign_key(id_field)
 
         class_eval do
           define_method field_name do
             val = instance_variable_get(variable_name)
 
             unless val
-              id = instance_variable_get(id_field)              
+              id = instance_variable_get("@#{id_field}")
               val = Object::const_get(class_name).find(id) if id
             end
 
@@ -41,10 +40,30 @@ module SolrMapper
 
       def has_many(target, opts = {})
         class_name, field_name, variable_name, id_field = determine_names(target, opts)
-        id_field = "#{id_field}_id"
-
+        @@facet_field_name = field_name
         has_many_relationships[field_name.to_s] = id_field
 
+        # add class method for loading relations via facets
+        class << self
+          define_method "#{@@facet_field_name}_facet" do |search|
+            fk =  has_many_relationships[__method__.to_s.gsub(/_facet$/, '')]
+
+            solr_results = raw_query(search, {'facet' => 'true', 'facet.field' => fk})
+            klass = Object::const_get(classify(singularize(__method__.to_s.gsub(/_facet$/, ''))))
+            results = {}
+
+            solr_results['facet_counts']['facet_fields'][fk].each_slice(2).each do |pair|
+              child = klass.find(pair[0])
+              results[child] = pair[1] if child
+            end
+
+            results
+          end
+        end
+
+        @@facet_field_name = nil
+
+        # add a helper method that we'll use to hook arrays with manipulation logic we need
         class_eval do
           def relationize_array(array)
             class << array
@@ -75,20 +94,21 @@ module SolrMapper
 
             array
           end
-          
+
+          # define a getter for this relation
           define_method field_name do
             val = instance_variable_get(variable_name)
 
             unless val
-              ids = instance_variable_get(id_field)
+              ids = instance_variable_get("@#{id_field}")
               val = []
 
               val.instance_variable_set("@owner", self)
               val.instance_variable_set("@field_name", field_name.to_s)
 
               unless ids
-                instance_variable_set(id_field, [])
-                ids = instance_variable_get(id_field)
+                instance_variable_set("@#{id_field}", [])
+                ids = instance_variable_get("@#{id_field}")
               end
 
               ids.each do |id|
@@ -104,6 +124,7 @@ module SolrMapper
             val
           end
 
+          # define a setter for this relation
           define_method "#{field_name}=" do |vals|
             ids = []
 
@@ -120,7 +141,7 @@ module SolrMapper
               relationize_array(vals) unless vals.respond_to?(:destroy)
             end
 
-            instance_variable_set(id_field, ids)
+            instance_variable_set("@#{id_field}", ids)
             instance_variable_set("@#{field_name}", val)
           end
         end
@@ -156,14 +177,15 @@ module SolrMapper
         class_name ||= classify(target)
         field_name = target
         variable_name = "@#{field_name}"
-        id_field_prefix = "@#{singularize(target)}"
+        id_field = opts[:foreign_key]
+        id_field ||= "#{foreign_key(singularize(target))}"
 
-        return class_name, field_name, variable_name, id_field_prefix
+        return class_name, field_name, variable_name, id_field
       end
     end
 
     def refresh_relation(field_name)
-      ids = instance_variable_get(self.class.has_many_relationships[field_name])
+      ids = instance_variable_get("@#{self.class.has_many_relationships[field_name]}")
       ids.clear
         
       instance_variable_get("@#{field_name}").each do |child|

data/lib/solr_mapper/solr_document.rb

@@ -27,7 +27,8 @@ module SolrMapper
 
       # send a read REST command to Solr
       def execute_read(opts)
-        eval(RestClient.get(build_url('select', opts.merge(:wt => 'ruby'))))
+        url = build_url('select', opts.merge(:wt => 'ruby'))
+        eval(RestClient.get(url))
       end
 
       # send a write REST command to SOlr
@@ -75,8 +76,8 @@ module SolrMapper
         results
       end
 
-      # execute  solr query and return the count as well as the results
-      def query_counted(values, opts = {})
+      # execute  solr query and return the count as well as the RAW results
+      def raw_query(values, opts = {})
         if values.kind_of?(Hash)
           search_string = ''
 
@@ -89,7 +90,12 @@ module SolrMapper
           search_string = values.to_s
         end
 
-        response = execute_read(opts.merge(:q => search_string))
+        execute_read(opts.merge(:q => search_string))
+      end
+
+      # execute  solr query and return the count as well as OBJECTS
+      def query_counted(values, opts = {})
+        response = raw_query(values, opts)
         return map(response), response['response']['numFound']
       end
 

data/solr_mapper.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solr_mapper}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Umbel"]
-  s.date = %q{2010-10-27}
+  s.date = %q{2010-10-29}
   s.description = %q{Object Document Mapper for the Apache Foundation's Solr search platform}
   s.email = %q{chrisu@dvdempire.com}
   s.extra_rdoc_files = ["LICENSE.txt", "README.rdoc", "lib/solr_mapper.rb", "lib/solr_mapper/calculations.rb", "lib/solr_mapper/locators.rb", "lib/solr_mapper/relations.rb", "lib/solr_mapper/solr_document.rb"]
-  s.files = ["LICENSE.txt", "README.rdoc", "Rakefile", "lib/solr_mapper.rb", "lib/solr_mapper/calculations.rb", "lib/solr_mapper/locators.rb", "lib/solr_mapper/relations.rb", "lib/solr_mapper/solr_document.rb", "spec/base.rb", "spec/calculations_spec.rb", "spec/locators_spec.rb", "spec/misc_spec.rb", "spec/paginated_spec.rb", "spec/query_spec.rb", "spec/relation_spec.rb", "spec/solr/stuff/config/schema.xml", "spec/solr/thing/config/schema.xml", "spec/solr/widget/conf/schema.xml", "spec/url_spec.rb", "Manifest", "solr_mapper.gemspec"]
+  s.files = ["LICENSE.txt", "README.rdoc", "Rakefile", "lib/solr_mapper.rb", "lib/solr_mapper/calculations.rb", "lib/solr_mapper/locators.rb", "lib/solr_mapper/relations.rb", "lib/solr_mapper/solr_document.rb", "solr_mapper.gemspec", "spec/base.rb", "spec/calculations_spec.rb", "spec/facets_spec.rb", "spec/locators_spec.rb", "spec/misc_spec.rb", "spec/paginated_spec.rb", "spec/query_spec.rb", "spec/relation_spec.rb", "spec/solr/stuff/config/schema.xml", "spec/solr/thing/config/schema.xml", "spec/solr/widget/conf/schema.xml", "spec/url_spec.rb", "Manifest"]
   s.homepage = %q{http://github.com/skunkworx/solr_mapper}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Solr_mapper", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/spec/facets_spec.rb

@@ -0,0 +1,56 @@
+# Copyright 2010 The Skunkworx.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require File.dirname(__FILE__) + '/base'
+require 'rest_client'
+
+describe SolrMapper::SolrDocument do
+  before(:all) do
+    url = Thing::base_url
+    resource = RestClient::Resource.new("#{url}/update")
+    resource.post("<delete><query>id:[* TO *]</query></delete>", {:content_type => 'text/xml'})
+    resource.post("<commit/>", {:content_type => 'text/xml'})
+
+    url = Stuff::base_url
+    resource = RestClient::Resource.new("#{url}/update")
+    resource.post("<delete><query>id:[* TO *]</query></delete>", {:content_type => 'text/xml'})
+    resource.post("<commit/>", {:content_type => 'text/xml'})
+
+    stuff = Stuff.new({:_id => '04787560-bc23-012d-817c-60334b2add63', :name => 'stuff 1'})
+    stuff.save
+
+    stuff = Stuff.new({:_id => '04787560-bc23-012d-817c-60334b2add64', :name => 'stuff 2'})
+    stuff.save
+
+    stuff = Stuff.new({:_id => '04787560-bc23-012d-817c-60334b2add65', :name => 'stuff 3'})
+    stuff.save
+
+    thing = Thing.new({:_id => '04787560-bc23-012d-817c-60334b2add60', :content => 'A',
+            :stuff_id => ['04787560-bc23-012d-817c-60334b2add63', '04787560-bc23-012d-817c-60334b2add64']})
+    thing.save
+
+    thing = Thing.new({:_id => '04787560-bc23-012d-817c-60334b2add61', :content => 'A',
+            :stuff_id => ['04787560-bc23-012d-817c-60334b2add63']})
+    thing.save
+
+    thing = Thing.new({:_id => '04787560-bc23-012d-817c-60334b2add62', :content => 'B',
+            :stuff_id => ['04787560-bc23-012d-817c-60334b2add65']})
+    thing.save
+  end
+
+  it "should lookup related object by facet" do
+    Thing.stuffs_facet('*:*').count.should_not == 0
+  end
+end
+

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solr_mapper
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Chris Umbel
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 +00:00
+date: 2010-10-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -38,6 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -51,6 +54,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -64,6 +68,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -92,8 +97,10 @@ files:
 - lib/solr_mapper/locators.rb
 - lib/solr_mapper/relations.rb
 - lib/solr_mapper/solr_document.rb
+- solr_mapper.gemspec
 - spec/base.rb
 - spec/calculations_spec.rb
+- spec/facets_spec.rb
 - spec/locators_spec.rb
 - spec/misc_spec.rb
 - spec/paginated_spec.rb
@@ -104,7 +111,6 @@ files:
 - spec/solr/widget/conf/schema.xml
 - spec/url_spec.rb
 - Manifest
-- solr_mapper.gemspec
 has_rdoc: true
 homepage: http://github.com/skunkworx/solr_mapper
 licenses: []
@@ -124,6 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -132,6 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
       segments: 
       - 1
       - 2