groonga-client-model 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a4687e8ec94929e2474ebe8205dc7f9ced8eb07
-  data.tar.gz: 8f374d746774e4673fac9aaf3a1697587f3c0e6e
+  metadata.gz: 0f62905cc625bbbe0a0a44b163ef75a1a176ea21
+  data.tar.gz: 70ca5ad3240f79c26eb581f16fbcabba4b8a8b66
 SHA512:
-  metadata.gz: 320533d1264b86925dc04f4e9913f77d5e049608b0ba5e8ce2334212f841dc1b3abf045b50d6b465fd84c38a8f05aa7205741ec0a12b9618f9f026bc7e325017
-  data.tar.gz: b0f9aadce06abd75c79fa79b3d58aa32fb5dc4d216fb79c983dde8e76126caa8699bf1654d90923744153b7522ad6f97151fdcd7b7c5facc162a0555994f635b
+  metadata.gz: 246eb7a6cfe6c03df9dc51aabc135cb1801cac43de8a6f9185ad493cad7ea3e7a17cc0616fb1f802851124849151d96d71801ef96ab5b2c1f11ec4ba29399c4c
+  data.tar.gz: 0a22d63d2a9b0500c3b8c273828157216bdfcb69b43ada31800cf5dae7fe5ac9a5b1df818db6f319799de98f68b6d7290a76e28ee78b0f3151f70e843541273e

data/doc/text/news.md

@@ -1,5 +1,18 @@
 # NEWS
 
+## 0.9.9 - 2016-02-07
+
+### Improvements
+
+  * {GroongaClientModel::Record}: Added `_key` validation by default.
+
+  * {GroongaClientModel::Record}: Supported `load --output_errors yes
+    --command_version 3` introduced since Groonga 7.0.0.
+
+  * Required groonga-client gem 0.4.1 or later.
+
+  * Supported i18n.
+
 ## 0.9.8 - 2016-01-27
 
 ### Improvements

data/groonga-client-model.gemspec

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016-2017  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
@@ -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,rake}")
+  spec.files += Dir.glob("lib/**/*.{rb,rake,yml}")
   spec.files += Dir.glob("doc/text/*")
   spec.test_files += Dir.glob("test/**/*")
 
-  spec.add_runtime_dependency("groonga-client", ">= 0.3.7")
+  spec.add_runtime_dependency("groonga-client", ">= 0.4.1")
   spec.add_runtime_dependency("groonga-command-parser")
   spec.add_runtime_dependency("activemodel")
 

data/lib/groonga-client-model.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016-2017  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
@@ -27,9 +27,11 @@ require "groonga_client_model/error"
 require "groonga_client_model/load_value_generator"
 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"
+require "groonga_client_model/validations/type_validator"
+
+require "groonga_client_model/record"
 
 module GroongaClientModel
   extend ActiveSupport::Autoload
@@ -42,3 +44,8 @@ ActiveSupport.run_load_hooks(:groonga_client_model, GroongaClientModel)
 if defined?(Rails)
   require "groonga_client_model/railtie"
 end
+
+ActiveSupport.on_load(:i18n) do
+  I18n.load_path << "#{__dir__}/groonga_client_model/locale/en.yml"
+  I18n.load_path << "#{__dir__}/groonga_client_model/locale/ja.yml"
+end

data/lib/groonga_client_model/locale/en.yml

@@ -0,0 +1,23 @@
+en:
+  errors:
+    messages:
+      not_a_positive_integer:
+        "must be a positive integer: %{inspected_value}"
+      invalid_uint8:
+        "must be less than 2 ** 8: %{inspected_value}"
+      invalid_uint16:
+        "must be less than 2 ** 16: %{inspected_value}"
+      invalid_uint32:
+        "must be less than 2 ** 32: %{inspected_value}"
+      invalid_uint64:
+        "must be less than 2 ** 64: %{inspected_value}"
+      invalid_int8:
+        "must be between -(2 ** 7) and (2 ** 7) - 1: %{inspected_value}"
+      invalid_int16:
+        "must be between -(2 ** 15) and (2 ** 15) - 1: %{inspected_value}"
+      invalid_int32:
+        "must be between -(2 ** 31) and (2 ** 31) - 1: %{inspected_value}"
+      invalid_int64:
+        "must be between -(2 ** 63) and (2 ** 63) - 1: %{inspected_value}"
+      not_a_time:
+        "must be a time: %{inspected_value}"

data/lib/groonga_client_model/locale/ja.yml

@@ -0,0 +1,23 @@
+ja:
+  errors:
+    messages:
+      not_a_positive_integer:
+        "正の整数ではありません：%{inspected_value}"
+      invalid_uint8:
+        "2 ** 8より大きいです：%{inspected_value}"
+      invalid_uint16:
+        "2 ** 16より大きいです：%{inspected_value}"
+      invalid_uint32:
+        "2 ** 32より大きいです：%{inspected_value}"
+      invalid_uint64:
+        "2 ** 64より大きいです：%{inspected_value}"
+      invalid_int8:
+        "-(2 ** 7)以上(2 ** 7) - 1以下の範囲外です：%{inspected_value}"
+      invalid_int16:
+        "-(2 ** 15)以上(2 ** 15) - 1以下の範囲外です：%{inspected_value}"
+      invalid_int32:
+        "-(2 ** 31)以上(2 ** 31) - 1以下の範囲外：%{inspected_value}"
+      invalid_int64:
+        "-(2 ** 63)以上(2 ** 63) - 1以下の範囲外です：%{inspected_value}"
+      not_a_time:
+        "時刻を表す値ではありません：%{inspected_value}"

data/lib/groonga_client_model/record.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016-2017  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
@@ -138,7 +138,13 @@ module GroongaClientModel
 
     attr_reader :attributes
 
-    validates :_key, presence: true, if: ->(record) {record.class.have_key?}
+    validates(:_key,
+              presence: true,
+              if: ->(record) {record.class.have_key?})
+    validates(:_key,
+              "groonga_client_model/validations/type": true,
+              if: ->(record) {record.class.have_key?},
+              allow_blank: true)
 
     def initialize(attributes=nil)
       @attributes = {}
@@ -265,6 +271,7 @@ module GroongaClientModel
         response = client.load(table: table.name,
                                values: [value],
                                output_ids: "yes",
+                               output_errors: "yes",
                                command_version: "3")
         unless response.success?
           message = "Failed to save: "
@@ -272,7 +279,12 @@ module GroongaClientModel
           raise RecordNotSaved.new(message, self)
         end
         if response.n_loaded_records.zero?
-          message = "Failed to save: #{value.inspect}"
+          message = "Failed to save"
+          error = response.errors[0]
+          if error and !error.return_code.zero?
+            message << ": #{error.return_code}: #{error.message}: "
+          end
+          message << ": #{value.inspect}"
           raise RecordNotSaved.new(message, self)
         end
         if @new_record

data/lib/groonga_client_model/schema.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016-2017  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
@@ -62,18 +62,20 @@ module GroongaClientModel
 
       def columns
         raw_columns = {}
-        raw_columns["_id"] = create_pseudo_column("_id")
-        if @raw_table.key_type
-          raw_columns["_key"] = create_pseudo_column("_key")
+        raw_columns["_id"] = create_pseudo_column("_id", {"name" => "UInt32"})
+        key_type = @raw_table.key_type
+        if key_type
+          raw_columns["_key"] = create_pseudo_column("_key", key_type)
         end
         Columns.new(@raw_schema, @raw_table.columns.merge(raw_columns))
       end
 
       private
-      def create_pseudo_column(name)
+      def create_pseudo_column(name, value_type)
         raw_column = {
           "name" => name,
           "indexes" => [],
+          "value_type" => value_type,
         }
         Groonga::Client::Response::Schema::Column.new(@raw_schema, raw_column)
       end
@@ -88,7 +90,7 @@ module GroongaClientModel
       end
 
       def exist?(name)
-        @raw_columns.key?(name)
+        @raw_columns.key?(normalize_name(name))
       end
 
       def names
@@ -96,7 +98,7 @@ module GroongaClientModel
       end
 
       def [](name)
-        @raw_columns[name]
+        @raw_columns[normalize_name(name)]
       end
 
       def each
@@ -104,6 +106,11 @@ module GroongaClientModel
           yield(name, column)
         end
       end
+
+      private
+      def normalize_name(name)
+        name.to_s
+      end
     end
   end
 end

data/lib/groonga_client_model/validations/type_validator.rb

@@ -0,0 +1,143 @@
+# Copyright (C) 2017  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 Validations
+    class TypeValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        column = record.class.columns[attribute]
+        return if column.nil?
+        value_type = column["value_type"]
+        return if value_type.nil?
+
+        case value_type["name"]
+        when "UInt8"
+          validate_uint(record, attribute, value, 8)
+        when "UInt16"
+          validate_uint(record, attribute, value, 16)
+        when "UInt32"
+          validate_uint(record, attribute, value, 32)
+        when "UInt64"
+          validate_uint(record, attribute, value, 64)
+        when "Int8"
+          validate_int(record, attribute, value, 8)
+        when "Int16"
+          validate_int(record, attribute, value, 16)
+        when "Int32"
+          validate_int(record, attribute, value, 32)
+        when "Int64"
+          validate_int(record, attribute, value, 64)
+        when "Float"
+          validate_float(record, attribute, value)
+        when "Time"
+          validate_time(record, attribute, value)
+        end
+      end
+
+      private
+      def validate_uint(record, attribute, value, n_bits)
+        if value.is_a?(String)
+          begin
+            value = Integer(value)
+          rescue ArgumentError
+          end
+        end
+
+        case value
+        when Numeric
+          if value < 0
+            record.errors.add(attribute,
+                              :not_a_positive_integer,
+                              options.merge(inspected_value: value.inspect))
+            return
+          end
+          if value > ((2 ** n_bits) - 1)
+            record.errors.add(attribute,
+                              :"invalid_uint#{n_bits}",
+                              options.merge(inspected_value: value.inspect))
+            return
+          end
+        else
+          record.errors.add(attribute,
+                            :not_a_positive_integer,
+                            options.merge(inspected_value: value.inspect))
+        end
+      end
+
+      def validate_int(record, attribute, value, n_bits)
+        if value.is_a?(String)
+          begin
+            value = Integer(value)
+          rescue ArgumentError
+          end
+        end
+
+        case value
+        when Numeric
+          min = -(2 ** (n_bits - 1))
+          max = ((2 ** (n_bits - 1)) - 1)
+          if value < min or value > max
+            record.errors.add(attribute,
+                              :"invalid_int#{n_bits}",
+                              options.merge(inspected_value: value.inspect))
+            return
+          end
+        else
+          record.errors.add(attribute, :not_an_integer)
+        end
+      end
+
+      def validate_float(record, attribute, value)
+        if value.is_a?(String)
+          begin
+            value = Float(value)
+          rescue ArgumentError
+          end
+        end
+
+        case value
+        when Numeric
+        else
+          record.errors.add(attribute, :not_a_number)
+        end
+      end
+
+      def validate_time(record, attribute, value)
+        if value.is_a?(String)
+          begin
+            value = Float(value)
+          rescue ArgumentError
+            begin
+              value = Time.strptime(value, "%Y-%m-%d %H:%M:%S.%N")
+            rescue ArgumentError
+              begin
+                value = Time.strptime(value, "%Y-%m-%d %H:%M:%S")
+              rescue ArgumentError
+              end
+            end
+          end
+        end
+
+        case value
+        when Date, Time, Numeric
+        else
+          record.errors.add(attribute, :not_a_time,
+                            options.merge(inspected_value: value.inspect))
+        end
+      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.8"
+  VERSION = "0.9.9"
 end

data/test/apps/rails4/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../../../groonga-client
   specs:
-    groonga-client (0.4.0)
+    groonga-client (0.4.1)
       gqtp (>= 1.0.4)
       groonga-command (>= 1.2.8)
       groonga-command-parser (>= 1.0.7)
@@ -10,9 +10,9 @@ PATH
 PATH
   remote: ../../../
   specs:
-    groonga-client-model (0.9.5)
+    groonga-client-model (0.9.9)
       activemodel
-      groonga-client (>= 0.3.7)
+      groonga-client (>= 0.4.1)
       groonga-command-parser
 
 GEM
@@ -78,10 +78,10 @@ GEM
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     gqtp (1.0.6)
-    groonga-command (1.3.1)
+    groonga-command (1.3.2)
       json
-    groonga-command-parser (1.0.7)
-      groonga-command (>= 1.0.9)
+    groonga-command-parser (1.0.9)
+      groonga-command (>= 1.3.2)
       json-stream
     hashie (3.4.6)
     i18n (0.7.0)
@@ -92,7 +92,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.0.2)
+    json (2.0.3)
     json-stream (0.2.1)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)

data/test/apps/rails4/log/test.log

@@ -205,3 +205,59 @@ Processing by PostsController#show as HTML
   Rendering posts/show.html.erb within layouts/application
   Rendered posts/show.html.erb within layouts/application (0.9ms)
 Completed 200 OK in 36ms (Views: 3.9ms)
+--------------------------------------------
+PostsControllerTest: test_should_create_post
+--------------------------------------------
+  table_create (0.7ms)  table_create --flags "TABLE_NO_KEY" --name "posts"
+-----------------------------------------
+PostsControllerTest: test_should_get_edit
+-----------------------------------------
+  table_create (0.4ms)  table_create --flags "TABLE_NO_KEY" --name "posts"
+------------------------------------------
+PostsControllerTest: test_should_show_post
+------------------------------------------
+  table_create (0.3ms)  table_create --flags "TABLE_NO_KEY" --name "posts"
+---------------------------------------------
+PostsControllerTest: test_should_destroy_post
+---------------------------------------------
+  table_create (0.5ms)  table_create --flags "TABLE_NO_KEY" --name "posts"
+----------------------------------------
+PostsControllerTest: test_should_get_new
+----------------------------------------
+  table_create (0.5ms)  table_create --flags "TABLE_NO_KEY" --name "posts"
+------------------------------------------
+PostsControllerTest: test_should_get_index
+------------------------------------------
+  table_create (0.5ms)  table_create --flags "TABLE_NO_KEY" --name "posts"
+--------------------------------------------
+PostsControllerTest: test_should_update_post
+--------------------------------------------
+  table_create (0.4ms)  table_create --flags "TABLE_NO_KEY" --name "posts"
+------------------------------------------
+PostsControllerTest: test_should_show_post
+------------------------------------------
+  table_create (0.6ms)  table_create --flags "TABLE_NO_KEY" --name "posts"
+--------------------------------------------
+PostsControllerTest: test_should_update_post
+--------------------------------------------
+  table_create (0.3ms)  table_create --flags "TABLE_NO_KEY" --name "posts"
+--------------------------------------------
+PostsControllerTest: test_should_create_post
+--------------------------------------------
+  table_create (0.3ms)  table_create --flags "TABLE_NO_KEY" --name "posts"
+----------------------------------------
+PostsControllerTest: test_should_get_new
+----------------------------------------
+  table_create (0.3ms)  table_create --flags "TABLE_NO_KEY" --name "posts"
+---------------------------------------------
+PostsControllerTest: test_should_destroy_post
+---------------------------------------------
+  table_create (0.3ms)  table_create --flags "TABLE_NO_KEY" --name "posts"
+-----------------------------------------
+PostsControllerTest: test_should_get_edit
+-----------------------------------------
+  table_create (0.3ms)  table_create --flags "TABLE_NO_KEY" --name "posts"
+------------------------------------------
+PostsControllerTest: test_should_get_index
+------------------------------------------
+  table_create (0.5ms)  table_create --flags "TABLE_NO_KEY" --name "posts"

data/test/apps/rails5/Gemfile.lock

@@ -10,9 +10,9 @@ PATH
 PATH
   remote: ../../../
   specs:
-    groonga-client-model (0.9.8)
+    groonga-client-model (0.9.9)
       activemodel
-      groonga-client (>= 0.3.7)
+      groonga-client (>= 0.4.1)
       groonga-command-parser
 
 GEM

data/test/apps/rails5/app/models/age.rb

@@ -0,0 +1,2 @@
+class Age < ApplicationGroongaRecord
+end

data/test/apps/rails5/db/schema.grn

@@ -7,3 +7,5 @@ table_create terms TABLE_PAT_KEY ShortText \
   --default_tokenizer TokenBigram \
   --normalizer NormalizerAuto
 column_create terms posts_body COLUMN_INDEX|WITH_POSITION posts body
+
+table_create ages TABLE_HASH_KEY UInt32