firestore-odm 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b530cba51bdd238e2599633f45d66c50945548a60c6b37e18d33d8e2f56aac4
-  data.tar.gz: 0b1ca53aa593fd9a028bcf83bc28f14e9eb3033484e33801512cf6f6f818df31
+  metadata.gz: 94b90e6ec000daec07e84a3772c145ff8e6db882205e0f384c022ac51bc8d520
+  data.tar.gz: b8b2a75bac4d646ef6dace0502bf9dc80a160b5f6892e5c226aa20a9e6ba130f
 SHA512:
-  metadata.gz: 16380f656883a44abcc3b73092df5f0ec621ba8b5a70354485f6af24787e0731d46583f1a4dd562a42f496803369a3b2739cc8c5250eab0ecc4f7b2820be9bff
-  data.tar.gz: be54202ae93445c1b6b3d5f2e020211592572096a670e2245517ab081980ec25ce0cae2c71cfe4add5d6292cfb1a551bea37711a3576090107c6965bc9ebf23c
+  metadata.gz: a0f9405724131206b7d0c2e379a0473bd846ec28ed4edcab94bfe7811cc7d9bf052118707779e4ee4537667b777b22a69188fde0ba28d1ca4d66262dd27b33e1
+  data.tar.gz: 20777dcbd8f983af757e9e487ecea5684775aa4722e805998a9cb012a45b0dc01c660e0c7bb7e7a1c297cee7d6334d4e4f4420d8959cb8d2665bf727567a4871

data/Gemfile

@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec
-
-group :development do
-  gem 'solargraph'
-end
+gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    firestore-odm (0.1.3)
+    firestore-odm (0.1.4)
       google-cloud-firestore (~> 1.4, >= 1.4.3)
 
 GEM
@@ -19,10 +19,10 @@ GEM
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.1)
+    google-cloud-env (1.3.2)
       faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.0.0)
-    google-cloud-firestore (1.4.3)
+    google-cloud-errors (1.0.1)
+    google-cloud-firestore (1.4.4)
       concurrent-ruby (~> 1.0)
       google-cloud-core (~> 1.2)
       google-gax (~> 1.8)
@@ -35,21 +35,21 @@ GEM
       googleauth (~> 0.9)
       grpc (~> 1.24)
       rly (~> 0.2.3)
-    google-protobuf (3.12.1-universal-darwin)
+    google-protobuf (3.12.2)
     googleapis-common-protos (1.3.10)
       google-protobuf (~> 3.11)
       googleapis-common-protos-types (>= 1.0.5, < 2.0)
       grpc (~> 1.27)
     googleapis-common-protos-types (1.0.5)
       google-protobuf (~> 3.11)
-    googleauth (0.12.0)
+    googleauth (0.13.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.14)
-    grpc (1.28.0-universal-darwin)
+    grpc (1.28.0)
       google-protobuf (~> 3.11)
       googleapis-common-protos-types (~> 1.0)
     jaro_winkler (1.5.4)

data/firestore-odm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = 'firestore-odm'
-  spec.version      = '0.1.4'
+  spec.version      = '0.1.5'
   spec.licenses     = 'BSD-2-Clause'
   spec.summary      = 'ODM for Firestore in Ruby'
   spec.description  = ''
@@ -10,5 +10,5 @@ Gem::Specification.new do |spec|
   spec.homepage     = 'https://github.com/fecabrera/firestore-odm'
   spec.metadata     = {"source_code_uri" => "https://github.com/fecabrera/firestore-odm"}
 
-  spec.add_dependency 'google-cloud-firestore', '~> 1.4', '>= 1.4.3'
+  spec.add_dependency 'google-cloud-firestore', '~> 1.4', '>= 1.4.0'
 end

data/lib/firestore-odm.rb

@@ -17,7 +17,7 @@ class Module
 end
 
 module FirestoreODM
-  attr_reader :conversions
+  attr_reader :conversions, :options
 
   @conversions = {
     String => :to_s,
@@ -28,6 +28,8 @@ module FirestoreODM
     Time => :to_time
   }
 
+  @options = {}
+
   # Sets a conversion rule for a certain type.
   # @param type [Class]
   # @param target [Symbol, Proc]
@@ -50,32 +52,42 @@ module FirestoreODM
     end
   end
 
-  def more_than value
-    Proc.new { |o| value < o }
+  # @param name [Symbol]
+  def add_option name, &block
+    @options[name] = block
   end
 
-  def min value
-    Proc.new { |o| value <= o }
-  end
-
-  def max value
-    Proc.new { |o| o <= value }
-  end
-
-  def less_than value
-    Proc.new { |o| o < value }
-  end
-
-  def check_option name, option
-    method = FirestoreODM.method name
+  def get_option name, option
+    method = @options[name]
 
     case option
     when Proc
-      check_option name, option.call
+      get_option name, option.call
     else
       method.call option
     end
   end
 
   extend self
+end
+
+
+FirestoreODM.add_option :more_than do |value|
+  Proc.new { |o| value < o }
+end
+
+FirestoreODM.add_option :min do |value|
+  Proc.new { |o| value <= o }
+end
+
+FirestoreODM.add_option :max do |value|
+  Proc.new { |o| o <= value }
+end
+
+FirestoreODM.add_option :less_than do |value|
+  Proc.new { |o| o < value }
+end
+
+FirestoreODM.add_option :in do |list|
+  Proc.new { |o| list.include? o }
 end

data/lib/firestore-odm/schema.rb

@@ -9,10 +9,11 @@ module FirestoreODM
 
       list = []
       
-      list << FirestoreODM.check_option(:min, opts[:min]) if opts[:min]
-      list << FirestoreODM.check_option(:max, opts[:max]) if opts[:max]
-      list << FirestoreODM.check_option(:less_than, opts[:less_than]) if opts[:less_than]
-      list << FirestoreODM.check_option(:more_than, opts[:more_than]) if opts[:more_than]
+      list << FirestoreODM.get_option(:min, opts[:min]) if opts[:min]
+      list << FirestoreODM.get_option(:max, opts[:max]) if opts[:max]
+      list << FirestoreODM.get_option(:less_than, opts[:less_than]) if opts[:less_than]
+      list << FirestoreODM.get_option(:more_than, opts[:more_than]) if opts[:more_than]
+      list << FirestoreODM.get_option(:in, opts[:in]) if opts[:in]
 
       define_singleton_method("parse_#{name}") do |value|
         list.reduce(true) { |result, o| result and o.call(value) }

data/test.rb

@@ -7,6 +7,7 @@ class Post < FirestoreODM::Model
   path :posts
 
   field :content, String
+  field :privacy, String, :in => ['public', 'hidden', 'private']
   field :created_at, DateTime
 end
 
@@ -31,6 +32,8 @@ end
 puts Account.parse_birthday(Date.parse('2001-12-02'))
 puts Account.parse_birthday(Date.parse('2002-12-02'))
 puts Account.parse_birthday(Date.parse('2003-12-02'))
+puts Post.parse_privacy('public')
+puts Post.parse_privacy('none')
 
 begin
   user = User.create_with_id 'john.smith' do |doc|
@@ -58,6 +61,7 @@ begin
 
     post = user.create_post do |doc|
       doc.content = 'Hello world!'
+      doc.privacy = 'public'
       doc.created_at = DateTime.now
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firestore-odm
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Felipe Cabrera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-firestore
@@ -19,7 +19,7 @@ dependencies:
         version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.0
 description: ''
 email: fecabrera0@outlook.com
 executables: []
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ODM for Firestore in Ruby