light_record 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cea325f7a213deab5fa00bcf32d07ccd14456ba3
-  data.tar.gz: b5dd83b77f9929ee46b0dc8b9d02e78c526a2bb8
+SHA256:
+  metadata.gz: ea1302da9cb295270ba77e8016a66df3555f8842884cff89fb08ad82db14fe6b
+  data.tar.gz: 3c722a60612f1e0d69c68791ade21162a0d53dcbb7c2ee63cabb7ec362b3d1df
 SHA512:
-  metadata.gz: 1ad5f7947d0570e46585d84882ce1e710973fbe43fa63aed576d0065b86918a77c08f9f9de4e8b27dddf69d3429bab58765b2e0893748eea84539dae91a92c36
-  data.tar.gz: 11231ea0c41e361b2247f6fe1816aa5a19bc1b48071447d9d78b7c3cbc3af787ab7928ef879b0615e2fe6677e223fec05f855f05135eb8bd9265792a4ee2d237
+  metadata.gz: fb7bf3a405a060cd01c8b7782d65879ddcc74cc7404057031005780de1d1c5a6b833687db1c8babe587bb055ed50de651ad0b0e9c464125f8c378ca178f84f33
+  data.tar.gz: 87eda8dc8e30afbe4e1c4304a6ae1ed137d8383af275c2506965fbcff04683c4f671852ebaac82af4a4994b245e5379825e2f14b936c75a0f8f67ee72cc5997c

data/lib/light_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LightRecord
   extend self
 
@@ -20,6 +22,13 @@ module LightRecord
       def initialize(data)
         @attributes = data
         @readonly = true
+        @association_cache = {}
+        @primary_key = self.class::LIGHT_RECORD_PRIMARY_KEY_CACHE
+        #init_internals
+      end
+
+      def self.model_name
+        self.superclass.model_name
       end
 
       def read_attribute_before_type_cast(attr_name)
@@ -45,22 +54,86 @@ module LightRecord
       def [](attr_name)
         @attributes[attr_name.to_sym]
       end
-    
+
       def attributes
         @attributes
       end
 
       # to avoid errors when try saving data
       def remember_transaction_record_state
-        @_start_transaction_state ||= {}
+        @new_record ||= false
+        @destroyed ||= false
+        @_start_transaction_state ||= {level: 0}
         super
       end
+
+      def sync_with_transaction_state
+        nil
+      end
+
+      def new_record?
+        false
+      end
+
+      # For Rails < 5.1
+      # Assign without type casting, no support for alias, sorry
+      def write_attribute_with_type_cast(attr_name, value, should_type_cast)
+        @attributes[attr_name.to_sym] = value
+      end
+
+      # For Rails >= 5.1
+      # Assign without type casting, no support for alias, sorry
+      if ActiveRecord.version >= Gem::Version.new("5.1.0")
+        def write_attribute(attr_name, value)
+          attr_name = attr_name.to_sym
+          attr_name = self.class.primary_key if attr_name == :id && self.class.primary_key
+          @attributes[attr_name] = value
+          value
+        end
+
+        def raw_write_attribute(attr_name, value) # :nodoc:
+          @attributes[attr_name.to_sym] = value
+          value
+        end
+      end
+
+      ## For Rails 5.2
+      def id_in_database
+        attributes[self.class.primary_key.to_sym]
+      end
+
+      def reload
+        super
+        @attributes = @attributes.to_h.symbolize_keys
+
+        self
+      end
+
+      private
+        def write_attribute_without_type_cast(attr_name, value)
+          @attributes[attr_name.to_sym] = value
+        end
+
+        def clear_aggregation_cache
+          if defined?(@aggregation_cache) && @aggregation_cache
+            super
+          end
+        end
     end
 
+    # for rails 6
+    new_klass.const_set(:LIGHT_RECORD_PRIMARY_KEY_CACHE, klass.primary_key)
+
     if klass.const_defined?(:LightRecord, false)
-      new_klass.send(:include, klass::LightRecord)
+      new_klass.send(:prepend, klass::LightRecord)
+      if klass::LightRecord.respond_to?(:included)
+        klass::LightRecord.included(new_klass)
+      end
     elsif klass.superclass.const_defined?(:LightRecord, false)
-      new_klass.send(:include, klass.superclass::LightRecord)
+      new_klass.send(:prepend, klass.superclass::LightRecord)
+      if klass.superclass::LightRecord.respond_to?(:included)
+        klass.superclass::LightRecord.included(new_klass)
+      end
     end
 
     new_klass
@@ -74,7 +147,7 @@ module LightRecord
       @fields ||= []
 
       fields.each do |field|
-        field = field.to_sym unless field.is_a?(Symbol)
+        field = field.to_sym
         @fields << field
         define_method(field) do
           @attributes[field]
@@ -87,7 +160,7 @@ module LightRecord
       end
 
       # ActiveRecord make method :id refers to primary key, even there is no column "id"
-      if !fields.include?(:id) && !fields.include?("id") && primary_key.present?
+      if !@fields.include?(:id) && primary_key.present?
         define_method(:id) do
           @attributes[self.class.primary_key.to_sym]
         end
@@ -100,7 +173,7 @@ module LightRecord
 
     # Active record keep it as strings, but I keep it as symbols
     def column_names
-      @fields.map(&:to_s)
+      @column_names ||= @fields.map(&:to_s)
     end
   end
 
@@ -118,14 +191,14 @@ module LightRecord
 
     # Executes query and return array of light object (model class extended by LightRecord)
     def light_records(options = {})
-      client = connection.instance_variable_get(:@connection)
       sql = self.to_sql
 
       options = {
         stream: false, symbolize_keys: true, cache_rows: false, as: :hash,
         database_timezone: ActiveRecord::Base.default_timezone
-      }
-      result = _light_record_execute_query(connection, sql, options)
+      }.merge(options)
+
+      result = _light_record_execute_query(connection, sql, options.except(:set_const))
 
       klass = LightRecord.build_for_class(self.klass, result.fields)
 
@@ -154,8 +227,9 @@ module LightRecord
       options = {
         stream: true, symbolize_keys: true, cache_rows: false, as: :hash,
         database_timezone: ActiveRecord::Base.default_timezone
-      }
-      result = _light_record_execute_query(conn, sql, options)
+      }.merge(options)
+
+      result = _light_record_execute_query(conn, sql, options.except(:set_const))
 
       klass = LightRecord.build_for_class(self.klass, result.fields)
 
@@ -163,21 +237,44 @@ module LightRecord
         self.klass.const_set(:"LR_#{Time.now.to_i}", klass)
       end
 
-      need_symbolize_keys = defined?(PG::Result) && result.is_a?(PG::Result)
-
-      result.each do |row|
-        row.symbolize_keys! if need_symbolize_keys
-        yield klass.new(row)
+      if defined?(PG::Result) && result.is_a?(PG::Result)
+        begin
+          result.stream_each do |row|
+            row.symbolize_keys!
+            yield klass.new(row)
+          end
+        rescue => error
+          conn.raw_connection.get_last_result
+          throw error
+        ensure
+          result.clear
+        end
+      else
+        result.each do |row|
+          yield klass.new(row)
+        end
       end
     ensure
       ActiveRecord::Base.connection_pool.checkin(conn)
     end
 
     private def _light_record_execute_query(connection, sql, options)
-      client = connection.instance_variable_get(:@connection)
+      client = connection.raw_connection
 
       if client.class.to_s == 'PG::Connection'
-        connection.execute(sql, "LightRecord - #{self.klass}")
+        if options[:stream]
+          connection.send(:log, sql, "LightRecord - #{self.klass}") do
+            ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+              client.send_query(sql)
+              client.set_single_row_mode
+              result = client.get_result
+              result.check
+              result
+            end
+          end
+        else
+          connection.execute(sql, "LightRecord - #{self.klass}")
+        end
       else
         connection.send(:log, sql, "LightRecord - #{self.klass}") do
           client.query(sql, options)

data/spec/attribute_spec.rb

@@ -0,0 +1,49 @@
+require_relative 'test_helper'
+require_relative 'prepare_db'
+
+#ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+class ARQuestion < ActiveRecord::Base
+  self.table_name =  "sample"
+  self.primary_key = "policy_id"
+end
+
+describe "LightRecord attributes" do
+
+  it "should assign attributes as method" do
+    record = ARQuestion.limit(10).light_records.first
+    record.statecode = "AAA"
+    assert_equal(record.statecode, "AAA")
+  end
+
+  it "should assign attributes ignoring type casting" do
+    record = ARQuestion.limit(10).light_records.first
+    record.statecode = 123
+    assert_equal(record.statecode, 123)
+  end
+
+  it "should assign attributes as hash" do
+    record = ARQuestion.limit(10).light_records.first
+    record[:statecode] = "AAA"
+    assert_equal(record[:statecode], "AAA")
+  end
+
+  it "should have correct primary_key" do
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+    record = ARQuestion.limit(10).light_records.first
+    assert_equal(record.class.primary_key, "policy_id")
+  end
+
+  it "should allow updating attributes" do
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+    record = ARQuestion.limit(10).light_records.first
+    ARQuestion.transaction do
+      record.update_columns(statecode: "AAA")
+      assert_equal(record.statecode, "AAA")
+      raise ActiveRecord::Rollback
+    end
+    # TODO
+    # assert_equal(record.statecode, "FL")
+  end
+
+end

data/spec/light_record_spec.rb

@@ -1,5 +1,5 @@
-require_relative './test_helper'
-require_relative './prepare_db'
+require_relative 'test_helper'
+require_relative 'prepare_db'
 
 #ActiveRecord::Base.logger = Logger.new(STDOUT)
 
@@ -16,6 +16,19 @@ class ARQuestion_wLR < ActiveRecord::Base
     def light_included?
       true
     end
+
+    def point_granularity
+      "Extended #{super}"
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+    module ClassMethods
+      def im_a_class_method
+        :pam_param_pam_pam
+      end
+    end
   end
 end
 
@@ -54,12 +67,20 @@ describe "LightRecord" do
     assert_equal(light.attributes, dark.attributes.symbolize_keys)
   end
 
-  it "should include LightRecord submodule if present" do
-    record = ARQuestion_wLR.limit(1).light_records.first
-    assert(record.light_included?)
+  describe "LightRecord submodule" do
+    it "should include LightRecord submodule if present" do
+      record = ARQuestion_wLR.limit(1).light_records.first
+      assert(record.light_included?)
+
+      klass = LightRecord.base_extended(ARQuestion_wLR)
+      assert_includes(klass.ancestors, ARQuestion_wLR::LightRecord)
+      assert_equal(:pam_param_pam_pam, klass.im_a_class_method)
+    end
 
-    klass = LightRecord.base_extended(ARQuestion_wLR)
-    assert_includes(klass.ancestors, ARQuestion_wLR::LightRecord)
+    it "should override attribute methods" do
+      record = ARQuestion_wLR.order(:policy_id).limit(1).light_records.first
+      assert_equal(record.point_granularity, "Extended 3")
+    end
   end
 
   it "should work with #respond_to?" do
@@ -86,7 +107,7 @@ describe "LightRecord" do
     assert(record.readonly?)
 
     assert_raises(ActiveRecord::ReadOnlyRecord) do
-      record.update_attributes(ARQuestion.column_names.first => "bla bla lba")
+      record.update(ARQuestion.column_names.first => "bla bla lba")
     end
   end
 
@@ -114,4 +135,20 @@ describe "LightRecord" do
       assert(record.time.gmt?, "Time is not UTC")
     end
   end
+
+  it "should return #model_name of original class" do
+    record = ARQuestion.where(policy_id: 119736).light_records.first
+    assert_equal(ARQuestion.model_name, record.class.model_name)
+  end
+
+  it "should reload record" do
+    record = ARQuestion.offset(3).limit(1).light_records.first
+
+    new_granularity = Time.now.to_i
+    ARQuestion.find_by(policy_id: record.policy_id).update_columns(point_granularity: new_granularity)
+
+    refute_equal(record.point_granularity, new_granularity)
+    record.reload
+    assert_equal(record.point_granularity, new_granularity)
+  end
 end

data/spec/prepare_db.rb

@@ -82,7 +82,7 @@ module TestDB
           point_longitude varchar(255) NULL,
           line varchar(255) DEFAULT NULL,
           construction varchar(255) NULL,
-          point_granularity real NULL,
+          point_granularity integer NULL,
           PRIMARY KEY(policy_id)
         );
       })

data/spec/test_helper.rb

@@ -15,3 +15,5 @@ require 'light_record'
 require 'looksee'
 
 require "minitest/autorun"
+
+# ActiveRecord::Base.logger = Logger.new(STDOUT)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: light_record
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Pavel Evstigneev
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/light_record.rb
+- spec/attribute_spec.rb
 - spec/light_record_spec.rb
 - spec/prepare_db.rb
 - spec/test_helper.rb
@@ -40,12 +41,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 3
 summary: ActiveRecord extension to speedup ActiveRecord object allocation
 test_files:
-- spec/light_record_spec.rb
 - spec/prepare_db.rb
+- spec/attribute_spec.rb
+- spec/light_record_spec.rb
 - spec/test_helper.rb