couchbase-orm 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fa31c17c17c2f5aa58e37caeb1de415a5f6bdbd
-  data.tar.gz: 947864f906f017a58da63e18300d094983b23cea
+  metadata.gz: f2b06085f930736b6220efb0e13013cc287a7891
+  data.tar.gz: b078737e87c3d752b317471fdf36b750b3a0d37d
 SHA512:
-  metadata.gz: a3b28f4857e50ae2dc5501e165f2fbb231d1188d2b718c0148dd15d2aa8183b8592bc221a790ccf91bfb783275733fd050f7f570f3adc6e9f56aa388df59ec9e
-  data.tar.gz: bee79ce83b2748f54adda680bd46d956577054b6c8407285e2d7fddb206d4eaf4082a4b1c9d6288aea269b2a006ee9e9fd75f46d02e7436c94f29be3fcd70e83
+  metadata.gz: e9e09cdc7885a995e5abff1dcd8282f1fda44060bda39d9690a1fc3a7ca909bc074816fecfde8e31cbbfd58ee582ef56de44f13b4d94991dc89fb9aa21a82d3e
+  data.tar.gz: d4bbe1ca233678304c2e1f811140f970ee796031483d5bdcfe50d228994d5158d6053223b25278ea0bc270acb0f39d4aced787dc6f3b4280230ed24a2bfefce6

data/.travis.yml

@@ -1,34 +1,35 @@
 language: ruby
 rvm:
-  - ruby-2.3.1
-  - ruby-2.2.5
+  - ruby-2.4.2
+  - ruby-2.3.5
   - ruby-head
-  - rubinius-3.62
-  - rubinius
-  - jruby-9.1.5.0
+  - jruby-9.1.13.0
   - jruby-head
+  - rubinius
+  - rubinius-3.86
 branches:
   only:
     - master
 before_install:
   - git submodule update --init --recursive
   - gem install ffi
-  - sudo apt-get install libev-dev
-  - sudo wget http://packages.couchbase.com/releases/4.5.1/couchbase-server-enterprise_4.5.1-ubuntu14.04_amd64.deb
-  - sudo dpkg -i couchbase-server-enterprise_4.5.1-ubuntu14.04_amd64.deb
-  - sleep 4
+  - sudo apt-get install libev-dev python-httplib2
+  - sudo wget https://packages.couchbase.com/releases/5.0.0/couchbase-server-enterprise_5.0.0-ubuntu14.04_amd64.deb
+  - sudo dpkg -i couchbase-server-enterprise_5.0.0-ubuntu14.04_amd64.deb
+  - sleep 8
   - sudo service couchbase-server status
   - /opt/couchbase/bin/couchbase-cli cluster-init -c 127.0.0.1:8091 --cluster-username=admin --cluster-password=password --cluster-ramsize=320 --cluster-index-ramsize=256 --cluster-fts-ramsize=256 --services=data,index,query,fts
-  - sleep 4
+  - sleep 5
   - /opt/couchbase/bin/couchbase-cli server-info   -c 127.0.0.1:8091 -u admin -p password
   - /opt/couchbase/bin/couchbase-cli bucket-create -c 127.0.0.1:8091 -u admin -p password --bucket=default --bucket-type=couchbase --bucket-ramsize=160 --bucket-replica=0 --wait
-before_script:
-  - rake compile
+  - sleep 1
+  - /opt/couchbase/bin/couchbase-cli user-manage   -c 127.0.0.1:8091 -u admin -p password --set --rbac-username tester --rbac-password password123 --rbac-name "Auto Tester" --roles admin --auth-domain local
+  - export TRAVIS_TEST=true
 matrix:
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: rubinius
-    - rvm: rubinius-3.62
+    - rvm: rubinius-3.86
 sudo: required
 dist: trusty

data/README.md

@@ -1,32 +1,41 @@
 # Couchbase ORM for Rails
 
+[![Build Status](https://secure.travis-ci.org/acaprojects/couchbase-orm.svg)](http://travis-ci.org/acaprojects/couchbase-orm)
+
 ## Rails integration
 
 To generate config you can use `rails generate couchbase_orm:config`:
 
-    $ rails generate couchbase_orm:config
-    create  config/couchbase.yml
+    $ rails generate couchbase_orm:config dev_bucket dev_user dev_password
+      => create  config/couchbase.yml
 
 It will generate this `config/couchbase.yml` for you:
 
     common: &common
       hosts: localhost
-      password:
+      username: dev_user
+      password: dev_password
 
     development:
       <<: *common
-      bucket: default
+      bucket: dev_bucket
 
     test:
       <<: *common
-      bucket: app_name_test
-      password: for_test_bucket
+      bucket: dev_bucket_test
 
     # set these environment variables on your production server
     production:
-      hosts: <%= ENV['COUCHBASE_HOST'] || ENV['COUCHBASE_HOSTS'] %>
-      bucket: <%= ENV['COUCHBASE_BUCKET'] %>
-      password: <%= ENV['COUCHBASE_PASSWORD'] %>
+    hosts: <%= ENV['COUCHBASE_HOST'] || ENV['COUCHBASE_HOSTS'] %>
+    bucket: <%= ENV['COUCHBASE_BUCKET'] %>
+    username: <%= ENV['COUCHBASE_USER'] %>
+    password: <%= ENV['COUCHBASE_PASSWORD'] %>
+
+Views are generated on application load if they don't exist or mismatch.
+This works fine in production however by default in development models are lazy loaded.
+
+    # config/environments/development.rb
+    config.eager_load = true
 
 
 ## Examples
@@ -167,7 +176,7 @@ The request above pulls the same database document each time and returns it. A s
 | Stat | Couchbase Ruby Model | Couchbase-ORM |
 | :--- | :---                 |   :---        |
 |Transactions|2500 hits|2500 hits|
-|Elapsed time|12.24 secs|8.20 secs|
-|Response time|0.88 secs|0.47 secs|
-|Transaction rate|204.25 trans/sec|304.88 trans/sec|
+|Elapsed time|12.24 secs|6.82 secs|
+|Response time|0.88 secs|0.34 secs|
+|Transaction rate|204.25 trans/sec|366.57 trans/sec|
 |Request Code|[ruby-model-app](https://github.com/QuayPay/coauth/blob/95bbf5e5c3b3340e5af2da494b90c91c5e3d6eaa/app/controllers/auth/authorities_controller.rb#L6)|[couch-orm-app](https://github.com/QuayPay/coauth/blob/87f6fdeaab784ba252a5d38bbcf9e6b0477bb504/app/controllers/auth/authorities_controller.rb#L8)|

data/Rakefile

@@ -1,75 +1,15 @@
 require 'rubygems'
 require 'rspec/core/rake_task'  # testing framework
 require 'yard'                  # yard documentation
-require 'ffi'                   # loads the extension
-require 'rake/clean'            # for the :clobber rake task
-require File.expand_path('../lib/libcouchbase/ext/tasks', __FILE__)    # platform specific rake tasks used by compile
-
-
 
 # By default we don't run network tests
-task :default => :limited_spec
-RSpec::Core::RakeTask.new(:limited_spec) do |t|
-    # Exclude full text search tests until we can automate index creation
-    t.rspec_opts = "--tag ~full_text_search --tag ~n1ql_query"
-end
-RSpec::Core::RakeTask.new(:spec)
+task :default => :test
 
+RSpec::Core::RakeTask.new(:spec)
 
 desc 'Run all tests'
 task :test => [:spec]
 
-
 YARD::Rake::YardocTask.new do |t|
-    t.files   = ['lib/**/*.rb', '-', 'ext/README.md', 'README.md']
-end
-
-
-desc 'Compile libcouchbase from submodule'
-if FFI::Platform.windows?
-    task :compile => ["ext/bin/libcouchbase.#{FFI::Platform::LIBSUFFIX}"]
-    CLOBBER.include("ext/bin/libcouchbase.#{FFI::Platform::LIBSUFFIX}")
-else
-    task :compile => ["ext/libcouchbase/build/lib/libcouchbase_libuv.#{FFI::Platform::LIBSUFFIX}"]
-    CLOBBER.include("ext/libcouchbase/build/lib/libcouchbase_libuv.#{FFI::Platform::LIBSUFFIX}")
-end
-
-
-# NOTE:: Generated on OSX
-desc 'Generate the FFI bindings'
-task :generate_bindings do
-    require "ffi/gen"
-
-    # NOTE:: you must export the include dir:
-    # export CPATH=./ext/libcouchbase/include/
-    #
-    # Once generated we need to:
-    # * adjust the ffi_lib path:
-    #   ffi_lib ::File.expand_path("../../../../ext/libcouchbase/build/lib/libcouchbase_libuv.#{FFI::Platform::LIBSUFFIX}", __FILE__)
-    # * Rename some structs strings to pointers
-    #   create_st3.rb -> connstr, username, passwd
-    #   cmdhttp.rb -> body, reqhandle, content_type, username, password, host
-    #   cmdfts.rb -> query
-    #   respfts.rb -> row
-    #   respviewquery.rb -> value, geometry, docid
-    #   respn1ql.rb -> row
-
-    FFI::Gen.generate(
-        module_name: "Libcouchbase::Ext",
-        ffi_lib:     "libcouchbase",
-        require_path: "libcouchbase/ext/libcouchbase",
-        headers:     [
-            "./ext/libcouchbase/include/libcouchbase/couchbase.h",
-            "./ext/libcouchbase/include/libcouchbase/error.h",
-            "./ext/libcouchbase/include/libcouchbase/views.h",
-            "./ext/libcouchbase/include/libcouchbase/subdoc.h",
-            "./ext/libcouchbase/include/libcouchbase/n1ql.h",
-            "./ext/libcouchbase/include/libcouchbase/cbft.h",
-            "./ext/libcouchbase/include/libcouchbase/kvbuf.h"
-        ],
-        # Searching for stdarg.h
-        cflags:      ["-I/System/Library/Frameworks/Kernel.framework/Versions/A/Headers"],
-        prefixes:    ["LCB_", "lcb_"],
-        output:      "libcouchbase.rb"
-    )
+    t.files   = ['lib/**/*.rb', '-', 'README.md']
 end

data/couchbase-orm.gemspec

@@ -13,14 +13,14 @@ Gem::Specification.new do |gem|
     gem.required_ruby_version = '>= 2.1.0'
     gem.require_paths = ["lib"]
 
-    gem.add_runtime_dependency     'libcouchbase', '~> 1.0'
+    gem.add_runtime_dependency     'libcouchbase', '~> 1.2'
     gem.add_runtime_dependency     'activemodel',  '>= 4.0', '< 6.0'
     gem.add_runtime_dependency     'radix',        '~> 2.2' # converting numbers to and from any base
 
-    gem.add_development_dependency 'rake',         '~> 11.2'
-    gem.add_development_dependency 'rspec',        '~> 3.5'
+    gem.add_development_dependency 'rake',         '~> 12.2'
+    gem.add_development_dependency 'rspec',        '~> 3.7'
     gem.add_development_dependency 'yard',         '~> 0.9'
-    gem.add_development_dependency 'minitest',     '~> 5.9'
+    gem.add_development_dependency 'minitest',     '~> 5.10'
 
     gem.files         = `git ls-files`.split("\n")
     gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/couchbase-orm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true, encoding: ASCII-8BIT
 
 module CouchbaseOrm
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
 end

data/lib/rails/generators/couchbase_orm/config/config_generator.rb

@@ -1,21 +1,4 @@
 # encoding: utf-8
-#
-# Author:: Couchbase <info@couchbase.com>
-# Copyright:: 2012 Couchbase, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 
 require 'rails/generators/couchbase_orm_generator'
 
@@ -23,7 +6,9 @@ module CouchbaseOrm
     module Generators
         class ConfigGenerator < Rails::Generators::Base
             desc 'Creates a Couchbase configuration file at config/couchbase.yml'
-            argument :database_name, :type => :string, :optional => true
+            argument :bucket_name, type: :string, optional: true
+            argument :username, type: :string, optional: true
+            argument :password, type: :string, optional: true
 
             def self.source_root
                 @_couchbase_source_root ||= File.expand_path('../templates', __FILE__)

data/lib/rails/generators/couchbase_orm/config/templates/couchbase.yml

@@ -1,18 +1,19 @@
 common: &common
   hosts: localhost
-  password:
+  username: <%= username || bucket_name || app_name %>
+  password: <%= password %>
 
 development:
   <<: *common
-  bucket: <%= database_name || 'default' %>
+  bucket: <%= bucket_name || app_name %>
 
 test:
   <<: *common
-  bucket: <%= database_name || app_name %>_test
-  password: for_test_bucket
+  bucket: <%= bucket_name || app_name %>_test
 
 # set these environment variables on your production server
 production:
   hosts: <%%= ENV['COUCHBASE_HOST'] || ENV['COUCHBASE_HOSTS'] %>
   bucket: <%%= ENV['COUCHBASE_BUCKET'] %>
+  username: <%%= ENV['COUCHBASE_USER'] %>
   password: <%%= ENV['COUCHBASE_PASSWORD'] %>

data/spec/support.rb

@@ -1,6 +1,12 @@
 # frozen_string_literal: true, encoding: ASCII-8BIT
 
 
+if ENV['TRAVIS_TEST']
+    require 'libcouchbase'
+    Libcouchbase::Defaults.username = 'tester'
+    Libcouchbase::Defaults.password = 'password123'
+end
+
 require 'couchbase-orm'
 require 'minitest/assertions'
 require 'active_model/lint'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-orm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libcouchbase
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -64,28 +64,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
 description: A Couchbase ORM for Rails
 email:
 - steve@cotag.me
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Couchbase ORM for Rails