arxutils 0.1.31 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb417c5c9b978efc194c67ba2fe77dc9c7d513fd
-  data.tar.gz: b6222fe0eb3cbaacbb3c2fb36d772854c993b3de
+  metadata.gz: 0db660cdf41eaaaab3cc142711afb8186b10c06e
+  data.tar.gz: 20a8b02d69969d52a37cfddda3c721d0d628762d
 SHA512:
-  metadata.gz: d114e775a16a5a73b328a802c221004dad54e8a2b7a5d4881fec1d4836fb69361c526a5e45a0dd4106dddb2f1b947274c1280b61509c051311ef0035da2abfb8
-  data.tar.gz: 25d2c83d30862cf07bc1fea7d17b1c2d22e481440cb476c8b094fc9561d6d329f8e1d2669454555226e744504370c5d453adbf4a762c36bc6d81b4a5f23f31f9
+  metadata.gz: 7e38ecbe696e36c4e4975fcf304beb86d49056edb6df241448232d7e8b987041f45514ece568c1449f4155fde058521c55a71e221e3de4f3d8a76bf5bd0e9f35
+  data.tar.gz: bc11ab615060d8d3eaff76d5e582258adf766d78cde23852403ba4c3f05ae54440c2853f047675a59c8389a802cb9b3d648ca730aea8d49200a8c117dbf16ee7

data/Rakefile

@@ -1,6 +1,3 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/arxutils.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "activesupport"
 #  spec.add_runtime_dependency "erb"
   spec.add_runtime_dependency "activerecord"
   spec.add_runtime_dependency "sqlite3"

data/lib/arxutils/arx.rb

@@ -12,18 +12,24 @@ module Arxutils
       # :items
       #  フィールド名, 型, null許容 の配列
       # :plural
+      # :relation
       @data = data
 
       @@field ||= Struct.new("Field" , :name, :type, :null ) 
 
-      @data[:ary] = @data[:items].map{ |x| @@field.new( *x ) }
+      if @data[:items]
+        @data[:ary] = @data[:items].map{ |x| @@field.new( *x ) }
+      else
+        @data[:ary] = []
+      end
     end
 
     def create
       contents = File.open( @fname ).read
-
       erb = ERB.new(contents)
-      erb.result(binding)
+      content = erb.result(binding)
+      content
     end
+
   end
 end

data/lib/arxutils/arxutils.rb

@@ -10,10 +10,6 @@ module Arxutils
       File.join(  Arxutils.dirname , ".." , "template" )
     end
 
-    def Arxutils.rakefile
-      File.join( Arxutils.dirname , ".." , 'Rakefile')
-    end
-
     def Arxutils.configdir
       File.join( Arxutils.dirname  , ".." , 'config' )
     end

data/lib/arxutils/dbutil/dbinit.rb

@@ -7,37 +7,42 @@ require 'sqlite3'
 module Arxutils
   module Dbutil
     DB_DIR = 'db'
-    MIGRATE_DIR = 'db/migrate'
+    MIGRATE_DIR = 'migrate'
     DBCONFIG_SQLITE3 = 'sqlite3'
     DBCONFIG_MYSQL = 'mysql'
     CONFIG_DIR = 'config'
     DATABASELOG = 'database.log'
     
     class Dbinit
-      attr_accessor :dbconfig_dest_path , :dbconfig_src_path , :dbconfig_src_fname , :dbconfig_dest_fname 
+      attr_accessor :dbconfig_dest_path , :dbconfig_src_path , :dbconfig_src_fname , :dbconfig_dest_fname , :migrate_dir
       
-      def initialize( db_dir , migrate_dir , src_config_dir , dbconfig , log_fname, forced = false )
-        @db_dir = db_dir
-        @migrate_dir = migrate_dir
+      def initialize( migrate_base_dir , src_config_dir , dbconfig , log_fname, forced = false )
+        @db_dir = dbconfig[:db_dir]
         @src_config_dir  = src_config_dir
         @dest_config_dir  = "config"
-        @dbconfig_dest_fname = "#{dbconfig}.yaml"
-        @dbconfig_src_fname = "#{dbconfig}.tmpl"
+        @dbconfig_dest_fname = "#{dbconfig[:kind]}.yaml"
+        @dbconfig_src_fname = "#{dbconfig[:kind]}.tmpl"
         @dbconfig_dest_path = File.join( @dest_config_dir , @dbconfig_dest_fname)
         @dbconfig_src_path = File.join(@src_config_dir  , @dbconfig_src_fname)
         @log_fname = log_fname
-        @log_path = File.join( @db_dir , @log_fname )
-        FileUtils.mkdir_p( @db_dir )
-        FileUtils.mkdir_p( @migrate_dir )
+
+        if @db_dir and @log_fname
+          @log_path = File.join( @db_dir , @log_fname )
+          @migrate_dir = File.join( @db_dir , migrate_base_dir )
+        end
+        FileUtils.mkdir_p( @db_dir ) if @db_dir
+        FileUtils.mkdir_p( @migrate_dir ) if @migrate_dir
         FileUtils.mkdir_p( @dest_config_dir )
         if forced
-          FileUtils.rm( Dir.glob( File.join( @migrate_dir , "*")))
+          FileUtils.rm( Dir.glob( File.join( @migrate_dir , "*"))) if @migrate_dir
           FileUtils.rm( Dir.glob( File.join( @dest_config_dir  , "*")))
         end
       end
       
       def setup
+        puts ENV['ENV']
         dbconfig = YAML.load( File.read( @dbconfig_dest_path ) )
+        puts dbconfig[ ENV['ENV'] ]
         ActiveRecord::Base.establish_connection(dbconfig[ENV['ENV']])
         ActiveRecord::Base.logger = Logger.new( @log_path )
       end

data/lib/arxutils/dbutil/dbmgr.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 require 'arxutils/dbutil/dbinit'
 
 require 'date'
@@ -7,8 +8,8 @@ require 'pp'
 module Arxutils
   module Dbutil
     class DbMgr
-      def DbMgr.init( db_dir , migrate_dir , config_dir , dbconfig, log_fname, forced = false )
-        dbinit = Dbinit.new( db_dir , migrate_dir , config_dir , dbconfig, log_fname, forced )
+      def DbMgr.init( migrate_dir , config_dir , dbconfig, log_fname, forced = false )
+        dbinit = Dbinit.new( migrate_dir , config_dir , dbconfig, log_fname, forced )
         DbMgr.setup( dbinit )
       end
       
@@ -27,7 +28,6 @@ module Arxutils
 
         @@ret
       end
-
       def DbMgr.conv_string(value , encoding)
         if value.class == String
           if value.encodingy != encoding
@@ -67,3 +67,4 @@ module Arxutils
     end
   end
 end
+

data/lib/arxutils/hier.rb

@@ -0,0 +1,180 @@
+# -*- coding: utf-8 -*-
+
+module Arxutils
+  class HierOp
+    def initialize( hier_symbol , base_klass , hier_klass , current_klass )
+      @hier_symbol = hier_symbol
+      @base_klass = base_klass
+      @hier_klass = hier_klass
+      @current_klass = current_klass
+    end
+    
+    def delete( hier )
+      # 子として探す
+      id = nil
+      row_item  = @base_klass.find_by( { @hier_symbol => hier } )
+      if row_item
+        id = row_item.id
+        delete_at( id )
+      end
+      id
+    end
+
+    def move( src_hier , dest_parent_hier )
+      # dest_parent_hierがsrc_hierの子であれば(=src_hierがdest_parent_hierの先頭からの部分文字列である)何もせずエラーを返す
+      escaped = Regexp.escape( src_hier )
+      src_re = Regexp.new( %Q!^#{escaped}! )
+      ret = ( src_re =~ dest_parent_hier )
+      # 自身の子への移動はエラーとする
+      if ret
+        return false
+      end
+      
+      src_row_item = @base_klass.where( name: src_hier )
+      src_num = src_row_item.id
+      # srcが子である(tblでは項目を一意に指定できる)のtblでの項目を得る
+      src_row = @hire_klass.find_by( child_id: src_num )
+      
+      dest_parent_row_item = @base_klass.find_by( name: dest_parent_hier )
+      unless dest_parent_row_item
+        dest_parent_num = register( dest_parent_hier )
+      else
+        dest_parent_num = dest_parent_row_item.id
+      end
+      dest_parent_level = get_level_by_child( dest_parent_num )
+      
+      # srcの親をdest_parentにする
+      src_row.parent_id = dest_parent_num
+
+      # destに移動後のsrcの子のレベルを調整する
+      level_adjust( src_row , dest_parent_level )
+      # destに移動後のsrcのhierを再設定
+      set_hier( src_row_item ,  make_hier( dest_parent_row_item.name , get_name( src_row_item ) ) )
+      # destに移動後のsrcの子のhierを調整する
+      hier_adjust( src_row_item )
+
+      true
+    end
+
+    def register_parent( hier_ary , child_num , level )
+      hier_ary.pop
+      parent_hier_ary = hier_ary
+      parent_hier = parent_hier_ary.join('/')
+      parent_num = register( parent_hier )
+      hs = { parent_id: parent_num , child_id: child_num , level: level }
+      @hier_klass.create( hs )
+    end
+    
+    def register( hier )
+      hier_ary = hier.split('/')
+      level = get_level_by_array( hier_ary )
+
+      # もしhier_aryがnilだけを1個持つ配列、または空文字列だけを1個もつ配列であれば、hier_nameは空文字列になる
+
+      item_row = @current_klass.find_by( {@hier_symbol => hier} )
+      unless item_row
+        # @base_klassがhierだけでcreateできる場合は（他にフィールドがnot_nullでないか）、ここに来てもよい。
+        # そうでなければ、SQLの制約違反が発生するため、ここに来ることを避けなければならない。
+        # （あらかじめここが呼ばれないようにdatabaseに登録済みにしておかなければならない。）
+        new_category = @base_klass.create( {@hier_symbol => hier} )
+        new_num = new_category.id
+        if level == 0
+          unless @hier_klass.find_by( child_id: new_num )
+            hs = { parent_id: new_num , child_id: new_num , level: level }
+            @hier_klass.create( hs )
+          end
+        else
+          register_parent( hier_ary , new_num, level )
+        end
+      else
+        new_num = item_row.org_id
+        if level == 0
+          unless @hier_klass.find_by( child_id: new_num )
+            hs = {parent_id: new_num , child_id: new_num , level: level}
+            @hier_klass.create( hs )
+          end
+        else
+          unless @hier_klass.find_by( child_id: new_num )
+            register_parent( hier_ary , new_num, level )
+          end
+        end
+      end
+      new_num
+    end
+    
+    private
+    
+    def delete_at( num )
+      # 子として探す
+      row = @hier_klass.find_by( child_id: num )
+      level = row.level
+      parent_id = row.parent_id
+      row_item = @base_klass.find( num )
+      
+      parent_item_row = @base_klass.find( parent_id )
+      parent_hier  = parent_item_row.name
+
+      # 属する子を探す
+      child_rows = @hier_klass.where( parent_id: num )
+      # 属する子の階層レベルを調整する(削除するのでlevel - 1になる)
+      child_rows.map{ |x| level_adjust( x , level - 1 ) }
+      # 属する子の親を、親の親にする
+      child_rows.map{ |x|
+        x.parent_id = parent_id
+      }
+      # 属する子のhierを調整する
+      child_rows.map{ |x|
+        child_item_row = @base_klass.find( x.child_id )
+        name = get_name( child_item_row )
+        child_item_row.name = make_hier( parent_hier , name )
+        hier_adjust( child_item_row )
+      }
+    end
+
+    def get_level_by_array( hier_ary )
+      level = hier_ary.size - 1
+      level = 0 if level < 0
+      level
+    end
+
+    def get_name( items_row )
+      name = ""
+      if items_row
+        name = items_row.name.split('/').pop
+      end
+      name
+    end
+
+    def hier_adjust( item_row )
+      parent_hier = item_row.name
+      parent_num = item_row.id
+
+      tbl_rows = @hier_klass.where( parent_id: parent_num )
+      if tbl_rows.size > 0
+        tbl_rows.map{|x|
+          child_num = x.child_id
+          item_row = @base_klass.find( child_num )
+          item_row.name =  make_hier( parent_hier , get_name( item_row ) )
+          hier_adjust( item_row )
+        }
+      end
+    end
+    
+    # 指定項目と、その子のlevelを調整
+    def level_adjust( row , parent_level )
+      row.level = parent_level + 1
+      child_rows = @hier_klass.where( parent_id: row.id )
+      if child_rows.size > 0
+        child_rows.map{ |x| level_adjust( x , row.level ) }
+      end
+    end  
+
+    def get_level_by_child( num )
+      @hier_klass.find_by( child_id: num ).level
+    end
+
+    def make_hier( parent_hier , name )
+      [ parent_hier , name ].join('/')
+    end
+  end
+end

data/lib/arxutils/migrate.rb

@@ -2,37 +2,70 @@
 require 'arxutils'
 
 require 'fileutils'
+require 'active_support'
 require 'active_record'
+require 'pp'
 
 module Arxutils
   class Migrate
     attr_accessor :dbinit , :dbconfig_dest_path , :dbconfig_dest_fname , :dbconfig_src_path , :dbconfig_src_fname
     
-    def Migrate.migrate( data_ary , idx , dbconfig , forced )
+    def Migrate.migrate( data_ary , relation_def_fpath , module_name, count_classname_downcase , count_field , dbconfig , forced )
       src_config_dir = Arxutils.configdir
-      mig = Migrate.new(Dbutil::DB_DIR, Dbutil::MIGRATE_DIR , src_config_dir , dbconfig, Dbutil::DATABASELOG, forced )
-      mig.make_dbconfig( data_ary[idx] )
+      mig = Migrate.new( Dbutil::MIGRATE_DIR , src_config_dir , dbconfig, Dbutil::DATABASELOG, forced )
+      # dbconfigのテンプレートは内容が固定である。convertを呼び出し、Arxのインスタンスを作成するときに、適切なdata_aryの要素を与える必要がある（ただしテンプレートへの埋め込みには用いられない
+      mig.make_dbconfig( dbconfig )
       
-      data_ary.reduce(0) do |next_num , x| 
+      data_ary.reduce(0) { |next_num , x| 
         mig.make( next_num , x )
-      end
+      }
 
+      content_array = data_ary.map { |x| 
+        mig.make_relation( x , "count", "end_count_id" )
+      }.select{ |x| x.size > 0 }
+      need_count_class_plural = content_array.reduce([]){ |s,x|
+        s << x[:need_count_class_plural] if x[:need_count_class_plural] != nil
+        s
+      }
+      if content_array.size > 0
+        data_count = {count_classname: "Count" ,
+                      count_field: count_field,
+                      need_count_class_plural: need_count_class_plural,
+                     }
+        ary = content_array.collect{|x| x[:content] }.flatten
+        count_content = mig.convert_count_class_relation( data_count , "relation_count.tmpl" )
+        ary.unshift( count_content )
+        content_array = ary
+      end
+      File.open( relation_def_fpath , 'w' , {:encoding => Encoding::UTF_8}){ |f|
+        f.puts("module #{module_name}")
+        content_array.map{ |content|
+          f.puts( content )
+          f.puts( "\n" )
+        }
+        f.puts("end")
+      }
+      
       Dbutil::DbMgr.setup( mig.dbinit )
 
       mig.migrate
     end
     
-    def initialize( db_dir , migrate_dir , config_dir , dbconfig, log_fname, forced = false )
-      @dbinit = Dbutil::Dbinit.new( db_dir , migrate_dir , config_dir , dbconfig, log_fname, forced )
+    def initialize( migrate_base_dir , config_dir , dbconfig, log_fname, forced = false )
+      @dbinit = Dbutil::Dbinit.new( migrate_base_dir , config_dir , dbconfig, log_fname, forced )
       @dbconfig_dest_path = @dbinit.dbconfig_dest_path
       @dbconfig_src_path = @dbinit.dbconfig_src_path
       @dbconfig_src_fname = @dbinit.dbconfig_src_fname
 
-      @migrate_dir = migrate_dir
+      @migrate_dir = @dbinit.migrate_dir
       @src_path = Arxutils.templatedir
       @src_config_path = Arxutils.configdir
     end
 
+    def convert_count_class_relation( data , src_fname )
+      convert( data , @src_path , src_fname )
+    end
+
     def convert( data , src_dir , src_fname )
       arx = Arx.new( data , File.join( src_dir, src_fname ) )
       arx.create
@@ -44,6 +77,28 @@ module Arxutils
         f.puts( content )
       }
     end
+
+    def make_relation( data , count_classname_downcase , count_field )
+      if data[:classname_downcase] != count_classname_downcase
+        data[:flist].reduce( { content: [], need_count_class: nil } ){ |s, x|
+          case x
+          when "base" , "noitem"
+            name_base = "relation"
+            data[:relation] = [] unless data[:relation]
+          else
+            data[:count_classname_downcase] = count_classname_downcase
+            data[:count_field] = count_field
+            name_base = "relation_#{x}"
+            s[:need_count_class_plural] ||= data[:plural]
+          end
+          content = convert( data , @src_path , "#{name_base}.tmpl" )
+          s[:content] << content
+          s
+        }
+      else
+        {}
+      end
+    end
     
     def make( next_num , data )
       data[:flist].reduce(next_num) do |idy , x|
@@ -56,7 +111,6 @@ module Arxutils
           additional = x
         end
         fname = File.join( @migrate_dir , sprintf("%03d_create_%s%s.rb" , idy , additional , data[:classname_downcase]) )
-        p fname
         File.open( fname , 'w' , {:encoding => Encoding::UTF_8}){ |f|
           f.puts( content )
         }

data/lib/arxutils/misc.rb

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+module Arxutils
+  def load_file( in_file )
+    File.open( in_file , "r" , { :encoding => 'UTF-8' } )
+  end
+  
+  def normalize_to_integer( *args )
+    args.map{ |x|
+      if x != nil and x !~ /^\s*$/
+        x.to_i
+      else
+        nil
+      end
+    }
+  end
+
+  def update_integer( model , hs )
+    value_hs = hs.reduce({}){ |hsx,item|
+      val = model.send(item[0])
+      if val == nil or val  < item[1]
+        hsx[ item[0] ] = item[1]
+      end
+      hsx
+    }
+    if value_hs.size > 0
+      begin
+        model.update(value_hs)
+      rescue => ex
+        puts ex.message
+      end
+    end
+  end
+
+  def capture_queries(&block)
+    queries = []
+    ActiveSupport::Notifications.subscribe('sql.active_record') do |_name, _start, _finish, _id, payload|
+      queries << payload
+    end
+    yield block
+    ActiveSupport::Notifications.unsubscribe('sql.active_record')
+    queries
+  end
+end

data/lib/arxutils/store/storedb.rb

@@ -6,7 +6,7 @@ module Arxutils
     class StoreDb
       def StoreDb.init( hs , block = nil )
         ret = nil
-        register_time = Dbutil::DbMgr.init( hs["db_dir"] , hs["migrate_dir"] , hs["config_dir"], hs["dbconfig"] , hs["log_fname"] )
+        register_time = Dbutil::DbMgr.init( hs["migrate_dir"] , hs["config_dir"], hs["dbconfig"] , hs["log_fname"] )
 
         if block
           ret = block.call( register_time )

data/lib/arxutils/transactstate.rb

@@ -0,0 +1,53 @@
+module Arxutils
+  class TransactState
+    attr_accessor :ids , :state
+    
+    def initialize
+      @ids = []
+      @state = :NONE
+    end
+
+    def add( xid )
+      @ids << xid if @state == :TRACE
+    end
+
+    def clear
+      @ids = []
+    end
+
+    def need?
+      @ids.size > 0
+    end
+
+  end
+
+  class TransactStateGroup
+    def initialize( *names )
+      @state = :NONE
+      @inst = {}
+      names.map{|x| @inst[x] = TransactState.new }
+    end
+    
+    def need?
+      @state != :NONE
+    end
+    
+    def set_all_inst_state
+      @inst.map{|x| x[1].state = @state }
+    end
+    
+    def trace
+      @state = :TRACE
+      set_all_inst_state
+    end
+    
+    def reset
+      @state = :NONE
+      set_all_inst_state
+    end
+    
+    def method_missing(name , lang = nil)
+      @inst[name] 
+    end
+  end
+end

data/lib/arxutils/version.rb

@@ -1,3 +1,3 @@
 module Arxutils
-  VERSION = "0.1.31"
+  VERSION = "0.1.35"
 end

data/lib/arxutils.rb

@@ -1,6 +1,12 @@
+require 'active_support'
+require 'active_support/core_ext'
+require 'active_record'
 require 'arxutils/version'
 require 'arxutils/arxutils'
 require 'arxutils/arx'
+require 'arxutils/transactstate'
+require 'arxutils/hier'
+require 'arxutils/misc'
 require 'arxutils/dbutil/dbinit'
 require 'arxutils/dbutil/dbmgr'
 require 'arxutils/store'

data/lib/config/mysql.tmpl

@@ -9,21 +9,21 @@ default_env: &default
   host:    localhost
   username: root
   password: 
-  database: <%= x.name %>
+  database: <%= @data[:dbname] %>
   pool: 5
   timeout: 5000
 
 development:
   <<: *default
-  database: <%= x.name %>_developement
+  database: <%= @data[:dbname] %>_developement
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: <%= x.name %>_test
+  database: <%= @data[:dbname] %>_test
 
 production:
   <<: *default
-  database: <%= x.name %>_production
+  database: <%= @data[:dbname] %>_production

data/lib/config/sqlite3.tmpl

@@ -8,19 +8,19 @@ default_env: &default
   adapter: sqlite3
   pool: 5
   timeout: 5000
-  database: db/sqlite3.db
+  database: <%= @data[:db_dir] %>/sqlite3.db
 
 development:
   <<: *default
-  database: db/development.sqlite3
+  database: <%= @data[:db_dir] %>/development.sqlite3
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: db/test.sqlite3
+  database: <%= @data[:db_dir] %>/test.sqlite3
 
 production:
   <<: *default
-  database: db/production.sqlite3
+  database: <%= @data[:db_dir] %>/production.sqlite3

data/lib/template/base.tmpl

@@ -3,8 +3,8 @@ class Create<%= @data[:classname] %> < ActiveRecord::Migration
     create_table :<%= @data[:plural] %> do |t|
 <% @data[:ary].each do |x| %>    
       t.column :<%= x.name %>, :<%= x.type %>, :null => <%= x.null %>
-<% end %>    
-      t.column :start_datetime, :datetime, :null => false
+<% end %>
+      t.timestamps  null: false
     end
   end
 

data/lib/template/current.tmpl

@@ -2,10 +2,8 @@ class CreateCurrent<%= @data[:classname_downcase] %> < ActiveRecord::Migration
   def self.up
     execute <<-SQL
       CREATE VIEW current<%= @data[:plural] %> AS SELECT id as org_id,
-<% @data[:ary].each do |x| %>    
-      <%= x.name %>,
-<% end %>    
-      start_datetime FROM <%= @data[:plural] %> where not exists (select * from invalid<%= @data[:plural] %> where invalid<%= @data[:plural] %>.org_id = <%= @data[:plural] %>.id )
+<%= @data[:ary].map{|x| x.name }.join(" , ") %>    
+      FROM <%= @data[:plural] %> where not exists (select * from invalid<%= @data[:plural] %> where invalid<%= @data[:plural] %>.org_id = <%= @data[:plural] %>.id )
     SQL
   end
 

data/lib/template/invalid.tmpl

@@ -2,7 +2,7 @@ class CreateInvalid<%= @data[:classname_downcase] %> < ActiveRecord::Migration
   def self.up
     create_table :invalid<%= @data[:plural] %> do |t|
       t.column :org_id, :int, :null => false
-      t.column :end_datetime, :datetime, :null => true
+      t.column :count_id, :int, :null => true
     end
   end
 

data/lib/template/relation.tmpl

@@ -0,0 +1,3 @@
+  class <%= @data[:classname] %> < ActiveRecord::Base
+<% @data[:relation].each do |x| %>    <%= x %>
+<% end %>  end

data/lib/template/relation_count.tmpl

@@ -0,0 +1,4 @@
+  class <%= @data[:count_classname] %> < ActiveRecord::Base
+<% @data[:need_count_class_plural].each do |x| %>    has_many :invalid<%= x %>
+<% end %>  end
+  

data/lib/template/relation_current.tmpl

@@ -0,0 +1,3 @@
+  class Current<%= @data[:classname_downcase] %> < ActiveRecord::Base
+    belongs_to :<%= @data[:classname_downcase] %> , foreign_key: 'org_id'
+  end  

data/lib/template/relation_invalid.tmpl

@@ -0,0 +1,4 @@
+  class Invalid<%= @data[:classname_downcase] %> < ActiveRecord::Base
+    belongs_to :<%= @data[:classname_downcase] %> , foreign_key: 'org_id'
+    belongs_to :<%= @data[:count_classname_downcase] %> , foreign_key: '<%= @data[:count_field] %>'
+  end  

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: arxutils
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.35
 platform: ruby
 authors:
 - yasuo kominami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -117,10 +131,13 @@ files:
 - lib/arxutils/arxutils.rb
 - lib/arxutils/dbutil/dbinit.rb
 - lib/arxutils/dbutil/dbmgr.rb
+- lib/arxutils/hier.rb
 - lib/arxutils/migrate.rb
+- lib/arxutils/misc.rb
 - lib/arxutils/store.rb
 - lib/arxutils/store/storecsv.rb
 - lib/arxutils/store/storedb.rb
+- lib/arxutils/transactstate.rb
 - lib/arxutils/version.rb
 - lib/config/mysql.tmpl
 - lib/config/sqlite3.tmpl
@@ -128,6 +145,10 @@ files:
 - lib/template/current.tmpl
 - lib/template/invalid.tmpl
 - lib/template/noitem.tmpl
+- lib/template/relation.tmpl
+- lib/template/relation_count.tmpl
+- lib/template/relation_current.tmpl
+- lib/template/relation_invalid.tmpl
 homepage: ''
 licenses: []
 metadata: {}
@@ -147,9 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: utility functions for ActiveRecord.
 test_files: []
-has_rdoc: