oedipus-dm 0.0.5 → 0.0.6

data/README.md

@@ -24,7 +24,7 @@ realtime indexes and multi-dimensional faceted search via ruby.
 
   - Sphinx >= 2.0.2
   - Ruby >= 1.9
-  - Mysql client development libraries
+  - Mysql client development libraries >= 4.1
 
 ## Installation
 
@@ -46,7 +46,7 @@ interface is not supported.
 require "oedipus-dm"
 
 Oedipus::DataMapper.configure do |config|
-  config.host = "localhost"
+  config.host = "127.0.0.1"
   config.port = 9306
 end
 ```
@@ -55,9 +55,13 @@ In Rails you can do this in an initializer for example.  If you prefer not to
 use a global configuration, it is possible to specify how to connect on a
 per-index basis instead.
 
+You should use '127.0.0.1' instead of 'localhost', in order to prevent the
+MySQL library from using a UNIX socket, which Sphinx doesn't currently
+support.
+
 ### Defining an Index
 
-The most basic way to connect sphinx index with your model is to define a
+The most basic way to connect a sphinx index with your model is to define a
 `.index` method on the model itself.  Oedipus doesn't directly mix behaviour
 into your models by default, as experience suggests this makes testing in
 isolation more difficult (note that you can easily have a standalone `Index`
@@ -98,7 +102,7 @@ connection settings, pass the `:connection` option.
 def self.index
   @index ||= Oedipus::DataMapper::Index.new(
     self,
-    connection: Oedipus.connect("localhost:9306")
+    connection: Oedipus.connect("127.0.0.1:9306")
   )
 end
 ```
@@ -108,15 +112,17 @@ end
 By default, the only field that Oedipus will map with your model is the `:id`
 attribute, which it will try to map with the key of your model.  This
 configuration will work fine for non-realtime indexes in most cases, but it
-is not optimized for many cases.
+is not optimal when you have attributes in your index that can be mapped with
+your model.
 
 When Oedipus finds search results, it pulls out all the attributes defined in
 your index, then tries to map them to instances of your model.  Mapping `:id`
 alone means that DataMapper will load all of your resources from the database
 when you first try to access any other attribute.
 
-Chances are, you have some attributes in your index that can be mapped to your
-model, avoiding the extra database hit.  You can add these mappings like so.
+Chances are, you have some (or lots of) attributes in your index that can be
+mapped to your model, avoiding the extra database hit.  You can add these
+mappings like so.
 
 ``` ruby
 Oedipus::DataMapper::Index.new(self) do |idx|
@@ -125,10 +131,12 @@ Oedipus::DataMapper::Index.new(self) do |idx|
 end
 ```
 
-`Index#map` takes the name of the attribute in your index.  By default it will
-map 1:1 with a property of the same name in your model.  If the property name
-in your model differs from that in the index, you may specify that with the
-`:with` option, as you see with the `:views` attribute above.
+The `#map` method takes the name of the attribute in your index.  By default
+it will map 1:1 with a property of the same name in your model.  If the
+property name in your model differs from that in the index, you may specify
+that with the `:with` option, as you see with the `:views` attribute above.
+
+You may also map arbitrary methods in your model— Oedipus will figure this out.
 
 Now when Oedipus loads your search results, they will be loaded with `:id`,
 `:user_id` and `:view_count` pre-loaded.

data/lib/oedipus/data_mapper/version.rb

@@ -9,6 +9,6 @@
 
 module Oedipus
   module DataMapper
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/oedipus/data_mapper.rb

@@ -31,14 +31,14 @@ module Oedipus
       #
       # @return [Connection]
       def connection
-        @connection ||= Connection.new(host: config.host, port: config.port)
+        @connection ||= Connection.new(host: config.host, port: config.port, verify: config.verify)
       end
 
       # Returns the configuration options.
       #
       # @return [Struct<host, port>]
       def config
-        @config ||= Struct.new(:host, :port).new("localhost", 9306)
+        @config ||= Struct.new(:host, :port, :verify).new("localhost", 9306, true)
       end
     end
   end

data/spec/integration/index_spec.rb

@@ -1,25 +1,15 @@
 require "spec_helper"
 
 describe Oedipus::DataMapper::Index do
-  include Oedipus::RSpec::TestHarness
-
-  before(:all) do
-    set_data_dir File.expand_path("../../data", __FILE__)
-    set_searchd  ENV["SEARCHD"]
-    start_searchd
-  end
-
-  after(:all) { stop_searchd }
+  include_context "oedipus test rig"
+  include_context "oedipus posts_rt"
 
   before(:each) do
     Post.destroy!
     User.destroy!
-    empty_indexes
   end
 
-  let(:conn) do
-    Oedipus::Connection.new(searchd_host)
-  end
+  let(:conn) { connection }
 
   let(:index) do
     Oedipus::DataMapper::Index.new(Post, name: :posts_rt, connection: conn) do |idx|

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require "rspec"
 require "oedipus-dm"
-require "oedipus/rspec/test_harness"
+require "oedipus/rspec/test_rig"
 require "dm-pager"
 
 Dir[File.expand_path("../support/**/*.rb", __FILE__)].each { |f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus-dm
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oedipus
-  requirement: &6993440 !ruby/object:Gem::Requirement
+  requirement: &14190380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *6993440
+  version_requirements: *14190380
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &6989940 !ruby/object:Gem::Requirement
+  requirement: &14196800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *6989940
+  version_requirements: *14196800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7004880 !ruby/object:Gem::Requirement
+  requirement: &14207400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7004880
+  version_requirements: *14207400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7002480 !ruby/object:Gem::Requirement
+  requirement: &14217140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7002480
+  version_requirements: *14217140
 - !ruby/object:Gem::Dependency
   name: dm-pager
-  requirement: &7000960 !ruby/object:Gem::Requirement
+  requirement: &14214160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7000960
+  version_requirements: *14214160
 description: ! '== DataMapper Integration for Oedipus
 
 
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2768834143295324576
+      hash: -1092648085512523153
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2768834143295324576
+      hash: -1092648085512523153
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11