activerecord-crate-adapter 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b72a6d0d462cc8984a6925f8d44119ed4e9501b5
-  data.tar.gz: 8d00b8c20cc072b143f55caf53e133ae4878b1d0
+  metadata.gz: c92b2e7b75c81dd6a9311fa896e68b2f7fb7f11f
+  data.tar.gz: 68fba8a8fd6fa57c4c4c134a235b5d8a87a2c545
 SHA512:
-  metadata.gz: 9e4f017f9f2ea9757378a9ae2d0aca1e91755b873ebcf2ebbf3938e174448033d48b24e8e7bd599cdfcd9e4b413fee5dc0514add07e4e2f2ada806eb5a662d93
-  data.tar.gz: 388ab7fc995ab6a112aa412b97c05ecb4a84da88555195ef21afaffc0becfcdeda055e1aa2f0b7576ec2fee06b2ae08a70b810d78b51445a6381f7d3dc1a8ef6
+  metadata.gz: a6bbd362b466ffc8757f2dbe464b2fe25f136244161819ff95f4b79c6e9c928dd5e0e66ba0017a51b9f1d64a7f09cb497bbe23a5ae8ce6e2f170995ff6229ba2
+  data.tar.gz: 45b2e48e6699be970d98613bc9f4368fe5aa4de1f9715a7b2aad11fdf84b00956e0957cb507ec788ce40dc2495137ac822ceaf7bd909d3257a9fffebd7a3b019

data/.travis.yml

@@ -1,12 +1,16 @@
 language: ruby
 rvm:
-  - "1.9.2"
   - "1.9.3"
   - "2.1.1"
   - "2.0.0"
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx
-  - rbx-2
 # uncomment this line if your project needs to run something other than `rake`:
-#script: bundle exec rspec spec
+
+before_script:
+  - wget https://cdn.crate.io/downloads/releases/crate-0.39.0.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
+
+script: bundle exec rspec spec
+

data/CONTRIBUTING.rst

@@ -0,0 +1,90 @@
+Contributing to Crate Active Record Adapter
+===========================================
+
+Thanks for considering contributing to crate active record adapter.
+
+
+Reporting an issue
+------------------
+
+- Search existing issues before raising a new one.
+
+- include as much details as possible. This might include:
+
+  - Which OS you're using.
+
+  - Which version you've been running.
+
+  - Logs/Stacktrace of the error that occurred.
+
+  - Steps to reproduce.
+
+
+Pull requests
+-------------
+
+Before we can accept any pull requests to CRATE Active Record Adapter we need you to agree to
+our CLA_. Once that is done, we suggest to continue as follows:
+
+- Add an issue on Github and let us know that you're working on something.
+
+- Use a feature branch, not master.
+
+- Rebase your feature branch onto origin/master before raising the PR
+
+- Be descriptive in your PR and commit messages. What is it for, why is it
+  needed, etc.
+
+- Squash related commits
+
+.. _CLA: https://crate.io/contribute/agreements/
+
+
+Rebase
+------
+
+If while you've been working in the feature branch new commits were added to
+the master branch please don't merge them but use rebase::
+
+    git fetch origin
+    git rebase origin/master
+
+This will apply all commits on your feature branch on top of the master branch.
+Any conflicts can be resolved just the same as if ``git merge`` was used. After
+the conflict has been resolved use ``git rebase --continue`` to continue the
+rebase process.
+
+
+Squash
+------
+
+Minor commits that only fix typos or rename variables that are related to a
+bigger change should be squashed into that commit.
+
+This can be done using ``git rebase -i ( <hash> | <branch> )``
+
+For example while working on a feature branch you'd use::
+
+    git add .
+    git commit -m "implemented feature XY"
+
+    # push and ask for a merge/review
+
+    git add .
+    git commit --fixup $(git rev-parse HEAD)
+
+    # push and ask for a merge/review
+
+    git add .
+    git commit --fixup $(git rev-parse HEAD)
+
+    git rebase -i origin/master
+
+``git commit --fixup`` will mark the commit as a fixup relating to the commit
+HEAD currently points to.
+
+This is useful because ``git rebase -i`` will then automatically recognize the
+fixup commits and mark them to squash. But in order for that to work the
+``autosquash`` setting has to be enabled in the ``.gitconfig``::
+
+    git config --global rebase.autosquash true

data/LICENSE

@@ -0,0 +1,219 @@
+CRATE Active Record Adapter
+Copyright 2013-2014 CRATE Technology GmbH ("Crate")
+
+
+Licensed to CRATE Technology GmbH (referred to in this notice as "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 software to you under the Apache License, Version 2.0.
+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.
+
+
+=========================================================================
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.

data/NOTICE

@@ -0,0 +1,11 @@
+Crate Data Adapter for ActiveRecord
+Copyright 2013-2014 CRATE Technology GmbH ("Crate")
+
+
+=========================================================================
+
+Copyright (2014) by Christoph Klocker (http://www.vedanova.com)
+Special thanks go to Christoph for launching and writing the
+main parts of this project.
+
+=========================================================================

data/README.md

@@ -1,4 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/activerecord-crate-adapter.svg)](http://badge.fury.io/rb/activerecord-crate-adapter)
+[![Build Status](https://travis-ci.org/crate/activerecord-crate-adapter.svg?branch=master)](https://travis-ci.org/crate/activerecord-crate-adapter)
+[![Code Climate](https://codeclimate.com/github/crate/activerecord-crate-adapter.png)](https://codeclimate.com/github/crate/activerecord-crate-adapter)
 
 The [Crate](http://www.crate.io) adapter for ActiveRecord.
 
@@ -129,19 +131,14 @@ then run the tests
 
 ## Contributing
 
-This adapter is a work in progress. If you think something is missing, either follow the steps below
+If you think something is missing, either create a pull request
 or log a new issue, so someone else can tackle it.
-
-1. Fork it ( `http://github.com/crate/activerecord-crate-adapter/fork` )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Add tests
-5. Push to the branch (`git push origin my-new-feature`)
-6. Create new Pull Request
+Please refer to CONTRIBUTING.rst for further information.
 
 ##Maintainer
 
+* [CRATE Technology GmbH](http://crate.io)
 * [Christoph Klocker](http://www.vedanova.com), [@corck](http://www.twitter.com/corck)
 
-##License
-MIT License. Copyright 2014 Christoph Klocker. [http://vedanova.com](http://vedanova.com)
+##License & Copyright
+See LICENSE for details.

data/activerecord-crate-adapter.gemspec

@@ -1,4 +1,24 @@
 # 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.
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'activerecord-crate-adapter/version'
@@ -6,12 +26,12 @@ require 'activerecord-crate-adapter/version'
 Gem::Specification.new do |spec|
   spec.name          = "activerecord-crate-adapter"
   spec.version       = ActiverecordCrateAdapter::VERSION
-  spec.authors       = ["Christoph Klocker"]
-  spec.email         = ["christoph@vedanova.com"]
+  spec.authors       = ["Christoph Klocker", "CRATE Technology GmbH"]
+  spec.email         = ["office@crate.io"]
   spec.summary       = "ActiveRecord Crate Data Adapter"
-  spec.description   = "ActiveRecord adapter for Crate, a shared-nothing, fully searchable, document-oriented cluster data store."
+  spec.description   = "ActiveRecord adapter for Crate Data, a shared-nothing, fully searchable, document-oriented cluster data store."
   spec.homepage      = "https://crate.io"
-  spec.license       = "MIT"
+  spec.license       = "Apache License, v2.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
   #spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -20,11 +40,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "debugger"
   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.5')
+  spec.add_dependency('crate_ruby', '~> 0.0.6')
 
 end

data/history.txt

@@ -1,5 +1,10 @@
 # coding: UTF-8
 
+=== unreleased
+=== 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
 

data/lib/active_record/attribute_methods/crate_object.rb

@@ -1,3 +1,24 @@
+# -*- 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.
+
 module CrateObject
   extend ActiveSupport::Concern
 

data/lib/active_record/connection_adapters/crate/database_statements.rb

@@ -1,3 +1,24 @@
+# -*- 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.
+
 module ActiveRecord
   module ConnectionAdapters
     module DatabaseStatements
@@ -10,27 +31,15 @@ module ActiveRecord
         ActiveRecord::Result.new(fields, result.values)
       end
 
-      # Converts an arel AST to SQL
-      def to_sql(arel, binds = [])
-        if arel.respond_to?(:ast)
-          binds = binds.dup
-          visitor.accept(arel.ast) do
-            quote(*binds.shift.reverse)
-          end
-        else
-          arel
-        end
-      end
-
       def do_exec_query(sql, name, binds)
         params = []
         binds.each_with_index do |(column, value), index|
           ar_column = column.is_a?(ActiveRecord::ConnectionAdapters::Column)
           # only quote where clause values
           unless ar_column # && column.sql_type == 'timestamp'
-          v = value
-          quoted_value = ar_column ? quote(v, column) : quote(v, nil)
-          params << quoted_value
+            v = value
+            quoted_value = ar_column ? quote(v, column) : quote(v, nil)
+            params << quoted_value
           else
             params << value
           end

data/lib/active_record/connection_adapters/crate/schema_statements.rb

@@ -1,3 +1,24 @@
+# -*- 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.
+
 module ActiveRecord
   module ConnectionAdapters
     module Crate

data/lib/active_record/connection_adapters/crate_adapter.rb

@@ -1,3 +1,24 @@
+# -*- 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 'active_record'
 require 'active_record/base'
 require 'active_record/base'

data/lib/activerecord-crate-adapter.rb

@@ -1,2 +1,23 @@
+# -*- 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 'active_record/connection_adapters/crate_adapter'
-require 'arel/visitors/crate'
+require 'arel/visitors/crate'

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

@@ -1,3 +1,24 @@
+# -*- 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.
+
 module ActiverecordCrateAdapter
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/arel/arel_crate.rb

@@ -1,3 +1,24 @@
+# -*- 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 'arel'
 require 'arel/visitors/crate'
-require 'arel/visitors/bind_visitor'
+require 'arel/visitors/bind_visitor'

data/lib/arel/visitors/crate.rb

@@ -1,3 +1,24 @@
+# -*- 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.
+
 module Arel
   module Visitors
     class Crate < Arel::Visitors::ToSql

data/spec/activerecord/connection_adapters/crate/table_definition_spec.rb

@@ -1,3 +1,24 @@
+# -*- 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_relative '../../../spec_helper'
 
 describe ActiveRecord::ConnectionAdapters::CrateAdapter::TableDefinition do

data/spec/data_types/array_spec.rb

@@ -1,3 +1,24 @@
+# -*- 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_relative '../spec_helper'
 
 describe "Post#array" do

data/spec/data_types/object_spec.rb

@@ -1,3 +1,24 @@
+# -*- 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_relative '../spec_helper'
 
 describe "User#object" do

data/spec/dummy/app/models/address.rb

@@ -1,3 +1,24 @@
+# -*- 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 'active_record/attribute_methods/crate_object'
 
 class Address

data/spec/dummy/app/models/post.rb

@@ -1,3 +1,24 @@
+# -*- 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.
+
 class Post < ActiveRecord::Base
   before_create :set_id
 

data/spec/dummy/app/models/user.rb

@@ -1,3 +1,24 @@
+# -*- 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.
+
 class User < ActiveRecord::Base
   before_create :set_id
 

data/spec/models/post_spec.rb

@@ -1,3 +1,24 @@
+# -*- 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_relative '../spec_helper'
 
 describe Post do
@@ -91,5 +112,28 @@ describe Post do
     end
   end
 
+  describe 'sql input sanitization' do
+
+    before do
+      @post = Post.create!(params)
+    end
+
+    after do
+      @post.destroy
+    end
+
+    it 'should not return all records but sanitize string' do
+      sql = Post.where(id: "#{@post.id} or 1=1").to_sql
+      sql.should match(/'#{@post.id} or 1=1'/)
+    end
+
+    it 'should not drop the table but sanitize string' do
+      Post.where(id: "#{@post.title}; DROP TABLE POST")
+      refresh_posts
+      Post.last.id.should eq @post.id
+    end
+
+  end
+
 end
 

data/spec/spec_helper.rb

@@ -1,3 +1,24 @@
+# -*- 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.
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require 'activerecord-crate-adapter'

data/spec/test_server.rb

@@ -1,4 +1,24 @@
 #!/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
@@ -14,7 +34,7 @@ class TestServer
   end
 
   def start
-    cmd = "sh #{CRATE_PATH}/bin/crate #{start_params}"
+    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'
@@ -62,7 +82,8 @@ class TestServer
 
 end
 
-server = TestServer.new.start *ARGV
+server = TestServer.new *ARGV
+server.start
 
 trap("INT") do
   puts "Script terminated by user."

data/spec/travis_test_server.rb

@@ -0,0 +1,75 @@
+#!/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

metadata

@@ -1,125 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-crate-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Christoph Klocker
+- CRATE Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: crate_ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
-description: ActiveRecord adapter for Crate, a shared-nothing, fully searchable, document-oriented
-  cluster data store.
+        version: 0.0.6
+description: ActiveRecord adapter for Crate Data, a shared-nothing, fully searchable,
+  document-oriented cluster data store.
 email:
-- christoph@vedanova.com
+- office@crate.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
+- CONTRIBUTING.rst
 - Gemfile
-- LICENSE.txt
+- LICENSE
+- NOTICE
 - README.md
 - Rakefile
 - activerecord-crate-adapter.gemspec
@@ -143,9 +132,10 @@ files:
 - spec/models/post_spec.rb
 - spec/spec_helper.rb
 - spec/test_server.rb
+- spec/travis_test_server.rb
 homepage: https://crate.io
 licenses:
-- MIT
+- Apache License, v2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -153,17 +143,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: ActiveRecord Crate Data Adapter
@@ -178,3 +168,4 @@ test_files:
 - spec/models/post_spec.rb
 - spec/spec_helper.rb
 - spec/test_server.rb
+- spec/travis_test_server.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Christoph Klocker
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.