rasti-db 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 935cee1239288342a27bdcde6660f205b9fa1685
-  data.tar.gz: 2bc7b5c0cf6559c7ae5716b4814fea412e0481f3
+  metadata.gz: 25e0bbb3407cfae9d3217b22dff5f9756f451d2c
+  data.tar.gz: 8e92b0f310f1a7761e62b288cf3482b788f6c89c
 SHA512:
-  metadata.gz: b564fb1e883999d26e06b73c81d5ef68a68c2cdebc870403376c7c3b49e4729c020b552a010ffa47c13ca24743dfe9327b12963000a8892c55b3a4d0477f9170
-  data.tar.gz: 1f68b62bc955b2d7a4955a217877d9013c2ab7546740a0b90c452952e5cc241fa2573a7c1766da724e22013dfa176894c4ec81aa2da20bf322f0b84598f2ff63
+  metadata.gz: 6ce81a8a43cba1212c251d86a7cd32293c649059b0b1674bfb83fbc845cd4f9376ca2cd5f89046eecf26b69c63ce624f255a9f62f67511afca7e86d308eea985
+  data.tar.gz: f61e038f876cb4064fb75b61d2141eda0d013d17841d6b6b1e3933564e147c5a75d35df0f9595e42a7adebd0456e8b8ae7280f07cb1860fd58aa67e9f44a0a03

data/.travis.yml

@@ -7,6 +7,7 @@ rvm:
   - 2.2
   - 2.3.0
   - 2.4.0
+  - 2.5.0
   - jruby-1.7.25
   - jruby-9.1.7.0
   - ruby-head

data/README.md

@@ -64,15 +64,24 @@ DB.create_table :categories_posts do
   foreign_key :post_id, :posts, null: false, index: true
   primary_key [:category_id, :post_id]
 end
+
+DB.create_table :people do
+  String :document_number, null: false, primary_key: true
+  String :first_name, null: false
+  String :last_name, null: false
+  Date :birth_date, null: false
+  foreign_key :user_id, :users, null: false, unique: true
+end
 ```
 
 ### Models
 
 ```ruby
-User     = Rasti::DB::Model[:id, :name, :posts, :comments]
+User     = Rasti::DB::Model[:id, :name, :posts, :comments, :person]
 Post     = Rasti::DB::Model[:id, :title, :body, :user_id, :user, :comments, :categories]
 Comment  = Rasti::DB::Model[:id, :text, :user_id, :user, :post_id, :post]
 Category = Rasti::DB::Model[:id, :name, :posts]
+Person   = Rasti::DB::Model[:document_number, :first_name, :last_name, :birth_date, :user_id, :user]
 ```
 
 ### Collections
@@ -81,6 +90,7 @@ Category = Rasti::DB::Model[:id, :name, :posts]
 class Users < Rasti::DB::Collection
   one_to_many :posts
   one_to_many :comments
+  one_to_one :person
 end
 
 class Posts < Rasti::DB::Collection
@@ -113,10 +123,20 @@ class Categories < Rasti::DB::Collection
   many_to_many :posts
 end
 
+class People < Rasti::DB::Collection
+  set_collection_name :people
+  set_primary_key :document_number
+  set_foreign_key :document_number
+  set_model Person
+
+  many_to_one :user
+end
+
 users      = Users.new DB
 posts      = Posts.new DB
 comments   = Comments.new DB
 categories = Categories.new DB
+people     = People.new DB
 ```
 
 ### Persistence

data/lib/rasti/db/model.rb

@@ -18,7 +18,7 @@ module Rasti
 
         def [](*attribute_names)
           Class.new(self) do
-            attribute *attribute_names
+            attribute(*attribute_names)
 
             def self.inherited(subclass)
               subclass.instance_variable_set :@attributes, attributes.dup
@@ -82,15 +82,16 @@ module Rasti
       def to_h
         self.class.attributes.each_with_object({}) do |name, hash|
           if attributes.key? name
-            case attributes[name]
+            value = fetch_attribute name
+            case value
             when Model
-              hash[name] = attributes[name].to_h
+              hash[name] = value.to_h
             when Array
-              hash[name] = attributes[name].map do |e|
+              hash[name] = value.map do |e|
                 e.is_a?(Model) ? e.to_h : e
               end
             else
-              hash[name] = attributes[name]
+              hash[name] = value
             end
           end
         end
@@ -101,7 +102,11 @@ module Rasti
       attr_reader :attributes
 
       def fetch_attribute(name)
-        attributes.key?(name) ? attributes[name] : raise(UninitializedAttributeError, name)
+        attributes.key?(name) ? casted_attribute(name) : raise(UninitializedAttributeError, name)
+      end
+
+      def casted_attribute(name)
+        attributes[name].is_a?(Time) ? Timing::TimeInZone.new(attributes[name]) : attributes[name]
       end
       
     end

data/lib/rasti/db/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module DB
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/lib/rasti/db.rb

@@ -1,5 +1,7 @@
 require 'sequel'
 require 'consty'
+require 'time'
+require 'timing'
 
 require_relative 'db/version'
 require_relative 'db/helpers'

data/rasti-db.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'sequel', '~> 5.0'
   spec.add_runtime_dependency 'consty', '~> 1.0', '>= 1.0.3'
+  spec.add_runtime_dependency 'timing', '~> 0.1', '>= 0.1.3'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 11.0'

data/spec/collection_spec.rb

@@ -368,6 +368,11 @@ describe 'Collection' do
     it 'Graph' do
       1.upto(3) do |i|
         db[:users].insert name: "User #{i}"
+        db[:people].insert document_number: "document_#{i}", 
+                           first_name: "John #{i}",
+                           last_name: "Doe #{i}",
+                           birth_date: Time.now - i,
+                           user_id: i
         db[:categories].insert name: "Category #{i}"
         db[:posts].insert user_id: i, title: "Post #{i}", body: '...'
         db[:categories_posts].insert post_id: i, category_id: i
@@ -379,11 +384,12 @@ describe 'Collection' do
         end
       end
 
-      posts_graph = posts.where(id: 1).graph(:user, :categories, 'comments.user.posts.categories').all
+      posts_graph = posts.where(id: 1).graph('user.person', :categories, 'comments.user.posts.categories').all
 
       posts_graph.count.must_equal 1
 
-      posts_graph[0].user.must_equal users.find(1)
+      posts_graph[0].user.id.must_equal 1
+      posts_graph[0].user.person.must_equal people.detect(user_id: 1)
 
       posts_graph[0].categories.must_equal [categories.find(1)]
 

data/spec/model_spec.rb

@@ -28,6 +28,12 @@ describe 'Model' do
       proc { post.invalid_method }.must_raise NoMethodError
     end
 
+    it 'Time conversion' do
+      person = Person.new birth_date: Time.parse('2019-01-07T11:00:00-03:00')
+
+      person.birth_date.must_be_instance_of Timing::TimeInZone      
+    end
+
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-db
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-27 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -44,6 +44,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: timing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement