dialect_lookup 0.0.5 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecd76e49a3ad9d91f7bf09bcaf01d48c62d710023d2d0a5ba1f97f1a65a39001
-  data.tar.gz: 0ae4e1bc812bf5ed0ff849a31a7d79e5f5af7f9cdb16d041498bfff2dfacc0db
+  metadata.gz: 21b69bb982354d56f144c1ab9352aa5de738790fefc034e372db031d77f563b7
+  data.tar.gz: c45f08c77d7f7878ca5d2a2ec3a023a8580496248f874af35b0f36ac5db1491b
 SHA512:
-  metadata.gz: 8a0f654d4352439bf92f0c09b62aa4e10557d23e949129e444834590861e76481dc31e297b7751aaef449cfe13fee9a7db5aceb25beb87aa93b694b0b1672f53
-  data.tar.gz: a6a766487f3712e0719664f00afe084b12cefd7cfb02421a9c3b22d156fc609d3a2006ce617fde14621bc727d5200ad0ea337fec75b2f7fc0169c21acb94e9a2
+  metadata.gz: f67ce96286d16264dfb93837c0e8a04c5fa529dad196d13bb88742282f63c031cb76e3fde5fcace59a6b0e2b501c71711d1554ac452528365c26f8bc17e665b2
+  data.tar.gz: 01a834c811d6fbce4db7f15ac642af487696850958725d8938d4062dc5fb09eed1261b0d72927392915b2b486f7011e95187d573798b5deab50a87823f6516e2

data/.gitignore

@@ -1 +1,2 @@
+Gemfile.lock
 *.gem

data/dialect_lookup.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name    = 'dialect_lookup'.freeze
-  s.version = '0.0.5'
+  s.version = '0.0.8'
   s.authors = ['Eugene Istomin'.freeze]
   s.email   = ['info@innosense.org'.freeze]
   s.license = 'CC-BY-SA-4.0'
@@ -18,7 +18,10 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }  
   s.require_paths = ['lib'.freeze]
   
+  s.required_ruby_version = '>= 2.5'  
   s.add_runtime_dependency 'sqlite3',   '~> 1.3'
   s.add_runtime_dependency 'oj',        '~> 3.6'
+  s.add_runtime_dependency 'json',      '~> 2.1'
+  
 
 end

data/lib/dialect_lookup.rb

@@ -14,6 +14,9 @@ module Dialect
 
 #Gems
 require 'sqlite3'
+require 'json'
+require 'oj'
+
 
 #Files
 require 'sql'
@@ -39,7 +42,7 @@ Dir[File.join(__dir__, 'lookup/**', '*.rb')].each { |file| require_relative file
               args[:views][id] ||= {}
               args[:views][id][:version] = row[1]
               args[:views][id][:name] = state[:dialectFolder]
-              Dialog.logger.info "Dialect functional view '#{viewAtr[0][0]}' (id #{id}, view ver.#{row[1]}, model ver.#{row[2]}) of folder '#{Dialog.config.dialect.folder}' for bot '#{Dialog.config.naming.instance}' suits for me!"
+              Dialog.logger.info "Dialect functional view '#{viewAtr[0][0]}' (id #{id}, view ver.#{row[1]}, model ver.#{row[2]}) of interface '#{Dialog.config.naming.interface}' for bot '#{Dialog.config.naming.instance}' suits for me!"
             end
           end           
         end
@@ -80,7 +83,7 @@ Dir[File.join(__dir__, 'lookup/**', '*.rb')].each { |file| require_relative file
         viewType = :perView
         fullName = "#{state[:dialectFolder]}_#{viewId}"
         fullNameSym = fullName.to_sym
-        Dialog.logger.debug "#Dialect_lookup RUN instance #{state[:dialectFolder]}"
+        Dialog.logger.debug "Dialect_lookup RUN instance '#{state[:dialectFolder]}' view '#{viewProps[:name]}' ver.#{viewProps[:version]}"
         ###functional
         lookupStruct = {'functional' => [
           'Expect2Events',     'Events2AppEvent',   'Events2ModReceive', 'ModReceive2AppEvent',
@@ -99,12 +102,13 @@ Dir[File.join(__dir__, 'lookup/**', '*.rb')].each { |file| require_relative file
         
         
         state[:dbhandler].close
-        json = Oj.dump(args)
+        #json = Oj.dump(args) ## NO GIT-PREFERRED PRETTY OUTPUT IN OJ
+        json = JSON.pretty_generate(args)
 #         File.delete(db)
-        FileUtils.mkdir_p("#{state[:jsonFolder]}")
-        FileUtils.rm_rf(Dir.glob("#{state[:jsonFolder]}/*.json"))        
-        jsonDump = "#{state[:jsonFolder]}/#{state[:dialectFolder]}_#{state[:myAppName]}.json"
-        File.open(jsonDump, 'w') { |file| file.write(json) }
+#         FileUtils.mkdir_p("#{state[:jsonFolder]}")
+        FileUtils.rm_rf("#{state[:json]}")
+        File.open(state[:json], 'w') { |file| file.write(json) }
+
     end
 
   end

data/lib/lookup.rb

@@ -102,7 +102,11 @@ module Dialect
       
       case viewType
       when :perView
-        base = args[:stages][state[:dialectFolder]][viewType][state[:myAppName]][viewId][queryName]          
+        if not args[:stages][state[:dialectFolder]][viewType][state[:myAppName]].nil?
+          base = args[:stages][state[:dialectFolder]][viewType][state[:myAppName]][viewId][queryName]          
+        else
+          base = false
+        end
       when :constructors
         base = args[:stages][state[:dialectFolder]][viewType][state[:myAppName]][queryName]          
       end

data/lib/sql.rb

@@ -99,7 +99,7 @@ module Dialect
           objProps.each do |objProp, objVal|
             if objProp.to_s =~ /Relationship/
               links[objProp] ||= {}                
-              objVal.each do |conPairId, conProps| 
+              objVal.sort.map do |conPairId, conProps| 
                 
                 if ! rows[conProps[:from]].nil? and ! rows[conProps[:to]].nil?
                   links[objProp][conPairId] ||= {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dialect_lookup
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors:
 - Eugene Istomin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: Dialect lookup
 email:
 - info@innosense.org
@@ -82,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -90,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Dialect lookup