active-record-streamer 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d8b5c1fec28a6f974455ccce6fbd52a0fc12c50
-  data.tar.gz: 18f069f74884669921e18ba2de93e35bef73b4e4
+  metadata.gz: 0109c5a9442a68bb7f3e62685d8d415b126edb9f
+  data.tar.gz: 14db767e20d9e3eeaaed277a7e5c60728d5b63e4
 SHA512:
-  metadata.gz: f58bb3295ba5ff75b6f60ae52fa962868cc14c55be11502a413b10ca5419c45863fe11426b50f1fa239676a62006c682dba4e2ef238c514917c56ab6f0942601
-  data.tar.gz: 237fc4af6c15458651d28d37418ba5aca3e9edc9e9bfde211e98a1908b13a89542c7c98dc51f9ca8dc856861871779194571b027a3ba2e94f6370aafc52ccec5
+  metadata.gz: 7b1603127f1b1100efd4114c1954ebddfb6f96afc63b49a00ca434de2f57d7b87b88280dd3d391a13a29c620bbfb63ef563de55b7f2268f7523a3129ee329f6b
+  data.tar.gz: cd3a12cc4776eb0f36e231fd842365cbab1ca83e66dc4f1ebc2667b86081c4d8057ec953741dd9df69bc9e6c072a88d66f5692242a8148bcac208a6cc3e2f496

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem 'baza', '~> 0.0.17'
+gem 'baza', '>= 0.0.19'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -16,9 +16,9 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.8)
     arel (6.0.0)
-    array_enumerator (0.0.7)
-    baza (0.0.17)
-      array_enumerator (~> 0.0.7)
+    array_enumerator (0.0.10)
+    baza (0.0.19)
+      array_enumerator (~> 0.0.10)
       datet (~> 0.0.25)
       event_handler (~> 0.0.0)
       string-cases (~> 0.0.1)
@@ -104,7 +104,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (= 4.2.1)
-  baza (~> 0.0.17)
+  baza (>= 0.0.19)
   bundler (~> 1.0)
   jeweler (~> 2.0.1)
   mysql2 (= 0.3.18)
@@ -112,3 +112,6 @@ DEPENDENCIES
   rdoc (~> 3.12)
   rspec (~> 2.8.0)
   simplecov
+
+BUNDLED WITH
+   1.10.5

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/active-record-streamer.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: active-record-streamer 0.0.1 ruby lib
+# stub: active-record-streamer 0.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "active-record-streamer"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["kaspernj"]
-  s.date = "2015-05-31"
+  s.date = "2015-08-05"
   s.description = "Stream ActiveRecord results"
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
@@ -34,14 +34,14 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/kaspernj/active-record-streamer"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.0"
   s.summary = "Stream ActiveRecord results"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<baza>, ["~> 0.0.17"])
+      s.add_runtime_dependency(%q<baza>, [">= 0.0.19"])
       s.add_development_dependency(%q<activerecord>, ["= 4.2.1"])
       s.add_development_dependency(%q<mysql2>, ["= 0.3.18"])
       s.add_development_dependency(%q<pry>, [">= 0"])
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<baza>, ["~> 0.0.17"])
+      s.add_dependency(%q<baza>, [">= 0.0.19"])
       s.add_dependency(%q<activerecord>, ["= 4.2.1"])
       s.add_dependency(%q<mysql2>, ["= 0.3.18"])
       s.add_dependency(%q<pry>, [">= 0"])
@@ -62,7 +62,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<baza>, ["~> 0.0.17"])
+    s.add_dependency(%q<baza>, [">= 0.0.19"])
     s.add_dependency(%q<activerecord>, ["= 4.2.1"])
     s.add_dependency(%q<mysql2>, ["= 0.3.18"])
     s.add_dependency(%q<pry>, [">= 0"])

data/lib/active-record-streamer.rb

@@ -8,16 +8,30 @@ class ActiveRecordStreamer
     @includes = @args[:query].includes_values
   end
 
+  def rails4?
+    @@rails4 ||= ActiveRecord::VERSION::STRING.start_with?('4')
+  end
+
   def each(&blk)
-    @baza_db = Baza::Cloner.from_active_record_connection(@klass.connection)
+    if @klass.respond_to?(:connection_without_octopus)
+      @baza_db = Baza::Cloner.from_active_record_connection(@klass.connection_without_octopus)
+    else
+      @baza_db = Baza::Cloner.from_active_record_connection(@klass.connection)
+    end
 
     begin
       cache = []
 
       @baza_db.query_ubuf(@sql) do |data|
         model = @klass.new
-        model.instance_variable_set(:@new_record, false)
-        model.instance_variable_set(:@attributes, data.stringify_keys!)
+
+        if rails4?
+          model.assign_attributes(data)
+          model.instance_variable_set(:@new_record, false)
+        else
+          model.instance_variable_set(:@new_record, false)
+          model.instance_variable_set(:@attributes, data.stringify_keys!)
+        end
 
         cache << model
 
@@ -36,7 +50,11 @@ class ActiveRecordStreamer
 private
 
   def yield_cache(cache)
-    ActiveRecord::Associations::Preloader.new(cache, @includes).run
+    if rails4?
+      ActiveRecord::Associations::Preloader.new.preload(cache, @includes)
+    else
+      ActiveRecord::Associations::Preloader.new(cache, @includes).run
+    end
 
     cache.each do |model|
       yield model

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active-record-streamer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: baza
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.19
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: Stream ActiveRecord results