active_reporting 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e776c2130450c3db98c5518529079744a8e3f7e
-  data.tar.gz: 8284510c02504a70d78e3db21ba9697ac95bece6
+  metadata.gz: c3ef7db85c82db17046183576d9a62cfe08acbcc
+  data.tar.gz: ed929413c1768196e855b3116bc76c82df631cc8
 SHA512:
-  metadata.gz: ab8d651c7b980707ad6d4af9736c444c1c021f3a3f6d967e7f9eb8398270c17579c0b3dd35049e426225a0448924fa49edb77d4db9d10e8784786ae710e3b1e6
-  data.tar.gz: 9b488e5c85ce172cf06103a244faaf6150c34039750c670d235792539c970642110f15692cf24fc3e714ec4a394f4d8fc922560f5b6b9c27d789779c63a125b5
+  metadata.gz: f74516592d42a6494db7f827a1bcbf7391c9d4a5ff44e181205b6bf385a692fa57e62fdfec7005007e606dfb8a65e13f073618670eb3a76f10a6ef64272ceaaf
+  data.tar.gz: 2ff7e312d8f749199fa022e2000e825bfbd6c58174e81be4ef4a7b2dd09c7301cf898f7bb34ef70682fdd1907928333decdee867a358239cd1e401deea084cc2

data/.travis.yml

@@ -4,13 +4,21 @@ rvm:
   - 2.2.7
   - 2.3.4
   - 2.4.1
-gemfiles:
-  - gemfiles/4.2.gemfile
-  - gemfiles/5.0.gemfile
+env:
+  - RAILS=5-0 DB=sqlite
+  - RAILS=5-0 DB=pg
+  - RAILS=5-0 DB=mysql
+  - RAILS=4-2 DB=sqlite
+  - RAILS=4-2 DB=pg
+  - RAILS=4-2 DB=mysql
 matrix:
   exclude:
-    - rvm: 2.2
-      gemfile: gemfiles/5.0.gemfile
-script:
-  - bundle exec rake
-
+    - rvm: 2.2.7
+      env: RAILS=5-0 DB=sqlite
+    - rvm: 2.2.7
+      env: RAILS=5-0 DB=pg
+    - rvm: 2.2.7
+      env: RAILS=5-0 DB=mysql
+before_script:
+  - psql -c 'create database active_reporting_test;' -U postgres
+  - mysql -e 'create database active_reporting_test collate utf8_general_ci;'

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.1 (2017-04-22)
+
+* Fix MySQL querying
+* Properly test against multiple dbs and versions of ActiveRecord in CI
+
 ## 0.1.0 (2017-04-16)
 
 * Initial release

data/Gemfile

@@ -1,6 +1,14 @@
 source 'https://rubygems.org'
+# Specify your gem's dependencies in active_reporting.gemspec
+gemspec
 
 gem 'simplecov', require: false
 
-# Specify your gem's dependencies in active_reporting.gemspec
-gemspec
+rails = ENV['RAILS'] || '5-0'
+
+case rails
+when '4-2'
+  gem 'activerecord', '~> 4.2.0'
+else
+  gem 'activerecord', '~> 5.0.0'
+end

data/active_reporting.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.2'
+
   spec.add_dependency 'activerecord', '>= 4.2.0'
   spec.add_dependency 'activesupport', '>= 4.2.0'
 
@@ -29,4 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'ransack'
   spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'pg'
+  spec.add_development_dependency 'mysql2'
 end

data/lib/active_reporting/report.rb

@@ -34,7 +34,7 @@ module ActiveReporting
     private ######################################################################
 
     def build_data
-      @data = model.connection.execute(statement.to_sql).to_a
+      @data = model.connection.exec_query(statement.to_sql).to_hash
       apply_dimension_callbacks
       @data
     end

data/lib/active_reporting/version.rb

@@ -1,3 +1,3 @@
 module ActiveReporting
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_reporting
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tony Drake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-16 00:00:00.000000000 Z
+date: 2017-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - t27duck@gmail.com
@@ -128,8 +156,6 @@ files:
 - active_reporting.gemspec
 - bin/console
 - bin/setup
-- gemfiles/4.0.gemfile
-- gemfiles/5.0.gemfile
 - lib/active_reporting.rb
 - lib/active_reporting/active_record_adaptor.rb
 - lib/active_reporting/configuration.rb
@@ -152,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/gemfiles/4.0.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.0.0"
-
-gemspec :path=>"../"

data/gemfiles/5.0.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.0.0"
-
-gemspec :path=>"../"