td-client 0.8.69 → 0.8.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cce938755d8baa274b4129395cc3bf025852123d
-  data.tar.gz: 251fa5c0007d67a8bcbae03f01f31d7748a2654d
+  metadata.gz: 1ec9013fc056a1f4bcd364a56ca5d19c704884de
+  data.tar.gz: 0ec13bda51e5ea8f5d35573406bbe7386efaccb2
 SHA512:
-  metadata.gz: ebe285884532e4683d0ca58db039433d5f53fd5cf047db0318ceb93230f0bf0b151fd1f5bd321bbfc55f23784ecd4650764fa57019ec3b6e8d8762a74b6486e1
-  data.tar.gz: d37ce150f9a65d5d5a5231c4d277cd1867f193e0c9dec8c5920424faa67acfa75ff5e0e114130156ebc6db991af4eb58b6095784c5afc8cb0124724180ffb687
+  metadata.gz: 333b6b5e408515f0a0523d6c4057274232255e8c4da8904fa383eb69e7d78b5d679454317ff21efc0ebc0df0e870fdd99fe316a3a2880bbf24e3281602807260
+  data.tar.gz: 9f2fd6c88a7e8624aba8b89997cce43f1b88e08a3e364b5789367c823f95b10a99bfcc9787058716d68abeaa451ffe7e00f99f54b39321cf6e76fe9c23aff76f

data/lib/td/client.rb

@@ -192,9 +192,11 @@ class Client
   def jobs(from=nil, to=nil, status=nil, conditions=nil)
     results = @api.list_jobs(from, to, status, conditions)
     results.map {|job_id, type, status, query, start_at, end_at, cpu_time,
-                 result_size, result_url, priority, retry_limit, org, db|
+                 result_size, result_url, priority, retry_limit, org, db,
+                 duration|
       Job.new(self, job_id, type, query, status, nil, nil, start_at, end_at, cpu_time,
-              result_size, nil, result_url, nil, priority, retry_limit, org, db)
+              result_size, nil, result_url, nil, priority, retry_limit, org, db,
+              duration)
     }
   end
 
@@ -298,9 +300,10 @@ class Client
   end
 
   # @param [String] name
+  # @param [Hash] opts options for API
   # @return [Job]
-  def perform_bulk_import(name)
-    job_id = @api.perform_bulk_import(name)
+  def perform_bulk_import(name, opts={})
+    job_id = @api.perform_bulk_import(name, opts)
     Job.new(self, job_id, :bulk_import, nil)
   end
 

data/lib/td/client/api/bulk_load.rb

@@ -1,5 +1,3 @@
-require 'td/client/api/to_hash_struct'
-
 class TreasureData::API
 module BulkLoad
 
@@ -42,65 +40,40 @@ module BulkLoad
   #   "table": table_name
   # }
 
-  ## Resource definitions
-
-  class BulkLoad < ToHashStruct.new(:config, :name, :cron, :timezone, :delay, :time_column, :database, :table)
-    class BulkLoadSessionConfig < ToHashStruct.new(:type, :access_key_id, :secret_access_key, :endpoint, :bucket, :path_prefix, :parser, :decoders)
-      def validate_self
-        validate_presence_of :type
-      end
-    end
-
-    model_property :config, BulkLoadSessionConfig
-
-    def validate_self
-      validate_presence_of :config
-    end
-  end
-
-  class BulkLoadPreview < ToHashStruct.new(:schema, :records)
-  end
-
-  class Job < ToHashStruct.new(:job_id, :account_id, :type, :status, :cpu_time, :config, :records, :schema, :database, :table, :priority, :created_at, :updated_at, :start_at, :end_at)
-    model_property :config, BulkLoad::BulkLoadSessionConfig
-  end
-
-  ## API definitions
-
   LIST = '/v3/bulk_loads'
   SESSION = LIST +     '/%s'
   JOB = SESSION +         '/jobs'
 
-  # job: BulkLoad -> BulkLoad
+  # job: Hash -> Hash
   def bulk_load_guess(job)
     # retry_request = true
     path = LIST + '/guess'
-    res = api { post(path, job.validate.to_json) }
+    res = api { post(path, job.to_json) }
     unless res.ok?
       raise_error('BulkLoad configuration guess failed', res)
     end
-    BulkLoad.from_json(res.body)
+    JSON.load(res.body)
   end
 
-  # job: BulkLoad -> BulkLoadPreview
+  # job: Hash -> Hash
   def bulk_load_preview(job)
     # retry_request = true
     path = LIST + '/preview'
-    res = api { post(path, job.validate.to_json) }
+    res = api { post(path, job.to_json) }
     unless res.ok?
       raise_error('BulkLoad job preview failed', res)
     end
-    BulkLoadPreview.from_json(res.body)
+    JSON.load(res.body)
   end
 
-  # job: BulkLoad -> String (job_id)
+  # job: Hash -> String (job_id)
   def bulk_load_issue(database, table, job)
     type = 'bulkload'
     job = job.dup
     job['database'] = database
     job['table'] = table
     path = "/v3/job/issue/#{e type}/#{e database}"
-    res = api { post(path, job.validate.to_json) }
+    res = api { post(path, job.to_json) }
     unless res.ok?
       raise_error('BulkLoad job issuing failed', res)
     end
@@ -108,16 +81,16 @@ module BulkLoad
     js['job_id'].to_s
   end
 
-  # nil -> [BulkLoad]
+  # nil -> [Hash]
   def bulk_load_list
     res = api { get(LIST) }
     unless res.ok?
       raise_error("BulkLoadSession list retrieve failed", res)
     end
-    to_ary(res, BulkLoad)
+    JSON.load(res.body)
   end
 
-  # name: String, database: String, table: String, job: BulkLoad -> BulkLoad
+  # name: String, database: String, table: String, job: Hash -> Hash
   def bulk_load_create(name, database, table, job, opts = {})
     job = job.dup
     job['name'] = name
@@ -126,51 +99,51 @@ module BulkLoad
     end
     job['database'] = database
     job['table'] = table
-    res = api { post(LIST, job.validate.to_json) }
+    res = api { post(LIST, job.to_json) }
     unless res.ok?
       raise_error("BulkLoadSession: #{name} create failed", res)
     end
-    BulkLoad.from_json(res.body)
+    JSON.load(res.body)
   end
 
-  # name: String -> BulkLoad
+  # name: String -> Hash
   def bulk_load_show(name)
     path = session_path(name)
     res = api { get(path) }
     unless res.ok?
       raise_error("BulkLoadSession: #{name} retrieve failed", res)
     end
-    BulkLoad.from_json(res.body)
+    JSON.load(res.body)
   end
 
-  # name: String, job: BulkLoad -> BulkLoad
+  # name: String, job: Hash -> Hash
   def bulk_load_update(name, job)
     path = session_path(name)
-    res = api { put(path, job.validate.to_json) }
+    res = api { put(path, job.to_json) }
     unless res.ok?
       raise_error("BulkLoadSession: #{name} update failed", res)
     end
-    BulkLoad.from_json(res.body)
+    JSON.load(res.body)
   end
 
-  # name: String -> BulkLoad
+  # name: String -> Hash
   def bulk_load_delete(name)
     path = session_path(name)
     res = api { delete(path) }
     unless res.ok?
       raise_error("BulkLoadSession: #{name} delete failed", res)
     end
-    BulkLoad.from_json(res.body)
+    JSON.load(res.body)
   end
 
-  # name: String -> [Job]
+  # name: String -> [Hash]
   def bulk_load_history(name)
     path = job_path(name)
     res = api { get(path) }
     unless res.ok?
       raise_error("history of BulkLoadSession: #{name} retrieve failed", res)
     end
-    to_ary(res, Job)
+    JSON.load(res.body)
   end
 
   def bulk_load_run(name, scheduled_time = nil)
@@ -195,11 +168,5 @@ private
     JOB % e(name)
   end
 
-  def to_ary(res, klass)
-    JSON.parse(res.body).map { |bulk_load|
-      klass.from_hash(bulk_load)
-    }
-  end
-
 end
 end

data/lib/td/client/api/job.rb

@@ -35,8 +35,10 @@ module Job
       result_url = m['result']
       priority = m['priority']
       retry_limit = m['retry_limit']
+      duration = m['duration']
       result << [job_id, type, status, query, start_at, end_at, cpu_time,
-                 result_size, result_url, priority, retry_limit, nil, database]
+                 result_size, result_url, priority, retry_limit, nil, database,
+                 duration]
     }
     return result
   end

data/lib/td/client/model.rb

@@ -381,9 +381,10 @@ class Job < Model
   # @param [Fixnum] retry_limit
   # @param [String] org_name
   # @param [String] db_name
+  # @param [Fixnum] duration
   def initialize(client, job_id, type, query, status=nil, url=nil, debug=nil, start_at=nil, end_at=nil, cpu_time=nil,
                  result_size=nil, result=nil, result_url=nil, hive_result_schema=nil, priority=nil, retry_limit=nil,
-                 org_name=nil, db_name=nil)
+                 org_name=nil, db_name=nil, duration=nil)
     super(client)
     @job_id = job_id
     @type = type
@@ -401,6 +402,7 @@ class Job < Model
     @priority = priority
     @retry_limit = retry_limit
     @db_name = db_name
+    @duration = duration
   end
 
   # @!attribute [r] job_id
@@ -410,8 +412,10 @@ class Job < Model
   # @!attribute [r] retry_limit
   # @!attribute [r] org_name
   # @!attribute [r] db_name
+  # @!attribute [r] duration
   attr_reader :job_id, :type, :result_url
   attr_reader :priority, :retry_limit, :org_name, :db_name
+  attr_reader :duration
 
   def wait(timeout=nil)
     # TODO

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '0.8.69'
+    VERSION = '0.8.70'
   end
 end

data/spec/td/client/bulk_load_spec.rb

@@ -114,8 +114,8 @@ describe 'BulkImport API' do
         with(:body => original_config.to_json).
         to_return(:body => guessed_config.to_json)
       api.bulk_load_guess(
-        TreasureData::API::BulkLoad::BulkLoad.from_hash(original_config)
-      ).to_h.should == guessed_config
+        original_config
+      ).should == guessed_config
     end
 
     it 'raises an error' do
@@ -124,24 +124,56 @@ describe 'BulkImport API' do
         to_return(:status => 500, :body => guessed_config.to_json)
       expect {
         api.bulk_load_guess(
-          TreasureData::API::BulkLoad::BulkLoad.from_hash(original_config)
+          original_config
         )
       }.to raise_error(TreasureData::APIError)
     end
 
-    it 'raises on validation error' do
-      config = TreasureData::API::BulkLoad::BulkLoad.from_hash({})
-      expect {
-        api.bulk_load_guess(config)
-      }.to raise_error(ArgumentError)
+    it 'perform redo on 500 error' do
+      stub_api_request(:post, '/v3/bulk_loads/guess').
+        with(:body => original_config.to_json).
+        to_return(:status => 500, :body => guessed_config.to_json)
+      begin
+        retry_api.bulk_load_guess(
+          original_config
+        ).should != nil
+      rescue TreasureData::APIError => e
+        e.message.should =~ /^500: BulkLoad configuration guess failed/
+      end
     end
 
-    it 'raises on nested validation error' do
-      config = TreasureData::API::BulkLoad::BulkLoad.from_hash(original_config)
-      config.config.type = nil
+    it 'perform retries on connection failure' do
+      api = retry_api
+      api.instance_eval { @api }.stub(:post).and_raise(SocketError.new('>>'))
+      begin
+        retry_api.bulk_load_guess(
+          original_config
+        )
+      rescue SocketError => e
+        e.message.should == '>> (Retried 1 times in 1 seconds)'
+      end
+    end
+  end
+
+  describe 'guess with old format' do
+    it 'returns guessed json' do
+      stub_api_request(:post, '/v3/bulk_loads/guess').
+        with(:body => original_config.to_json).
+        to_return(:body => guessed_config.to_json)
+      api.bulk_load_guess(
+        original_config
+      ).should == guessed_config
+    end
+
+    it 'raises an error' do
+      stub_api_request(:post, '/v3/bulk_loads/guess').
+        with(:body => original_config.to_json).
+        to_return(:status => 500, :body => guessed_config.to_json)
       expect {
-        api.bulk_load_guess(config)
-      }.to raise_error(ArgumentError)
+        api.bulk_load_guess(
+          original_config
+        )
+      }.to raise_error(TreasureData::APIError)
     end
 
     it 'perform redo on 500 error' do
@@ -150,7 +182,7 @@ describe 'BulkImport API' do
         to_return(:status => 500, :body => guessed_config.to_json)
       begin
         retry_api.bulk_load_guess(
-          TreasureData::API::BulkLoad::BulkLoad.from_hash(original_config)
+          original_config
         ).should != nil
       rescue TreasureData::APIError => e
         e.message.should =~ /^500: BulkLoad configuration guess failed/
@@ -162,7 +194,7 @@ describe 'BulkImport API' do
       api.instance_eval { @api }.stub(:post).and_raise(SocketError.new('>>'))
       begin
         retry_api.bulk_load_guess(
-          TreasureData::API::BulkLoad::BulkLoad.from_hash(original_config)
+          original_config
         )
       rescue SocketError => e
         e.message.should == '>> (Retried 1 times in 1 seconds)'
@@ -176,8 +208,8 @@ describe 'BulkImport API' do
         with(:body => guessed_config.to_json).
         to_return(:body => preview_result.to_json)
       api.bulk_load_preview(
-        TreasureData::API::BulkLoad::BulkLoad.from_hash(guessed_config)
-      ).to_h.should == preview_result
+        guessed_config
+      ).should == preview_result
     end
 
     it 'raises an error' do
@@ -186,17 +218,10 @@ describe 'BulkImport API' do
         to_return(:status => 500, :body => preview_result.to_json)
       expect {
         api.bulk_load_preview(
-          TreasureData::API::BulkLoad::BulkLoad.from_hash(guessed_config)
+          guessed_config
         )
       }.to raise_error(TreasureData::APIError)
     end
-
-    it 'raises on validation error' do
-      config = TreasureData::API::BulkLoad::BulkLoad.from_hash({})
-      expect {
-        api.bulk_load_preview(config)
-      }.to raise_error(ArgumentError)
-    end
   end
 
   describe 'issue' do
@@ -210,16 +235,9 @@ describe 'BulkImport API' do
       api.bulk_load_issue(
         'database',
         'table',
-        TreasureData::API::BulkLoad::BulkLoad.from_hash(guessed_config)
+        guessed_config
       ).should == '12345'
     end
-
-    it 'raises on validation error' do
-      config = TreasureData::API::BulkLoad::BulkLoad.from_hash({})
-      expect {
-        api.bulk_load_issue(config)
-      }.to raise_error(ArgumentError)
-    end
   end
 
   describe 'list' do
@@ -228,7 +246,7 @@ describe 'BulkImport API' do
         to_return(:body => [bulk_load_session, bulk_load_session].to_json)
       result = api.bulk_load_list
       result.size.should == 2
-      result.first.to_h.should == bulk_load_session
+      result.first.should == bulk_load_session
     end
 
     it 'returns empty' do
@@ -254,13 +272,13 @@ describe 'BulkImport API' do
         'nahi_test_1',
         'database',
         'table',
-        TreasureData::API::BulkLoad::BulkLoad.from_hash(guessed_config),
+        guessed_config,
         {
           cron: '@daily',
           timezone: 'Asia/Tokyo',
           delay: 3600
         }
-      ).to_h.should == bulk_load_session
+      ).should == bulk_load_session
     end
 
     it 'accepts empty option' do
@@ -275,8 +293,8 @@ describe 'BulkImport API' do
         'nahi_test_1',
         'database',
         'table',
-        TreasureData::API::BulkLoad::BulkLoad.from_hash(guessed_config)
-      ).to_h.should == bulk_load_session
+        guessed_config
+      ).should == bulk_load_session
     end
 
     it 'accepts time_column option' do
@@ -292,11 +310,11 @@ describe 'BulkImport API' do
         'nahi_test_1',
         'database',
         'table',
-        TreasureData::API::BulkLoad::BulkLoad.from_hash(guessed_config),
+        guessed_config,
         {
           time_column: 'c0'
         }
-      ).to_h.should == bulk_load_session
+      ).should == bulk_load_session
     end
   end
 
@@ -304,7 +322,7 @@ describe 'BulkImport API' do
     it 'returns bulk_load_session' do
       stub_api_request(:get, '/v3/bulk_loads/nahi_test_1').
         to_return(:body => bulk_load_session.to_json)
-      api.bulk_load_show('nahi_test_1').to_h.should == bulk_load_session
+      api.bulk_load_show('nahi_test_1').should == bulk_load_session
     end
   end
 
@@ -315,8 +333,8 @@ describe 'BulkImport API' do
         to_return(:body => bulk_load_session.to_json)
       api.bulk_load_update(
         'nahi_test_1',
-        TreasureData::API::BulkLoad::BulkLoad.from_hash(bulk_load_session)
-      ).to_h.should == bulk_load_session
+        bulk_load_session
+      ).should == bulk_load_session
     end
   end
 
@@ -324,7 +342,7 @@ describe 'BulkImport API' do
     it 'returns updated bulk_load_session' do
       stub_api_request(:delete, '/v3/bulk_loads/nahi_test_1').
         to_return(:body => bulk_load_session.to_json)
-      api.bulk_load_delete('nahi_test_1').to_h.should == bulk_load_session
+      api.bulk_load_delete('nahi_test_1').should == bulk_load_session
     end
   end
 
@@ -334,7 +352,7 @@ describe 'BulkImport API' do
         to_return(:body => [bulk_load_job, bulk_load_job].to_json)
       result = api.bulk_load_history('nahi_test_1')
       result.size.should == 2
-      result.first.to_h.should == bulk_load_job
+      result.first.should == bulk_load_job
     end
   end
 

data/spec/td/client/job_api_spec.rb

@@ -30,7 +30,8 @@ describe 'Job API' do
 
         jobs = api.list_jobs
         jobs[i..i].map {|job_id, type, status, query, start_at, end_at, cpu_time,
-                      result_size, result_url, priority, retry_limit, org, db|
+                      result_size, result_url, priority, retry_limit, org, db,
+                      duration|
           job_id.should == job['job_id']
           type.should == job['type']
           status.should == job['status']
@@ -44,6 +45,7 @@ describe 'Job API' do
           retry_limit.should == job['retry_limit']
           org.should == job['organization']
           db.should == job['database']
+          duration.should == job['duration']
         }
       end
     }

data/spec/td/client/model_job_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'td/client/spec_resources'
+
+describe 'Job Model' do
+  include_context 'spec symbols'
+  include_context 'common helper'
+  include_context 'job resources'
+
+  before do
+    stub_api_request(:post, "/v3/user/authenticate").
+      to_return(:body => {'apikey' => 'apikey'}.to_json)
+  end
+
+  describe '#client' do
+    subject do
+      Job.new(client, *arguments).client
+    end
+
+    let :client do
+      Client.authenticate('user', 'password')
+    end
+
+    let :arguments do
+      job_attributes = raw_jobs.first
+      [
+        'job_id', 'type', 'query', 'status', 'url', 'debug',
+        'start_at', 'end_at', 'cpu_time', 'result_size', 'result', 'result_url',
+        'hive_result_schema', 'priority', 'retry_limit', 'org_name', 'db_name',
+        'duration'
+      ].map {|name| job_attributes[name]}
+    end
+
+    it 'returns Job object having client' do
+      expect(subject).to eq client
+    end
+  end
+end

data/spec/td/client/spec_resources.rb

@@ -85,6 +85,7 @@ shared_context 'job resources' do
         "cpu_time"           => i * 100 + i,
         "result_size"        => i * 1000,
         'retry_limit'        => 10,
+        "duration"           => i,
         'organization'       => nil,
         'hive_result_schema' => nil,
         'debug' => {

data/spec/td/client_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+require 'td/client/spec_resources'
+
+describe 'Command' do
+  include_context 'spec symbols'
+  include_context 'common helper'
+  include_context 'job resources'
+
+  before do
+    stub_api_request(:post, "/v3/user/authenticate").
+      to_return(:body => {'apikey' => 'apikey'}.to_json)
+  end
+
+  let :client do
+    Client.authenticate('user', 'password')
+  end
+
+  describe '#job' do
+    before do
+      stub_api_request(:get, "/v3/job/list").to_return(:body => {'jobs' => raw_jobs}.to_json)
+    end
+
+    it 'return jobs created with API result' do
+      jobs = client.jobs
+
+      expect(jobs).to be_kind_of Array
+      jobs.each.with_index do |job, i|
+        expect(job.job_id).to       eq raw_jobs[i]['job_id']
+        expect(job.type).to         eq raw_jobs[i]['type']
+        expect(job.status).to       eq raw_jobs[i]['status']
+        expect(job.query).to        eq raw_jobs[i]['query']
+        expect(job.start_at).to     eq Time.parse(raw_jobs[i]['start_at'])
+        expect(job.end_at).to       eq Time.parse(raw_jobs[i]['end_at'])
+        expect(job.cpu_time).to     eq raw_jobs[i]['cpu_time']
+        expect(job.result_size).to  eq raw_jobs[i]['result_size']
+        expect(job.result_url).to   eq raw_jobs[i]['result_url']
+        expect(job.priority).to     eq raw_jobs[i]['priority']
+        expect(job.retry_limit).to  eq raw_jobs[i]['retry_limit']
+        expect(job.org_name).to     eq raw_jobs[i]['organization']
+        expect(job.db_name).to      eq raw_jobs[i]['database']
+        expect(job.duration).to     eq raw_jobs[i]['duration']
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.69
+  version: 0.8.70
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -223,7 +223,6 @@ files:
 - lib/td/client/api/schedule.rb
 - lib/td/client/api/server_status.rb
 - lib/td/client/api/table.rb
-- lib/td/client/api/to_hash_struct.rb
 - lib/td/client/api/user.rb
 - lib/td/client/api_error.rb
 - lib/td/client/compat_gzip_reader.rb
@@ -241,6 +240,7 @@ files:
 - spec/td/client/export_api_spec.rb
 - spec/td/client/import_api_spec.rb
 - spec/td/client/job_api_spec.rb
+- spec/td/client/model_job_spec.rb
 - spec/td/client/partial_delete_api_spec.rb
 - spec/td/client/result_api_spec.rb
 - spec/td/client/sched_api_spec.rb
@@ -249,6 +249,7 @@ files:
 - spec/td/client/table_api_spec.rb
 - spec/td/client/user_api_spec.rb
 - spec/td/client_sched_spec.rb
+- spec/td/client_spec.rb
 homepage: http://treasuredata.com/
 licenses: []
 metadata: {}
@@ -283,6 +284,7 @@ test_files:
 - spec/td/client/export_api_spec.rb
 - spec/td/client/import_api_spec.rb
 - spec/td/client/job_api_spec.rb
+- spec/td/client/model_job_spec.rb
 - spec/td/client/partial_delete_api_spec.rb
 - spec/td/client/result_api_spec.rb
 - spec/td/client/sched_api_spec.rb
@@ -290,4 +292,5 @@ test_files:
 - spec/td/client/table_api_spec.rb
 - spec/td/client/user_api_spec.rb
 - spec/td/client_sched_spec.rb
+- spec/td/client_spec.rb
 has_rdoc: false

data/lib/td/client/api/to_hash_struct.rb

@@ -1,82 +0,0 @@
-class TreasureData::API
-  class ToHashStruct < Struct
-    module ClassModule
-      def parse_json(body)
-        begin
-          js = JSON.load(body)
-        rescue
-          raise "Unexpected API response: #{$!}"
-        end
-        unless js.is_a?(Hash)
-          raise "Unexpected API response: #{body}"
-        end
-        js
-      end
-
-      def from_json(json)
-        from_hash(parse_json(json))
-      end
-
-      def from_hash(hash)
-        return new if hash.nil?
-        new(*members.map { |sym|
-          v = hash[sym] || hash[sym.to_s]
-          model.key?(sym) ? model[sym].from_hash(v) : v
-        })
-      end
-
-      def model_property(key, klass)
-        model[key.to_sym] = klass
-      end
-
-      def model
-        @model ||= {}
-      end
-    end
-    extend ClassModule
-
-    def to_h
-      self.class.members.inject({}) { |r, e|
-        v = obj_to_h(self[e])
-        r[e.to_s] = v unless v.nil?
-        r
-      }
-    end
-
-    def to_json
-      to_h.to_json
-    end
-
-    def validate
-      validate_self
-      values.each do |v|
-        v.validate if v.is_a?(ToHashStruct)
-      end
-      self
-    end
-
-    def validate_self
-      # define as required
-    end
-
-  private
-
-    def validate_presence_of(key)
-      unless self.send(key)
-        raise ArgumentError.new("#{key} required")
-      end
-    end
-
-    def obj_to_h(obj)
-      if obj.nil?
-        nil
-      elsif Array === obj
-        obj.map { |e| obj_to_h(e) }
-      elsif obj.respond_to?(:to_h)
-        obj.to_h
-      else
-        obj
-      end
-    end
-  end
-end