groonga-client-rails 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61c2734632b846ae915755b89870df52681baed3
-  data.tar.gz: 943dda80d5cd297b3fb3256ba7d0a0d6f7a5018a
+  metadata.gz: 00dc09f576d3e1ac6f32e8ba7813e0da4f5e6174
+  data.tar.gz: cc731edd88e439fc245dee13245978280cf64d1f
 SHA512:
-  metadata.gz: 2f4ee6862d905d8fcf67da653873ec3d2998eeb9236c46b3d75db3522a118b9654ebaf9537fe918b6e1e98c238e3b8ab290ceffeca7cc2dea45b8d5dfc31ce97
-  data.tar.gz: 22a8543082e087569e262ddb96f477e59f9605dfe48bc86a7aafb81732e453bf17e079acc92f23dba5d82f9cb12952d61f424fe4c1b25df8d78ab603379780e4
+  metadata.gz: 2fe2a8ba1c4a5b2d0fb2837b0c98625bddf14f64248d28507559ea7372cbbf683e12a99e206abd5f43bb3dbf894b77011731be7f0f331e777f92b2f53b398f0a
+  data.tar.gz: dc33b785d1ccca991e5392ee39be9975908a58f238ba28e651f6d07e47787a65fd82a8cff7f231f7b6662e106862974cafb8fef6ada6a1e0f4e0f57ac65ba993

data/Gemfile

@@ -19,3 +19,9 @@
 source "https://rubygems.org/"
 
 gemspec
+
+gem "groonga-client", path: "../groonga-client"
+
+if (RUBY_VERSION.split(".").collect(&:to_i) <=> [2, 2]) < 0
+  gem "rails", "< 5"
+end

data/doc/text/news.md

@@ -1,5 +1,14 @@
 # NEWS
 
+## 0.9.5 - 2016-12-21
+
+### Improvements
+
+  * Required groonga-client 0.3.8 or later.
+
+  * Deprecated `Searcher.search.result_set`. Use
+    `Searcher.search.response` instead.
+
 ## 0.9.4 - 2016-06-09
 
 ### Improvements

data/groonga-client-rails.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.files += Dir.glob("doc/text/*")
   spec.test_files += Dir.glob("test/**/*")
 
-  spec.add_runtime_dependency("groonga-client", ">= 0.2.4")
+  spec.add_runtime_dependency("groonga-client", ">= 0.3.8")
   spec.add_runtime_dependency("rails")
 
   spec.add_development_dependency("bundler")

data/lib/groonga/client/rails/spec_helper.rb

@@ -14,23 +14,21 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "groonga/client/rails/fixture"
+require "groonga/client/spec-helper"
+require "groonga/client/rails/test_synchronizer"
 
 module Groonga
   class Client
     module Rails
       module SpecHelper
-        include Fixture
-
         extend ActiveSupport::Concern
 
         included do
-          before(:each) do
-            setup_groonga
-          end
+          inlcude Groonga::Client::SpecHelper
 
-          after(:each) do
-            teardown_groonga
+          before(:each) do
+            syncher = TestSynchronizer.new
+            syncher.sync
           end
         end
       end

data/lib/groonga/client/rails/test_helper.rb

@@ -14,23 +14,26 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "groonga/client/rails/fixture"
+require "groonga/client/test-helper"
+require "groonga/client/rails/test_synchronizer"
 
 module Groonga
   class Client
     module Rails
       module TestHelper
-        include Fixture
-
         extend ActiveSupport::Concern
 
         included do
-          setup do
-            setup_groonga
-          end
+          include Groonga::Client::TestHelper
 
-          teardown do
-            teardown_groonga
+          setup do
+            syncher = TestSynchronizer.new
+            options = {}
+            if self.class.respond_to?(:fixture_table_names)
+              fixture_table_names = self.fixture_table_names
+              options[:sync_records] = true unless fixture_table_names.empty?
+            end
+            syncher.sync(options)
           end
         end
       end

data/lib/groonga/client/rails/test_synchronizer.rb

@@ -0,0 +1,17 @@
+module Groonga
+  class Client
+    module Rails
+      class TestSynchronizer
+        def sync(options={})
+          ::Rails.application.eager_load!
+          ObjectSpace.each_object(Class) do |klass|
+            if klass < Searcher
+              klass.sync_schema
+              klass.sync_records if options[:sync_records]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/groonga/client/rails/version.rb

@@ -17,7 +17,7 @@
 module Groonga
   class Client
     module Rails
-      VERSION = "0.9.4"
+      VERSION = "0.9.5"
     end
   end
 end

data/lib/groonga/client/searcher/select_request.rb

@@ -0,0 +1,63 @@
+# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Groonga
+  class Client
+    class Searcher
+      module SelectRequest
+        # For backward compatibility
+        def result_set
+          response
+        end
+
+        private
+        def create_response
+          response = super
+          response.extend(SourcesSupport)
+          response.sources
+          response
+        end
+
+        module SourcesSupport
+          def sources
+            @sources ||= fetch_sources
+          end
+
+          private
+          def fetch_sources
+            source_ids = {}
+            records.collect do |record|
+              model_name, id = record._key.split(/-/, 2)
+              source_ids[model_name] ||= []
+              source_ids[model_name] << id
+            end
+            sources = {}
+            source_ids.each do |model_name, ids|
+              model_name.constantize.find(ids).each_with_index do |model, i|
+                sources["#{model_name}-#{ids[i]}"] = model
+              end
+            end
+            records.collect do |record|
+              source = sources[record._key]
+              record.source = source
+              source
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/groonga/client/searcher.rb

@@ -16,8 +16,7 @@
 
 require "groonga/client"
 
-require "groonga/client/searcher/error"
-require "groonga/client/searcher/select"
+require "groonga/client/searcher/select_request"
 require "groonga/client/searcher/schema"
 require "groonga/client/searcher/schema_synchronizer"
 require "groonga/client/searcher/source"
@@ -152,7 +151,8 @@ module Groonga
             full_text_searchable_column_names << name
           end
         end
-        Select::Request.new(schema.table).
+        extensions = [SelectRequest]
+        Request::Select.new(schema.table, extensions).
           match_columns(full_text_searchable_column_names)
       end
 

data/test/apps/rails4-mongoid/Gemfile

@@ -33,6 +33,7 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 gem 'mongoid', '~> 5.1.1'
 
 gem 'groonga-client-rails', path: '../../../'
+gem 'groonga-client', path: '../../../../groonga-client'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

data/test/apps/rails4-mongoid/Gemfile.lock

@@ -1,8 +1,16 @@
+PATH
+  remote: ../../../../groonga-client
+  specs:
+    groonga-client (0.3.4)
+      gqtp (>= 1.0.4)
+      groonga-command (>= 1.2.8)
+      hashie
+
 PATH
   remote: ../../../
   specs:
-    groonga-client-rails (0.9.4)
-      groonga-client (>= 0.2.4)
+    groonga-client-rails (0.9.5)
+      groonga-client (>= 0.3.4)
       rails
 
 GEM
@@ -46,40 +54,36 @@ GEM
     arel (6.0.3)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bson (4.0.4)
+    bson (4.2.0)
     builder (3.2.2)
-    byebug (8.2.2)
+    byebug (9.0.6)
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.1)
+    coffee-script-source (1.11.1)
+    concurrent-ruby (1.0.2)
     debug_inspector (0.0.2)
     erubis (2.7.0)
-    execjs (2.6.0)
-    factory_girl (4.5.0)
+    execjs (2.7.0)
+    factory_girl (4.7.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.6.0)
-      factory_girl (~> 4.5.0)
+    factory_girl_rails (4.7.0)
+      factory_girl (~> 4.7.0)
       railties (>= 3.0.0)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     gqtp (1.0.6)
-    groonga-client (0.2.5)
-      gqtp (>= 1.0.4)
-      groonga-command (>= 1.2.0)
-      hashie
-    groonga-command (1.2.0)
+    groonga-command (1.3.1)
       json
-    hashie (3.4.4)
+    hashie (3.4.6)
     i18n (0.7.0)
-    jbuilder (2.4.1)
+    jbuilder (2.6.1)
       activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
-    jquery-rails (4.1.1)
+    jquery-rails (4.2.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -88,23 +92,23 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    mime-types (3.0)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    mongo (2.2.4)
-      bson (~> 4.0)
-    mongoid (5.1.1)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    mongo (2.4.0)
+      bson (~> 4.2.0)
+    mongoid (5.1.6)
       activemodel (~> 4.0)
       mongo (~> 2.1)
       origin (~> 2.2)
       tzinfo (>= 0.3.37)
-    multi_json (1.11.2)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    origin (2.2.0)
-    rack (1.6.4)
+    multi_json (1.12.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    origin (2.2.2)
+    rack (1.6.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.6)
@@ -131,35 +135,36 @@ GEM
       activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.1.1)
-    rdoc (4.2.2)
-      json (~> 1.4)
-    sass (3.4.21)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+    rake (12.0.0)
+    rdoc (4.3.0)
+    sass (3.4.22)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sdoc (0.4.1)
+    sdoc (0.4.2)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    spring (1.6.4)
-    sprockets (3.5.2)
+    spring (2.0.0)
+      activesupport (>= 4.2)
+    sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
-    tilt (2.0.2)
-    turbolinks (2.5.3)
-      coffee-rails
+    tilt (2.0.5)
+    turbolinks (5.0.1)
+      turbolinks-source (~> 5)
+    turbolinks-source (5.0.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.0)
+    uglifier (3.0.4)
       execjs (>= 0.3.0, < 3)
     web-console (2.3.0)
       activemodel (>= 4.0)
@@ -174,6 +179,7 @@ DEPENDENCIES
   byebug
   coffee-rails (~> 4.1.0)
   factory_girl_rails
+  groonga-client!
   groonga-client-rails!
   jbuilder (~> 2.0)
   jquery-rails
@@ -187,4 +193,4 @@ DEPENDENCIES
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.12.5
+   1.13.6