groonga-client-model 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6824d1482f9c9b4b419159a32fe8b1d8039291ca
-  data.tar.gz: d71d506459e9dc29b16475e1746e8d08a578f23f
+  metadata.gz: 280065806b16cf11124e4ce8a5d8550c6a427f4c
+  data.tar.gz: ea03fc0c321b8aea0df6951c94b15b5879852371
 SHA512:
-  metadata.gz: 519907f3b5b2c4566ffb381400effbb8659fdd85b614a2683753ae7e6116cdd418627635e56ea9e5aa9d8e75c2c942cc819b336d156cdb1f400ea31f46810a53
-  data.tar.gz: 787015c1026f79ad217dd2b977f1a04a5294f49ecebd3164e7cc23827b97b49b532f0251aa92e4da97860cef485c6a3ad3d03c5fd31937cf3d1f209b1b0db0c1
+  metadata.gz: fc49cbe218f850a775997ae6cd937799249720e9a70ed582d10009dffa8cac3a51695e69eb10a9958d8421faa4774eb989c3ecf19071613d3490745191dbe1a8
+  data.tar.gz: d8edfa839c110f51e7ec55978964e0de3bee6c79ffcbae99fbe5e4ed8a9facae653a895a7a1946f7103de7e66906953fbc3d2573a74c6875cdfb4e890a6a943f

data/doc/text/news.md

@@ -1,5 +1,18 @@
 # NEWS
 
+## 0.9.5 - 2016-12-27
+
+### Improvements
+
+  * Added the default presence validation for `_key`.
+
+  * Supported validation on save by default.
+
+  * Supported Rails 4.
+
+  * Supported sub record class under the record class instead of
+    top-level.
+
 ## 0.9.4 - 2016-12-21
 
 ### Improvements

data/lib/groonga-client-model.rb

@@ -20,6 +20,7 @@ require "groonga/client"
 
 require "groonga_client_model/version"
 
+require "groonga_client_model/attribute_assignment"
 require "groonga_client_model/client"
 require "groonga_client_model/client_opener"
 require "groonga_client_model/error"

data/lib/groonga_client_model/attribute_assignment.rb

@@ -0,0 +1,34 @@
+# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module GroongaClientModel
+  module AttributeAssignment
+    if ActiveModel.const_defined?(:AttributeAssignment)
+      include ActiveModel::AttributeAssignment
+    else
+      def assign_attributes(attributes)
+        attributes.each do |name, value|
+          setter = "#{name}="
+          if respond_to?(setter)
+            public_send(setter, value)
+          else
+            raise NoMethodError, "unknown attribute: #{name}: #{self.class}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/groonga_client_model/client.rb

@@ -16,7 +16,7 @@
 
 module GroongaClientModel
   class Client
-    class_attribute :url
+    class_attribute :url, instance_accessor: false
 
     class << self
       def open(&block)

data/lib/groonga_client_model/record.rb

@@ -16,7 +16,7 @@
 
 module GroongaClientModel
   class Record
-    include ActiveModel::AttributeAssignment
+    include AttributeAssignment
     include ActiveModel::AttributeMethods
     include ActiveModel::Callbacks
     include ActiveModel::Conversion
@@ -41,6 +41,10 @@ module GroongaClientModel
         schema.tables[table_name].columns
       end
 
+      def have_key?
+        columns.exist?("_key")
+      end
+
       def define_attributes
         return if defined?(@defined)
         @defined = true
@@ -118,6 +122,8 @@ module GroongaClientModel
 
     attr_reader :attributes
 
+    validates :_key, presence: true, if: ->(record) {record.class.have_key?}
+
     def initialize(attributes=nil)
       @attributes = {}
       self.class.define_attributes
@@ -132,13 +138,13 @@ module GroongaClientModel
       @destroyed = false
     end
 
-    def save(validate: false)
+    def save(validate: true)
       run_callbacks(:save) do
         save_raw(validate: validate)
       end
     end
 
-    def save!(validate: false)
+    def save!(validate: true)
       unless save(validate: validate)
         message = "Failed to save the record"
         raise RecordNotSaved.new(message, self)
@@ -195,12 +201,12 @@ module GroongaClientModel
     def save_raw(validate:)
       if validate
         if valid?
-          upsert
+          upsert(validate: true)
         else
           false
         end
       else
-        upsert
+        upsert(validate: false)
       end
     end
 
@@ -221,20 +227,21 @@ module GroongaClientModel
       freeze
     end
 
-    def upsert
+    def upsert(validate:)
       if new_record?
         run_callbacks(:create) do
-          upsert_raw
+          upsert_raw(validate: validate)
         end
       else
         run_callbacks(:update) do
-          upsert_raw
+          upsert_raw(validate: validate)
         end
       end
     end
 
-    def upsert_raw
-      upsert_sub_records
+    def upsert_raw(validate:)
+      return false unless upsert_sub_records(validate: validate)
+
       Client.open do |client|
         table = self.class.schema.tables[self.class.table_name]
         load_value_generator = LoadValueGenerator.new(self)
@@ -273,20 +280,30 @@ module GroongaClientModel
       end
     end
 
-    def upsert_sub_records
+    def upsert_sub_records(validate:)
       attributes.each do |name, value|
-        upsert_sub_record(value)
+        return false unless upsert_sub_record(value, validate)
       end
+      true
     end
 
-    def upsert_sub_record(sub_record)
+    def upsert_sub_record(sub_record, validate)
       case sub_record
       when Record
-        sub_record.save if sub_record.changed?
+        if sub_record.changed?
+          sub_record.save(validate: validate)
+        else
+          true
+        end
       when Array
         sub_record.each do |sub_element|
-          upsert_sub_record(sub_element)
+          unless upsert_sub_record(sub_element, validate)
+            return false
+          end
         end
+        true
+      else
+        true
       end
     end
 
@@ -298,7 +315,11 @@ module GroongaClientModel
 
       class_name = name.classify
       begin
-        sub_record_class = class_name.constantize
+        if self.class.const_defined?(class_name)
+          sub_record_class = self.class.const_get(class_name)
+        else
+          sub_record_class = class_name.constantize
+        end
       rescue NameError
         return value
       end

data/lib/groonga_client_model/version.rb

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module GroongaClientModel
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

data/test/apps/rails4/Gemfile

@@ -0,0 +1,55 @@
+source 'https://rubygems.org'
+
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 5.0.1'
+# Use Puma as the app server
+gem 'puma', '~> 3.0'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.2'
+# See https://github.com/rails/execjs#readme for more supported runtimes
+# gem 'therubyracer', platforms: :ruby
+
+# Use jquery as the JavaScript library
+gem 'jquery-rails'
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+gem 'turbolinks', '~> 5'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.5'
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 3.0'
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platform: :mri
+  gem 'factory_girl_rails'
+end
+
+group :development do
+  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '~> 3.0.5'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+gem 'groonga-client-model', path: '../../../'
+gem 'groonga-client', path: '../../../../groonga-client'

data/test/apps/rails4/Gemfile.lock

@@ -0,0 +1,206 @@
+PATH
+  remote: ../../../../groonga-client
+  specs:
+    groonga-client (0.4.0)
+      gqtp (>= 1.0.4)
+      groonga-command (>= 1.2.8)
+      groonga-command-parser (>= 1.0.7)
+      hashie
+
+PATH
+  remote: ../../../
+  specs:
+    groonga-client-model (0.9.5)
+      activemodel
+      groonga-client (>= 0.3.7)
+      groonga-command-parser
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.0.1)
+      actionpack (= 5.0.1)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.1)
+      actionpack (= 5.0.1)
+      actionview (= 5.0.1)
+      activejob (= 5.0.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.1)
+      actionview (= 5.0.1)
+      activesupport (= 5.0.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.1)
+      activesupport (= 5.0.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (5.0.1)
+      activesupport (= 5.0.1)
+      globalid (>= 0.3.6)
+    activemodel (5.0.1)
+      activesupport (= 5.0.1)
+    activerecord (5.0.1)
+      activemodel (= 5.0.1)
+      activesupport (= 5.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.1.4)
+    builder (3.2.2)
+    byebug (9.0.6)
+    coffee-rails (4.2.1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.2.x)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.4)
+    debug_inspector (0.0.2)
+    erubis (2.7.0)
+    execjs (2.7.0)
+    factory_girl (4.8.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.8.0)
+      factory_girl (~> 4.8.0)
+      railties (>= 3.0.0)
+    ffi (1.9.14)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
+    gqtp (1.0.6)
+    groonga-command (1.3.1)
+      json
+    groonga-command-parser (1.0.7)
+      groonga-command (>= 1.0.9)
+      json-stream
+    hashie (3.4.6)
+    i18n (0.7.0)
+    jbuilder (2.6.1)
+      activesupport (>= 3.0.0, < 5.1)
+      multi_json (~> 1.2)
+    jquery-rails (4.2.1)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    json (2.0.2)
+    json-stream (0.2.1)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    multi_json (1.12.1)
+    nio4r (1.2.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    puma (3.6.2)
+    rack (2.0.1)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.0.1)
+      actioncable (= 5.0.1)
+      actionmailer (= 5.0.1)
+      actionpack (= 5.0.1)
+      actionview (= 5.0.1)
+      activejob (= 5.0.1)
+      activemodel (= 5.0.1)
+      activerecord (= 5.0.1)
+      activesupport (= 5.0.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6.0)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.1)
+      actionpack (= 5.0.1)
+      activesupport (= 5.0.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    sass (3.4.23)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    spring (2.0.0)
+      activesupport (>= 4.2)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.19.4)
+    thread_safe (0.3.5)
+    tilt (2.0.5)
+    turbolinks (5.0.1)
+      turbolinks-source (~> 5)
+    turbolinks-source (5.0.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (3.0.4)
+      execjs (>= 0.3.0, < 3)
+    web-console (3.4.0)
+      actionview (>= 5.0)
+      activemodel (>= 5.0)
+      debug_inspector
+      railties (>= 5.0)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  byebug
+  coffee-rails (~> 4.2)
+  factory_girl_rails
+  groonga-client!
+  groonga-client-model!
+  jbuilder (~> 2.5)
+  jquery-rails
+  listen (~> 3.0.5)
+  puma (~> 3.0)
+  rails (~> 5.0.1)
+  sass-rails (~> 5.0)
+  spring
+  spring-watcher-listen (~> 2.0.0)
+  turbolinks (~> 5)
+  tzinfo-data
+  uglifier (>= 1.3.0)
+  web-console (>= 3.3.0)
+
+BUNDLED WITH
+   1.13.6

data/test/apps/rails4/README.md

@@ -0,0 +1,24 @@
+# README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...

data/test/apps/rails4/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require_relative 'config/application'
+
+Rails.application.load_tasks

data/test/apps/rails4/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/test/apps/rails4/app/assets/javascripts/application.js

@@ -0,0 +1,16 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require jquery
+//= require jquery_ujs
+//= require turbolinks
+//= require_tree .

data/test/apps/rails4/app/assets/javascripts/cable.js

@@ -0,0 +1,13 @@
+// Action Cable provides the framework to deal with WebSockets in Rails.
+// You can generate new channels where WebSocket features live using the rails generate channel command.
+//
+//= require action_cable
+//= require_self
+//= require_tree ./channels
+
+(function() {
+  this.App || (this.App = {});
+
+  App.cable = ActionCable.createConsumer();
+
+}).call(this);

data/test/apps/rails4/app/assets/javascripts/posts.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

data/test/apps/rails4/app/assets/stylesheets/application.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */

data/test/apps/rails4/app/assets/stylesheets/posts.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the posts controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

data/test/apps/rails4/app/assets/stylesheets/scaffolds.scss

@@ -0,0 +1,89 @@
+body {
+  background-color: #fff;
+  color: #333;
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+  margin: 33px;
+}
+
+p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+  margin: 33px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a {
+  color: #000;
+
+  &:visited {
+    color: #666;
+  }
+
+  &:hover {
+    color: #fff;
+    background-color: #000;
+  }
+}
+
+th {
+  padding-bottom: 5px;
+}
+
+td {
+  padding-bottom: 7px;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+div {
+  &.field, &.actions {
+    margin-bottom: 10px;
+  }
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px;
+  padding-bottom: 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+
+  h2 {
+    text-align: left;
+    font-weight: bold;
+    padding: 5px 5px 5px 15px;
+    font-size: 12px;
+    margin: -7px;
+    margin-bottom: 0;
+    background-color: #c00;
+    color: #fff;
+  }
+
+  ul li {
+    font-size: 12px;
+    list-style: square;
+  }
+}
+
+label {
+  display: block;
+}

data/test/apps/rails4/app/channels/application_cable/channel.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end

data/test/apps/rails4/app/channels/application_cable/connection.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end

data/test/apps/rails4/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery with: :exception
+end