directiverecord 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beaaac82f30ff3e1c16a7c5844497500badcbbdb
-  data.tar.gz: 60eb917a702a908c1ac2930b805d8ab68758603b
+  metadata.gz: 15593ea42289ab19de5a5b3d79a4a73a3c1b26bc
+  data.tar.gz: 5c54c1040ccbf78cff3c4bd86c176b4b8966ff96
 SHA512:
-  metadata.gz: de73729b955fe0d5df7e026b413fd4a425bd6f28232bd0ecc6c46bea53bdf52db0603e62dc62d0e6ee4b5ac4d1024efb40dfd5023727b3dfc55820f1418cf3b9
-  data.tar.gz: 981c5d1921382b87d20fc6f62293b6dbc62f20e05d0c92c7ce26b09844878ff664671486c4d1fa592a577b9931a42e4e4c4672c187989b170c419e0b1462f9a7
+  metadata.gz: c79a81ea790365f31a76c1b3528d4537e3ee0c4646033406ff1c9b195239d33aef03a7134cee50336fbb37ddc86fc60b59749b01db24d76cb1b2069b1e9064ae
+  data.tar.gz: 80d924a264d36962941a8994d691f28331c71d5b8e90879e127d4dddeebfdbea54f20179fae09acb675da2cb5c22b0ff7efbe165b404d7170d472e0164b9daae

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.24 (April 20, 2015)
+
+* Properly getting BigQuery dataset from options
+
 == Version 0.1.23 (April 9, 2015)
 
 * Extracted ActiveRecord::Relation#count override to separate (non-auto-required) source file

data/VERSION

@@ -1 +1 @@
-0.1.23
+0.1.24

data/lib/directive_record/query/big_query.rb

@@ -18,8 +18,7 @@ module DirectiveRecord
             begin_date, end_date = $1, $2
           end
           if begin_date
-            dataset = ::BigQuery.connection.instance_variable_get(:@dataset) # TODO: fix this
-            options[:from] = "\n  TABLE_DATE_RANGE(#{dataset}.#{base.table_name}_, TIMESTAMP('#{begin_date}'), TIMESTAMP('#{end_date}'))"
+            options[:from] = "\n  TABLE_DATE_RANGE(#{options[:dataset]}.#{base.table_name}_, TIMESTAMP('#{begin_date}'), TIMESTAMP('#{end_date}'))"
           end
         end
       end

data/lib/directive_record/query/sql.rb

@@ -87,7 +87,7 @@ SQL
       end
 
       def validate_options!(options)
-        options.assert_valid_keys :connection, :select, :subselect, :where, :ignore_where, :group_by, :order_by, :limit, :offset, :aggregates, :numerize_aliases, :period, :optimize
+        options.assert_valid_keys :connection, :select, :subselect, :where, :ignore_where, :group_by, :order_by, :limit, :offset, :aggregates, :numerize_aliases, :dataset, :period, :optimize
       end
 
       def optimize_query!(options)

data/lib/directive_record/version.rb

@@ -1,7 +1,7 @@
 module DirectiveRecord
   MAJOR = 0
   MINOR = 1
-  TINY  = 23
+  TINY  = 24
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/test/unit/query/test_big_query.rb

@@ -1,7 +1,7 @@
 require_relative "../../test_helper"
 
-module BigQuery
-  class Client
+module Google
+  class BigQuery
   end
 end
 
@@ -11,8 +11,8 @@ module Unit
 
       describe DirectiveRecord::Query::BigQuery do
         before do
-          (connection = BigQuery::Client.new).instance_variable_set(:@dataset, "my_stats")
-          BigQuery.expects(:connection).returns(connection).at_least_once
+          connection = Google::BigQuery.new
+          Google::BigQuery.expects(:connection).returns(connection).at_least_once
         end
 
         it "generates the expected SQL" do
@@ -29,10 +29,11 @@ module Unit
             }.strip.gsub(/\s+/, " "),
             Order.to_qry(
               "id", "order_details_quantity_ordered", "order_details_price_each", "SUM(order_details_quantity_ordered * order_details_price_each) AS price",
-              :connection => BigQuery.connection,
+              :connection => Google::BigQuery.connection,
               :where => "order_date = '2015-01-21'",
               :group_by => "id",
               :order_by => "price DESC",
+              :dataset => "my_stats",
               :period => "order_date",
               :aggregates => {
                 "order_details_quantity_ordered" => :sum,
@@ -51,10 +52,11 @@ module Unit
             }.strip.gsub(/\s+/, " "),
             Order.to_qry(
               "id", "SUM(order_details.quantity_ordered * order_details.price_each)",
-              :connection => BigQuery.connection,
+              :connection => Google::BigQuery.connection,
               :where => "order_date >= '2015-01-15' AND order_date <= '2015-01-21'",
               :group_by => "id",
               :order_by => "id",
+              :dataset => "my_stats",
               :period => "order_date"
             ).strip.gsub(/\s+/, " ")
           )
@@ -69,10 +71,11 @@ module Unit
             }.strip.gsub(/\s+/, " "),
             Order.to_qry(
               "id", "customer_id", "SUM(order_details.quantity_ordered * order_details.price_each)",
-              :connection => BigQuery.connection,
+              :connection => Google::BigQuery.connection,
               :where => "order_date >= '2015-01-15' AND order_date <= '2015-01-21'",
               :group_by => "id",
               :order_by => "id",
+              :dataset => "my_stats",
               :period => "order_date"
             ).strip.gsub(/\s+/, " ")
           )
@@ -86,9 +89,10 @@ module Unit
             }.strip.gsub(/\s+/, " "),
             Order.to_qry(
               "COUNT(id)",
-              :connection => BigQuery.connection,
+              :connection => Google::BigQuery.connection,
               :where => "order_date >= '2015-01-15' AND order_date <= '2015-01-21'",
               :group_by => "YEAR(order_date) AS year",
+              :dataset => "my_stats",
               :period => "order_date"
             ).strip.gsub(/\s+/, " ")
           )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A layer on top of ActiveRecord for using paths within queries without thinking