dnif 0.0.1.beta.3 → 0.0.1.beta.4

data/spec/dnif/multi_attribute_spec.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Dnif::MultiAttribute do
+
+  it ".encode" do
+    Dnif::MultiAttribute.encode("Dnif").should == "324,622,873,1126"
+  end
+
+  describe ".decode" do
+
+    it "should decode a string" do
+      Dnif::MultiAttribute.decode("324,622,873,1126").should == "Dnif"
+    end
+
+    it "should decode an array" do
+      Dnif::MultiAttribute.decode(["324", "622", "873", "1126"]).should == "Dnif"
+    end
+  end
+end

data/{test/unit/test_schema.rb → spec/dnif/schema_spec.rb}

@@ -1,11 +1,11 @@
 # encoding: utf-8
-require 'test_helper'
+require 'spec_helper'
 
-class TestSchema < Test::Unit::TestCase
+describe Dnif::Schema do
 
-  test ".generate" do
+  it ".generate" do
     schema = Dnif::Schema.new(User)
     expected = File.read(File.dirname(__FILE__) + "/../fixtures/sphinx_4.xml")
-    assert_equal expected, schema.generate
+    schema.generate.should == expected
   end
-end
+end

data/spec/dnif/search_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Dnif::Search do
+
+  describe "#search" do
+
+    it "should search specific class" do
+      klass = Class.new
+      klass.extend(Dnif::Search)
+      klass.should_receive(:name).and_return("ClassName")
+
+      Dnif.should_receive(:search).with("foo", :classes => "ClassName").and_return("results")
+
+      klass.search("foo").should == "results"
+    end
+  end
+end

data/{test → spec}/fixtures/db/schema.rb

@@ -7,6 +7,7 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table "users", :force => true do |t|
     t.string :name
     t.boolean :active
+    t.decimal :weight, :precision => 16, :scale => 2
   end
 
   create_table "people", :force => true do |t|

data/{test → spec}/fixtures/sphinx_1.xml

@@ -8,6 +8,7 @@
   <sphinx:attr name="class_id" type="int"/>
   <sphinx:attr name="class_name" type="multi"/>
   <sphinx:attr name="active" type="bool"/>
+  <sphinx:attr name="weight" type="float"/>
   <sphinx:attr name="clicked" type="int"/>
   <sphinx:attr name="published_at" type="timestamp"/>
   <sphinx:attr name="expire_at" type="timestamp"/>

data/{test → spec}/fixtures/sphinx_2.xml

@@ -8,6 +8,7 @@
   <class_id>3</class_id>
   <class_name>334,623,884,1125</class_name>
   <active>true</active>
+  <weight></weight>
   <clicked>10</clicked>
   <published_at>{now}</published_at>
   <expire_at>{expire}</expire_at>

data/{test → spec}/fixtures/sphinx_3.xml

@@ -8,6 +8,7 @@
   <class_id>1</class_id>
   <class_name>336,613,882,1139,1391,1646</class_name>
   <active></active>
+  <weight></weight>
   <clicked></clicked>
   <published_at></published_at>
   <expire_at></expire_at>

data/{test → spec}/fixtures/sphinx_4.xml

@@ -6,6 +6,7 @@
   <sphinx:attr name="class_id" type="int"/>
   <sphinx:attr name="class_name" type="multi"/>
   <sphinx:attr name="active" type="bool"/>
+  <sphinx:attr name="weight" type="float"/>
   <sphinx:attr name="clicked" type="int"/>
   <sphinx:attr name="published_at" type="timestamp"/>
   <sphinx:attr name="expire_at" type="timestamp"/>

data/{test → spec}/fixtures/sphinx_5.xml

@@ -8,6 +8,7 @@
   <class_id>0</class_id>
   <class_name>1,2,3,4</class_name>
   <active>true</active>
+  <weight>34.5</weight>
   <clicked></clicked>
   <published_at></published_at>
   <expire_at></expire_at>

data/spec/spec_helper.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+require "bundler"
+Bundler.require(:default, :development)
+
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+require "dnif"
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f }
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+
+  config.before(:suite) do
+    Dnif.root_path = File.expand_path(File.dirname(__FILE__) + "/fixtures")
+
+    ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+    silence_stream(STDOUT) { load "fixtures/db/schema.rb" }
+
+    DatabaseCleaner.strategy = :transaction
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end

data/{test/test_helper.rb → spec/support/activerecord/models.rb}

@@ -1,23 +1,3 @@
-# encoding: utf-8
-
-# $:.unshift(File.dirname(__FILE__) + "/../../lib/")
-
-require "test/unit"
-require "mocha"
-require "active_record"
-require "ap"
-
-require 'database_cleaner'
-DatabaseCleaner.strategy = :transaction
-
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-require "dnif"
-
-Dnif.root_path = File.expand_path(File.dirname(__FILE__) + "/fixtures")
-
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-silence_stream(STDOUT) { load "fixtures/db/schema.rb" }
-
 class Post
 
   extend Dnif::Search
@@ -33,6 +13,7 @@ class User < ActiveRecord::Base
   define_index do
     field :name
     attribute :active, :type => :boolean
+    attribute :weight, :type => :decimal
   end
 end
 
@@ -73,4 +54,4 @@ class Note < ActiveRecord::Base
     attribute :active, :type => :boolean
     attribute :points, :type => :float
   end
-end
+end

data/templates/config.erb

@@ -0,0 +1,38 @@
+# Hand modifications will be overwritten.
+indexer {
+  mem_limit = 512M
+}
+
+searchd {
+  listen = 127.0.0.1:3313
+  seamless_rotate = 1
+  log = <%= Dnif.root_path %>/log/searchd.<%= Dnif.environment %>.log
+  query_log = <%= Dnif.root_path %>/log/query.<%= Dnif.environment %>.log
+  read_timeout = 5
+  max_children = 300
+  pid_file = <%= Dnif.root_path %>/log/searchd.<%= Dnif.environment %>.pid
+  max_matches = 1000
+}
+
+<% sources do |name, model| %>
+source <%= name %>
+{
+  type = xmlpipe2
+  xmlpipe_command = <%= (defined?(Rails) ? "RAILS_ENV" : "RACK_ENV") %>=<%= Dnif.environment %> MODEL=<%= model %> rake dnif:xml --silent
+}
+<% end %>
+
+index main
+{
+  <% sources do |name| %>
+    source = <%= name %>
+  <% end %>
+  path = <%= Dnif.root_path %>/db/sphinx/<%= Dnif.environment %>/index_main
+  docinfo = extern
+  morphology = none
+  min_word_len = 1
+  html_strip = 0
+  html_index_attrs = 
+  charset_type = utf-8
+  charset_table = 0..9, A..Z->a..z, -, _, ., &, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F,U+C5->U+E5, U+E5, U+C4->U+E4, U+E4, U+D6->U+F6, U+F6, U+16B, U+0c1->a, U+0c4->a, U+0c9->e, U+0cd->i, U+0d3->o, U+0d4->o, U+0da->u, U+0dd->y, U+0e1->a, U+0e4->a, U+0e9->e, U+0ed->i, U+0f3->o, U+0f4->o, U+0fa->u, U+0fd->y, U+104->U+105, U+105, U+106->U+107, U+10c->c, U+10d->c, U+10e->d, U+10f->d, U+116->U+117, U+117, U+118->U+119, U+11a->e, U+11b->e, U+12E->U+12F, U+12F, U+139->l, U+13a->l, U+13d->l, U+13e->l, U+141->U+142, U+142, U+143->U+144, U+144,U+147->n, U+148->n, U+154->r, U+155->r, U+158->r, U+159->r, U+15A->U+15B, U+15B, U+160->s, U+160->U+161, U+161->s, U+164->t, U+165->t, U+16A->U+16B, U+16B, U+16e->u, U+16f->u, U+172->U+173, U+173, U+179->U+17A, U+17A, U+17B->U+17C, U+17C, U+17d->z, U+17e->z,
+}

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - beta
-  - 3
-  version: 0.0.1.beta.3
+  - 4
+  version: 0.0.1.beta.4
 platform: ruby
 authors: 
 - Rafael Souza
@@ -16,12 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 -03:00
+date: 2010-09-07 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
+  name: rake
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,33 +30,140 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
+  name: activerecord
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 0
+        version: 3.0.0
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: riddle
-  prerelease: false
+  name: activesupport
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 0
+        version: 3.0.0
   type: :runtime
+  prerelease: false
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: riddle
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: builder
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 0
+        - pre2
+        version: 1.5.0.pre2
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: database_cleaner
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: awesome_print
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id010
 description: dnif is a gem to index data using ActiveRecord finders, letting you index your custom methods and not only your table fields
 email: me@rafaelss.com
 executables: []
@@ -67,6 +173,10 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
 - dnif.gemspec
@@ -74,38 +184,39 @@ files:
 - lib/dnif/configuration.rb
 - lib/dnif/document.rb
 - lib/dnif/index.rb
-- lib/dnif/index_builder.rb
 - lib/dnif/indexer.rb
 - lib/dnif/multi_attribute.rb
 - lib/dnif/schema.rb
 - lib/dnif/search.rb
 - lib/dnif/tasks.rb
-- test/fixtures/db/schema.rb
-- test/fixtures/log/searchd.pid
-- test/fixtures/models.rb
-- test/fixtures/sphinx_1.xml
-- test/fixtures/sphinx_2.xml
-- test/fixtures/sphinx_3.xml
-- test/fixtures/sphinx_4.xml
-- test/fixtures/sphinx_5.xml
-- test/fixtures/templates/config.erb
-- test/test_helper.rb
-- test/unit/test_configuration.rb
-- test/unit/test_dnif.rb
-- test/unit/test_document.rb
-- test/unit/test_index.rb
-- test/unit/test_index_builder.rb
-- test/unit/test_indexer.rb
-- test/unit/test_multi_attribute.rb
-- test/unit/test_schema.rb
-- test/unit/test_search.rb
-has_rdoc: true
+- lib/dnif/version.rb
+- spec/dnif/configuration_spec.rb
+- spec/dnif/dnif_spec.rb
+- spec/dnif/document_spec.rb
+- spec/dnif/index_spec.rb
+- spec/dnif/indexer_spec.rb
+- spec/dnif/multi_attribute_spec.rb
+- spec/dnif/schema_spec.rb
+- spec/dnif/search_spec.rb
+- spec/fixtures/db/schema.rb
+- spec/fixtures/log/searchd.pid
+- spec/fixtures/models.rb
+- spec/fixtures/sphinx_1.xml
+- spec/fixtures/sphinx_2.xml
+- spec/fixtures/sphinx_3.xml
+- spec/fixtures/sphinx_4.xml
+- spec/fixtures/sphinx_5.xml
+- spec/fixtures/templates/config.erb
+- spec/spec_helper.rb
+- spec/support/activerecord/models.rb
+- templates/config.erb
+has_rdoc: false
 homepage: http://github.com/rafaelss/dnif
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -113,6 +224,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3446720878037895666
       segments: 
       - 0
       version: "0"
@@ -134,15 +246,15 @@ signing_key:
 specification_version: 3
 summary: dnif is the new find... for sphinx
 test_files: 
-- test/fixtures/db/schema.rb
-- test/fixtures/models.rb
-- test/test_helper.rb
-- test/unit/test_configuration.rb
-- test/unit/test_dnif.rb
-- test/unit/test_document.rb
-- test/unit/test_index.rb
-- test/unit/test_index_builder.rb
-- test/unit/test_indexer.rb
-- test/unit/test_multi_attribute.rb
-- test/unit/test_schema.rb
-- test/unit/test_search.rb
+- spec/dnif/configuration_spec.rb
+- spec/dnif/dnif_spec.rb
+- spec/dnif/document_spec.rb
+- spec/dnif/index_spec.rb
+- spec/dnif/indexer_spec.rb
+- spec/dnif/multi_attribute_spec.rb
+- spec/dnif/schema_spec.rb
+- spec/dnif/search_spec.rb
+- spec/fixtures/db/schema.rb
+- spec/fixtures/models.rb
+- spec/spec_helper.rb
+- spec/support/activerecord/models.rb