gdatastore_mapper 0.1.1 → 0.1.2bata

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 252614e80440189db611c059b54b585ef35fb463
-  data.tar.gz: 327bfa042abefc8ab140922550911efc6b156806
+  metadata.gz: 96cdd7dfe7d4ff1f1770ae525b2e142bd12ca1d3
+  data.tar.gz: 4c25acbe84f26e5480ddf5d42e80e25bde7080a5
 SHA512:
-  metadata.gz: dbd509bfd392f50b11e5bbf1c331932915b8d2984637c20d16788be5bafa1a718493c777a7491ecda8fdea11a3a103c2169866430595a2a9c74fdb345725f221
-  data.tar.gz: ffa79b0e909e5912fad1fbf1d2f3977934b09a75f8148adf652877467fc18ab863cbcde423f8abbd88c738f2daa923256fc416480dc0e77806bd72720c605bbb
+  metadata.gz: 0d8aef851f6ed9db4960e0eb3836f25fe3726a5365266fa9d6ec9a0522e9b14aa0168220643677019ac8c3b7a650def18c2f75595d2b61acce76069a3bb1283d
+  data.tar.gz: cc1489a449780b14b03bbd42d029c8f9f06f4fb074ef6ddbf8bfd7b3fb99717fc61f7bfe04af050ee6b55586a423e947f85dadaee9981536d5e76b9a86abcb60

data/README.md

@@ -1,6 +1,6 @@
 # GdatastoreMapper
 
-GdatastoreMapper is a mapper framework for Google Cloud Datastore in Ruby / Ruby on Rails
+GdatastoreMapper is a mapper framework for Google Cloud Datastore in Ruby / Ruby on Rails.
 Once you install GdatastoreMapper you can use Google Cloud Datastore like ActiveRecord.
 
 ## Installation
@@ -44,8 +44,8 @@ test:
 
 Only 2 things you need to do.
 
-1 To include GdatastoreMapper
-2 To set attr_accessor as column
+1. To include GdatastoreMapper
+2. To set attr_accessor as column
 
 That's it!
 
@@ -69,10 +69,10 @@ book = Book.new(title: 'Harry Potter')
 book.save
 ```
 ```
-Book.create(title: 'Harry Potter'
+Book.create(title: 'Harry Potter')
 ```
 ```
-book.update(title: 'Harry Potter 2'
+book.update(title: 'Harry Potter 2')
 ```
 ```
 book.delete
@@ -82,17 +82,84 @@ book.delete
 
 ```
 Book.where(title: 'Harry Potter')
+=> [#<Book:0x00 @created_at=2017-04-08 21:22:31 +0200, @title="Harry Potter",
+    @id=70, @updated_at=2017-04-08 21:22:31 +0200>]
 ```
 ```
 Book.find(12)
+=> #<Book:0x00 @created_at=2017-04-07 10:03:54 +0200, @title="Harry Potter",
+    @id=12, @updated_at=2017-04-07 22:57:57 +0200>
 ```
 ```
 Book.find_by(title: 'Harry Potter')
+=> #<Book:0x00 @created_at ....
 ```
 ```
 Book.order(title: :asc)
+=> [#<Book:0x00 @created_at .... ]
 ```
+```
+Book.first
+=> #<Book:0x00 @created_at ....
+```
+```
+Book.last
+=> #<Book:0x00 @created_at ....
+```
+```
+Book.count
+=> 100
+```
+```
+Book.all
+=> [#<Book:0x00 @created_at .... ]
+```
+
+## Associations
+
+example of one to many relationship
+
+```ruby
+class Book
+  include GdatastoreMapper::Base
+
+  attr_accessor :title
+
+  belongs_to :author
+end
+```
+
+```ruby
+class Author
+  include GdatastoreMapper::Base
+
+  attr_accessor :name
 
+  has_many :books
+end
+```
+
+books.create
+```
+j_k_rolling = Author.create(name: 'J K Rolling')
+harry_poter = j_k_rolling.books.create(title: 'Harry Poter')
+harry_poter_2 = j_k_rolling.books.create(title: 'Harry Poter 2')
+```
+books
+```
+j_k_rolling.books
+=> [#<Book:0x00 @created_at .... ]
+```
+
+books.count
+```
+j_k_rolling.books.count
+=> 2
+```
+```
+harry_poter.author
+=> [#<Author:0x00 @created_at .... ]
+```
 
 ## Development
 
@@ -102,7 +169,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/gdatastore_mapper. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/shinyaK14/gdatastore_mapper. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/gdatastore_mapper.rb

@@ -5,4 +5,3 @@ require "gdatastore_mapper/version"
 require "gdatastore_mapper/session"
 require "gdatastore_mapper/base"
 
-

data/lib/gdatastore_mapper/associations.rb

@@ -1,18 +1,38 @@
+# encoding: utf-8
 require "google/cloud"
+require "gdatastore_mapper/relation"
+require "gdatastore_mapper/associations/has_many"
 
 module GdatastoreMapper
   module Associations
+    extend ActiveSupport::Concern
+
+    def self.included(klass)
+      klass.include Associations
+    end
 
     def has_many models
+      self.class_eval("attr_accessor :#{models.to_s + '_id'}")
 
+      define_method models do
+        association = GdatastoreMapper::Associations::HasMany.new(self, models)
+        belongings = GdatastoreMapper::Relation.new(self, association)
+        if self.attributes.include?(id_ models) && !self.send(id_ models).nil?
+          self.send(id_ models).each do |id|
+            belongings << (models.to_s.classify.constantize.find id)
+          end
+        end
+        belongings
+      end
     end
 
     def belongs_to model
-      # if @belongs_to_mode.defined?
-      @belongs = model
+      self.class_eval("attr_accessor :#{model.to_s + '_id'}")
 
-      define_method @belongs do
-        p 'succseed'
+      define_method model do
+        if self.attributes.include?(id_ model)
+          model.to_s.classify.constantize.find self.send(id_ model)
+        end
       end
     end
 

data/lib/gdatastore_mapper/associations/has_many.rb

@@ -0,0 +1,28 @@
+module GdatastoreMapper
+  module Associations
+    class HasMany
+
+      attr_accessor :owner, :belonging
+
+      def initialize(owner, belonging)
+        @owner = owner
+        @belonging = belonging
+      end
+
+      def belonging_klass
+        @belonging.to_s.classify.constantize
+      end
+
+      def owner_attributes
+        {
+          (@owner.class.to_s.underscore + '_id') => @owner.id
+        }
+      end
+
+      def belonging_id
+        @belonging.to_s + '_id'
+      end
+    end
+  end
+end
+

data/lib/gdatastore_mapper/base.rb

@@ -54,17 +54,24 @@ module GdatastoreMapper
     end
 
     def to_entity
-      entity = Google::Cloud::Datastore::Entity.new
-      entity.key = Google::Cloud::Datastore::Key.new self.class.to_s, id
-
+      entity_timestamp
       attributes.each do |attribute|
-        entity[attribute] = self.send attribute if self.send attribute
+        @entity[attribute] = self.send attribute if self.send attribute
       end
+      @entity
+    end
 
-      entity['created_at'] = id ? self.created_at : Time.zone.now
-      entity["updated_at"] = Time.zone.now
-      entity
+    private
+
+    def entity_timestamp
+      @entity = Google::Cloud::Datastore::Entity.new
+      @entity.key = Google::Cloud::Datastore::Key.new self.class.to_s, id
+      @entity['created_at'] = id ? self.created_at : Time.zone.now
+      @entity["updated_at"] = Time.zone.now
     end
 
+    def id_ model
+      (model.to_s + '_id').to_sym
+    end
   end
 end

data/lib/gdatastore_mapper/relation.rb

@@ -1,5 +1,28 @@
 module GdatastoreMapper
-  class Relation
-    include Enumerable
+  class Relation < Array
+    def initialize(klass, association)
+      @klass = klass
+      @association = association
+    end
+
+    def create attributes
+      belonging = create_belonging attributes
+      update_owner belonging
+    end
+
+    private
+
+    def create_belonging attributes
+      belonging_attr = attributes.merge(@association.owner_attributes)
+      @association.belonging_klass.create(belonging_attr)
+    end
+
+    def update_owner belonging
+      existing_ids = @association.owner.send(@association.belonging_id)
+      existing_ids = [] if existing_ids.nil?
+      owner_attr = {}
+      owner_attr[@association.belonging_id] = (existing_ids << belonging.id)
+      @association.owner.update(owner_attr)
+    end
   end
 end

data/lib/gdatastore_mapper/scoping.rb

@@ -1,11 +1,12 @@
 require "google/cloud"
+require "gdatastore_mapper/relation"
 
 module GdatastoreMapper
   module Scoping
 
     def where condition
       return nil unless condition.is_a?(Hash)
-      entities = dataset_run(where_query condition)
+      dataset_run(where_query condition)
     end
 
     def find id
@@ -20,11 +21,37 @@ module GdatastoreMapper
       where(condition)&.first
     end
 
+    def find_or_create condition
+      return nil unless condition.is_a?(Hash)
+      if record = where(condition)&.first
+        record
+      else
+        create condition
+      end
+    end
+
     def order condition
       return nil unless condition.is_a?(Hash)
       dataset_run(order_query condition)
     end
 
+    def all
+      order(created_at: :asc)
+    end
+
+
+    def first
+      all.first
+    end
+
+    def last
+      all.last
+    end
+
+    def count
+      all.count
+    end
+
     private
 
     def where_query condition
@@ -47,9 +74,11 @@ module GdatastoreMapper
 
     def dataset_run query
       entities = GdatastoreMapper::Session.dataset.run query
-      entities.map do |entity|
-        from_entity entity
+      result = GdatastoreMapper::Relation.new(self, nil)
+      entities.each do |entity|
+        result << (from_entity entity)
       end
+      result
     end
   end
 end

data/lib/gdatastore_mapper/version.rb

@@ -1,3 +1,3 @@
 module GdatastoreMapper
-  VERSION = "0.1.1"
+  VERSION = "0.1.2bata"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gdatastore_mapper
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2bata
 platform: ruby
 authors:
 - Shinya Kitamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,7 @@ files:
 - gdatastore_mapper.gemspec
 - lib/gdatastore_mapper.rb
 - lib/gdatastore_mapper/associations.rb
+- lib/gdatastore_mapper/associations/has_many.rb
 - lib/gdatastore_mapper/base.rb
 - lib/gdatastore_mapper/persistence.rb
 - lib/gdatastore_mapper/relation.rb
@@ -107,9 +108,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11