td-client 0.8.8 → 0.8.9

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2012-02-12 version 0.8.9
+
+* Added API#normalize_table_name and API#normalize_database_name
+
+
 == 2012-02-02 version 0.8.8
 
 * Fixed SSL support

data/lib/td/client/api.rb

@@ -91,6 +91,26 @@ class API
     end
   end
 
+  def self.normalize_database_name(name)
+    name = name.to_s
+    if name.empty?
+      raise "Empty name is not allowed"
+    end
+    if name.length < 3
+      name += "_"*(3-name.length)
+    end
+    if 32 < name.length
+      name = name[0,30]+"__"
+    end
+    name = name.downcase
+    name = name.gsub(/[^a-z0-9_]/, '_')
+    name
+  end
+
+  def self.normalize_table_name(name)
+    normalize_database_name(name)
+  end
+
   # TODO support array types
   def self.normalize_type_name(name)
     case name

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.8'
+VERSION = '0.8.9'
 
 end

data/spec/api_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe API do
+  VALID_NAMES = [
+    'abc',
+    'abc_cd',
+    '_abc_cd',
+    '_abc_',
+    'ab0_',
+    'ab0',
+  ]
+
+  INVALID_NAMES = {
+    'a' => 'a__',
+    'a'*33 => 'a'*30+'__',
+    'abcD' => 'abcd',
+    'a-b*' => 'a_b_',
+  }
+
+  it 'normalize_database_name should return normalized data' do
+    INVALID_NAMES.each_pair {|ng,ok|
+      API.normalize_database_name(ng).should == ok
+    }
+    lambda {
+      API.normalize_database_name('')
+    }.should raise_error(RuntimeError)
+  end
+
+  it 'normalize_table_name should return normalized data' do
+    INVALID_NAMES.each_pair {|ng,ok|
+      API.normalize_table_name(ng).should == ok
+    }
+    lambda {
+      API.normalize_table_name('')
+    }.should raise_error(RuntimeError)
+  end
+
+  it 'validate_database_name should raise errors' do
+    INVALID_NAMES.each_pair {|ng,ok|
+      lambda {
+        API.validate_database_name(ng)
+      }.should raise_error(RuntimeError)
+    }
+    lambda {
+      API.validate_database_name('')
+    }.should raise_error(RuntimeError)
+  end
+
+  it 'validate_table_name should raise errors' do
+    INVALID_NAMES.each_pair {|ng,ok|
+      lambda {
+        API.validate_table_name(ng)
+      }.should raise_error(RuntimeError)
+    }
+    lambda {
+      API.validate_table_name('')
+    }.should raise_error(RuntimeError)
+  end
+
+  it 'normalize_database_name should return valid data' do
+    VALID_NAMES.each {|ok|
+      API.normalize_database_name(ok).should == ok
+    }
+  end
+
+  it 'validate_database_name should return valid data' do
+    VALID_NAMES.each {|ok|
+      API.validate_database_name(ok)
+    }
+  end
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+begin
+  require 'simplecov'
+  SimpleCov.start
+rescue LoadError
+end
+
+$LOAD_PATH << File.dirname(__FILE__)+"../lib"
+require 'td-client'
+
+include TreasureData
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000Z
+date: 2012-02-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70295290315500 !ruby/object:Gem::Requirement
+  requirement: &70135893795480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70295290315500
+  version_requirements: *70135893795480
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70295290315020 !ruby/object:Gem::Requirement
+  requirement: &70135893794220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,18 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70295290315020
+  version_requirements: *70135893794220
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70135893792760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :development
+  prerelease: false
+  version_requirements: *70135893792760
 description: 
 email: 
 executables: []
@@ -46,6 +57,8 @@ files:
 - lib/td/client/api.rb
 - lib/td/client/model.rb
 - lib/td/client/version.rb
+- spec/api_spec.rb
+- spec/spec_helper.rb
 - ChangeLog
 - README.rdoc
 homepage: 
@@ -72,4 +85,5 @@ rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Treasure Data API library for Ruby
-test_files: []
+test_files:
+- spec/api_spec.rb