xmlpipe2_indexer 0.0.1 → 0.0.2

data/Gemfile

@@ -1,9 +1,8 @@
 source "http://rubygems.org"
 
-gem 'activesupport', ">2.2.0"
-
 group :development do
   gem "rspec"
   gem "bundler"
   gem "jeweler"
+  gem 'uuid'
 end

data/Gemfile.lock

@@ -1,19 +1,16 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
     diff-lcs (1.1.3)
     git (1.2.5)
-    i18n (0.6.0)
     jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
     json (1.7.0)
-    multi_json (1.3.4)
+    macaddr (1.5.0)
+      systemu (>= 2.4.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -25,12 +22,15 @@ GEM
     rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
+    systemu (2.5.0)
+    uuid (2.3.5)
+      macaddr (~> 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (> 2.2.0)
   bundler
   jeweler
   rspec
+  uuid

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/erb/sphinx.conf.erb

@@ -11,23 +11,23 @@ searchd
 <% index = clazz.to_s.downcase %>
 source <%= index %>
 {
-    type = xmlpipe2
-    xmlpipe_command = <%= %x(which cat).rstrip %> <%= '<%= xml_stream_path %%>' %>
-	xmlpipe_fixup_utf8 = 1
+type = xmlpipe2
+xmlpipe_command = <%= %x(which cat).rstrip %> <%= '<%= xml_stream_path %%>' %>
+xmlpipe_fixup_utf8 = 1
 }
 
 index <%= index %>
 {
-  source = <%= index %>
-  path = <%= XMLPipe2::Configuration.index_path %>
-  charset_type = utf-8
-  <%= clazz.sphinx_index_options.map { |option, value| "#{option} = #{value}" }*"\n" %>
+source = <%= index %>
+path = <%= File.expand_path("#{XMLPipe2::Configuration.index_path}/#{index}") %>
+charset_type = utf-8
+<%= clazz.sphinx_index_options.map { |option, value| "#{option} = #{value}" }*"\n" %>
 }
 
 index <%= index %>_delta
 {
-  source = <%= index %>
-  path = <%= XMLPipe2::Configuration.delta_index_path %>
-  charset_type = utf-8
-  <%= clazz.sphinx_index_options.map { |option, value| "#{option} = #{value}" }*"\n" %>
+source = <%= index %>
+path = <%= File.expand_path("#{XMLPipe2::Configuration.index_path}/#{index}_delta") %>
+charset_type = utf-8
+<%= clazz.sphinx_index_options.map { |option, value| "#{option} = #{value}" }*"\n" %>
 }

data/erb/xml_schema.xml.erb

@@ -2,9 +2,9 @@
 
 <sphinx:docset>
 
-  <sphinx:schema>
-    <%= fields.map { |index, _| %(<sphinx:field name="#{index}"/>) }*"\n" %>
-    <%= attrs.map { |attr, _| %(<sphinx:attr name="#{attr}" type="string"/>) }*"\n" %>
-  </sphinx:schema>
+<sphinx:schema>
+<%= fields.map { |index, _| %(<sphinx:field name="#{index}"/>) }*"\n" %>
+<%= attrs.map { |attr, _| %(<sphinx:attr name="#{attr}" type="string"/>) }*"\n" %>
+</sphinx:schema>
 
 </sphinx:docset>

data/erb/xml_stream.xml.erb

@@ -2,14 +2,14 @@
 
 <sphinx:docset>
 
-  <sphinx:schema>
-    <%= fields.map { |index, _| %(<sphinx:field name="#{index}"/>) }*"\n" %>
-    <%= attrs.map { |attr, _| %(<sphinx:attr name="#{attr}" type="string"/>) }*"\n" %>
-  </sphinx:schema>
-
-  <sphinx:document id="<%= document_id %>">
-    <%= fields.map { |index, value| "<#{index}>#{value}</#{index}>" }*"\n" %>
-    <%= attrs.map { |attr, value| "<#{attr}>#{value}</#{attr}>" }*"\n" %>
-  </sphinx:document>
+<sphinx:schema>
+<%= fields.map { |index, _| %(<sphinx:field name="#{index}"/>) }*"\n" %>
+<%= attrs.map { |attr, _| %(<sphinx:attr name="#{attr}" type="string"/>) }*"\n" %>
+</sphinx:schema>
+
+<sphinx:document id="<%= document_id %>">
+<%= fields.map { |index, value| "<#{index}>#{value}</#{index}>" }*"\n" %>
+<%= attrs.map { |attr, value| "<#{attr}>#{value}</#{attr}>" }*"\n" %>
+</sphinx:document>
 
 </sphinx:docset>

data/lib/xml_pipe2/configuration.rb

@@ -8,13 +8,9 @@ module XMLPipe2
         yield(self)
       end
 
-      cattr_accessor :index_path
-      cattr_accessor :searchd
-      cattr_accessor :indexer
-
-      def delta_index_path
-        index_path + '_delta'
-      end
+      attr_accessor :index_path
+      attr_accessor :searchd
+      attr_accessor :indexer
 
     end
 

data/lib/xml_pipe2/delta_indexer.rb

@@ -20,8 +20,7 @@ module XMLPipe2
     def run
       config = '-c ' + sphinx_conf.path
       index = instance.class.to_s.downcase
-      system("$(which indexer) #{config} #{index}_delta")
-      system("$(which indexer) #{config} --merge #{index} #{index}_delta --rotate")
+      system("$(which indexer) #{config} #{index}_delta && $(which indexer) #{config} --merge #{index} #{index}_delta --rotate")
       sphinx_conf.unlink
       xml_stream.unlink
     end

data/lib/xml_pipe2/xml_pipe2.rb

@@ -49,4 +49,8 @@ module XMLPipe2
     self.sphinx_index_options = options
   end
 
+  def sphinx_id method
+    XMLStream.sphinx_id_method = method
+  end
+
 end

data/lib/xml_pipe2/xml_schema.rb

@@ -1,6 +1,6 @@
 module XMLPipe2
 
-  class XMLSchema < XMLStream
+  class XMLSchema
 
     TEMPLATE = File.read(File.expand_path(File.dirname(__FILE__) + '/../../erb/xml_schema.xml.erb'))
 
@@ -12,21 +12,11 @@ module XMLPipe2
 
     def generate
       fields = clazz.sphinx_indexes.inject({ }) do |hash, index|
-        unless index[:options].has_key?(:as) and index[:options][:as] == :document_id
-          if index[:options].has_key?(:as)
-            hash.merge!(index[:options][:as] => nil)
-          else
-            hash.merge!(index[:method] => nil)
-          end
-        end
+        index[:options].has_key?(:as) ? hash.merge!(index[:options][:as] => nil) : hash.merge!(index[:method] => nil)
         hash
       end
       attrs = clazz.sphinx_attributes.inject({ }) do |hash, attr|
-        if attr[:options].has_key?(:as)
-          hash.merge!(attr[:options][:as] => nil)
-        else
-          hash.merge!(attr[:method] => nil)
-        end
+        attr[:options].has_key?(:as) ? hash.merge!(attr[:options][:as] => nil) : hash.merge!(attr[:method] => nil)
         hash
       end
       ERB.new(TEMPLATE).result(binding)

data/lib/xml_pipe2/xml_stream.rb

@@ -6,22 +6,23 @@ module XMLPipe2
 
     def initialize(instance)
       @instance = instance
-      @document_id = instance.id
+    end
+
+    class << self
+      attr_accessor :sphinx_id_method
     end
 
     attr_reader :instance
     attr_accessor :document_id
 
     def generate
+      self.document_id = self.class.sphinx_id_method ?  instance.send(self.class.sphinx_id_method) : instance.id
+
       fields = instance.class.sphinx_indexes.inject({ }) do |hash, index|
-        if index[:options].has_key?(:as) and index[:options][:as] == :document_id
-          self.document_id = instance.send(index[:method])
+        if index[:options].has_key?(:as)
+          hash.merge!(index[:options][:as] => instance.send(index[:method]))
         else
-          if index[:options].has_key?(:as)
-            hash.merge!(index[:options][:as] => instance.send(index[:method]))
-          else
-            hash.merge!(index[:method] => instance.send(index[:method]))
-          end
+          hash.merge!(index[:method] => instance.send(index[:method]))
         end
         hash
       end

data/lib/xmlpipe2_indexer.rb

@@ -1,4 +1,3 @@
-require "active_support/core_ext/class/attribute_accessors"
 require 'tempfile'
 require 'erb'
 

data/spec/configuration_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'Configuration' do
+
+  describe 'set configuration' do
+
+    it 'should set index_path' do
+      XMLPipe2::Configuration.index_path.should == File.expand_path(File.dirname(__FILE__))
+    end
+
+    { listen: '127.0.0.1:9312',
+      log: File.expand_path(File.dirname(__FILE__) +"/searchd.log"),
+      query_log: File.expand_path(File.dirname(__FILE__) +"/searchd.query.log"),
+      pid_file: File.expand_path(File.dirname(__FILE__) +"/searchd.pid") }.each_pair do |setting, value|
+
+      it "should set searchd ##{setting}" do
+        XMLPipe2::Configuration.searchd[setting].should == value
+      end
+
+    end
+
+    it 'should set indexer #mem_limit' do
+      XMLPipe2::Configuration.indexer[:mem_limit].should == '256M'
+    end
+
+  end
+
+
+end

data/spec/spec_helper.rb

@@ -5,8 +5,48 @@ require 'xmlpipe2_indexer'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  
+
+end
+
+XMLPipe2::Configuration.set do |config|
+  config.index_path = File.expand_path(File.dirname(__FILE__))
+  config.searchd = { listen: '127.0.0.1:9312',
+                     log: File.expand_path(File.dirname(__FILE__) + '/searchd.log'),
+                     query_log: File.expand_path(File.dirname(__FILE__) + '/searchd.query.log'),
+                     pid_file: File.expand_path(File.dirname(__FILE__) + '/searchd.pid') }
+  config.indexer = { mem_limit: '256M' }
+end
+
+class Article
+
+  extend XMLPipe2
+
+  def id
+    "8b49b130-7664-012f-15fa-18a905d9fec6"
+  end
+
+  def custom_id
+    4133693989
+  end
+
+  def content
+    "some content"
+  end
+
+  def title
+    "any title"
+  end
+
+  define_index do
+    index :title
+    index :content, as: :data
+    sphinx_id :custom_id
+    index_options enable_star: 1, min_infix_len: 3
+    has :id
+    has :id, as: :uuid
+  end
+
 end

data/spec/sphinx_conf_spec.rb

@@ -0,0 +1,49 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "SphinxConf" do
+
+  it "should generate a valid SphinxConf" do
+
+    XMLPipe2::SphinxConf.new(Article).generate.should ==
+        %(indexer
+{
+mem_limit = 256M
+}
+
+searchd
+{
+listen = 127.0.0.1:9312
+log = #{File.expand_path(File.dirname(__FILE__) +"/searchd.log")}
+query_log = #{File.expand_path(File.dirname(__FILE__) +"/searchd.query.log")}
+pid_file = #{File.expand_path(File.dirname(__FILE__) +"/searchd.pid")}
+}
+
+
+source article
+{
+type = xmlpipe2
+xmlpipe_command = /bin/cat <%= xml_stream_path %>
+xmlpipe_fixup_utf8 = 1
+}
+
+index article
+{
+source = article
+path = #{File.expand_path(File.dirname(__FILE__) + '/article')}
+charset_type = utf-8
+enable_star = 1
+min_infix_len = 3
+}
+
+index article_delta
+{
+source = article
+path = #{File.expand_path(File.dirname(__FILE__) + '/article_delta')}
+charset_type = utf-8
+enable_star = 1
+min_infix_len = 3
+}
+)
+  end
+
+end

data/spec/xml_pipe2_spec.rb

@@ -0,0 +1,114 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "XMLPipe2" do
+
+  before(:all) do
+    @article = Article.new
+  end
+
+  describe "instance methods" do
+
+    subject { @article }
+
+    [:xml_stream,
+     :index!].each do |method|
+      it { subject.should respond_to method }
+    end
+
+    describe "#xml_stream" do
+
+      it "should generate a XMLStream" do
+        mock = mock(:xml_stream)
+        XMLPipe2::XMLStream.should_receive(:new).with(@article).and_return(mock)
+        mock.should_receive(:generate)
+
+        @article.xml_stream
+      end
+
+    end
+
+    describe '#index!' do
+
+      it "should run a DeltaIndexer" do
+        mock = mock(:delta_indexer)
+        XMLPipe2::DeltaIndexer.should_receive(:new).with(@article).and_return(mock)
+        mock.should_receive(:run)
+
+        @article.index!
+      end
+
+      it "should call system correctly" do
+        XMLPipe2::DeltaIndexer.any_instance.should_receive(:system).exactly(1).
+            with(/\$\(which indexer\) -c \/tmp\/sphinx.conf.* article_delta && \$\(which indexer\) -c \/tmp\/sphinx.conf.* --merge article article_delta --rotate/)
+
+        @article.index!
+      end
+
+    end
+
+  end
+
+
+
+  describe "methods on class instance" do
+    subject { Article }
+
+    [:sphinx_indexes,
+     :sphinx_attributes,
+     :sphinx_index_options,
+     :sphinx_conf,
+     :xml_schema,
+     :create_index!,
+     :index,
+     :has,
+     :index_options,
+     :sphinx_id].each do |method|
+      it { subject.should respond_to method }
+    end
+
+    describe '#sphinx_conf' do
+
+      it "should generate a SphinxConf" do
+        mock = mock(:sphinx_conf)
+        XMLPipe2::SphinxConf.should_receive(:new).with(Article).and_return(mock)
+        mock.should_receive(:generate)
+
+        Article.sphinx_conf
+      end
+
+    end
+
+    describe "#xml_schema" do
+
+      it "should generate a XMLSchema" do
+        mock = mock(:xml_schema)
+        XMLPipe2::XMLSchema.should_receive(:new).with(Article).and_return(mock)
+        mock.should_receive(:generate)
+
+        Article.xml_schema
+      end
+
+    end
+
+    describe "#create_index!" do
+
+      it "should build an index" do
+        mock = mock(:index_builder)
+        XMLPipe2::IndexBuilder.should_receive(:new).with(Article).and_return(mock)
+        mock.should_receive(:build)
+
+        Article.create_index!
+      end
+
+      it "should call system correctly" do
+        XMLPipe2::IndexBuilder.any_instance.should_receive(:system).
+            with(/\$\(which indexer\) -c \/tmp\/sphinx.conf.*article/)
+        Article.create_index!
+      end
+
+    end
+
+
+  end
+
+end

data/spec/xml_schema_spec.rb

@@ -0,0 +1,22 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "XMLSchema" do
+
+  it "should generate a valid XMLSchema" do
+
+    XMLPipe2::XMLSchema.new(Article).generate.should ==
+        %(<?xml version="1.0" encoding="utf-8"?>
+
+<sphinx:docset>
+
+<sphinx:schema>
+<sphinx:field name="title"/>
+<sphinx:field name="data"/>
+<sphinx:attr name="id" type="string"/>
+<sphinx:attr name="uuid" type="string"/>
+</sphinx:schema>
+
+</sphinx:docset>
+)
+  end
+end

data/spec/xml_stream_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "XMLStream" do
+
+  it "should generate a valid XMLStream" do
+
+    XMLPipe2::XMLStream.new(Article.new).generate.should ==
+        %(<?xml version="1.0" encoding="utf-8"?>
+
+<sphinx:docset>
+
+<sphinx:schema>
+<sphinx:field name="title"/>
+<sphinx:field name="data"/>
+<sphinx:attr name="id" type="string"/>
+<sphinx:attr name="uuid" type="string"/>
+</sphinx:schema>
+
+<sphinx:document id="4133693989">
+<title>any title</title>
+<data>some content</data>
+<id>8b49b130-7664-012f-15fa-18a905d9fec6</id>
+<uuid>8b49b130-7664-012f-15fa-18a905d9fec6</uuid>
+</sphinx:document>
+
+</sphinx:docset>
+)
+  end
+end

data/xmlpipe2_indexer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "xmlpipe2_indexer"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ludwig Bratke"]
-  s.date = "2012-05-01"
+  s.date = "2012-05-02"
   s.description = "xmlpipe2_indexer provides a small DSL which wrapps sphinx's xmlpipe2"
   s.email = "bratke@servtag.com"
   s.extra_rdoc_files = [
@@ -37,8 +37,12 @@ Gem::Specification.new do |s|
     "lib/xml_pipe2/xml_schema.rb",
     "lib/xml_pipe2/xml_stream.rb",
     "lib/xmlpipe2_indexer.rb",
+    "spec/configuration_spec.rb",
     "spec/spec_helper.rb",
-    "spec/xmlpipe2_indexer_spec.rb",
+    "spec/sphinx_conf_spec.rb",
+    "spec/xml_pipe2_spec.rb",
+    "spec/xml_schema_spec.rb",
+    "spec/xml_stream_spec.rb",
     "xmlpipe2_indexer.gemspec"
   ]
   s.homepage = "http://github.com/EeCnee/xmlpipe2_indexer"
@@ -51,21 +55,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["> 2.2.0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<uuid>, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>, ["> 2.2.0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<uuid>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["> 2.2.0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<uuid>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmlpipe2_indexer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,26 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: uuid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -103,8 +103,12 @@ files:
 - lib/xml_pipe2/xml_schema.rb
 - lib/xml_pipe2/xml_stream.rb
 - lib/xmlpipe2_indexer.rb
+- spec/configuration_spec.rb
 - spec/spec_helper.rb
-- spec/xmlpipe2_indexer_spec.rb
+- spec/sphinx_conf_spec.rb
+- spec/xml_pipe2_spec.rb
+- spec/xml_schema_spec.rb
+- spec/xml_stream_spec.rb
 - xmlpipe2_indexer.gemspec
 homepage: http://github.com/EeCnee/xmlpipe2_indexer
 licenses:
@@ -121,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1952783958797074807
+      hash: -46082169195006128
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/xmlpipe2_indexer_spec.rb

@@ -1,7 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Xmlpipe2Indexer" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end