gdatastore_mapper 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db5faa3582a78e8bec1ae7f512679a6d1de51d0d
-  data.tar.gz: cc263821fbf1d347fb3c99b18ddfb773d7c14fae
+  metadata.gz: 37b4099d9d73578ac345308631870169d1e24513
+  data.tar.gz: 65d545b40e2b8482f7033c2e53e195a869aa88d5
 SHA512:
-  metadata.gz: a9f83649f684855ab56c328416dde0831463afc7dfd85e0e7469f4c1e2f5a2e625f983ec2158acf5c7a29f5e221723485b061b3cf65c4757d00cb228b5f0c47c
-  data.tar.gz: 1bf9a85f642d1dc1301027d0ec7ce786d1d6b2badbb5005053e11750a382d8a9231fba8efcf8ca326534321aa720ecca574365616f8de4c2f78acf34207339df
+  metadata.gz: d17c543ebd171c76fd20dd5aa78ba860a3765c4741762331d9fbaa22bb6207010cf2b66e2accabda4e017af4e8f7ee566f22ee46d4863ac2065bea97f162c48d
+  data.tar.gz: b4af8479645b8b161b2cd74d61b699b4c9361a6e3f260291a45f9838f56085b1a5e6918d7e379a0363234c841d53dce3a077e57f633dc22d2dd587f7e5f1eb5e

data/Gemfile

@@ -3,11 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in gdatastore_mapper.gemspec
 gemspec
 
-gem 'activemodel', '~> 5.0.1'
-gem 'activesupport', '~> 5.0.1'
-gem 'rake'
-
-group :test do
+group :development, :test do
   gem 'byebug', platform: :mri
   gem 'factory_girl_rails', require: false
   gem 'pry-rails'

data/README.md

@@ -4,6 +4,7 @@ GdatastoreMapper is a mapper framework for Google Cloud Datastore in Ruby / Ruby
 Once you install GdatastoreMapper you can use Google Cloud Datastore like ActiveRecord.
 
 ## Table of Contents
+- [Demo](#demo)
 - [Requirements](#requirements)
 - [Installation](#installation)
 - [Configuration](#configuration)
@@ -15,11 +16,15 @@ Once you install GdatastoreMapper you can use Google Cloud Datastore like Active
   - [One to Many](#one-to-many)
 - [Development](#development)
 
-## Requirements
+## Demo
+
+Here is [demo](https://gdatastore-mapper-sample.appspot.com/). The demo works with Google Cloud Datastore.
 
-GdatastoreMapper requires Rails version >= 4.2 (of course it's working for Rails 5)
+Source code is [here](https://github.com/shinyaK14/gdatastore_mapper/tree/master/rails_example).
+
+## Requirements
 
-google-cloud >= 0.27
+GdatastoreMapper requires Rails version >= 5
 
 
 ## Installation
@@ -32,7 +37,6 @@ $ rails new your_project --skip-active-record
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'google-cloud'
 gem 'gdatastore_mapper'
 ```
 
@@ -117,20 +121,20 @@ Book.find(12)
 ```
 ```
 Book.find_by(title: 'Harry Potter')
-=> #<Book:0x00 @created_at ....
+=> #<Book:0x00 @title="Harry Potter" ....
 ```
 ```
 Book.order(title: :asc)
-=> [#<Book:0x00 @created_at .... ]
+=> [#<Book:0x00 @title="Harry Potter" .... ]
 ```
 
 ```
 Book.first
-=> #<Book:0x00 @created_at ....
+=> #<Book:0x00 @title="Harry Potter" ....
 ```
 ```
 Book.last
-=> #<Book:0x00 @created_at ....
+=> #<Book:0x00 @title="Harry Potter" ....
 ```
 ```
 Book.count
@@ -138,7 +142,7 @@ Book.count
 ```
 ```
 Book.all
-=> [#<Book:0x00 @created_at .... ]
+=> [#<Book:0x00 @title="Harry Potter" .... ]
 ```
 
 ## Timestamp
@@ -173,24 +177,24 @@ end
 
 books.create
 ```
-rolling = Author.create(name: 'J K Rolling')
+rowling = Author.create(name: 'J. K. Rowling')
 harry_poter = rolling.books.create(title: 'Harry Poter')
 harry_poter2 = rolling.books.create(title: 'Harry Poter 2')
 ```
 books
 ```
-rolling.books
-=> [#<Book:0x00 @created_at .... ]
+rowling.books
+=> [#<Book:0x00 @title="Harry Potter" .... ]
 ```
 
 books.count
 ```
-rolling.books.count
+rowling.books.count
 => 2
 ```
 ```
 harry_poter.author
-=> [#<Author:0x00 @created_at .... ]
+=> [#<Author:0x00 @name="J. K. Rowling" .... ]
 ```
 
 ## Development

data/gdatastore_mapper.gemspec

@@ -4,25 +4,28 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gdatastore_mapper/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "gdatastore_mapper"
+  spec.name          = 'gdatastore_mapper'
   spec.version       = GdatastoreMapper::VERSION
-  spec.authors       = ["Shinya Kitamura"]
-  spec.email         = ["shinya.kitamura.14@gmail.com"]
+  spec.authors       = ['Shinya Kitamura']
+  spec.email         = ['shinya.kitamura.14@gmail.com']
 
-  spec.summary       = %q{Google Cloud Datastore Mapper in Ruby / Ruby on Rails}
-  spec.description   = %q{Google Cloud Datastore ORM/ODM (Mapper) in Ruby and Ruby on Rails}
-  spec.homepage      = "https://github.com/shinyaK14/gdatastore_mapper"
-  spec.license       = "MIT"
+  spec.summary       = 'Google Cloud Datastore Mapper in Ruby / Ruby on Rails'
+  spec.description   = 'Google Cloud Datastore ORM/ODM (Mapper) in Ruby and Ruby on Rails'
+  spec.homepage      = 'https://github.com/shinyaK14/gdatastore_mapper'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_runtime_dependency 'google-cloud', '~> 0.27'
+  spec.add_runtime_dependency 'google-cloud-datastore', '~> 1.0'
+  spec.add_runtime_dependency 'activemodel', '~> 5.0'
+  spec.add_runtime_dependency 'activesupport', '~> 5.0'
+
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/gdatastore_mapper.rb

@@ -1,7 +1,8 @@
 require 'active_support/concern'
 require 'active_model'
+require 'google/cloud/datastore'
 
-require "gdatastore_mapper/version"
-require "gdatastore_mapper/session"
-require "gdatastore_mapper/base"
+require 'gdatastore_mapper/version'
+require 'gdatastore_mapper/session'
+require 'gdatastore_mapper/base'
 

data/lib/gdatastore_mapper/associations.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "google/cloud"
 require "gdatastore_mapper/relation"
 require "gdatastore_mapper/associations/has_many"
 
@@ -27,11 +26,7 @@ module GdatastoreMapper
     end
 
     def belongs_to model
-      if @belongs_to_models.nil?
-        @belongs_to_models = [model.to_s]
-      else
-        @belongs_to_models << model.to_s
-      end
+      add_belongs_to model
       self.class_eval("attr_accessor :#{model.to_s + '_id'}")
 
       define_method model do
@@ -45,5 +40,15 @@ module GdatastoreMapper
       @belongs_to_models
     end
 
+    private
+
+    def add_belongs_to(model)
+      if @belongs_to_models.nil?
+        @belongs_to_models = [model.to_s]
+      else
+        @belongs_to_models << model.to_s
+      end
+    end
+
   end
 end

data/lib/gdatastore_mapper/base.rb

@@ -1,14 +1,14 @@
-require "google/cloud/datastore"
-require "gdatastore_mapper/session"
-require "gdatastore_mapper/scoping"
-require "gdatastore_mapper/associations"
-require "gdatastore_mapper/persistence"
+require 'gdatastore_mapper/session'
+require 'gdatastore_mapper/scoping'
+require 'gdatastore_mapper/associations'
+require 'gdatastore_mapper/persistence'
 
 module GdatastoreMapper
   module Base
     extend ActiveSupport::Concern
     include ActiveModel::Model
     include ActiveModel::Validations
+    include ActiveModel::Validations::Callbacks
 
     attr_accessor :id, :created_at, :updated_at
 
@@ -67,7 +67,7 @@ module GdatastoreMapper
       @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
+      @entity['updated_at'] = Time.zone.now
     end
 
     def id_ model

data/lib/gdatastore_mapper/persistence.rb

@@ -1,5 +1,3 @@
-require "google/cloud"
-
 module GdatastoreMapper
   module Persistence
 
@@ -39,7 +37,7 @@ module GdatastoreMapper
       return if self.class.belongs_to_models.nil?
       belongings_id = belonging.class.to_s.pluralize.underscore + '_id'
       self.class.belongs_to_models.each do |owner|
-        owner_record = belonging.send(owner)
+        return unless owner_record = belonging.send(owner)
         existing_ids = owner_record.send(belongings_id) || []
         owner_record.update(owner_attr(belongings_id, existing_ids, flg))
       end

data/lib/gdatastore_mapper/relation.rb

@@ -13,6 +13,7 @@ module GdatastoreMapper
     def create attributes
       belonging = create_belonging attributes
       update_owner belonging
+      belonging
     end
 
     private

data/lib/gdatastore_mapper/scoping.rb

@@ -1,4 +1,3 @@
-require "google/cloud"
 require "gdatastore_mapper/relation"
 
 module GdatastoreMapper
@@ -10,6 +9,7 @@ module GdatastoreMapper
     end
 
     def find id
+      return nil if id.nil?
       query = Google::Cloud::Datastore::Key.new self.to_s, id.to_i
       entities = GdatastoreMapper::Session.dataset.lookup query
       from_entity entities.first if entities.any?

data/lib/gdatastore_mapper/session.rb

@@ -1,5 +1,3 @@
-require "google/cloud"
-
 module GdatastoreMapper
   class Session
 

data/lib/gdatastore_mapper/version.rb

@@ -1,3 +1,3 @@
 module GdatastoreMapper
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/rails_example/Gemfile

@@ -8,7 +8,7 @@ end
 gem 'rails', '~> 5.0.2'
 
 gem 'google-cloud'
-gem 'gdatastore_mapper', path: '../../gems/gdatastore_mapper'
+gem 'gdatastore_mapper'
 
 gem 'puma', '~> 3.0'
 gem 'sass-rails', '~> 5.0'

data/rails_example/Gemfile.lock

@@ -1,9 +1,3 @@
-PATH
-  remote: ../../gems/gdatastore_mapper
-  specs:
-    gdatastore_mapper (0.1.2bata)
-      google-cloud (~> 0.27)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -50,7 +44,6 @@ GEM
     bindex (0.5.0)
     builder (3.2.3)
     byebug (9.0.6)
-    coderay (1.1.1)
     coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.2.x)
@@ -67,6 +60,8 @@ GEM
     faraday (0.12.0.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
+    gdatastore_mapper (0.1.3)
+      google-cloud (~> 0.27)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     google-api-client (0.11.1)
@@ -148,7 +143,7 @@ GEM
       googleauth (~> 0.5.1)
       grpc (~> 1.0)
       rly (~> 0.2.3)
-    google-protobuf (3.2.0.2-universal-darwin)
+    google-protobuf (3.2.0.2)
     googleapis-common-protos (1.3.5)
       google-protobuf (~> 3.2)
       grpc (~> 1.0)
@@ -160,7 +155,7 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (1.2.2-universal-darwin)
+    grpc (1.2.2)
       google-protobuf (~> 3.1)
       googleauth (~> 0.5.1)
     grpc-google-iam-v1 (0.6.8)
@@ -201,18 +196,6 @@ GEM
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     os (0.9.6)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    pry-doc (0.10.0)
-      pry (~> 0.9)
-      yard (~> 0.9)
-    pry-rails (0.3.6)
-      pry (>= 0.10.4)
     public_suffix (2.0.5)
     puma (3.8.2)
     rack (2.0.1)
@@ -263,7 +246,6 @@ GEM
       faraday (~> 0.9)
       jwt (~> 1.5)
       multi_json (~> 1.10)
-    slop (3.6.0)
     spring (2.0.1)
       activesupport (>= 4.2)
     spring-watcher-listen (2.0.1)
@@ -296,7 +278,6 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    yard (0.9.8)
     zonefile (1.04)
 
 PLATFORMS
@@ -305,14 +286,11 @@ PLATFORMS
 DEPENDENCIES
   byebug
   coffee-rails (~> 4.2)
-  gdatastore_mapper!
+  gdatastore_mapper
   google-cloud
   jbuilder (~> 2.5)
   jquery-rails
   listen (~> 3.0.5)
-  pry-byebug
-  pry-doc
-  pry-rails
   puma (~> 3.0)
   rails (~> 5.0.2)
   sass-rails (~> 5.0)

data/rails_example/README.md

@@ -1,24 +1,45 @@
-# README
+# Gdatastore Mapper Rails example
 
-This README would normally document whatever steps are necessary to get the
-application up and running.
+Source code of Gdatastore Mapper Rails example. 
 
-Things you may want to cover:
+Here is [demo](https://gdatastore-mapper-sample.appspot.com/)
 
-* Ruby version
+## Versions
 
-* System dependencies
+Ruby 2.3.3
 
-* Configuration
+Rails 5.0.2
 
-* Database creation
+google-cloud 0.28.0
 
-* Database initialization
+# Model Association
 
-* How to run the test suite
+In the application containing authors and books, the author model has many books. The book belongs to author.
 
-* Services (job queues, cache servers, search engines, etc.)
 
-* Deployment instructions
+```ruby
+# app/models/author.rb
+class Author
+  include GdatastoreMapper::Base
 
-* ...
+  attr_accessor :name
+
+  has_many :books
+
+  validates :name, presence: true
+end
+```
+
+```ruby
+class Book
+  include GdatastoreMapper::Base
+
+  attr_accessor :title, :description
+
+  belongs_to :author
+
+  validates :title, presence: true
+end
+```
+
+![has_many](https://cloud.githubusercontent.com/assets/9897663/25094991/e71472b4-2399-11e7-9b3d-d612b6f1e742.png)

data/rails_example/app.yaml

@@ -0,0 +1,3 @@
+runtime: ruby
+env: flex
+entrypoint: bundle exec rackup -p $PORT

data/rails_example/config/secrets.yml

@@ -1,14 +1,3 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key is used for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-# You can use `rails secret` to generate a secure secret key.
-
-# Make sure the secrets in this file are kept private
-# if you're sharing your code publicly.
 
 development:
   secret_key_base: aa6a42b0d5535f02cc6e8889c5b7199ab06b9b12303f04e9815c99944e0e5618a8a22d870c6a8eee907dc365650ccc4a4a8b54666747bcc1317f389642f0213d
@@ -16,7 +5,5 @@ development:
 test:
   secret_key_base: fcb7e03df887de76cdce579fa0d51bc576d193d3b44aac7eabe0a5c9d3ccad3f45d40696d7264cc3866cb101ff9ad689fbc2a8a2c5a422e7075b27a289022f57
 
-# Do not keep production secrets in the repository,
-# instead read values from the environment.
 production:
-  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+  secret_key_base: to-input-your-secret-key-base

metadata

@@ -1,71 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: gdatastore_mapper
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Shinya Kitamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-16 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: google-cloud-datastore
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :development
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.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: 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: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: google-cloud
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
-  type: :runtime
+        version: '3.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '3.0'
 description: Google Cloud Datastore ORM/ODM (Mapper) in Ruby and Ruby on Rails
 email:
 - shinya.kitamura.14@gmail.com
@@ -98,6 +126,7 @@ files:
 - rails_example/Gemfile.lock
 - rails_example/README.md
 - rails_example/Rakefile
+- rails_example/app.yaml
 - rails_example/app/assets/config/manifest.js
 - rails_example/app/assets/images/.keep
 - rails_example/app/assets/javascripts/application.js