bq_factory 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bc8211483c62a953a3cc99c9ee1dd9073bfcdae
-  data.tar.gz: b7b7db7ed189385e5911144cdf5d96da4308ba95
+  metadata.gz: f3bf7adb9cfd5447f4c311f4c1806ae26a85f366
+  data.tar.gz: e22118db5564b37085690d2bef1b03b8d1f637e6
 SHA512:
-  metadata.gz: ed059d60e5a56227512a74c6443b34b4091125be7c127e9757e766a4a5af228c84065965b83236fed43f6f5c63f602aeadc489be58b4c208400c72744f184298
-  data.tar.gz: f982725b904d52ca2b6b24a48e47fee668270273b9c825a35b978742a0c9688dcd639d2433464121158dc92839be5abfa9a6284935acf8daab64a05a970a4ebf
+  metadata.gz: 5e85ed2c024c379775b0aa94d54c31533e55a794b915a0850c2172580f84d7868e5fa1b064fe265df8bda284d994fef3e1b284da4e341990a11cc8188edd2481
+  data.tar.gz: 24ca55a19b184418d94ba8d1b8f87c463a250e03188a717638251e3ff48ddcd58c40bc4c241c4fb024146141a9bdfd8425ffeb57a9f83390f19ad2413d1fc9b5

data/.gitignore

@@ -10,5 +10,6 @@
 /Gemfile.local
 /Gemfile.local.lock
 /Guardfile
-/keys
+/spec/keys/bq-factory.json
 /.env
+/spec/vcr

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - ruby-head
-before_install: gem install bundler -v "~> 1.10"
+- 2.1
+- 2.2
+- 2.3.0
+- ruby-head
+before_install:
+- gem install bundler -v "~> 1.10"
 bundler_args: "--jobs=2"
 cache: bundler
 script:

data/README.md

@@ -28,7 +28,7 @@ Or install it yourself as:
 
 Add configuration to initializer or spec_helper.
 
-```
+```ruby
 # RSpec
 # spec/spec_helper.rb
 
@@ -38,19 +38,50 @@ BqFactory.configure do |config|
 end
 ```
 
-and, setup factories in fixture file.
+### specify schema
+
+This pattern is fetch schema from hash(not call api access).
 
+First, setup factories in fixture file:
+
+```ruby
+BqFactory.register :user, schema: [{ name: 'name', type: 'INTEGER' }, { name: 'age', type: 'INTEGER' }]
 ```
-BqFactory.define do
-  # Reference target of dataset and tables in options.
-  # Factory read schema from reference target!
-  factory :user, dataset: 'my_dataset', table: 'my_table'
+
+And, In your test code:
+
+```
+describe 'test query' do
+  before(:all) do
+    BqFactory.create_dataset!(:test_dataset)
+  end
+
+  describe 'query is valid' do
+    before { BqFactory.create_view(:test_dataset, :test_view, users) }
+    subject { BqFactory.query(query) }
+
+    let(:users) { [{ name: 'alice', age: 20 }] }
+    let(:query) { 'SELECT * FROM [test_dataset.test_view]' }
+
+    it { expect(subject.first).to eq users.first }
+  end
 end
 ```
 
-### Use Case
+### fetch schema from bigquery
+
+This pattern is fetch schema from bigquery(call api access).
 
-Example, if `user` table schema is this:
+First, setup factories in fixture file:
+
+```ruby
+# Reference target of dataset and tables in options.
+# Factory fetch schema from  bigquery
+BqFactory.register :user, dataset: 'my_dataset' # => reference my_dataset.user table
+BqFactory.register :user, dataset: 'my_dataset', table: 'my_table' # => reference my_dataset.my_table
+```
+
+If register `:user, dataset: 'test_dataset'` and `user` table schema is this:
 
 |column_name|type|
 |:----|:----|
@@ -60,12 +91,12 @@ Example, if `user` table schema is this:
 |height|FLOAT|
 |admin|BOOLEAN|
 
-In your test code:
+And, In your test code:
 
 ```ruby
 # RSpec
 
-describe TestClass do
+describe 'query test' do
   before(:all) do
     BqFactory.create_dataset!('test_dataset') # => create test dataset
   end
@@ -73,32 +104,32 @@ describe TestClass do
   let(:bob) { { name: 'bob', age: 30, create_at: "2016-01-01 00:00:00", height: 170.1, admin: false } }
 
   describe 'build query' do
-    subject { BqFactory.build_query 'user', alice }
+    subject { BqFactory.build_query :user, alice }
     let(:query) { 'SELECT * FROM (SELECT "alice" AS name, 20 AS age, TIMESTAMP("2016-01-01 00:00:00") AS create_at, 150.1 AS height, true AS admin )' }
     it { is_expected.to eq query }
   end
 
   describe 'from Hash' do
-    before { BqFactory.create_view 'test_dataset', 'test_view', alice }
+    before { BqFactory.create_view :test_dataset, :test_view1, alice }
     # => Build query 'SELECT * FROM (SELECT "alice" AS name, 20 AS age, TIMESTAMP("2016-01-01 00:00:00") AS create_at, 150.1 AS height, true AS admin )'
     # And create view "test_view" to "test_dataset"
 
     let(:query) { "SELECT * FROM [test_dataset.test_view]" }
     subject { BqFactory.query(query) }
 
-    it { expect(subject.first.name).to eq alise["name"] }
+    it { expect(subject.first).to eq alice
   end
 
   describe 'from Array' do
-    before { BqFactory.create_view 'test_dataset', 'test_view', [alice, bob] }
+    before { BqFactory.create_view :test_dataset, :test_view2, [alice, bob] }
     # => Build query 'SELECT * FROM (SELECT "alice" AS name, 20 AS age, TIMESTAMP("2016-01-01 00:00:00") AS create_at, 150.1 AS height, true AS admin ), (SELECT "bob" AS name, 30 AS age, TIMESTAMP("2016-01-01 00:00:00") AS create_at, 170.1 AS height, false AS admafterin)'
     # And create view "test_view" to "test_dataset"
 
     let(:query) { "SELECT * FROM [test_dataset.test_view]" }
     subject { BqFactory.query(query) }
 
-    it { expect(subject.first.name).to eq alise["name"] }
-    it { expect(subject.last.name).to eq bob["name"] }
+    it { expect(subject.first).to eq alise }
+    it { expect(subject.last).to eq bob }
   end
 
   after(:all) do
@@ -112,13 +143,13 @@ end
 ### Install dependencies
 
 ```shell
-bundle install
+$ bundle install
 ```
 
 ### Run rspec
 
-```
-bundle exec rspec
+```shell
+$ bundle exec rspec
 ```
 
 ## Contributing

data/bq_factory.gemspec

@@ -20,12 +20,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "gcloud", "~> 0.6.1"
-  spec.add_dependency "hashie", "~> 3.4"
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "shoulda-matchers"
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "simplecov", "~> 0.8.0"
-  spec.add_development_dependency "dotenv"
 end

data/lib/bq_factory/configuration.rb

@@ -1,13 +1,5 @@
 module BqFactory
   class Configuration
     attr_accessor :project_id, :keyfile_path
-
-    def schemas
-      @schemas ||= RegistoryDecorator.new(Registory.new('schema'))
-    end
-
-    def client
-      @client ||= BqFactory::Client.new(project_id, keyfile_path)
-    end
   end
 end

data/lib/bq_factory/errors.rb

@@ -1,3 +1,3 @@
 module BqFactory
-  class DuplicateDefinitionError < StandardError; end
+  class DuplicateDefinitionError < RuntimeError; end
 end

data/lib/bq_factory/proxy.rb

@@ -0,0 +1,23 @@
+module BqFactory
+  class Proxy
+    delegate :fetch_schema, :create_dataset!, :delete_dataset!, :create_table!, :delete_table!, :query, to: :client
+    alias :fetch_schema_from_bigquery :fetch_schema
+
+    delegate :register, :find, to: :schemas
+    alias :table_by_name :find
+
+    delegate :project_id, :keyfile_path, to: :configuration
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    def schemas
+      @schemas ||= RegistoryDecorator.new(Registory.new('schema'))
+    end
+
+    def client
+      @client ||= Client.new(project_id, keyfile_path)
+    end
+  end
+end

data/lib/bq_factory/query_builder.rb

@@ -1,12 +1,20 @@
 module BqFactory
   class QueryBuilder < Array
-    attr_reader :records
+    attr_reader :schema
 
-    def initialize(records)
-      @records = records
+    def initialize(schema)
+      @schema = schema
     end
 
-    def build
+    def build(rows)
+      rows = [rows] unless rows.is_a? Array
+      records = rows.flatten.map { |row| Record.new(schema, row) }
+      build_query(records)
+    end
+
+    private
+
+    def build_query(records)
       %{SELECT * FROM #{records.map { |record| build_subquery(record) }.join(', ')}}
     end
 

data/lib/bq_factory/record.rb

@@ -1,4 +1,4 @@
-require 'hashie'
+require 'ostruct'
 
 module BqFactory
   class Record
@@ -10,7 +10,7 @@ module BqFactory
       raise ArgumentError.new, "Schema is not Array" unless schema.is_a? Array
 
       schema.each do |hash|
-        column = Hashie::Mash.new(hash)
+        column = OpenStruct.new(hash)
         items[column.name] = Attribute.new(column.name, column.type)
       end
 

data/lib/bq_factory/table.rb

@@ -0,0 +1,12 @@
+module BqFactory
+  class Table
+    attr_reader :name, :dataset
+    attr_accessor :schema
+
+    def initialize(name, dataset, schema = nil)
+      @name = name
+      @dataset = dataset
+      @schema = schema
+    end
+  end
+end

data/lib/bq_factory/version.rb

@@ -1,3 +1,3 @@
 module BqFactory
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/bq_factory.rb

@@ -5,72 +5,52 @@ require "bq_factory/attribute"
 require "bq_factory/record"
 require "bq_factory/client"
 require "bq_factory/configuration"
-require "bq_factory/dsl"
 require "bq_factory/errors"
+require "bq_factory/proxy"
 require "bq_factory/query_builder"
+require "bq_factory/table"
 require "bq_factory/record"
 require "bq_factory/registory"
 require "bq_factory/registory_decorator"
 
 module BqFactory
   class << self
-    delegate :client, :project_id, :keyfile_path, :schemas, to: :configuration
+    delegate :fetch_schema_from_bigquery, :create_dataset!, :delete_dataset!, :create_table!, :delete_table!, :query,
+             :table_by_name, :configuration, :project_id, :keyfile_path, :client, to: :proxy
 
     def configure
       yield configuration if block_given?
       configuration
     end
 
-    def configuration
-      @configuration ||= Configuration.new
-    end
-
-    def define(&block)
-      DSL.run(block)
-    end
-
     def create_view(dataset_name, factory_name, rows)
       query = build_query(factory_name, rows)
       client.create_view(dataset_name, factory_name, query)
     end
 
-    def build_query(factory_name, rows)
-      rows = [rows] unless rows.instance_of? Array
-      schema = schema_by_name(factory_name)
-      records = rows.flatten.map { |row| Record.new(schema, row) }
-      QueryBuilder.new(records).build
-    end
-
-    def schema_by_name(factory_name)
-      schemas.find(factory_name)
-    end
-
-    def create_dataset!(dataset_name)
-      client.create_dataset!(dataset_name)
-    end
+    def build_query(register_name, rows)
+      table = table_by_name(register_name)
+      schema = table.schema
 
-    def create_table!(dataset_name, table_name, schema)
-      client.create_table!(dataset_name, table_name, schema)
-    end
+      if schema.nil?
+        schema = proxy.fetch_schema_from_bigquery(table.dataset, table.name)
+        table.schema = schema
+      end
 
-    def delete_dataset!(dataset_name)
-      client.delete_dataset!(dataset_name)
+      QueryBuilder.new(schema).build(rows)
     end
 
-    def delete_table!(dataset_name, table_name)
-      client.delete_table!(dataset_name, table_name)
-    end
+    def register(name, dataset:, table: nil, schema: nil)
+      name = name.to_sym
+      table_name = table.nil? ? name : table
 
-    def fetch_schema_from_bigquery(dataset_name, table_name)
-      client.fetch_schema(dataset_name, table_name)
+      proxy.register(name, Table.new(table_name, dataset, schema))
     end
 
-    def query(query)
-      client.query(query)
-    end
+    private
 
-    def register(factory_name, schema)
-      schemas.register(factory_name, schema)
+    def proxy
+      @proxy ||= Proxy.new
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bq_factory
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - yuemori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gcloud
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  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: Create BigQuery view from hash
 email:
 - yuemori@aiming-inc.com
@@ -160,12 +132,13 @@ files:
 - lib/bq_factory/attribute.rb
 - lib/bq_factory/client.rb
 - lib/bq_factory/configuration.rb
-- lib/bq_factory/dsl.rb
 - lib/bq_factory/errors.rb
+- lib/bq_factory/proxy.rb
 - lib/bq_factory/query_builder.rb
 - lib/bq_factory/record.rb
 - lib/bq_factory/registory.rb
 - lib/bq_factory/registory_decorator.rb
+- lib/bq_factory/table.rb
 - lib/bq_factory/version.rb
 homepage: http://github.com/yuemori/bq_factory
 licenses:

data/lib/bq_factory/dsl.rb

@@ -1,15 +0,0 @@
-module BqFactory
-  class DSL
-    def self.run(block)
-      new.instance_eval(&block)
-    end
-
-    def factory(name, options = {})
-      name = name.to_sym
-      dataset_name = options.key?(:dataset) ? options[:dataset] : BqFactory.default_dataset
-      table_name = options.key?(:table) ? options[:table] : name
-      schema = BqFactory.fetch_schema_from_bigquery(dataset_name, table_name)
-      BqFactory.register(name, schema)
-    end
-  end
-end