eve_static 0.0.1 → 0.0.2

data/lib/eve_static.rb

@@ -6,6 +6,7 @@ Bundler.require(:default)
 module EveStatic
   autoload :Database, 'eve_static/database.rb'
   autoload :Coerce, 'eve_static/coerce.rb'
+  autoload :Manipulate, 'eve_static/manipulate.rb'
   
   module Queries
     autoload :Basic, 'eve_static/queries/basic.rb'

data/lib/eve_static/database.rb

@@ -2,6 +2,7 @@ module EveStatic
   class Database
     include EveStatic::Queries::Basic
     include EveStatic::Queries::Industry
+    include EveStatic::Manipulate
     include EveStatic::Coerce
   
     def initialize(opt = {})

data/lib/eve_static/manipulate.rb

@@ -0,0 +1,53 @@
+module EveStatic
+  module Manipulate  
+    def add_category_id(input)
+      input.merge({ :categoryID => typeCategory(input[:typeID])[:categoryID]})
+    end
+    
+    def add_category_ids(input)
+      input.map { |i| add_category_id i }
+    end
+    
+    def add_group_id(input)
+      input.merge({ :groupID => typeGroup(input[:typeID])[:groupID]})
+    end
+    
+    def add_group_ids(input)
+      input.map { |i| add_group_id i }
+    end
+    
+    def to_human(input)
+      if input.is_a? Array
+        output = input.map { |i| to_human(i) }
+      elsif input.is_a? Hash
+        if primitive?(input)
+          output = add_category_id(input)
+          output = add_group_id(input)
+          output = output.merge({:categoryName => typeCategory(input[:typeID])[:categoryName]})
+          output = output.merge({:groupName => typeGroup(input[:typeID])[:groupName]})
+        else
+          output = input.map do |k, v|
+            if primitive?(v)
+              [k, v]
+            else
+              [k, to_human(v)]
+            end          
+          end
+          
+          output = Hash[output]
+        end
+      else
+        output = input
+      end
+      
+      output
+    end
+    
+    private
+    def primitive?(input)
+      return false if input.is_a?(Array)
+      output = input.values.map { |i| i.is_a?(Array) || i.is_a?(Hash) }
+      output = !output.reduce(:|)
+    end
+  end
+end

data/lib/eve_static/queries/basic.rb

@@ -16,6 +16,35 @@ module EveStatic
         
         instance[:invTypes].where(:typeID => typeID).select(Sequel.lit('typeName')).first[:typeName]
       end
+      
+      def groupName(groupID)
+        instance[:invGroups].where(:groupID => groupID).select(Sequel.lit('groupName')).first[:groupName]
+      end
+      
+      def groupID(groupName)
+        instance[:invGroups].where(:groupName => groupName).select(Sequel.lit('groupID')).first[:groupID]
+      end
+      
+      def typeGroup(type)
+        typeID = coerce_type_id(type)
+        
+        instance[:invTypes].inner_join(:invGroups, :groupID => :groupID).where(:typeID => typeID).select_all(:invGroups).first
+      end
+      
+      def categoryName(categoryID)
+        instance[:invCategories].where(:categoryID => categoryID).select(Sequel.lit('categoryName')).first[:categoryName]
+      end
+      
+      def categoryID(categoryName)
+        instance[:invCategories].where(:categoryName => categoryName).select(Sequel.lit('categoryID')).first[:categoryID]
+      end
+      
+      def typeCategory(type)
+        typeID = coerce_type_id(type)
+        
+        instance[:invTypes].inner_join(:invGroups, :groupID => :groupID).inner_join(:invCategories, :categoryID => :categoryID).where(:typeID => typeID).select_all(:invCategories).first
+      end
+      
     end
   end
 end

data/lib/eve_static/queries/industry.rb

@@ -116,6 +116,9 @@ module EveStatic
         end       
         
         raw = raw.map { |r| r.merge({ :waste => waste(r[:quantity], bp[:wasteFactor], me) }) }
+        
+        raw = raw.map { |r| normalize_materials r }
+        extra = extra.map { |e| normalize_materials e }
                 
         { :raw => raw, 
           :extra => extra }
@@ -141,6 +144,15 @@ module EveStatic
         result = base * (base_waste.to_f/100.0) * me
         result.to_i
       end
+      
+      def normalize_materials(input)
+        output = input.map do |k, v|
+          k = :typeID if k == :materialTypeID || k == :requiredTypeID
+          [ k, v ]
+        end
+        
+        Hash[output]
+      end
     end
   end
 end

data/lib/eve_static/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eve_static
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -28,6 +28,7 @@ files:
 - lib/eve_static.rb
 - lib/eve_static/coerce.rb
 - lib/eve_static/database.rb
+- lib/eve_static/manipulate.rb
 - lib/eve_static/queries/basic.rb
 - lib/eve_static/queries/industry.rb
 - lib/eve_static/version.rb