dnif 0.1.0 → 0.1.1

data/Gemfile

@@ -1,14 +1,3 @@
 source "http://rubygems.org"
 
-gem "rake"
-gem "activerecord", ">= 3.0.0", :require => "active_record"
-gem "activesupport", ">= 3.0.0", :require => "active_support"
-gem "riddle", ">= 1.1.0"
-gem "builder", ">= 2.1.2"
-
-group :development do
-  gem "jeweler", ">= 1.5.0.pre2"
-  gem "rspec", ">= 2.0.0.beta.20"
-  gem "database_cleaner"
-  gem "sqlite3-ruby", :require => "sqlite3"
-end
+gemspec

data/Gemfile.lock

@@ -1,23 +1,32 @@
+PATH
+  remote: .
+  specs:
+    dnif (0.1.1)
+      activerecord (>= 3.0.3)
+      activesupport (>= 3.0.3)
+      builder (>= 2.1.2)
+      rake
+      riddle (>= 1.1.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activesupport (3.0.3)
+    arel (2.0.4)
     builder (2.1.2)
     database_cleaner (0.5.2)
     diff-lcs (1.1.2)
     git (1.2.5)
-    i18n (0.4.1)
+    i18n (0.4.2)
     jeweler (1.5.0.pre2)
       bundler (>= 1.0.0.rc.5)
       git (>= 1.2.5)
@@ -39,10 +48,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 3.0.0)
-  activesupport (>= 3.0.0)
+  activerecord (>= 3.0.3)
+  activesupport (>= 3.0.3)
   builder (>= 2.1.2)
   database_cleaner
+  dnif!
   jeweler (>= 1.5.0.pre2)
   rake
   riddle (>= 1.1.0)

data/README.rdoc

@@ -4,6 +4,18 @@ dnif is the new find... for sphinx
 
 dnif is a gem to index data using ActiveRecord finders (for now), letting you index custom methods and not only table columns
 
+== Installation
+
+Install gem
+
+  gem install dnif
+
+Put line below in your Gemfile
+
+  gem "dnif"
+
+Now, all you need is configure your models and run rake tasks. See below.
+
 == Usage
 
   require "dnif"
@@ -15,7 +27,7 @@ dnif is a gem to index data using ActiveRecord finders (for now), letting you in
       field :email
       attribute :created_at, :type => :datetime
 
-      where ["active = ?", false]
+      where "active = ?", false
     end
 
     def full_name
@@ -31,13 +43,11 @@ dnif is a gem to index data using ActiveRecord finders (for now), letting you in
 
 == TODO
 
-- Add messages for rake tasks
-- Better error handler
-- Try to remove ActiveRecord dependency, making it work with others ORMs/ODMs/etc
-- Documentation
 - Improve test suite
-- Index in chunks
+- Documentation
 - Support to delta index (or something like that)
+- Improve error handler
+- Try to remove ActiveRecord dependency, making it work with others ORMs/ODMs/etc
 - Remove the class_name (seems not be necessary anymore)
 - Move this TODO to Issues
 

data/Rakefile

@@ -1,30 +1,5 @@
-require "bundler"
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require "jeweler"
-
-$LOAD_PATH.unshift('lib')
-require "dnif/version"
-
-Jeweler::Tasks.new do |gemspec|
-  gemspec.name = "dnif"
-  gemspec.version = Dnif::Version::STRING
-  gemspec.summary = "dnif is the new find... for sphinx"
-  gemspec.description = "dnif is a gem to index data using ActiveRecord finders, letting you index your custom methods and not only your table fields"
-  gemspec.email = "me@rafaelss.com"
-  gemspec.homepage = "http://github.com/rafaelss/dnif"
-  gemspec.authors = ["Rafael Souza"]
-  gemspec.has_rdoc = false
-  gemspec.files.include %w(.gitignore .rspec templates/config.erb)
-end
-
-Jeweler::GemcutterTasks.new
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)

data/dnif.gemspec

@@ -1,79 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "dnif/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{dnif}
-  s.version = "0.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Rafael Souza"]
-  s.date = %q{2010-10-21}
+  s.name        = "dnif"
+  s.version     = Dnif::Version::STRING
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Rafael Souza"]
+  s.email       = ["me@rafaelss.com"]
+  s.homepage    = "http://rubygems.org/gems/dnif"
+  s.summary     = %q{dnif is the new find... for sphinx}
   s.description = %q{dnif is a gem to index data using ActiveRecord finders, letting you index your custom methods and not only your table fields}
-  s.email = %q{me@rafaelss.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "README.rdoc",
-    "Rakefile",
-    "dnif.gemspec",
-    "lib/dnif.rb",
-    "lib/dnif/configuration.rb",
-    "lib/dnif/document.rb",
-    "lib/dnif/index.rb",
-    "lib/dnif/indexer.rb",
-    "lib/dnif/multi_attribute.rb",
-    "lib/dnif/railtie.rb",
-    "lib/dnif/schema.rb",
-    "lib/dnif/search.rb",
-    "lib/dnif/tasks.rb",
-    "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"
-  ]
-  s.has_rdoc = false
-  s.homepage = %q{http://github.com/rafaelss/dnif}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{dnif is the new find... for sphinx}
-  s.test_files = [
-    "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"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -81,8 +23,8 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rake>, [">= 0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.3"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.3"])
       s.add_runtime_dependency(%q<riddle>, [">= 1.1.0"])
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
       s.add_development_dependency(%q<jeweler>, [">= 1.5.0.pre2"])
@@ -91,8 +33,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_dependency(%q<activerecord>, [">= 3.0.3"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.3"])
       s.add_dependency(%q<riddle>, [">= 1.1.0"])
       s.add_dependency(%q<builder>, [">= 2.1.2"])
       s.add_dependency(%q<jeweler>, [">= 1.5.0.pre2"])
@@ -102,8 +44,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+    s.add_dependency(%q<activerecord>, [">= 3.0.3"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.3"])
     s.add_dependency(%q<riddle>, [">= 1.1.0"])
     s.add_dependency(%q<builder>, [">= 2.1.2"])
     s.add_dependency(%q<jeweler>, [">= 1.5.0.pre2"])
@@ -112,4 +54,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
   end
 end
-

data/lib/dnif.rb

@@ -1,7 +1,4 @@
 # encoding: utf-8
-require "bundler"
-Bundler.setup(:default)
-
 require "riddle"
 
 module Dnif
@@ -98,6 +95,10 @@ module Dnif
   end
 end
 
+if defined?(Rails)
+  require "dnif/railtie"
+end
+
 if defined?(ActiveRecord::Base)
   ActiveRecord::Base.extend(Dnif::Indexer)
   ActiveRecord::Base.extend(Dnif::Search)

data/lib/dnif/indexer.rb

@@ -1,3 +1,5 @@
+require "builder"
+
 module Dnif
   module Indexer
 

data/lib/dnif/version.rb

@@ -2,8 +2,8 @@ module Dnif
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 0
-    BUILD = nil # "beta.6"
+    PATCH = 1
+    BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
-require "bundler"
-Bundler.require(:default, :development)
+require "bundler/setup"
+require "active_record"
+require "rspec"
+require "database_cleaner"
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require "dnif"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Rafael Souza
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 -02:00
+date: 2010-11-24 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,8 +40,8 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        - 3
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -55,8 +55,8 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        - 3
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: *id003
@@ -150,13 +150,14 @@ dependencies:
   prerelease: false
   version_requirements: *id009
 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
+email: 
+- me@rafaelss.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .gitignore
 - .rspec
@@ -196,8 +197,8 @@ files:
 - spec/spec_helper.rb
 - spec/support/activerecord/models.rb
 - templates/config.erb
-has_rdoc: false
-homepage: http://github.com/rafaelss/dnif
+has_rdoc: true
+homepage: http://rubygems.org/gems/dnif
 licenses: []
 
 post_install_message: 
@@ -210,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -121134360209263234
+      hash: -3974449168105955734
       segments: 
       - 0
       version: "0"
@@ -219,6 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -3974449168105955734
       segments: 
       - 0
       version: "0"
@@ -239,6 +241,13 @@ test_files:
 - 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