groonga-client-model 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b2cf03fdcfdb869cb2172151102aa4c482b7130
-  data.tar.gz: e20f37fa67e8f1678746339d55e397f1583d5c25
+  metadata.gz: 10ccadcbf3eaddb6061a466dc9ba7b87cdc4d2d5
+  data.tar.gz: 1075d6f24a9ff0d5e86f108aace16fd72ebf60b8
 SHA512:
-  metadata.gz: 1148b877bf6b88f09c662481fa3ffddc2ddb477c6a08c3c15c857cfb67106beca571ed14775d13a71f8e76eef6e5f89e5dc51efb4bd9d5817f2cb5683e4f1f24
-  data.tar.gz: baca7b76ce089e899d9096babcba35e6d0fea0bf827bb8289e7a59b402c078d72e8f04804ea489a1351481a8ce6f48f1b7fa95768caf4f383df9e5e071ecda85
+  metadata.gz: 3f5e4724ecb1596f0bc346eac94655629fa8c7a81dbc2c69d1c685eac944774f56dfd0d407d4c11aec84ebce5dc161e2a5f3065df4957ba8e2b0bc48e76dfaaa
+  data.tar.gz: a01f038e60358a501df26ac9561bc327d532fe9cfad9a3b75828b0c950d7de8c047184a60f0d3c01ea97ff53c1f5dbd3d3b2b267ac8a885ab9b92c463e49a8ef

data/Gemfile

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

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # NEWS
 
+## 0.9.3 - 2016-12-20
+
+### Improvements
+
+  * Supported using `config/groonga.yml` for test fixture.
+
 ## 0.9.2 - 2016-12-20
 
 ### Improvements

data/groonga-client-model.gemspec

@@ -43,7 +43,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.3.6")
+  spec.add_runtime_dependency("groonga-client", ">= 0.3.7")
   spec.add_runtime_dependency("groonga-command-parser")
   spec.add_runtime_dependency("activemodel")
 

data/lib/groonga_client_model/client.rb

@@ -24,6 +24,7 @@ module GroongaClientModel
       end
     end
 
+    attr_reader :url
     def initialize(url=nil)
       @url = url || self.class.url || "http://127.0.0.1:10041"
     end

data/lib/groonga_client_model/spec_helper.rb

@@ -14,7 +14,6 @@
 # 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/spec-helper"
 require "groonga_client_model/test/fixture"
 
 module GroongaClientModel
@@ -22,11 +21,14 @@ module GroongaClientModel
     extend ActiveSupport::Concern
 
     included do
-      include Groonga::Client::SpecHelper
       include Test::Fixture
 
       before(:each) do
-        setup_groonga_schema
+        setup_groonga
+      end
+
+      after(:each) do
+        teardown_groonga
       end
     end
   end

data/lib/groonga_client_model/test/fixture.rb

@@ -14,19 +14,19 @@
 # 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_model/test/groonga_server_runner"
+
 module GroongaClientModel
   module Test
     module Fixture
-      def setup_groonga_schema
-        return if @groonga_server_runner.using_running_server?
+      def setup_groonga
+        @groonga_server_runner = GroongaServerRunner.new
+        @groonga_server_runner.run
+      end
 
-        if defined?(Rails)
-          base_dir = Rails.root
-        else
-          base_dir = Pathname.pwd
-        end
-        schema_loader = SchemaLoader.new(base_dir)
-        schema_loader.load
+      def teardown_groonga
+        return if @groonga_server_runner.nil?
+        @groonga_server_runner.stop
       end
     end
   end

data/lib/groonga_client_model/test/groonga_server_runner.rb

@@ -0,0 +1,53 @@
+# 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 "pathname"
+require "uri"
+
+require "groonga/client/test/groonga-server-runner"
+
+module GroongaClientModel
+  module Test
+    class GroongaServerRunner < Groonga::Client::Test::GroongaServerRunner
+      def initialize
+        super
+        @client = Client.new
+      end
+
+      def run
+        super
+        return if 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
+
+      def url
+        @url ||= URI(@client.url)
+      end
+
+      private
+      def open_client(&block)
+        @client.open(&block)
+      end
+    end
+  end
+end

data/lib/groonga_client_model/test_helper.rb

@@ -14,19 +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/test-helper"
 require "groonga_client_model/test/fixture"
 
 module GroongaClientModel
   module TestHelper
+    include Test::Fixture
+
     extend ActiveSupport::Concern
 
     included do
-      include Groonga::Client::TestHelper
-      include Test::Fixture
-
       setup do
-        setup_groonga_schema
+        setup_groonga
+      end
+
+      teardown do
+        teardown_groonga
       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.2"
+  VERSION = "0.9.3"
 end

data/test/apps/rails5/Gemfile.lock

@@ -10,7 +10,7 @@ PATH
 PATH
   remote: ../../../
   specs:
-    groonga-client-model (0.9.2)
+    groonga-client-model (0.9.3)
       activemodel
       groonga-client (>= 0.3.6)
       groonga-command-parser

data/test/apps/rails5/log/test.log

@@ -1577,3 +1577,168 @@ Processing by PostsController#edit as HTML
   Rendered posts/_form.html.erb (2.1ms)
   Rendered posts/edit.html.erb within layouts/application (3.3ms)
 Completed 200 OK in 71ms (Views: 5.8ms)
+------------------------------------------
+PostsControllerTest: test_should_get_index
+------------------------------------------
+----------------------------------------
+PostsControllerTest: test_should_get_new
+----------------------------------------
+-----------------------------------------
+PostsControllerTest: test_should_get_edit
+-----------------------------------------
+--------------------------------------------
+PostsControllerTest: test_should_update_post
+--------------------------------------------
+--------------------------------------------
+PostsControllerTest: test_should_create_post
+--------------------------------------------
+------------------------------------------
+PostsControllerTest: test_should_show_post
+------------------------------------------
+---------------------------------------------
+PostsControllerTest: test_should_destroy_post
+---------------------------------------------
+--------------------------------------------
+PostsControllerTest: test_should_create_post
+--------------------------------------------
+------------------------------------------
+PostsControllerTest: test_should_show_post
+------------------------------------------
+---------------------------------------------
+PostsControllerTest: test_should_destroy_post
+---------------------------------------------
+----------------------------------------
+PostsControllerTest: test_should_get_new
+----------------------------------------
+--------------------------------------------
+PostsControllerTest: test_should_update_post
+--------------------------------------------
+-----------------------------------------
+PostsControllerTest: test_should_get_edit
+-----------------------------------------
+------------------------------------------
+PostsControllerTest: test_should_get_index
+------------------------------------------
+------------------------------------------
+PostsControllerTest: test_should_show_post
+------------------------------------------
+--------------------------------------------
+PostsControllerTest: test_should_create_post
+--------------------------------------------
+------------------------------------------
+PostsControllerTest: test_should_get_index
+------------------------------------------
+----------------------------------------
+PostsControllerTest: test_should_get_new
+----------------------------------------
+---------------------------------------------
+PostsControllerTest: test_should_destroy_post
+---------------------------------------------
+--------------------------------------------
+PostsControllerTest: test_should_update_post
+--------------------------------------------
+-----------------------------------------
+PostsControllerTest: test_should_get_edit
+-----------------------------------------
+-----------------------------------------
+PostsControllerTest: test_should_get_edit
+-----------------------------------------
+------------------------------------------
+PostsControllerTest: test_should_get_index
+------------------------------------------
+--------------------------------------------
+PostsControllerTest: test_should_create_post
+--------------------------------------------
+------------------------------------------
+PostsControllerTest: test_should_show_post
+------------------------------------------
+---------------------------------------------
+PostsControllerTest: test_should_destroy_post
+---------------------------------------------
+--------------------------------------------
+PostsControllerTest: test_should_update_post
+--------------------------------------------
+----------------------------------------
+PostsControllerTest: test_should_get_new
+----------------------------------------
+---------------------------------------------
+PostsControllerTest: test_should_destroy_post
+---------------------------------------------
+-----------------------------------------
+PostsControllerTest: test_should_get_edit
+-----------------------------------------
+--------------------------------------------
+PostsControllerTest: test_should_create_post
+--------------------------------------------
+------------------------------------------
+PostsControllerTest: test_should_get_index
+------------------------------------------
+----------------------------------------
+PostsControllerTest: test_should_get_new
+----------------------------------------
+------------------------------------------
+PostsControllerTest: test_should_show_post
+------------------------------------------
+--------------------------------------------
+PostsControllerTest: test_should_update_post
+--------------------------------------------
+--------------------------------------------
+PostsControllerTest: test_should_create_post
+--------------------------------------------
+Started POST "/posts" for 127.0.0.1 at 2016-12-20 17:28:34 +0900
+Processing by PostsController#create as HTML
+  Parameters: {"post"=>{"body"=>"World", "title"=>"Hello"}}
+Redirected to http://www.example.com/posts/2
+Completed 302 Found in 10ms
+------------------------------------------
+PostsControllerTest: test_should_get_index
+------------------------------------------
+Started GET "/posts" for 127.0.0.1 at 2016-12-20 17:28:34 +0900
+Processing by PostsController#index as HTML
+  Rendering posts/index.html.erb within layouts/application
+  Rendered posts/index.html.erb within layouts/application (7.5ms)
+Completed 200 OK in 167ms (Views: 164.9ms)
+-----------------------------------------
+PostsControllerTest: test_should_get_edit
+-----------------------------------------
+Started GET "/posts/1/edit" for 127.0.0.1 at 2016-12-20 17:28:35 +0900
+Processing by PostsController#edit as HTML
+  Parameters: {"id"=>"1"}
+  Rendering posts/edit.html.erb within layouts/application
+  Rendered posts/_form.html.erb (8.1ms)
+  Rendered posts/edit.html.erb within layouts/application (8.8ms)
+Completed 200 OK in 44ms (Views: 10.3ms)
+----------------------------------------
+PostsControllerTest: test_should_get_new
+----------------------------------------
+Started GET "/posts/new" for 127.0.0.1 at 2016-12-20 17:28:35 +0900
+Processing by PostsController#new as HTML
+  Rendering posts/new.html.erb within layouts/application
+  Rendered posts/_form.html.erb (4.2ms)
+  Rendered posts/new.html.erb within layouts/application (6.3ms)
+Completed 200 OK in 13ms (Views: 11.7ms)
+------------------------------------------
+PostsControllerTest: test_should_show_post
+------------------------------------------
+Started GET "/posts/1" for 127.0.0.1 at 2016-12-20 17:28:35 +0900
+Processing by PostsController#show as HTML
+  Parameters: {"id"=>"1"}
+  Rendering posts/show.html.erb within layouts/application
+  Rendered posts/show.html.erb within layouts/application (0.5ms)
+Completed 200 OK in 59ms (Views: 2.1ms)
+---------------------------------------------
+PostsControllerTest: test_should_destroy_post
+---------------------------------------------
+Started DELETE "/posts/1" for 127.0.0.1 at 2016-12-20 17:28:35 +0900
+Processing by PostsController#destroy as HTML
+  Parameters: {"id"=>"1"}
+Redirected to http://www.example.com/posts
+Completed 302 Found in 58ms
+--------------------------------------------
+PostsControllerTest: test_should_update_post
+--------------------------------------------
+Started PATCH "/posts/1" for 127.0.0.1 at 2016-12-20 17:28:35 +0900
+Processing by PostsController#update as HTML
+  Parameters: {"post"=>{"body"=>"World", "title"=>"Hello"}, "id"=>"1"}
+Redirected to http://www.example.com/posts/1
+Completed 302 Found in 59ms

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client-model
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,7 @@ files:
 - lib/groonga_client_model/schema_loader.rb
 - lib/groonga_client_model/spec_helper.rb
 - lib/groonga_client_model/test/fixture.rb
+- lib/groonga_client_model/test/groonga_server_runner.rb
 - lib/groonga_client_model/test_helper.rb
 - lib/groonga_client_model/version.rb
 - test/apps/rails5/Gemfile