eve_app 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ea6c1e6b9b6c9e9ff7652d6735a3abb2df0a72
-  data.tar.gz: eaaae3b38e6384eb6c21a415fbb299e52ffead38
+  metadata.gz: 57c8d8f59f960e2c00cda4ce2ba5ba8c2e268e40
+  data.tar.gz: 15af8961dd8c713c389613226ae81ef2eb927fd3
 SHA512:
-  metadata.gz: ac2803e27660b03ff755a49652690f2042eac8eba469d6485cf5b3569e6b232bc281699cd7fb0eb5573810239117c2a0a03f9ae46a7012ca9e5748a4e3477c14
-  data.tar.gz: 5502bb2b4a8d1950d8a607fbc274db79884fe3a3813aa7c4e4aa64b2bcde64a9d7d6429d67a45bc643e71f7808790c6557d497dd47c2f8b66fcef56685a42064
+  metadata.gz: 6d9c36fa6a1326997245fe2bef3fe35a9d3c189a32ce4f91fe040c08d07885f6988ecc8850c67e4a7b0df39f2df545cf8335c12f92023bbc2df4f30f8f762da8
+  data.tar.gz: 9c04bdcf42755174e84b5de11ec79c4b4a57ae2f407b52e3b132ba50f246ddaad1d40891e4ceeb74195ce26ff8b33a9ad1b3f3559f2e14abb390336b0a4bd74b

data/app/models/eve_app/activity_material.rb

@@ -3,7 +3,9 @@ class EveApp::ActivityMaterial < EveApp::ApplicationRecord
 
   belongs_to :material_type, class_name: 'EveApp::Type', foreign_key: :material_type_id
 
-  scope :order_by_quantity, -> { order(quantity: :desc) }
+  scope :buildable, -> { joins(:material_type).where.not(eve_types: { blueprint_type_id: nil }) }
+  scope :simple, -> { joins(:material_type).where(eve_types: { blueprint_type_id: nil }) }
+  # scope :order_by_quantity, -> { order(quantity: :desc) }
 
   def quantity_for(runs)
     runs > 0 ? runs * quantity : 0

data/lib/eve_app/sde/data_importer.rb

@@ -29,12 +29,18 @@ module EveApp
       def table_list
         @_table_list ||= begin
           whitelist = Array[SDE.config.table_whitelist].flatten.compact.map(&:to_s)
-          tables = SDE.table_list
-          tables = whitelist.any? ? tables & whitelist : tables
-          Hash[tables.map { |name| [name, normalize_table_name(name)] }]
+          tables = SDE.table_info
+          tables.transform_values!(&:symbolize_keys)
+          tables.select! { |(name,_)| whitelist.include?(name) } if whitelist.any?
+
+          Hash[tables.map { |(name,info)| [name, { name: normalize_table_name(name) }.merge(info)] }]
         end
       end
 
+      def table_names
+        Hash[table_list.map { |(on,info)| [on, info[:name]] }]
+      end
+
       def normalize_table_name(name)
         (SDE.config.table_prefix.to_s + name.gsub(/^#{SDE::PREFIXES.join('|')}/, '')).pluralize.underscore
       end

data/lib/eve_app/sde/downloader.rb

@@ -3,6 +3,7 @@ module EveApp
     module Downloader
       def download
         within SDE.config.tmp_path do
+          execute :rm, '-f', 'postgres-latest*'
           execute :wget, '-q', download_uri + '{,.md5}'
           verify!
           execute :bunzip2, SDE.config.archive
@@ -10,9 +11,9 @@ module EveApp
       end
 
       def restore
-        table_list.each do |table_name,normalized_name|
+        table_list.each do |table_name,info|
           sql %Q(DROP TABLE IF EXISTS "#{table_name}")
-          sql %Q(DROP TABLE IF EXISTS "#{normalized_name}")
+          sql %Q(DROP TABLE IF EXISTS "#{info[:name]}")
         end
 
         options = ['-x -O']

data/lib/eve_app/sde/normalizer.rb

@@ -2,18 +2,26 @@ module EveApp
   module SDE
     module Normalizer
       def normalize
-        table_names
+        normalize_table_names
+        primary_keys
         column_names
         missing_relations
         indexes
       end
 
-      def table_names
-        table_list.each do |table_name, normalized_name|
+      def normalize_table_names
+        table_names.each do |table_name, normalized_name|
           sql %Q(ALTER TABLE IF EXISTS "#{table_name}" RENAME TO "#{normalized_name}")
         end
       end
 
+      def primary_keys
+        tables = table_list.select { |_, info| info[:add_primary] }
+        tables.values.each do |info|
+          sql %Q(ALTER TABLE #{info[:name]} ADD id SERIAL PRIMARY KEY)
+        end
+      end
+
       def column_names
         columns.each do |row|
           resource_name = row[:table_name].singularize.gsub('eve_', '')
@@ -21,7 +29,9 @@ module EveApp
           if row[:target_column_name].starts_with?(resource_name)
             row[:target_column_name] = row[:target_column_name].gsub("#{resource_name}_", "")
           end
-
+          if row[:target_column_name] == 'id' && table_info(row[:table_name]).add_primary
+            next
+          end
           if row[:column_name] != row[:target_column_name]
             sql %Q(ALTER TABLE "#{row[:table_name]}" RENAME COLUMN "#{row[:column_name]}" TO "#{row[:target_column_name]}")
           end
@@ -35,49 +45,40 @@ module EveApp
           end
           if row[:column_name] == 'id'
             sql %Q(ALTER TABLE #{row[:table_name]} DROP CONSTRAINT IF EXISTS #{row[:table_name]}_pkey)
-
-            if complex_id_index?(row[:table_name])
-              sql %Q(ALTER TABLE #{row[:table_name]} ADD PRIMARY KEY (id, type_id))
-            else
-              sql %Q(ALTER TABLE #{row[:table_name]} ADD PRIMARY KEY (id))
-            end
+            sql %Q(ALTER TABLE #{row[:table_name]} ADD PRIMARY KEY (id))
           end
         end
       end
 
       def missing_relations
-        sql %Q(ALTER TABLE #{table_list['invTypes']} ADD IF NOT EXISTS category_id integer)
-        sql %Q(ALTER TABLE #{table_list['invTypes']} ADD IF NOT EXISTS category_name character varying)
-        sql %Q(ALTER TABLE #{table_list['invTypes']} ADD IF NOT EXISTS group_name character varying)
-        sql %Q(ALTER TABLE #{table_list['invTypes']} ADD IF NOT EXISTS market_group_name character varying)
-        sql %Q(ALTER TABLE #{table_list['invMarketGroups']} ADD root_group_id INTEGER DEFAULT NULL)
-        sql %Q(ALTER TABLE #{table_list['invTypes']} ADD market_group_root_id integer)
-        sql %Q(ALTER TABLE #{table_list['invTypes']} ADD blueprint_type_id integer)
-        sql %Q(UPDATE #{table_list['invTypes']} SET group_name = (SELECT name FROM #{table_list['invGroups']} WHERE id = #{table_list['invTypes']}.group_id))
-        sql %Q(UPDATE #{table_list['invTypes']} SET category_id = (SELECT category_id FROM #{table_list['invGroups']} WHERE id = #{table_list['invTypes']}.group_id))
-        sql %Q(UPDATE #{table_list['invTypes']} SET category_name = (SELECT name FROM #{table_list['invCategories']} WHERE id = #{table_list['invTypes']}.category_id))
-        sql %Q(UPDATE #{table_list['invTypes']} SET market_group_name = (SELECT name FROM #{table_list['invMarketGroups']} WHERE id = #{table_list['invTypes']}.market_group_id))
-        sql %Q(UPDATE #{table_list['invTypes']} SET blueprint_type_id = (SELECT type_id FROM #{table_list['industryActivityProducts']} WHERE activity_id = 1 AND product_type_id = #{table_list['invTypes']}.id LIMIT 1))
+        sql %Q(ALTER TABLE #{table_names['invTypes']} ADD IF NOT EXISTS category_id integer)
+        sql %Q(ALTER TABLE #{table_names['invTypes']} ADD IF NOT EXISTS category_name character varying)
+        sql %Q(ALTER TABLE #{table_names['invTypes']} ADD IF NOT EXISTS group_name character varying)
+        sql %Q(ALTER TABLE #{table_names['invTypes']} ADD IF NOT EXISTS market_group_name character varying)
+        sql %Q(ALTER TABLE #{table_names['invMarketGroups']} ADD root_group_id INTEGER DEFAULT NULL)
+        sql %Q(ALTER TABLE #{table_names['invTypes']} ADD market_group_root_id integer)
+        sql %Q(ALTER TABLE #{table_names['invTypes']} ADD blueprint_type_id integer)
+        sql %Q(UPDATE #{table_names['invTypes']} SET group_name = (SELECT name FROM #{table_names['invGroups']} WHERE id = #{table_names['invTypes']}.group_id))
+        sql %Q(UPDATE #{table_names['invTypes']} SET category_id = (SELECT category_id FROM #{table_names['invGroups']} WHERE id = #{table_names['invTypes']}.group_id))
+        sql %Q(UPDATE #{table_names['invTypes']} SET category_name = (SELECT name FROM #{table_names['invCategories']} WHERE id = #{table_names['invTypes']}.category_id))
+        sql %Q(UPDATE #{table_names['invTypes']} SET market_group_name = (SELECT name FROM #{table_names['invMarketGroups']} WHERE id = #{table_names['invTypes']}.market_group_id))
+        sql %Q(UPDATE #{table_names['invTypes']} SET blueprint_type_id = (SELECT type_id FROM #{table_names['industryActivityProducts']} WHERE activity_id = 1 AND product_type_id = #{table_names['invTypes']}.id LIMIT 1))
 
         sql %Q(
           WITH RECURSIVE mg_roots(id, root_id) AS (
-            SELECT mg.id, mg.id AS root_id FROM #{table_list['invMarketGroups']} AS mg WHERE mg.parent_group_id IS NULL
+            SELECT mg.id, mg.id AS root_id FROM #{table_names['invMarketGroups']} AS mg WHERE mg.parent_group_id IS NULL
             UNION ALL
-              SELECT c.id, p.root_id FROM mg_roots AS p, #{table_list['invMarketGroups']} AS c WHERE c.parent_group_id = p.id
+              SELECT c.id, p.root_id FROM mg_roots AS p, #{table_names['invMarketGroups']} AS c WHERE c.parent_group_id = p.id
           )
-          UPDATE #{table_list['invMarketGroups']} SET root_group_id = mg_roots.root_id FROM (
+          UPDATE #{table_names['invMarketGroups']} SET root_group_id = mg_roots.root_id FROM (
             SELECT id, root_id FROM mg_roots WHERE root_id != id
-          ) AS mg_roots WHERE #{table_list['invMarketGroups']}.id = mg_roots.id;
+          ) AS mg_roots WHERE #{table_names['invMarketGroups']}.id = mg_roots.id;
         )
-        sql %Q(UPDATE #{table_list['invTypes']} SET market_group_root_id = (SELECT root_group_id FROM #{table_list['invMarketGroups']} WHERE id = #{table_list['invTypes']}.market_group_id))
+        sql %Q(UPDATE #{table_names['invTypes']} SET market_group_root_id = (SELECT root_group_id FROM #{table_names['invMarketGroups']} WHERE id = #{table_names['invTypes']}.market_group_id))
       end
 
       private
 
-      def complex_id_index?(table_name)
-        SDE::ID_TYPE_INDEX.include?(table_name.gsub("#{SDE.config.table_prefix.to_s}_", ''))
-      end
-
       def columns
         query = %Q(
           SELECT table_name, column_name, ordinal_position
@@ -85,7 +86,7 @@ module EveApp
           WHERE
             table_catalog = '#{db_config[:database]}' AND
             table_schema = 'public' AND
-            table_name IN(#{table_list.values.map { |n| "'#{n}'" }.join(', ')})
+            table_name IN(#{table_names.values.map { |n| "'#{n}'" }.join(', ')})
         )
         db.select_all(query).map(&:symbolize_keys)
       end
@@ -110,6 +111,10 @@ module EveApp
         )
         count.to_i > 0
       end
+
+      def table_info(table_name)
+        OpenStruct.new(table_list.detect { |(name,info)| [name, info[:name]].include?(table_name) }[1])
+      end
     end
   end
 end

data/lib/eve_app/sde.rb

@@ -12,15 +12,18 @@ module EveApp
       table_list_file: EveApp.root.join('lib', 'table-list.yml')
     }
     PREFIXES = %w(agt dgm map trn inv sta industry ram)
-    ID_TYPE_INDEX = %w(activities)
 
     class << self
       def config
         @_config ||= OpenStruct.new(DEFAULT_CONFIG)
       end
 
+      def table_info
+        @_table_info ||= YAML::load_file(config.table_list_file)
+      end
+
       def table_list
-        @_table_list ||= YAML::load_file(config.table_list_file)
+        @_table_list ||= table_info.keys
       end
     end
   end

data/lib/eve_app/version.rb

@@ -1,3 +1,3 @@
 module EveApp
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

data/lib/eve_app.rb

@@ -21,15 +21,3 @@ module EveApp
     end
   end
 end
-
-if defined?(::Rails)
-  module ::Rails
-    class Application
-      rake_tasks do
-        Dir[File.join(EveApp.root, "/lib/tasks/", "**/*.rake")].each do |file|
-          load file
-        end
-      end
-    end
-  end
-end

data/lib/table-list.yml

@@ -1,88 +1,177 @@
-- agtAgentTypes
-- agtAgents
-- agtResearchAgents
-- certCerts
-- certMasteries
-- certSkills
-- chrAncestries
-- chrAttributes
-- chrBloodlines
-- chrFactions
-- chrRaces
-- crpActivities
-- crpNPCCorporationDivisions
-- crpNPCCorporationResearchFields
-- crpNPCCorporationTrades
-- crpNPCCorporations
-- crpNPCDivisions
-- dgmAttributeCategories
-- dgmAttributeTypes
-- dgmEffects
-- dgmExpressions
-- dgmTypeAttributes
-- dgmTypeEffects
-- eveGraphics
-- eveIcons
-- eveUnits
-- industryActivity
-- industryActivityMaterials
-- industryActivityProbabilities
-- industryActivityProducts
-- industryActivityRaces
-- industryActivitySkills
-- industryBlueprints
-- invCategories
-- invContrabandTypes
-- invControlTowerResourcePurposes
-- invControlTowerResources
-- invFlags
-- invGroups
-- invItems
-- invMarketGroups
-- invMetaGroups
-- invMetaTypes
-- invNames
-- invPositions
-- invTraits
-- invTypeMaterials
-- invTypeReactions
-- invTypes
-- invUniqueNames
-- invVolumes
-- mapCelestialStatistics
-- mapConstellationJumps
-- mapConstellations
-- mapDenormalize
-- mapJumps
-- mapLandmarks
-- mapLocationScenes
-- mapLocationWormholeClasses
-- mapRegionJumps
-- mapRegions
-- mapSolarSystemJumps
-- mapSolarSystems
-- mapUniverse
-- planetSchematics
-- planetSchematicsPinMap
-- planetSchematicsTypeMap
-- ramActivities
-- ramAssemblyLineStations
-- ramAssemblyLineTypeDetailPerCategory
-- ramAssemblyLineTypeDetailPerGroup
-- ramAssemblyLineTypes
-- ramInstallationTypeContents
-- skinLicense
-- skinMaterials
-- skinShip
-- skins
-- staOperationServices
-- staOperations
-- staServices
-- staStationTypes
-- staStations
-- translationTables
-- trnTranslationColumns
-- trnTranslationLanguages
-- trnTranslations
-- warCombatZoneSystems
-- warCombatZones
+---
+agtAgentTypes:
+  add_primary: false
+agtAgents:
+  add_primary: false
+agtResearchAgents:
+  add_primary: false
+certCerts:
+  add_primary: false
+certMasteries:
+  add_primary: false
+certSkills:
+  add_primary: false
+chrAncestries:
+  add_primary: false
+chrAttributes:
+  add_primary: false
+chrBloodlines:
+  add_primary: false
+chrFactions:
+  add_primary: false
+chrRaces:
+  add_primary: false
+crpActivities:
+  add_primary: false
+crpNPCCorporationDivisions:
+  add_primary: false
+crpNPCCorporationResearchFields:
+  add_primary: false
+crpNPCCorporationTrades:
+  add_primary: false
+crpNPCCorporations:
+  add_primary: false
+crpNPCDivisions:
+  add_primary: false
+dgmAttributeCategories:
+  add_primary: false
+dgmAttributeTypes:
+  add_primary: false
+dgmEffects:
+  add_primary: false
+dgmExpressions:
+  add_primary: false
+dgmTypeAttributes:
+  add_primary: false
+dgmTypeEffects:
+  add_primary: false
+eveGraphics:
+  add_primary: false
+eveIcons:
+  add_primary: false
+eveUnits:
+  add_primary: false
+industryActivity:
+  add_primary: true
+industryActivityMaterials:
+  add_primary: true
+industryActivityProbabilities:
+  add_primary: false
+industryActivityProducts:
+  add_primary: false
+industryActivityRaces:
+  add_primary: false
+industryActivitySkills:
+  add_primary: false
+industryBlueprints:
+  add_primary: false
+invCategories:
+  add_primary: false
+invContrabandTypes:
+  add_primary: false
+invControlTowerResourcePurposes:
+  add_primary: false
+invControlTowerResources:
+  add_primary: false
+invFlags:
+  add_primary: false
+invGroups:
+  add_primary: false
+invItems:
+  add_primary: false
+invMarketGroups:
+  add_primary: false
+invMetaGroups:
+  add_primary: false
+invMetaTypes:
+  add_primary: false
+invNames:
+  add_primary: false
+invPositions:
+  add_primary: false
+invTraits:
+  add_primary: false
+invTypeMaterials:
+  add_primary: false
+invTypeReactions:
+  add_primary: false
+invTypes:
+  add_primary: false
+invUniqueNames:
+  add_primary: false
+invVolumes:
+  add_primary: false
+mapCelestialStatistics:
+  add_primary: false
+mapConstellationJumps:
+  add_primary: false
+mapConstellations:
+  add_primary: false
+mapDenormalize:
+  add_primary: false
+mapJumps:
+  add_primary: false
+mapLandmarks:
+  add_primary: false
+mapLocationScenes:
+  add_primary: false
+mapLocationWormholeClasses:
+  add_primary: false
+mapRegionJumps:
+  add_primary: false
+mapRegions:
+  add_primary: false
+mapSolarSystemJumps:
+  add_primary: false
+mapSolarSystems:
+  add_primary: false
+mapUniverse:
+  add_primary: false
+planetSchematics:
+  add_primary: false
+planetSchematicsPinMap:
+  add_primary: false
+planetSchematicsTypeMap:
+  add_primary: false
+ramActivities:
+  add_primary: false
+ramAssemblyLineStations:
+  add_primary: false
+ramAssemblyLineTypeDetailPerCategory:
+  add_primary: false
+ramAssemblyLineTypeDetailPerGroup:
+  add_primary: false
+ramAssemblyLineTypes:
+  add_primary: false
+ramInstallationTypeContents:
+  add_primary: false
+skinLicense:
+  add_primary: false
+skinMaterials:
+  add_primary: false
+skinShip:
+  add_primary: false
+skins:
+  add_primary: false
+staOperationServices:
+  add_primary: false
+staOperations:
+  add_primary: false
+staServices:
+  add_primary: false
+staStationTypes:
+  add_primary: false
+staStations:
+  add_primary: false
+translationTables:
+  add_primary: false
+trnTranslationColumns:
+  add_primary: false
+trnTranslationLanguages:
+  add_primary: false
+trnTranslations:
+  add_primary: false
+warCombatZoneSystems:
+  add_primary: false
+warCombatZones:
+  add_primary: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eve_app
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Danny Hiemstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-28 00:00:00.000000000 Z
+date: 2017-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails