marty 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9eca20c44c4ac0d2d1aee885ad3f191084430fcb
-  data.tar.gz: bb1d9ade2b3762cd8498d059e3d7dba62eb247a9
+  metadata.gz: b3706e10b3963927d93e8fe86eb70aa4b78e05cb
+  data.tar.gz: 9aaa8850f9ae36f04d4e1199f5514a6a20f1bba4
 SHA512:
-  metadata.gz: 1e34d45e691a904e1823b386b8f0b0141c7b03662847706eb951375bc4a210d3d6fb1f9197f21de70601969f4028ee7fe7debdcece2d9c4f91e11f6c2e963200
-  data.tar.gz: d25b19be0b9a86e1fbbfe2fd617d8b64d0202d2ef1c0a21ca9136e5ccc5d0bd007ccda1f2b107bda101a9881d2954ac72595957fdd0aa6c9aeef0a050dae1eba
+  metadata.gz: 52d297b24f77a152fafbad2bd27af1b1053b31862b9262d611f427984184e344878194b73e9da811667df30a7e880a30cf51fe359218f1fa6c7ada97c567fa25
+  data.tar.gz: fbe6d7c752d6adcd8c83657c983d18c05701d63bb99d0bb12f6af40469796d5f1bfc334957d8237b891f25203ec2b19e1294f7caef6dfbad65518780e88a9b49

data/lib/marty/monkey.rb

@@ -133,8 +133,8 @@ require 'netzke/basepack/data_adapters/active_record_adapter'
 module Netzke::Basepack::DataAdapters
   class ActiveRecordAdapter < AbstractAdapter
     # FIXME: another giant hack to handle lazy_load columns.
-    # Modified original count_records to call count('*') instead of
-    # count when lazy-loaded.  Otherwise, we run into issues with
+    # Modified original count_records to call count on first passed column.name
+    # when lazy-loaded.  Otherwise, we run into issues with
     # counting records in the default_scope placed by the lazy_load
     # module.
     def count_records(params, columns=[])
@@ -145,7 +145,7 @@ module Netzke::Basepack::DataAdapters
         relation = relation.includes(assoc.to_sym).references(assoc.to_sym) if method
       end
 
-      @model.const_defined?(:LAZY_LOADED) ? relation.unscoped.count :
+      @model.const_defined?(:LAZY_LOADED) ? relation.count(columns.first.name) :
         relation.count
     end
 

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -1538,7 +1538,6 @@ files:
 - spec/features/data_import_spec.rb
 - spec/features/javascripts/job_dashboard_live_search.js.coffee
 - spec/features/javascripts/login.js.coffee
-- spec/features/jobs_dashboard_netzke_spec.rb
 - spec/features/jobs_dashboard_spec.rb
 - spec/features/reporting_spec.rb
 - spec/features/scripting_spec.rb

data/spec/features/jobs_dashboard_netzke_spec.rb

@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe 'Jobs Dashboard - Netzke::Testing', type: :feature, js: true,
-          capybara: true,  netzke_testing: true do
-  it 'filters out usernames other than the one specified in the search box' do
-    other_user = Marty::User.create(login: 'other',
-                                    firstname: 'other',
-                                    lastname: 'other',
-                                    active: true)
-    Marty::Promise.create title: "Test Job 1",
-      user: Marty::User.find_by(login: 'marty'),
-      cformat: 'csv',
-      start_dt: Time.now
-    Marty::Promise.create title: "Test Job 2",
-      user: other_user,
-      cformat: 'csv',
-      start_dt: Time.now
-
-    run_mocha_spec 'login', component: 'marty__auth_app'
-
-    run_mocha_spec 'job_dashboard_live_search',
-      component: 'Marty::PromiseView'
-  end
-end