td_model 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb028ec09bbcf54c2bb7de389d0c4a5141cece21
-  data.tar.gz: 3fbe3f04f385b2ad368834f3db995cd2a82d9b48
+  metadata.gz: b463ad1750c71a6e85acc68b4d742be47f881d07
+  data.tar.gz: c2dd1ec98d5c7fef668e8008c78efde3c4dacd33
 SHA512:
-  metadata.gz: bbdad16069e5c0f0fbd0270cba11c06b750ec71a3e244e56b2ca08cef29e7523688f6b70ff7297aaada2602166d3472244c7571e6a6195b9856a41b40cf9a6ac
-  data.tar.gz: be13a853a199b3f722874fdbe9b8b8fbe14516cd5bebc6618614102d4d449e4cfa3b7c0a9362638586f8420cf66f176795b8a4a11e306f42426cf37a80158edd
+  metadata.gz: b76ea582640c84d5b9dc4fd696ec62c76e36a7ef6f661284a74ad54ccd9ddbb5e978da21595879253f346ab2ab9130b8d71413235aafb79c4e002c4e9d822bfc
+  data.tar.gz: 2e77bf021036b082aa1a3f827d75b5466d199b3b7cff61ea7801bfa047ba57419d0255eadad101299b9061db6f6db8cfa6795666a9daf0f0fdadc486d9e80738

data/README.md

@@ -45,6 +45,7 @@ end
 ```
 
 * Search
+
 ```ruby
 # Basic
 td_user = TdUser.new

data/lib/td_model/base.rb

@@ -3,16 +3,13 @@ require "td_model/errors/failed_to_type_validation_of_column_error"
 
 module TdModel
   class Base
-    @@TD_SQL = ::TdModel::Sql
-    @@ATTR_TYPES = {}
-    @@ATTR_DEFAULT_VALUES = {}
-    @@TABLE_NAME = {}
+    include ::TdModel::Sql
 
     attr_accessor :table_name, :attr_values, :where_sql, :sql, :select_sql, :select_keys, :order_sql, :limit_sql
 
     def initialize(args=nil)
-      self.class.set_column(:time) unless @@ATTR_TYPES.keys.include?(:time)
-      @attr_values = @@ATTR_DEFAULT_VALUES.clone
+      self.class.set_column(:time) unless self.class.attr_types.keys.include?(:time)
+      @attr_values = self.class.attr_default_values.clone
       @select_keys = []
       @attr_values.keys.each do |col|
         proc = Proc.new { @attr_values[col] }
@@ -29,21 +26,40 @@ module TdModel
       end
     end
 
+    def self.attr_types
+      {}
+    end
+
+    def self.attr_default_values
+      {}
+    end
+
     def self.set_column(name, type=nil)
-      @@ATTR_TYPES.store(name, type)
-      @@ATTR_DEFAULT_VALUES.store(name, self.init_type_value(type))
+      attr_types = self.attr_types
+      attr_types.store(name, type)
+      self.define_singleton_method :attr_types do
+        attr_types
+      end
+
+      attr_default_values = self.attr_default_values
+      attr_default_values.store(name, self.init_type_value(type))
+      self.define_singleton_method :attr_default_values do
+        attr_default_values
+      end
     end
 
     def self.table_name=(name)
-      @@TABLE_NAME = name
+      self.define_singleton_method :table_name do
+        name
+      end
     end
 
     def self.table_name
-      @@TABLE_NAME
+      self.to_s.underscore
     end
 
     def table_name
-      @@TABLE_NAME
+      self.class.table_name || self.class.to_s.underscore
     end
 
     def create
@@ -59,7 +75,7 @@ module TdModel
     end
 
     def valid!(args)
-      @@ATTR_TYPES.each do |key, val|
+      self.class.attr_types.each do |key, val|
         next if val.nil?
         unless args[key].kind_of?(val)
           raise ::TdModel::Errors::FailedToTypeValidationOfColumnError
@@ -76,8 +92,8 @@ module TdModel
       end
     end
 
-    def self.query(sql)
-      @@TD_SQL.query(sql)
+    def self.where(obj)
+      self.new.where(obj)
     end
 
     def where(obj)
@@ -104,6 +120,11 @@ module TdModel
       self
     end
 
+
+    def self.order(col, sort=nil)
+      self.new.order(col, sort)
+    end
+
     def order(col, sort=nil)
       if col.instance_of?(Array)
         col.each do |column|
@@ -124,10 +145,18 @@ module TdModel
       self
     end
 
+    def self.reverse_order(col)
+      self.new.reverse_order(col)
+    end
+
     def reverse_order(col)
       self.order(col, 'DESC')
     end
 
+    def self.limit(num=nil)
+      self.new.limit(num)
+    end
+
     def limit(num=nil)
       if num.present?
         @limit_sql = "LIMIT #{num}"
@@ -138,7 +167,7 @@ module TdModel
     def query_execute
       if @select_sql.blank?
         @select_keys = [:time]
-        @@ATTR_TYPES.keys.each do |key|
+        self.class.attr_types.keys.each do |key|
           if @select_sql.blank?
             @select_sql = ''
             @select_sql += "SELECT #{self.table_name}.#{key}"
@@ -149,7 +178,7 @@ module TdModel
         end
       end
       @sql = "#{@select_sql} FROM #{self.table_name} #{@where_sql} #{@order_sql} #{@limit_sql}"
-      res = @@TD_SQL.query(@sql)
+      res = self.query(@sql)
 
       if res.blank?
         result = [self.class.new]
@@ -166,6 +195,10 @@ module TdModel
       result
     end
 
+    def self.select(args)
+      self.new.select(args)
+    end
+
     def select(args)
       @select_sql = ''
       @select_keys = []

data/lib/td_model/sql.rb

@@ -1,10 +1,8 @@
 module TdModel
   module Sql
-    extend self
-
-    def query(sql)
-      td_client = TdModel.config.td_client
-      job = td_client.query(TdModel.config.database_name, sql, nil, nil, nil, type: :presto)
+    def self.query(sql)
+      td_client = ::TdModel.config.td_client
+      job = td_client.query(::TdModel.config.database_name, sql, nil, nil, nil, type: :presto)
 
       until job.finished?
         sleep 2

data/lib/td_model/version.rb

@@ -1,3 +1,3 @@
 module TdModel
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td_model
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - hogino