dusen 0.4.6 → 0.4.8

data/.gitignore

@@ -3,7 +3,6 @@ pkg
 *.gem
 .idea
 app_root/log/*
-Gemfile.lock
 spec/shared/app_root/db/*.db
 spec/shared/app_root/config/database.yml
 

data/README.md

@@ -37,7 +37,7 @@ Under the hood the search will be performed using [LIKE queries](http://dev.mysq
 Our example will be a simple address book:
 
     class Contact < ActiveRecord::Base
-      validates_presence_of :name, :street, :city, :name
+      validates_presence_of :name, :street, :city, :email
     end
 
 

data/Rakefile

@@ -45,7 +45,7 @@ namespace :all do
   desc "Bundle all spec apps"
   task :bundle do
     for_each_directory_of('spec/**/Gemfile') do |directory|
-      system("cd #{directory} && rm -f Gemfile.lock && bundle install")
+      system("cd #{directory} Gemfile.lock && bundle install")
     end
   end
 

data/dusen.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('rails')
+  s.add_dependency('activerecord')
+  s.add_dependency('edge_rider', '>=0.2.3')
 
 end

data/lib/dusen/active_record/search_text.rb

@@ -27,7 +27,7 @@ module Dusen
 
       def self.synchronize_model(model)
         invalid_index_records = for_model(model).invalid
-        source_ids = Util.collect_column(invalid_index_records, :source_id)
+        source_ids = invalid_index_records.collect_column(:source_id)
         pending_source_ids = Set.new(source_ids)
         source_records = Util.append_scope_conditions(model, :id => source_ids)
         source_records.find_in_batches do |batch|
@@ -57,7 +57,7 @@ module Dusen
           Dusen::Util.boolean_fulltext_query(phrases)
         ]
         matching_texts = Dusen::Util.append_scope_conditions(for_model(model), conditions)
-        Dusen::Util.collect_column(matching_texts, :source_id)
+        matching_texts.collect_column(:source_id)
       end
 
     end

data/lib/dusen/util.rb

@@ -81,42 +81,6 @@ module Dusen
       print "\033[0m"
     end
 
-    #def scope_to_sql(scope)
-    #  query = if scope.respond_to?(:to_sql)
-    #    scope.to_sql
-    #  else
-    #    scope.construct_finder_sql({})
-    #  end
-    #end
-
-    def scope_to_sql(options = {})
-      if Rails.version < '3'
-        scope.construct_finder_sql(options)
-      else
-        scope.scoped(options).to_sql
-      end
-    end
-
-    def collect_column(scope, column_name, find_options = {})
-      distinct = find_options.delete(:distinct)
-      qualified_column_name = "`#{scope.table_name}`.`#{column_name}`"
-      select = distinct ? "DISTINCT #{qualified_column_name}" : qualified_column_name
-      query = if Rails.version.to_i < 3
-        scope.construct_finder_sql(find_options.merge(:select => select))
-      else
-        scope.scoped(find_options.merge(:select => select)).to_sql
-      end
-      raw_values = scope.connection.select_values(query)
-      column = scope.columns_hash[column_name.to_s] or raise "Could not retrieve column information: #{column_name}"
-      raw_values.collect { |value| column.type_cast(value) }
-    end
-
-    #def collect_ids(scope)
-    #  scope = select_scope_fields(scope, "`#{scope.table_name}`.`id`")
-    #  query = scope_to_sql(scope)
-    #  ::ActiveRecord::Base.connection.select_values(query).collect(&:to_i)
-    #end
-
     def normalize_word_boundaries(text)
       unwanted_mysql_boundary = /[\.;\-]/
       text.gsub(unwanted_mysql_boundary, '')

data/lib/dusen/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Dusen
-  VERSION = '0.4.6'
+  VERSION = '0.4.8'
 end

data/lib/dusen.rb

@@ -9,6 +9,7 @@ require 'dusen/query'
 require 'dusen/syntax'
 
 if defined?(ActiveRecord)
+  require 'edge_rider'
   require 'dusen/active_record/base_ext'
   require 'dusen/active_record/search_text'
 end

data/spec/rails-2.3/Gemfile.lock

@@ -0,0 +1,66 @@
+PATH
+  remote: ../..
+  specs:
+    dusen (0.4.7)
+      activerecord
+      edge_rider (>= 0.2.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (2.3.18)
+      actionpack (= 2.3.18)
+    actionpack (2.3.18)
+      activesupport (= 2.3.18)
+      rack (~> 1.1.0)
+    activerecord (2.3.18)
+      activesupport (= 2.3.18)
+    activeresource (2.3.18)
+      activesupport (= 2.3.18)
+    activesupport (2.3.18)
+    andand (1.3.3)
+    columnize (0.3.6)
+    database_cleaner (1.0.1)
+    edge_rider (0.2.3)
+      activerecord
+    hoe (2.8.0)
+      rake (>= 0.8.7)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mysql2 (0.2.18)
+    rack (1.1.6)
+    rails (2.3.18)
+      actionmailer (= 2.3.18)
+      actionpack (= 2.3.18)
+      activerecord (= 2.3.18)
+      activeresource (= 2.3.18)
+      activesupport (= 2.3.18)
+      rake (>= 0.8.3)
+    rake (10.0.4)
+    rbx-require-relative (0.0.9)
+    rspec (1.3.2)
+    rspec-rails (1.3.4)
+      rack (>= 1.0.0)
+      rspec (~> 1.3.1)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    test-unit (1.2.3)
+      hoe (>= 1.5.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  andand
+  database_cleaner
+  dusen!
+  hoe (= 2.8.0)
+  mysql2 (~> 0.2.0)
+  rails (~> 2.3)
+  rspec (~> 1.3)
+  rspec-rails (~> 1.3)
+  ruby-debug
+  test-unit (~> 1.2)

data/spec/rails-3.0/Gemfile.lock

@@ -0,0 +1,120 @@
+PATH
+  remote: ../..
+  specs:
+    dusen (0.4.7)
+      activerecord
+      edge_rider (>= 0.2.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.20)
+      actionpack (= 3.0.20)
+      mail (~> 2.2.19)
+    actionpack (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+    activesupport (3.0.20)
+    andand (1.3.3)
+    arel (2.0.10)
+    builder (2.1.2)
+    columnize (0.3.6)
+    database_cleaner (1.0.1)
+    diff-lcs (1.2.4)
+    edge_rider (0.2.3)
+      activerecord
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    json (1.8.0)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mail (2.2.20)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.23)
+    mysql2 (0.2.18)
+    polyglot (0.3.3)
+    rack (1.2.8)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.20)
+      actionmailer (= 3.0.20)
+      actionpack (= 3.0.20)
+      activerecord (= 3.0.20)
+      activeresource (= 3.0.20)
+      activesupport (= 3.0.20)
+      bundler (~> 1.0)
+      railties (= 3.0.20)
+    railties (3.0.20)
+      actionpack (= 3.0.20)
+      activesupport (= 3.0.20)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (10.0.4)
+    rbx-require-relative (0.0.9)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    thor (0.14.6)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  andand
+  database_cleaner
+  dusen!
+  mysql2 (~> 0.2.0)
+  rails (~> 3.0.17)
+  rspec
+  rspec-rails
+  ruby-debug

data/spec/rails-3.2/Gemfile.lock

@@ -0,0 +1,135 @@
+PATH
+  remote: ../..
+  specs:
+    dusen (0.4.7)
+      activerecord
+      edge_rider (>= 0.2.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    andand (1.3.3)
+    arel (3.0.2)
+    builder (3.0.4)
+    columnize (0.3.6)
+    database_cleaner (1.0.1)
+    diff-lcs (1.2.4)
+    edge_rider (0.2.3)
+      activerecord
+    erubis (2.7.0)
+    hike (1.2.2)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.8.0)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.23)
+    multi_json (1.7.3)
+    mysql2 (0.3.11)
+    polyglot (0.3.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
+      bundler (~> 1.0)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.4)
+    rbx-require-relative (0.0.9)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec_candy (0.2.9)
+      rspec
+      sneaky-save
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    sneaky-save (0.0.4)
+      activerecord (>= 3.2.0)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  andand
+  database_cleaner
+  dusen!
+  mysql2
+  rails (~> 3.2.0)
+  rspec
+  rspec-rails
+  rspec_candy
+  ruby-debug

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dusen
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 8
+  version: 0.4.8
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-26 00:00:00 +02:00
+date: 2013-09-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,6 +32,22 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: edge_rider
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 2
+        - 3
+        version: 0.2.3
+  type: :runtime
+  version_requirements: *id002
 description: Comprehensive full text search for ActiveRecord and MySQL
 email: henning.koch@makandra.de
 executables: []
@@ -69,6 +85,7 @@ files:
 - lib/dusen/util.rb
 - lib/dusen/version.rb
 - spec/rails-2.3/Gemfile
+- spec/rails-2.3/Gemfile.lock
 - spec/rails-2.3/Rakefile
 - spec/rails-2.3/app_root/config/boot.rb
 - spec/rails-2.3/app_root/config/environment.rb
@@ -82,6 +99,7 @@ files:
 - spec/rails-2.3/spec/spec_helper.rb
 - spec/rails-3.0/.rspec
 - spec/rails-3.0/Gemfile
+- spec/rails-3.0/Gemfile.lock
 - spec/rails-3.0/Rakefile
 - spec/rails-3.0/app_root/.gitignore
 - spec/rails-3.0/app_root/config/application.rb
@@ -101,6 +119,7 @@ files:
 - spec/rails-3.0/spec/spec_helper.rb
 - spec/rails-3.2/.rspec
 - spec/rails-3.2/Gemfile
+- spec/rails-3.2/Gemfile.lock
 - spec/rails-3.2/Rakefile
 - spec/rails-3.2/app_root/.gitignore
 - spec/rails-3.2/app_root/config/application.rb