feidee_utils 0.0.5.3 → 0.0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52939cfeaaed123fbd26ae21d28323de5e4f9315
-  data.tar.gz: e9fea8a9ebda721a02a0a71a49a4aed8b4382bad
+  metadata.gz: 13652aed513e122b73d0f6a0c8444038f62e6ce7
+  data.tar.gz: 7e6471828e9b63c29d0509cbe0a4623fdfcb1447
 SHA512:
-  metadata.gz: 262d1e6c897f1ad951605df672c58d1f2058eb5d28554754100e8ee5e340606533a0e0dad838d01db0738b960df6b6912be520a60367a67e34a41ed1055c0331
-  data.tar.gz: 74daf0b8276450c6359668881731ba86f2339a882340098457e91c2dabcd251fc2c0cfd231057de214de03acc626adedb5588e831f163dd511587e5fa13bf85a
+  metadata.gz: 9850f54ef6101377e427e5074e7070660283713b9333ee8f289471fcf01f6817adc40989e161ab35e945b9ba494d9be52c74e67fb97485428e09833a5555d581
+  data.tar.gz: 463fba9a6616c73a0333338eee7610a22476dfea791be9acc5e4152313f286f7b5fe1da28d973c100966e23fa1cfba7dd774dddadd06292ec9b4d77760a558e1

data/lib/feidee_utils/account.rb

@@ -62,7 +62,7 @@ module FeideeUtils
       "clientID",         # Always equal to poid.
     ].freeze
 
-    define_accessors(FieldMappings)
+    register_indexed_accessors(FieldMappings)
 
     # NOTE: balance is not set for credit cards etc. Instead
     # credit/debit are used.
@@ -111,7 +111,7 @@ module FeideeUtils
         "SELECT * FROM #{self.class.table_name} WHERE parent = ?", poid
       ) do |result|
         result.each do |raw_row|
-          arr << self.class.new(result.columns, result.types, raw_row)
+          arr << self.class.new(raw_row)
         end
       end
       arr

data/lib/feidee_utils/account_group.rb

@@ -31,7 +31,7 @@ module FeideeUtils
       "clientID",              # Always equal to poid.
     ].freeze
 
-    define_accessors(FieldMappings)
+    register_indexed_accessors(FieldMappings)
 
     define_type_enum({
       0 => :asset,

data/lib/feidee_utils/category.rb

@@ -59,7 +59,7 @@ module FeideeUtils
       "clientID",              # Always equal to poid.
     ].freeze
 
-    define_accessors(FieldMappings)
+    register_indexed_accessors(FieldMappings)
 
     define_type_enum({
       0 => :expenditure,

data/lib/feidee_utils/database.rb

@@ -40,7 +40,7 @@ module FeideeUtils
       drop_unused_tables if strip
 
       # TODO: make Ledger a first class object.
-      @ledger = Record.generate_namespaced_record_classes(self)
+      @ledger = Record.generate_subclasses(self)
     end
 
     def sqlite_backup(dest_file_path)

data/lib/feidee_utils/record/accessors.rb

@@ -10,6 +10,9 @@ module FeideeUtils
       end
 
       module ClassMethods
+
+        private
+
         def define_accessors field_mappings
           field_mappings.each do |name, key|
             if method_defined? name
@@ -36,6 +39,31 @@ module FeideeUtils
             self.class.environment.const_get(target_class_name).find_by_id(poid)
           end
         end
+
+        def register_indexed_accessors field_mappings
+          # The indexes of those columns are unknown until we see the schema.
+          const_set :IndexedAccessorFieldMappings, field_mappings
+        end
+
+        protected
+        # NOTE: Here we assume the underlaying database schema does not change.
+        # The assumption is safe in the sense that it is generally expected to
+        # restart and/or recompile your application after updating the schema.
+        def define_indexed_accessors
+          return if !const_defined? :IndexedAccessorFieldMappings
+
+          self::IndexedAccessorFieldMappings.each do |name, column_name|
+            if method_defined? name
+              raise "Accessor #{name} already exists in #{self.name}."
+            end
+
+            index = self.column_names.index column_name
+            if index.nil?
+              raise "Cannot find column #{column_name} in #{inspect}."
+            end
+            define_method name do column_at_index(index) end
+          end
+        end
       end
     end
   end

data/lib/feidee_utils/record/namespaced.rb

@@ -6,6 +6,8 @@ module FeideeUtils
       module ClassMethods
         attr_reader :child_classes
 
+        private
+
         # Must be invoked by Record.inherited
         def collect_subclass(child_class)
           @child_classes ||= Set.new
@@ -23,7 +25,7 @@ module FeideeUtils
               define_method("environment") { mod }
             })
 
-            this.child_classes.each do |child_class|
+            @contained_classes = this.child_classes.map do |child_class|
               if child_class.name.start_with? FeideeUtils.name
                 class_name = child_class.name.sub(/#{FeideeUtils.name}::/, '')
                 # Generate a const for the child class
@@ -32,6 +34,10 @@ module FeideeUtils
                 })
               end
             end
+
+            def self.contained_classes
+              @contained_classes
+            end
           end
         end
       end

data/lib/feidee_utils/record/persistent.rb

@@ -3,25 +3,35 @@ module FeideeUtils
   class Record
     module Persistent
       module ClassMethods
+        protected
+
         # Names
         # Must be invoked by Record.inherited
-        def genereate_names subclass
+        def generate_names
           entity_name =
-            if i = subclass.name.rindex("::")
-              subclass.name[(i+2)..-1]
+            if i = self.name.rindex("::")
+              self.name[(i+2)..-1]
             else
-              subclass.name
+              self.name
             end
 
           id_field_name = entity_name.sub(/^[A-Z]/) { $&.downcase } + "POID"
           entity_name_underscore =
               entity_name.gsub(/([a-z\d])([A-Z\d])/, '\1_\2').downcase
           table_name = "t_" + entity_name_underscore
-          subclass.class_exec do
-            define_singleton_method :entity_name do entity_name end
-            define_singleton_method :id_field_name do id_field_name end
-            define_singleton_method :table_name do table_name end
-          end
+          define_singleton_method :entity_name do entity_name end
+          define_singleton_method :id_field_name do id_field_name end
+          define_singleton_method :table_name do table_name end
+        end
+
+        public
+
+        def columns
+          database.table_info(self.table_name)
+        end
+
+        def column_names
+          @column_names ||= self.columns.map do |entry| entry["name"] end.freeze
         end
 
         # Persistent
@@ -29,7 +39,7 @@ module FeideeUtils
           arr = []
           database.query("SELECT * FROM #{self.table_name}") do |result|
             result.each do |raw_row|
-              arr << self.new(result.columns, result.types, raw_row)
+              arr << self.new(raw_row)
             end
           end
           arr
@@ -49,7 +59,7 @@ module FeideeUtils
               "in table #{self.table_name}."
           end
 
-          self.new(raw_result.columns, raw_result.types, raw_row)
+          self.new(raw_row)
         end
 
         def find(id)

data/lib/feidee_utils/record.rb

@@ -24,8 +24,7 @@ module FeideeUtils
   # is copied to the new namespace, with it's database method overloaded.
   class Record
     public
-    def initialize(columns, types, row)
-      @columns = columns.freeze
+    def initialize(row)
       @row = row.freeze
 
       validate_integrity
@@ -39,6 +38,14 @@ module FeideeUtils
       # Do nothing.
     end
 
+    def self.generate_subclasses db
+      env = generate_namespaced_record_classes db
+      env.contained_classes.each do |klass|
+        klass.define_indexed_accessors
+      end
+      env
+    end
+
     class << self
       protected
       def database
@@ -49,7 +56,7 @@ module FeideeUtils
       def inherited subclass
         if subclass.name != nil and subclass.name.start_with? FeideeUtils.name
           collect_subclass subclass
-          genereate_names subclass
+          subclass.generate_names
         end
       end
     end
@@ -74,10 +81,14 @@ module FeideeUtils
       # few characters. The overhead is relatively low.
       # In fact, a downstream benchmark showed that it is faster than building a
       # hash upfront and lookup the hash here.
-      index = @columns.index key
+      index = self.class.column_names.index key
       return nil if index.nil?
       @row[index]
     end
 
+    def column_at_index index
+      @row[index]
+    end
+
   end
 end

data/lib/feidee_utils/transaction.rb

@@ -122,7 +122,7 @@ module FeideeUtils
       "FSourceKey",           # WTF
     ].freeze
 
-    define_accessors(FieldMappings)
+    register_indexed_accessors(FieldMappings)
 
     define_type_enum({
       0 => :expenditure,

data/lib/feidee_utils/version.rb

@@ -1,3 +1,3 @@
 module FeideeUtils
-    VERSION = '0.0.5.3'
+    VERSION = '0.0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feidee_utils
 version: !ruby/object:Gem::Version
-  version: 0.0.5.3
+  version: 0.0.6.1
 platform: ruby
 authors:
 - Liqing Muyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake