bigqueryid 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70c88dd1296fdab6ac0f993a6aee623eeec9a186
-  data.tar.gz: 61698805be2a892b6668d8564ab8b1d843410004
+  metadata.gz: 581f61be916e1263baf264135277f138768453ce
+  data.tar.gz: 1fa8ba7020e174a3f4e6655009834fb71fed0b3d
 SHA512:
-  metadata.gz: f1f311616135eb0b4007070f3cf6b945fa8e5f594ffec55ff3ef56f93b6aae2ad8c17f42c8bb830db68e0b7041e43a50b252e71720ad05af37ddb4951a1e980a
-  data.tar.gz: b0bd58efb62b7622929ed0c237cbe12d92b648ae07d273496bce07a57652d5e94512984e6ba73145dc290c6024253098d353f420b57df7d9f4b301b6cd4b108e
+  metadata.gz: aae16fa93c3f03338b9bce0bcd1aab0f09b38123b856d4112a79f6d0c337e8033b878e796b845d1455cfcc2896139eb6eb2d9795ea36401597067f5396508545
+  data.tar.gz: 5085c1e1c1d0aec450b390893236bccf0b0550d74fec3f792e93658445e690080e0cba8dce8da5ae1cb0fb3ddcd63724f9161fbd52abae8ff027af6b07f7ba2b

data/lib/bigqueryid/attributes.rb

@@ -5,10 +5,12 @@ module Bigqueryid
 
     included do
       class_attribute :attributes
+      class_attribute :coercer
 
       self.attributes = {}
+      self.coercer = Coercer.new(attributes)
 
-      field :id
+      field :id, type: String
 
       def attributes=(attributes)
         if attributes.is_a? ::Hash
@@ -42,64 +44,6 @@ module Bigqueryid
         end
         hash.sort.to_h
       end
-
-      def coercer
-        @coercer ||= Coercible::Coercer.new
-      end
-
-      def coerce(value, type)
-        if value.nil? || !type
-          value
-        else
-          case
-          when Array == type || Array === type then coerce_array(value, type)
-          when Hash  == type || Hash  === type then coerce_hash(value, type)
-          when type == Time  then coerce_time(value)
-          else coerce_other(value, type)
-          end
-        end
-      end
-
-
-      def coerce_array(value, type)
-        # type: generic Array
-        if type == Array
-          coerce_other(value, type)
-        # type: Array[Something]
-        elsif value.respond_to?(:map)
-          value.map do |element|
-            coerce(element, type[0])
-          end
-        else
-          raise ArgumentError.new "Invalid coercion: #{value.class} => #{type}"
-        end
-      end
-
-      def coerce_hash(value, type)
-        # type: generic Hash
-        if type == Hash
-          coerce_other(value, type)
-        # type: Hash[Something => Other thing]
-        elsif value.respond_to?(:to_h)
-          k_type, v_type = type.to_a[0]
-          value.to_h.map{ |k,v| [ coerce(k, k_type), coerce(v, v_type) ] }.to_h
-        else
-          raise ArgumentError.new "Invalid coercion: #{value.class} => #{type}"
-        end
-      end
-
-      def coerce_time(value)
-        case value
-        when Integer, Float      then Time.at(value)
-        when /\d{4}-\d{2}-\d{2}/ then Time.parse(value)
-        when /\A\d+(\.\d+)?/     then Time.at(value.to_f)
-        else value
-        end
-      end
-
-      def coerce_other(value, type)
-        coercer[value.class].send("to_#{type.to_s.downcase}", value)
-      end
     end
 
     class_methods do
@@ -121,7 +65,7 @@ module Bigqueryid
         end
 
         define_method("#{name}=") do |value| # Define set method
-          instance_variable_set("@#{name}", coerce(value, attributes[name][:type]))
+          instance_variable_set("@#{name}", coercer.coerce(name, value))
         end
       end
     end

data/lib/bigqueryid/coercer.rb

@@ -0,0 +1,72 @@
+module Bigqueryid
+  class Coercer
+    attr_reader :coercer, :schema
+
+    def initialize(schema, coercer = Coercible::Coercer.new)
+      @coercer = coercer
+      @schema  = schema
+    end
+
+    def coerce(name, value)
+      return value if value.nil? || !has_type?(name)
+
+      coerce_by_type(value, schema[name.to_s][:type])
+    end
+
+    private
+
+    def has_type?(name)
+      schema.include?(name.to_s) &&
+        schema[name.to_s].include?(:type)
+    end
+
+    def coerce_by_type(value, type)
+      case
+        when Array == type || Array === type then coerce_array(value, type)
+        when Hash  == type || Hash  === type then coerce_hash(value, type)
+        when type == Time  then coerce_time(value)
+        else coerce_other(value, type)
+      end
+    end
+
+    def coerce_array(value, type)
+      # type: generic Array
+      if type == Array
+        coerce_other(value, type)
+      # type: Array[Something]
+      elsif value.respond_to?(:map)
+        value.map do |element|
+          coerce_by_type(element, type[0])
+        end
+      else
+        raise ArgumentError.new "Invalid coercion: #{value.class} => #{type}"
+      end
+    end
+
+    def coerce_hash(value, type)
+      # type: generic Hash
+      if type == Hash
+        coerce_other(value, type)
+      # type: Hash[Something => Other thing]
+      elsif value.respond_to?(:to_h)
+        k_type, v_type = type.to_a[0]
+        value.to_h.map { |k,v| [coerce_by_type(k, k_type), coerce_by_type(v, v_type)] }.to_h
+      else
+        raise ArgumentError.new "Invalid coercion: #{value.class} => #{type}"
+      end
+    end
+
+    def coerce_time(value)
+      case value
+      when Integer, Float      then Time.at(value)
+      when /\d{4}-\d{2}-\d{2}/ then Time.parse(value)
+      when /\A\d+(\.\d+)?/     then Time.at(value.to_f)
+      else value
+      end
+    end
+
+    def coerce_other(value, type)
+      coercer[value.class].send("to_#{type.to_s.downcase}", value)
+    end
+  end
+end

data/lib/bigqueryid/criteria/queryable.rb

@@ -6,6 +6,24 @@ module Bigqueryid
 
       class_methods do
 
+        def where(filter)
+          return [] if filter.empty?
+
+          where = []
+          filter.each do |key, value|
+            filter[key] = coercer.coerce(key, value)
+            where << "#{key} = @#{key}"
+          end
+
+          query = "SELECT * FROM #{dataset_name}.#{table_name}" \
+                  " WHERE #{where.join(' AND ')}"
+
+          result = bigquery.query(query, params: filter)
+          result.map do |row|
+            new(row.select { |f| attributes.include?(f) })
+          end
+        end
+
         def run(query)
           result = bigquery.query query
           new(result.first) if result.count == 1

data/lib/bigqueryid/version.rb

@@ -1,5 +1,5 @@
 module Bigqueryid
   # version string
   # @api public
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/lib/bigqueryid.rb

@@ -8,6 +8,7 @@ module Bigqueryid
   require 'bigqueryid/attributes'
   require 'bigqueryid/criteria/queryable'
   require 'bigqueryid/criteria'
+  require 'bigqueryid/coercer'
   require 'bigqueryid/base/initializable'
   require 'bigqueryid/base'
   require 'bigqueryid/timestamps'

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: bigqueryid
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Fabio Tomio
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: google-cloud-bigquery
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.21'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: coercible
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Simple ORM for Google BigQuery
@@ -114,8 +114,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -128,6 +128,7 @@ files:
 - lib/bigqueryid/attributes.rb
 - lib/bigqueryid/base.rb
 - lib/bigqueryid/base/initializable.rb
+- lib/bigqueryid/coercer.rb
 - lib/bigqueryid/criteria.rb
 - lib/bigqueryid/criteria/queryable.rb
 - lib/bigqueryid/errors/bigquery_error.rb
@@ -143,17 +144,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Google BigQuery ORM