arxutils 0.1.35 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0db660cdf41eaaaab3cc142711afb8186b10c06e
-  data.tar.gz: 20a8b02d69969d52a37cfddda3c721d0d628762d
+  metadata.gz: 1b719f143307e145df60195bc5e2670aa7fb2474
+  data.tar.gz: 00c4f031d2555d54eb937523eb8b02c7f5a57e52
 SHA512:
-  metadata.gz: 7e38ecbe696e36c4e4975fcf304beb86d49056edb6df241448232d7e8b987041f45514ece568c1449f4155fde058521c55a71e221e3de4f3d8a76bf5bd0e9f35
-  data.tar.gz: bc11ab615060d8d3eaff76d5e582258adf766d78cde23852403ba4c3f05ae54440c2853f047675a59c8389a802cb9b3d648ca730aea8d49200a8c117dbf16ee7
+  metadata.gz: bee744f9f8444396d9e0c41dda4851dfb24c0e6959c3e465bf1e91b0f64a2e1c4a99427aae8fce2e778d75dcf99bd872a773f5143cf1ea9f9c7e15b0afb80be1
+  data.tar.gz: a0fd2f8c5f1c0973d0673194ebd98b83e033fba1ba6eb7620a5ca2f13cddd75d0113c05425afad57e9fb7de838bf7b7f83c0b112a71078fdd9911b21a085be48

data/lib/arxutils/dbutil/dbinit.rb

@@ -16,16 +16,17 @@ module Arxutils
     class Dbinit
       attr_accessor :dbconfig_dest_path , :dbconfig_src_path , :dbconfig_src_fname , :dbconfig_dest_fname , :migrate_dir
       
-      def initialize( migrate_base_dir , src_config_dir , dbconfig , log_fname, forced = false )
-        @db_dir = dbconfig[:db_dir]
+      def initialize( db_dir , migrate_base_dir , src_config_dir , dbconfig , env, log_fname, forced = false )
+        @db_dir = db_dir
         @src_config_dir  = src_config_dir
         @dest_config_dir  = "config"
-        @dbconfig_dest_fname = "#{dbconfig[:kind]}.yaml"
-        @dbconfig_src_fname = "#{dbconfig[:kind]}.tmpl"
+        @dbconfig_dest_fname = "#{dbconfig}.yaml"
+        @dbconfig_src_fname = "#{dbconfig}.tmpl"
         @dbconfig_dest_path = File.join( @dest_config_dir , @dbconfig_dest_fname)
         @dbconfig_src_path = File.join(@src_config_dir  , @dbconfig_src_fname)
+        @env = env
         @log_fname = log_fname
-
+        
         if @db_dir and @log_fname
           @log_path = File.join( @db_dir , @log_fname )
           @migrate_dir = File.join( @db_dir , migrate_base_dir )
@@ -40,10 +41,8 @@ module Arxutils
       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.establish_connection(dbconfig[@env])
         ActiveRecord::Base.logger = Logger.new( @log_path )
       end
     end

data/lib/arxutils/dbutil/dbmgr.rb

@@ -8,8 +8,8 @@ require 'pp'
 module Arxutils
   module Dbutil
     class DbMgr
-      def DbMgr.init( migrate_dir , config_dir , dbconfig, log_fname, forced = false )
-        dbinit = Dbinit.new( migrate_dir , config_dir , dbconfig, log_fname, forced )
+      def DbMgr.init( db_dir , migrate_dir , config_dir , dbconfig, env , log_fname, forced = false )
+        dbinit = Dbinit.new( db_dir, migrate_dir , config_dir , dbconfig, env , log_fname, forced )
         DbMgr.setup( dbinit )
       end
       

data/lib/arxutils/hier.rb

@@ -2,13 +2,30 @@
 
 module Arxutils
   class HierOp
-    def initialize( hier_symbol , base_klass , hier_klass , current_klass )
+    attr_reader :field_name, :hier_symbol, :base_klass, :hier_klass, :current_klass, :invalid_klass
+
+    def initialize( field_name, hier_symbol , hier_name, base_klass , hier_klass , current_klass , invalid_klass )
+      @field_name = field_name
       @hier_symbol = hier_symbol
       @base_klass = base_klass
       @hier_klass = hier_klass
       @current_klass = current_klass
+      @invalid_klass = invalid_klass
     end
-    
+
+    def get_category_hier_json( kind_num )
+      JSON( @hier_klass.pluck( :parent_id , :child_id , :level ).map{ |ary|
+              text = @base_klass.find( ary[1] ).__send__( @hier_symbol ).split("/").pop
+              if ary[2] == 0
+                parent_id = "#"
+              else
+                parent_id = %Q!#{ary[0]}!
+              end
+              child_id = %Q!#{ary[1]}!
+              { "id" => child_id , "parent" => parent_id , "text" => text }
+            } )
+    end
+
     def delete( hier )
       # 子として探す
       id = nil

data/lib/arxutils/migrate.rb

@@ -10,7 +10,7 @@ module Arxutils
   class Migrate
     attr_accessor :dbinit , :dbconfig_dest_path , :dbconfig_dest_fname , :dbconfig_src_path , :dbconfig_src_fname
     
-    def Migrate.migrate( data_ary , relation_def_fpath , module_name, count_classname_downcase , count_field , dbconfig , forced )
+    def Migrate.migrate( data_ary , relation_def_fpath , module_name, count_classname_downcase , dbconfig , forced )
       src_config_dir = Arxutils.configdir
       mig = Migrate.new( Dbutil::MIGRATE_DIR , src_config_dir , dbconfig, Dbutil::DATABASELOG, forced )
       # dbconfigのテンプレートは内容が固定である。convertを呼び出し、Arxのインスタンスを作成するときに、適切なdata_aryの要素を与える必要がある（ただしテンプレートへの埋め込みには用いられない
@@ -21,7 +21,7 @@ module Arxutils
       }
 
       content_array = data_ary.map { |x| 
-        mig.make_relation( x , "count", "end_count_id" )
+        mig.make_relation( x , "count" )
       }.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
@@ -29,7 +29,6 @@ module Arxutils
       }
       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
@@ -78,7 +77,7 @@ module Arxutils
       }
     end
 
-    def make_relation( data , count_classname_downcase , count_field )
+    def make_relation( data , count_classname_downcase )
       if data[:classname_downcase] != count_classname_downcase
         data[:flist].reduce( { content: [], need_count_class: nil } ){ |s, x|
           case x
@@ -87,7 +86,6 @@ module Arxutils
             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

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["migrate_dir"] , hs["config_dir"], hs["dbconfig"] , hs["log_fname"] )
+        register_time = Dbutil::DbMgr.init( hs["db_dir"], hs["migrate_dir"] , hs["config_dir"], hs["dbconfig"] , hs["env"] , hs["log_fname"] )
 
         if block
           ret = block.call( register_time )

data/lib/arxutils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arxutils
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
 platform: ruby
 authors:
 - yasuo kominami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: utility functions for ActiveRecord.