ar-ondemand 1.1.2 → 1.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZThhOTU2ZmNlZGRlOTZmNWZiZTNlMDQxNjIwNzgwMzEyMTU0MGZhOA==
+    NWUwZjI4MzczNTc2NTkxNGEyMDRmNjBlZjNjMWU4YmE5Zjk3MGZiZg==
   data.tar.gz: !binary |-
-    MWMyMTgzMGFkMjRhZjQ2YzNlNWI1OGIxNWM4OWIwMjJkMWQ0NWY2Yw==
+    MjhiYTMxYTgxZGI3MGFmOGQxODc2MTcwZDI5OGQ4MDgwOWM0Y2JhOQ==
 SHA512:
   metadata.gz: !binary |-
-    OWI0NWYxZDA1ODY3MDNmNjYwOWNiZjRkMmE4MDdlODA4MDA0NjBiOTliOWFm
-    MTA4NTVjYjBjNTU3MTQ3YzEyYTcxMTc5NGY0ZWNiY2M0NjJlYjNkMTVkZmZm
-    MzZiNjMzODllMjVhOTNhOWUyZTNmZTU2MmY2Zjk2ZjM3MDE1YWU=
+    Y2E4Zjk0MTQzNjliM2RjOWZiZWUwZTA1ZGI1NTUyMTk5YTcwY2Y2ZTFiMzZi
+    OWZlZGYzYjE2NTA3MjIzN2UyOWM2MDhhNGY0NzFiZGU5NTViYzhiYWMyYWM5
+    NzFkNTg5NTc0ODE0ZGNmNmE2Nzk0NmRmZjBkOTJjODkyNjQ4NWU=
   data.tar.gz: !binary |-
-    MWVmZGY0ZjA2Y2ZmMjNhYTJlNzEwMDdiYzI3NjE4YWMzZDAzOGJlMjFhYjBl
-    ZDBhOWQ1Mjk5MDBjNmU4YTYwMzRjMmZjOGRkMzQxZjk1YTFkY2FmMDhiNDhh
-    YmViMTEwMTcwN2NhODc4MjAzN2IyNTE0NGUwYTZhMGFlMmQ3MTQ=
+    ZTU4MTg4NWY0MzU3NWY2NzE3ZTQ0YjM0NWNlMDZiMjM1ODg5NWMxNDk4NTc0
+    ZTI1NGFhOTAwMWE4NDdhMTRhOGM4NjNlZWQ4NDI4MjNhMzc1ZmNlYTYzNmZl
+    ZWFhY2I5ZDE3MzkxMTI4MzcyNjAzOTY4ODY3NGI2MDEyZDZmNGQ=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ar-ondemand (1.1.2)
+    ar-ondemand (1.1.3)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
 

data/lib/ar-ondemand/for_reading.rb

@@ -57,7 +57,7 @@ module ActiveRecord
 
       def query_for_reading(ar)
         results = ::ActiveRecord::Base.connection.exec_query ar.to_sql
-        ::ActiveRecord::OnDemand::ResultSet.new self.arel.engine, results
+        ::ActiveRecord::OnDemand::ResultSet.new self.arel.engine, results, readonly: true
       end
 
       def batch_order_for_reading

data/lib/ar-ondemand/on_demand.rb

@@ -28,7 +28,7 @@ module ActiveRecord
           h[row[@key_index]] = row
           h
         end
-
+        
         self
       end
 

data/lib/ar-ondemand/result.rb

@@ -3,11 +3,13 @@ module ActiveRecord
     class ResultSet
       include ::Enumerable
 
-      def initialize(model, results)
+      def initialize(model, results, options = {})
         @model = model
         @results = results
         @column_types = Hash[@model.columns.map { |x| [x.name, x] }]
         @col_indexes = HashWithIndifferentAccess[@results.columns.each_with_index.map { |x, i| [x,i] }]
+        @readonly = options.delete :readonly
+        @readonly_klass = @readonly ? create_readonly_class : nil
       end
 
       def ids
@@ -22,25 +24,33 @@ module ActiveRecord
       alias_method :size, :length
 
       def each
-        @results.rows.each do |row|
-          yield ::ActiveRecord::OnDemand::Record.new(convert_to_hash(row), @model, nil)
-        end
+        @results.rows.each { |row| yield result_to_record(row) }
       end
 
       def first
-        row = @results.rows.first
-        return nil if row.nil?
-        ::ActiveRecord::OnDemand::Record.new convert_to_hash(row), @model, nil
+        result_to_record @results.rows.first
       end
 
       def last
-        row = @results.rows.last
-        return nil if row.nil?
-        ::ActiveRecord::OnDemand::Record.new convert_to_hash(row), @model, nil
+        result_to_record @results.rows.last
       end
 
       protected
 
+      def result_to_record(row)
+        return nil if row.nil?
+        if @readonly
+          convert_to_struct @readonly_klass, row
+        else
+          ::ActiveRecord::OnDemand::Record.new convert_to_hash(row), @model, nil
+        end
+      end
+
+      def create_readonly_class
+        attrs = @col_indexes.keys.map(&:to_sym)
+        ::Struct.new *attrs
+      end
+
       def convert_to_hash(rec)
         # TODO: Is using HashWithIndifferentAccess[] more efficient?
         h = {}
@@ -49,6 +59,14 @@ module ActiveRecord
         end
         h.with_indifferent_access
       end
+
+      def convert_to_struct(klass, rec)
+        vals = []
+        @col_indexes.each_pair do |k, v|
+          vals << @column_types[k].type_cast(rec[v])
+        end
+        klass.new *vals
+      end
     end
   end
 end

data/lib/ar-ondemand/version.rb

@@ -1,3 +1,3 @@
 module ArOnDemand
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-ondemand
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Steve Frank