groonga-client-model 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f2f4297ac8ce17ad858b8f7e99e09489b5df778
-  data.tar.gz: 4ba6bdb1d06bb0477d3f5e1eb8e8b085bc51701e
+  metadata.gz: 3b2cf03fdcfdb869cb2172151102aa4c482b7130
+  data.tar.gz: e20f37fa67e8f1678746339d55e397f1583d5c25
 SHA512:
-  metadata.gz: 43c81276d83bbe681a2f28075f73d58e8a932ce02cda38671cbbcda15737d0778a23a2ac90826959546facdb4d247e8855797c2fec7de483f64691ba48f67257
-  data.tar.gz: 054e74ec89cdaa75b9c26fe30f45446d1af97b1b3f2c2cbaf85dd4d827f7800510e638158fbd37196c489dd1059998f219b64b2b43c522061d154f88c7dc700a
+  metadata.gz: 1148b877bf6b88f09c662481fa3ffddc2ddb477c6a08c3c15c857cfb67106beca571ed14775d13a71f8e76eef6e5f89e5dc51efb4bd9d5817f2cb5683e4f1f24
+  data.tar.gz: baca7b76ce089e899d9096babcba35e6d0fea0bf827bb8289e7a59b402c078d72e8f04804ea489a1351481a8ce6f48f1b7fa95768caf4f383df9e5e071ecda85

data/Gemfile

@@ -20,4 +20,6 @@ source "https://rubygems.org/"
 
 gemspec
 
-gem "groonga-client", path: "../groonga-client"
+if File.exist?("../groonga-client")
+  gem "groonga-client", path: "../groonga-client"
+end

data/doc/text/news.md

@@ -1,5 +1,15 @@
 # NEWS
 
+## 0.9.2 - 2016-12-20
+
+### Improvements
+
+  * Supported loading `db/schema.grn` on test.
+
+### Fixes
+
+  * Added missing `*.rake` files.
+
 ## 0.9.1 - 2016-12-19
 
 ### Fixes

data/groonga-client-model.gemspec

@@ -39,11 +39,11 @@ Gem::Specification.new do |spec|
   spec.license = "LGPL-2.1+"
   spec.files = ["README.md", "Rakefile", "Gemfile", "#{spec.name}.gemspec"]
   spec.files += [".yardopts"]
-  spec.files += Dir.glob("lib/**/*.rb")
+  spec.files += Dir.glob("lib/**/*.{rb,rake}")
   spec.files += Dir.glob("doc/text/*")
   spec.test_files += Dir.glob("test/**/*")
 
-  spec.add_runtime_dependency("groonga-client", ">= 0.3.5")
+  spec.add_runtime_dependency("groonga-client", ">= 0.3.6")
   spec.add_runtime_dependency("groonga-command-parser")
   spec.add_runtime_dependency("activemodel")
 

data/lib/groonga-client-model.rb

@@ -28,6 +28,7 @@ require "groonga_client_model/modelizable"
 require "groonga_client_model/modelize"
 require "groonga_client_model/record"
 require "groonga_client_model/schema"
+require "groonga_client_model/schema_loader"
 
 module GroongaClientModel
   mattr_accessor :logger, instance_writer: false

data/lib/groonga_client_model/railties/groonga.rake

@@ -0,0 +1,35 @@
+# -*- ruby -*-
+#
+# 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
+
+namespace :groonga do
+  namespace :config do
+    desc "Load config/groonga.rb"
+    task load: [:environment] do
+      config = Rails.application.config_for(:groonga)
+      GroongaClientModel::Client.url = config["url"]
+    end
+  end
+
+  namespace :schema do
+    desc "Loads config/schema.grn info Groonga"
+    task load: ["config:load"] do
+      schema_loader = GroongaClientModel::SchemaLoader.new(Rails.root)
+      schema_loader.load
+    end
+  end
+end

data/lib/groonga_client_model/schema_loader.rb

@@ -0,0 +1,43 @@
+# 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
+
+require "groonga/command/parser"
+
+module GroongaClientModel
+  class SchemaLoader
+    def initialize(base_dir)
+      @base_dir = base_dir
+    end
+
+    def load
+      schema_path = @base_dir + "db" + "schema.grn"
+      return unless schema_path.exist?
+
+      Client.open do |client|
+        parser = Groonga::Command::Parser.new
+        parser.on_command do |command|
+          client.execute(command)
+        end
+        schema_path.open do |schema_file|
+          schema_file.each_line do |line|
+            parser << line
+          end
+        end
+        parser.finish
+      end
+    end
+  end
+end

data/lib/groonga_client_model/spec_helper.rb

@@ -15,6 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/client/spec-helper"
+require "groonga_client_model/test/fixture"
 
 module GroongaClientModel
   module SpecHelper
@@ -22,6 +23,11 @@ module GroongaClientModel
 
     included do
       include Groonga::Client::SpecHelper
+      include Test::Fixture
+
+      before(:each) do
+        setup_groonga_schema
+      end
     end
   end
 end

data/lib/groonga_client_model/test/fixture.rb

@@ -0,0 +1,33 @@
+# 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 GroongaClientModel
+  module Test
+    module Fixture
+      def setup_groonga_schema
+        return if @groonga_server_runner.using_running_server?
+
+        if defined?(Rails)
+          base_dir = Rails.root
+        else
+          base_dir = Pathname.pwd
+        end
+        schema_loader = SchemaLoader.new(base_dir)
+        schema_loader.load
+      end
+    end
+  end
+end

data/lib/groonga_client_model/test_helper.rb

@@ -15,6 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/client/test-helper"
+require "groonga_client_model/test/fixture"
 
 module GroongaClientModel
   module TestHelper
@@ -22,6 +23,11 @@ module GroongaClientModel
 
     included do
       include Groonga::Client::TestHelper
+      include Test::Fixture
+
+      setup do
+        setup_groonga_schema
+      end
     end
   end
 end

data/lib/groonga_client_model/version.rb

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module GroongaClientModel
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/test/apps/rails5/Gemfile.lock

@@ -1,17 +1,18 @@
 PATH
   remote: ../../../../groonga-client
   specs:
-    groonga-client (0.3.5)
+    groonga-client (0.3.7)
       gqtp (>= 1.0.4)
       groonga-command (>= 1.2.8)
+      groonga-command-parser (>= 1.0.7)
       hashie
 
 PATH
   remote: ../../../
   specs:
-    groonga-client-model (0.9.0)
+    groonga-client-model (0.9.2)
       activemodel
-      groonga-client (>= 0.3.4)
+      groonga-client (>= 0.3.6)
       groonga-command-parser
 
 GEM
@@ -63,28 +64,25 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.11.1)
-    concurrent-ruby (1.0.2)
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.3)
     debug_inspector (0.0.2)
     erubis (2.7.0)
     execjs (2.7.0)
-    factory_girl (4.5.0)
+    factory_girl (4.8.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.6.0)
-      factory_girl (~> 4.5.0)
+    factory_girl_rails (4.8.0)
+      factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
     ffi (1.9.14)
-    ffi-yajl (2.2.3)
-      libyajl2 (~> 1.2)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     gqtp (1.0.6)
     groonga-command (1.3.1)
       json
-    groonga-command-parser (1.0.5)
-      ffi
-      ffi-yajl
+    groonga-command-parser (1.0.7)
       groonga-command (>= 1.0.9)
+      json-stream
     hashie (3.4.6)
     i18n (0.7.0)
     jbuilder (2.6.1)
@@ -95,7 +93,7 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.0.2)
-    libyajl2 (1.2.0)
+    json-stream (0.2.1)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -108,7 +106,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.10.0)
+    minitest (5.10.1)
     multi_json (1.12.1)
     nio4r (1.2.1)
     nokogiri (1.6.8.1)
@@ -140,11 +138,11 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.3.0)
+    rake (12.0.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    sass (3.4.22)
+    sass (3.4.23)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
@@ -156,7 +154,7 @@ GEM
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.0)