activerecord-crate-adapter 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c92b2e7b75c81dd6a9311fa896e68b2f7fb7f11f
-  data.tar.gz: 68fba8a8fd6fa57c4c4c134a235b5d8a87a2c545
+  metadata.gz: d4ded4506bbde8a818b21084414eebea95deb49e
+  data.tar.gz: 4ad62050c12839e881c4c940aca845b6a45144d7
 SHA512:
-  metadata.gz: a6bbd362b466ffc8757f2dbe464b2fe25f136244161819ff95f4b79c6e9c928dd5e0e66ba0017a51b9f1d64a7f09cb497bbe23a5ae8ce6e2f170995ff6229ba2
-  data.tar.gz: 45b2e48e6699be970d98613bc9f4368fe5aa4de1f9715a7b2aad11fdf84b00956e0957cb507ec788ce40dc2495137ac822ceaf7bd909d3257a9fffebd7a3b019
+  metadata.gz: ac47bffc111c1dcef655bf62a5553f40d5b4ff42908e8f3ede12c2b34bbf5ff02bb362e912d9bb2c3fd4146b535ec8370e4b33cb096ebf6909f4261eb07735fa
+  data.tar.gz: a29e36b5e7cca424ab1233eb8d68884330e5befce62168180533c2b4b87c7cf257298ea1d7cf1ea77566e1b0d4aa390630dc10451aa8ab2927f97f4729e53676

data/.travis.yml

@@ -1,16 +1,15 @@
 language: ruby
 rvm:
   - "1.9.3"
-  - "2.1.1"
   - "2.0.0"
+  - "2.1.5"
+  - "2.2.0"
 # uncomment this line if your project needs to run something other than `rake`:
 
 before_script:
-  - wget https://cdn.crate.io/downloads/releases/crate-0.39.0.tar.gz -O /tmp/crate.tar.gz
+  - wget https://cdn.crate.io/downloads/releases/crate-0.47.3.tar.gz -O /tmp/crate.tar.gz
   - tar -xvf /tmp/crate.tar.gz
-  - ls
-  - echo $PWD
-  - bundle exec ruby spec/travis_test_server.rb $PWD/crate-0.39.0/ 4209
+  - bundle exec ruby spec/test_server.rb $PWD/crate-0.47.3/ true
 
 script: bundle exec rspec spec
 

data/README.md

@@ -8,6 +8,8 @@ The [Crate](http://www.crate.io) adapter for ActiveRecord.
 
 ## Installation
 
+**Note:** `activerecord-crate-adapter` currently only works with Rails 4.1.x
+
 Add this line to your application's Gemfile:
 
     gem 'activerecord-crate-adapter'
@@ -44,20 +46,20 @@ please add an issue so we can discuss.
       end
 
     end
-    
+
 ## Special Data Types
 
 ### Array
 You can simply create Array columns by specifying t.array and passing array_type when you create a migration.
- 
+
     t.array :tags, array_type: :string
     t.array :votes, array_type: :integer
     t.array :bool_arr, array_type: :boolean
-    
+
 When you create an object just pass your Array directly
 
     Post.create!(title: 'Arrays are awesome', tags: %w(hot fresh), votes: [1,2])
-    post = Post.where("'fresh' = ANY (tags)")    
+    post = Post.where("'fresh' = ANY (tags)")
 
 ### Object
 Crate allows you to define nested objects. I tried to make it as simply as possible to use and reuse existing AR functionality,
@@ -69,27 +71,27 @@ I tried to make your guys life easier and created a module that does this automa
 and assign it in the initializer. So a serialized class should look like this:
 
     require 'active_record/attribute_methods/crate_object'
-    
+
     class Address
       attr_accessor :street, :city, :phones, :zip
-    
+
       include CrateObject
-    
+
       def initialize(opts)
         @street = opts[:street]
         @city = opts[:city]
         @phones = opts[:phones]
         @zip = opts[:zip]
       end
-    
+
     end
 
-Check out CrateObject module if you need to write your own serializer. 
- 
+Check out CrateObject module if you need to write your own serializer.
+
 Then in your model simply use #serialize to have objects working
 
-      class User < ActiveRecord::Base        
-        serialize :address, Address  
+      class User < ActiveRecord::Base
+        serialize :address, Address
       end
 
 Note: I do not plan to support nested objects inside objects.
@@ -97,11 +99,11 @@ Note: I do not plan to support nested objects inside objects.
 #### Object Migrations
 
 In the migrations you can create an object and specify the object behaviour(strict|dynamic|ignored) and it's schema.
-    
+
     t.object :address, object_schema_behaviour: :strict,
                        object_schema: {street: :string, city: :string, phones: {array: :string}, zip: :integer}
-      
-   
+
+
 
 ## Migrations
 
@@ -121,13 +123,14 @@ Crate does not support Joins (yet) so joins won't work.
 
 ## Tests
 
-First run the test instance of crate
+Start up the crate server before running the tests
+
+    ruby spec/test_server.rb /path/to/crate
 
-    $ ./spec/test_server.rb
+Then run tests with
 
-then run the tests
+    bundle exec rspec spec
 
-    $ rspec spec
 
 ## Contributing
 
@@ -141,4 +144,5 @@ Please refer to CONTRIBUTING.rst for further information.
 * [Christoph Klocker](http://www.vedanova.com), [@corck](http://www.twitter.com/corck)
 
 ##License & Copyright
-See LICENSE for details.
+
+see LICENSE for details.

data/activerecord-crate-adapter.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
   spec.version       = ActiverecordCrateAdapter::VERSION
   spec.authors       = ["Christoph Klocker", "CRATE Technology GmbH"]
   spec.email         = ["office@crate.io"]
-  spec.summary       = "ActiveRecord Crate Data Adapter"
-  spec.description   = "ActiveRecord adapter for Crate Data, a shared-nothing, fully searchable, document-oriented cluster data store."
+  spec.summary       = "ActiveRecord adapter for Crate"
+  spec.description   = "ActiveRecord adapter for Crate, the distributed database for Docker."
   spec.homepage      = "https://crate.io"
   spec.license       = "Apache License, v2.0"
 
@@ -42,8 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 2.14"
 
-  spec.add_dependency('activerecord', '>= 4.0.0')
-  spec.add_dependency('arel', '>= 4.0.0')
-  spec.add_dependency('crate_ruby', '~> 0.0.6')
-
+  spec.add_dependency('activerecord', '~> 4.1.0')
+  spec.add_dependency('arel', '>= 5.0.0')
+  spec.add_dependency('crate_ruby', '~> 0.0.7')
 end

data/history.txt

@@ -1,11 +1,18 @@
 # coding: UTF-8
 
 === unreleased
+
+=== 0.0.4
+
+  * Updated crate version to 0.45.7
+
 === 0.0.3
+
   * now officially supported by Crate Data and available under the
     Apache 2.0 License
 
 === 0.0.2
+
   * Switched query execution to parameter substitution
 
 === 0.0.1

data/lib/active_record/connection_adapters/crate_adapter.rb

@@ -131,11 +131,16 @@ module ActiveRecord
 
       def columns(table_name) #:nodoc:
         cols = @connection.table_structure(table_name).map do |field|
-          CrateColumn.new(field[2], nil, field[4], nil)
+          name = dotted_name(field[2])
+          CrateColumn.new(name, nil, field[4], nil)
         end
         cols
       end
 
+      def dotted_name(name)
+        name.gsub(%r(\[['"]), '.').delete(%{'"]})
+      end
+
       def tables
         @connection.tables
       end

data/lib/activerecord-crate-adapter/version.rb

@@ -20,5 +20,5 @@
 # software solely pursuant to the terms of the relevant commercial agreement.
 
 module ActiverecordCrateAdapter
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/data_types/array_spec.rb

@@ -33,6 +33,7 @@ describe "Post#array" do
         t.array :bool_arr, array_type: :boolean
       end
     end
+    ensure_status('yellow')
     Post.reset_column_information
   end
 
@@ -81,4 +82,4 @@ describe "Post#array" do
 
   end
 
-end
+end

data/spec/data_types/object_spec.rb

@@ -31,6 +31,7 @@ describe "User#object" do
                  object_schema: {street: :string, city: :string, phones: {array: :string}, zip: :integer}
       end
     end
+    ensure_status('yellow')
     User.reset_column_information
   end
 
@@ -56,4 +57,4 @@ describe "User#object" do
 
   end
 
-end
+end

data/spec/models/post_spec.rb

@@ -30,6 +30,7 @@ describe Post do
         t.integer :views
       end
     end
+    ensure_status('yellow')
     Post.reset_column_information
   end
 
@@ -61,7 +62,7 @@ describe Post do
     end
 
     it 'should persist the record to the database' do
-      @post.persisted?.should be_true
+      @post.persisted?.should eq true
       refresh_posts
       Post.count.should eq 1
     end

data/spec/spec_helper.rb

@@ -29,6 +29,9 @@ require 'dummy/app/models/address'
 require 'dummy/app/models/post'
 require 'dummy/app/models/user'
 
+HOST = "127.0.0.1"
+PORT = 44200
+
 RSpec.configure do |config|
 
   config.before(:each) do
@@ -49,8 +52,8 @@ def connect
       'arunit' => {
           adapter: 'crate',
           min_messages: 'warning',
-          port: 4209,
-          host: '127.0.0.1'
+          host: HOST,
+          port: PORT,
       }
   }
   ActiveRecord::Base.establish_connection :arunit
@@ -61,4 +64,16 @@ end
 # query for the primary key
 def refresh_posts
   Post.connection.raw_connection.refresh_table('posts')
-end
+end
+
+# Wait till all table is synced to all shards
+# this should be used after each create_table to prevent flaky tests
+def ensure_status(expected_status)
+  req = Net::HTTP::Get.new("/_cluster/health?wait_for_status=#{expected_status}&timeout=10s")
+  resp = Net::HTTP.new(HOST, PORT)
+  response = resp.start { |http| http.request(req) }
+  actual_status = JSON.parse(response.body)['status']
+  raise WrongStatusError, "expected status #{expected_status}, got #{actual_status}" if actual_status != expected_status
+end
+
+class WrongStatusError < StandardError; end

data/spec/test_server.rb

@@ -21,57 +21,54 @@
 # software solely pursuant to the terms of the relevant commercial agreement.
 
 require 'net/http'
+
 class TestServer
-  CRATE_PATH = "~/crate"
-  TEST_PORT = 4209
   NAME = "TestCluster"
+  HOST = "127.0.0.1"
+  PORT = 44200
+  TIMEOUT = 30
 
-
-  def initialize(crate_home = nil, port = nil, host = "127.0.0.1")
-    @crate_home = crate_home || CRATE_PATH
-    @port = port || TEST_PORT
-    @host = host
+  def initialize(crate_home = '~/crate', run_in_background = false)
+    @crate_home = crate_home
+    @run_in_background = run_in_background
   end
 
   def start
-    cmd = "sh #{File.join(@crate_home, 'bin/crate')} #{start_params}"
-    @pid = spawn(cmd, :out => "/tmp/crate_test_server.out", :err => "/tmp/crate_test_server.err")
+    cmd = "sh #{File.join(@crate_home, 'bin', 'crate')} #{start_params}"
+    @pid = spawn(cmd, out: "/tmp/crate_test_server.out",
+                 err: "/tmp/crate_test_server.err")
     Process.detach(@pid)
-    puts 'starting'
+    puts 'Starting Crate... (this will take a few seconds)'
     time_slept = 0
+    interval = 2
     while true
-      puts "Crate not yet fully available. Waiting since #{time_slept} seconds..." unless alive?
-      sleep(2)
-      time_slept += 2
+      if !alive? and time_slept > TIMEOUT
+        puts "Crate hasn't started for #{TIMEOUT} seconds. Giving up now..."
+        exit
+      end
+      if alive? and @run_in_background
+        exit
+      end
+      sleep(interval)
+      time_slept += interval
     end
   end
 
-  def stop
-    Process.kill("HUP", @pid)
-  end
-
   private
 
-
-  def crate_exec
-  end
-
-  def crate_config
-  end
-
   def start_params
     "-Des.index.storage.type=memory " +
         "-Des.node.name=#{NAME} " +
-        "-Des.cluster.name=Testing#{@port} " +
-        "-Des.http.port=#{@port}-#{@port} " +
+        "-Des.cluster.name=Testing#{PORT} " +
+        "-Des.http.port=#{PORT}-#{PORT} " +
         "-Des.network.host=localhost " +
-        "-Des.discovery.type=zen " +
-        "-Des.discovery.zen.ping.multicast.enabled=false"
+        "-Des.discovery.zen.ping.multicast.enabled=false " +
+        "-Des.es.api.enabled=true"
   end
 
   def alive?
     req = Net::HTTP::Get.new('/')
-    resp = Net::HTTP.new(@host, @port)
+    resp = Net::HTTP.new(HOST, PORT)
     begin
       response = resp.start { |http| http.request(req) }
       response.code == "200" ? true : false
@@ -79,15 +76,7 @@ class TestServer
       false
     end
   end
-
 end
 
-server = TestServer.new *ARGV
+server = TestServer.new(*ARGV)
 server.start
-
-trap("INT") do
-  puts "Script terminated by user."
-  server.stop
-  puts "Server stopped"
-  exit
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-crate-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Christoph Klocker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,46 +57,45 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: crate_ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
-description: ActiveRecord adapter for Crate Data, a shared-nothing, fully searchable,
-  document-oriented cluster data store.
+        version: 0.0.7
+description: ActiveRecord adapter for Crate, the distributed database for Docker.
 email:
 - office@crate.io
 executables: []
@@ -132,7 +131,6 @@ files:
 - spec/models/post_spec.rb
 - spec/spec_helper.rb
 - spec/test_server.rb
-- spec/travis_test_server.rb
 homepage: https://crate.io
 licenses:
 - Apache License, v2.0
@@ -153,10 +151,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: ActiveRecord Crate Data Adapter
+summary: ActiveRecord adapter for Crate
 test_files:
 - spec/activerecord/connection_adapters/crate/crate_adapter_spec.rb
 - spec/activerecord/connection_adapters/crate/table_definition_spec.rb
@@ -168,4 +166,3 @@ test_files:
 - spec/models/post_spec.rb
 - spec/spec_helper.rb
 - spec/test_server.rb
-- spec/travis_test_server.rb

data/spec/travis_test_server.rb

@@ -1,75 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8; -*-
-#
-# Licensed to CRATE Technology GmbH ("Crate") under one or more contributor
-# license agreements.  See the NOTICE file distributed with this work for
-# additional information regarding copyright ownership.  Crate licenses
-# this file to you 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.
-#
-# However, if you have executed another commercial license agreement
-# with Crate these terms will supersede the license and you may use the
-# software solely pursuant to the terms of the relevant commercial agreement.
-
-require 'net/http'
-class TestServer
-  CRATE_PATH = "~/crate"
-  TEST_PORT = 4209
-  NAME = "TestCluster"
-
-
-  def initialize(crate_home = nil, port = nil)
-    @crate_home = crate_home
-    @port = port
-    @host = "127.0.0.1"
-  end
-
-  def start
-    cmd = "sh #{File.join(@crate_home, 'bin/crate')} #{start_params}"
-    @pid = spawn(cmd, :out => "/tmp/crate_test_server.out", :err => "/tmp/crate_test_server.err")
-    Process.detach(@pid)
-    puts 'starting'
-    time_slept = 0
-    while !alive?
-      puts "Crate not yet fully available. Waiting since #{time_slept} seconds..."
-      sleep(2)
-      time_slept += 2
-    end
-  end
-
-  private
-
-  def start_params
-    "-Des.index.storage.type=memory " +
-        "-Des.node.name=#{NAME} " +
-        "-Des.cluster.name=Testing#{@port} " +
-        "-Des.http.port=#{@port}-#{@port} " +
-        "-Des.network.host=localhost " +
-        "-Des.discovery.type=zen " +
-        "-Des.discovery.zen.ping.multicast.enabled=false"
-  end
-
-  def alive?
-    req = Net::HTTP::Get.new('/')
-    resp = Net::HTTP.new(@host, @port)
-    begin
-      response = resp.start { |http| http.request(req) }
-      response.code == "200" ? true : false
-    rescue Errno::ECONNREFUSED
-      false
-    end
-  end
-
-end
-
-server = TestServer.new *ARGV
-server.start