grn_mini 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3573d54bbab536ecc6429349a5326bce7f07e6b
-  data.tar.gz: e8d6c8f86a4b732aea1d84f6aee06ab8521fda97
+  metadata.gz: ae45c1488c3a7184b8fd2c10bba81c2eed07d494
+  data.tar.gz: de61b4abb5bc91414e59fa604172c6c77d12a4fb
 SHA512:
-  metadata.gz: a7471f3cf1a8e784d1aad28d94d84f174aa19fb31a570d4a9b6e2dfd339a15e33341e39c43e0b14134db64deafb05fdc2cca51feded94a679df8179f01bc60bc
-  data.tar.gz: b0ecedae697ebc81e318c815488188db3744b87bac42fc91970b46b41c7158bf3cac1194784d058f8d8b3794eb1d9cf3bbd86d742535c33eaeaee3fea3eb26f7
+  metadata.gz: ce4e8c4e078767403beb126bd8db0b9e1fe423088cb2e16297798cee3089af4d06a1e145cfb7bdbd98567e45bd65f3b6c0d3497345195d0a7e58235fda137c89
+  data.tar.gz: 1b79f00b43b762205ab8b6415b637886d7a305b7dbb62acdea87cefee24ff20b3829bb8511e6cf858d37dd6e1e9e05319f3238d4396a5758ee593655fdc99f91

data/HISTORY.md

@@ -1,5 +1,10 @@
 # HISTORY - grn_mini
 
+## 0.5 - 2014/02/11
+
+- Use Groonga::Schema
+  - Can use setup_columns when table column defined already.
+
 ## 0.4 - 2014/02/01
 
 - GrnMini

data/README.md

@@ -16,6 +16,8 @@ Groonga(Rroonga) wrapper for using easily.
 
     $ gem install grn_mini
 
+When you faild to install Rroonga, Please refer -> [File: install — rroonga - Ranguba](http://ranguba.org/rroonga/en/file.install.html)
+
 ## Basic Usage
 
 ### Create a database with the name "test.db".
@@ -480,8 +482,13 @@ GrnMini::tmpdb do
   users = GrnMini::Hash.new("Users")
   articles = GrnMini::Hash.new("Articles")
 
-  users.setup_columns(name: "", favorites: [articles])
-  articles.setup_columns(author: users, text: "")
+  users.setup_columns(name: "",
+                      favorites: [articles]
+                      )
+
+  articles.setup_columns(author: users,
+                         text: ""
+                         )
 
   users["aaa"] = {name: "Mr.A"}
   users["bbb"] = {name: "Mr.B"}

data/lib/grn_mini/array.rb

@@ -6,11 +6,12 @@ module GrnMini
   class Array < Table
     def initialize(name = "Array")
       super(name,
-            Groonga[name] || Groonga::Array.create(name: name, persistent: true))
+            Groonga[name] || Groonga::Array.create(name: name, persistent: true),
+            )
     end
 
     def add(hash)
-      setup_columns(hash) unless @setup_columns_once
+      setup_columns(hash) if need_setup_columns?
       @grn.add(hash)
     end
 

data/lib/grn_mini/hash.rb

@@ -4,11 +4,12 @@ module GrnMini
   class Hash < Table
     def initialize(name = "Hash")
       super(name,
-            Groonga[name] || Groonga::Hash.create(name: name, persistent: true))
+            Groonga[name] || Groonga::Hash.create(name: name, persistent: true),
+            )
     end
 
     def add(key, values)
-      setup_columns(values) unless @setup_columns_once
+      setup_columns(values) if need_setup_columns?
       @grn.add(key, values)
     end
 

data/lib/grn_mini/table.rb

@@ -15,25 +15,50 @@ module GrnMini
       @setup_columns_once = false
     end
 
+    def need_setup_columns?
+      !@setup_columns_once && empty?
+    end
+
     def setup_columns(hash)
-      hash.each do |key, value|
-        column = key.to_s
+      Groonga::Schema.define do |schema|
+        schema.change_table(@name) do |table|
+          hash.each do |key, value|
+            column = key.to_s
+
+            if value.is_a?(::Array)
+              table.column(column, value_type(value), type: :vector)
+            else
+              table.column(column, value_type(value))
+            end
+          end
+        end
+
+        schema.change_table("Terms") do |table|
+          hash.each do |key, value|
+            column = key.to_s
 
-        if value.is_a?(String)
-          @grn.define_column(column, value_type(value))
-          @terms.define_index_column("#{@name}_#{column}", @grn, source: "#{@name}.#{column}", with_position: true)
-        elsif value.is_a?(::Array)
-          @grn.define_column(column, value_type(value), type: :vector)
+            if value.is_a?(String)
+              table.index("#{@name}.#{column}", with_position: true)
+            end
+          end
+        end
 
-          elem = value.first
+        hash.each do |key, value|
+          column = key.to_s
           
-          if elem.is_a?(GrnMini::Table)
-            elem.grn.define_index_column("index_#{column}", @grn, source: "#{@grn.name}.#{column}")
-          elsif elem.is_a?(Groonga::Table)
-            elem.define_index_column("index_#{column}", @grn, source: "#{@grn.name}.#{column}")
+          if value.is_a?(::Array)
+            elem = value.first
+            
+            if elem.is_a?(GrnMini::Table)
+              schema.change_table(elem.grn.name) do |table|
+                table.index("#{@grn.name}.#{column}")
+              end
+            elsif elem.is_a?(Groonga::Table)
+              schema.change_table(elem.name) do |table|
+                table.index("#{@grn.name}.#{column}")
+              end
+            end
           end
-        else
-          @grn.define_column(column, value_type(value))
         end
       end
 

data/lib/grn_mini/version.rb

@@ -1,3 +1,3 @@
 module GrnMini
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/test/{test_grn_mini_array.rb → test_array.rb}

@@ -1,6 +1,6 @@
 require 'minitest_helper'
 
-class TestGrnMiniArray < MiniTest::Unit::TestCase
+class TestArray < MiniTest::Test
   def test_initialize
     GrnMini::tmpdb do
       array = GrnMini::Array.new

data/test/test_grn_mini.rb

@@ -1,6 +1,6 @@
 require 'minitest_helper'
 
-class TestGrnMini < MiniTest::Unit::TestCase
+class TestGrnMini < MiniTest::Test
   def test_that_it_has_a_version_number
     refute_nil ::GrnMini::VERSION
   end

data/test/{test_grn_mini_hash.rb → test_hash.rb}

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'minitest_helper'
 
-class TestGrnMiniHash < MiniTest::Unit::TestCase
+class TestHash < MiniTest::Test
   def test_initialize
     GrnMini::tmpdb do
       hash = GrnMini::Hash.new

data/test/test_micro_blog.rb

@@ -1,6 +1,6 @@
 require 'minitest_helper'
 
-class TestMicroBlog < MiniTest::Unit::TestCase
+class TestMicroBlog < MiniTest::Test
   def test_micro_blog
     GrnMini::tmpdb do
       engine = MicroBlog.new

data/test/test_setup_columns.rb

@@ -0,0 +1,129 @@
+require 'minitest_helper'
+
+class TestSetupColumns < MiniTest::Test
+  def test_repeat_setup_columns
+    GrnMini::tmpdb do
+      hash = GrnMini::Hash.new
+
+      hash.setup_columns(name: "")
+      hash.setup_columns(name: "")
+
+      hash["a"] = {name: "aaa"}
+      hash["b"] = {name: "bbb"}
+      hash["c"] = {name: "aaa bbb ccc"}
+
+      assert_equal 1, hash.select("name:@ccc").size
+    end
+  end
+
+  def test_array
+    GrnMini::tmpdb do
+      array = GrnMini::Array.new
+
+      array << {text:"aaa"}
+      array << {text:"bbb"}
+      array << {text:"ccc"}
+
+      results = array.select("text:@bb")
+
+      assert_equal 1, results.size
+      assert_equal "bbb", results.first.text
+    end
+  end
+
+  def test_number
+    GrnMini::tmpdb do
+      array = GrnMini::Array.new
+
+      array << {text:"aaa", number: 1, float: 1.5, time: Time.at(1) }
+      array << {text:"bbb", number: 2}
+      array << {text:"ccc", number: 3}
+
+      results = array.select("text:@bb")
+
+      assert_equal 1, results.size
+      assert_equal "bbb", results.first.text
+    end
+  end
+  
+  def test_table
+    GrnMini::tmpdb do
+      array = GrnMini::Array.new
+      array2 = GrnMini::Array.new("A2")
+
+      array.setup_columns(n: 0)
+      array2.setup_columns(parent: array)
+
+      array << {n: 1}
+      array << {n: 2}
+      array << {n: 3}
+      array << {n: 4}
+
+      array2 << {parent:  array[1]}
+      array2 << {parent:  array[2]}
+      array2 << {parent:  array[3]}
+
+    end
+  end
+
+  def test_vector
+    GrnMini::tmpdb do
+      array = GrnMini::Array.new
+      array.setup_columns(vec: [""])
+    end
+  end
+
+  def column_array(table)
+    table.columns.map{ |c| c.local_name }
+  end
+
+  def test_columns
+    GrnMini::tmpdb do
+      array = GrnMini::Array.new
+      array.setup_columns(str: "")
+
+      assert_equal ["str"], column_array(Groonga["Array"])
+      assert_equal ["Array_str"], column_array(Groonga["Terms"])
+
+      array2 = GrnMini::Array.new("Array2")
+      array2.setup_columns(str: "", number: 1, float: 0.1, time: Time.at(0))
+
+      assert_equal ["float", "number", "str", "time"], column_array(Groonga["Array2"])
+      assert_equal ["Array2_str", "Array_str"], column_array(Groonga["Terms"])
+
+      # Change array schema
+      array.setup_columns(str: "", str2: "", number: 1)
+      assert_equal ["number", "str", "str2"], column_array(Groonga["Array"])
+      assert_equal ["Array2_str", "Array_str", "Array_str2"], column_array(Groonga["Terms"])
+    end
+  end
+
+  def test_multi_table_columns
+    GrnMini::tmpdb do
+      users = GrnMini::Hash.new("Users")
+      articles = GrnMini::Hash.new("Articles")
+
+      users.setup_columns(name: "", favorites: [articles])
+      articles.setup_columns(author: users, text: "")
+
+      users["aaa"] = {name: "Mr.A"}
+      users["bbb"] = {name: "Mr.B"}
+      users["ccc"] = {name: "Mr.C"}
+
+      articles["aaa:1"] = {author: "aaa", text: "111"}
+      articles["aaa:2"] = {author: "aaa", text: "222"}
+      articles["aaa:3"] = {author: "aaa", text: "333"}
+      articles["bbb:1"] = {author: "bbb", text: "111"}
+      articles["bbb:2"] = {author: "bbb", text: "222"}
+      articles["ccc:1"] = {author: "ccc", text: "111"}
+
+      users["aaa"].favorites = ["aaa:1", "bbb:2"]
+      users["bbb"].favorites = ["aaa:2"]
+      users["ccc"].favorites = ["aaa:1", "bbb:1", "ccc:1"]
+
+      assert_equal ["favorites", "name"], column_array(Groonga["Users"])
+      assert_equal ["Users_favorites", "author", "text"], column_array(Groonga["Articles"])
+      assert_equal ["Articles_text", "Users_name"], column_array(Groonga["Terms"])
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grn_mini
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - ongaeshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,10 +91,11 @@ files:
 - lib/grn_mini/util.rb
 - lib/grn_mini/version.rb
 - test/minitest_helper.rb
+- test/test_array.rb
 - test/test_grn_mini.rb
-- test/test_grn_mini_array.rb
-- test/test_grn_mini_hash.rb
+- test/test_hash.rb
 - test/test_micro_blog.rb
+- test/test_setup_columns.rb
 homepage: ''
 licenses:
 - MIT
@@ -121,7 +122,9 @@ specification_version: 4
 summary: Groonga(Rroonga) wrapper for use as the KVS.
 test_files:
 - test/minitest_helper.rb
+- test/test_array.rb
 - test/test_grn_mini.rb
-- test/test_grn_mini_array.rb
-- test/test_grn_mini_hash.rb
+- test/test_hash.rb
 - test/test_micro_blog.rb
+- test/test_setup_columns.rb
+has_rdoc: