activerecord-crate-adapter 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56df652b663e2d0dd2abcc83154b07b1575ee21b
-  data.tar.gz: f9c8908ea5f6f296d05a16f4502ce12f430d8921
+  metadata.gz: b72a6d0d462cc8984a6925f8d44119ed4e9501b5
+  data.tar.gz: 8d00b8c20cc072b143f55caf53e133ae4878b1d0
 SHA512:
-  metadata.gz: bf7d9a0a55a82065e81fbb3f9a1406e8524b81fef1f8803c0b0594eb4136b26a0af7fc20cf44439fca7390f49b42c4a6e7fde56dfc332c7a38baa9c9fb0689ff
-  data.tar.gz: 6d0d522e9680e251477fada311f1a023ce349a507e43e13f668ee1210d2f7173997885e5da312c9eea957c5fddef827a88e35e24cc2c8f2cda25c87e441041ae
+  metadata.gz: 9e4f017f9f2ea9757378a9ae2d0aca1e91755b873ebcf2ebbf3938e174448033d48b24e8e7bd599cdfcd9e4b413fee5dc0514add07e4e2f2ada806eb5a662d93
+  data.tar.gz: 388ab7fc995ab6a112aa412b97c05ecb4a84da88555195ef21afaffc0becfcdeda055e1aa2f0b7576ec2fee06b2ae08a70b810d78b51445a6381f7d3dc1a8ef6

data/.travis.yml

@@ -0,0 +1,12 @@
+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

data/README.md

@@ -1,18 +1,14 @@
-# Activerecord::Crate::Adapter
+[![Gem Version](https://badge.fury.io/rb/activerecord-crate-adapter.svg)](http://badge.fury.io/rb/activerecord-crate-adapter)
 
 The [Crate](http://www.crate.io) adapter for ActiveRecord.
 
-## Work in progress
-
-I've just started coding the adapter and lots of functionality might still not work. Give it a try
-and help bei either contributing (fix it) or add an issue.
 
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'activerecord-crate-adapter', :git => "https://github.com/crate/activerecord-crate-adapter.git"
+    gem 'activerecord-crate-adapter'
 
 And then execute:
 
@@ -37,7 +33,7 @@ please add an issue so we can discuss.
 
     class Post < ActiveRecord::Base
 
-      before_validation :set_id
+      before_validation :set_id, on: :create
 
       private
 
@@ -50,8 +46,7 @@ please add an issue so we can discuss.
 ## Special Data Types
 
 ### Array
-You can simply create Array columns by specifying t.array and passing array_type when you create a migration. You need at least the upcoming
-release 0.39 of Crate for this functionality.
+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
@@ -63,8 +58,7 @@ When you create an object just pass your Array directly
     post = Post.where("'fresh' = ANY (tags)")    
 
 ### Object
-Crate allows you to define nested objects. You need at least the upcoming
-release 0.39 of Crate for this functionality. I tried to make it as simply as possible to use and reuse existing AR functionality,
+Crate allows you to define nested objects. I tried to make it as simply as possible to use and reuse existing AR functionality,
 I therefore ask you to reuse the existing serialize functionality. AR#serialize allows you to define your own serialization
 mechanism and we simply reuse that for serializing an AR object. To get serialize working simply create a #dump and #load method 
 on the class that creates a literal statement that is then used in the SQL. Read up more in this [commit}(https://github.com/crate/crate/commit/16a3d4b3f23996a327f91cdacef573f7ba946017).

data/history.txt

@@ -1,5 +1,8 @@
 # coding: UTF-8
 
+=== 0.0.2
+  * Switched query execution to parameter substitution
+
 === 0.0.1
 
 Initial Release

data/lib/active_record/attribute_methods/crate_object.rb

@@ -12,19 +12,17 @@ module CrateObject
     end
 
     def dump(object)
-      object ? object.to_literals : nil
+      object ? object.to_hash : nil
     end
   end
 
 
-  def to_literals
-    arr = []
+  def to_hash
+    h = {}
     instance_variables.each do |var|
-      v = instance_variable_get(var)
-      value = v.is_a?(Array) ? v : %Q{"#{v}"}
-      arr << %Q{"#{var.to_s.gsub(/@/, '')}"=#{value}}
+      h.merge!({"#{var.to_s.gsub(/@/, '')}" => instance_variable_get(var)})
     end
-    arr.join(', ')
+    h
   end
 end
 

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

@@ -26,13 +26,17 @@ module ActiveRecord
         params = []
         binds.each_with_index do |(column, value), index|
           ar_column = column.is_a?(ActiveRecord::ConnectionAdapters::Column)
-          next if ar_column && column.sql_type == 'timestamp'
+          # 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
+          else
+            params << value
+          end
+
         end
-        params.each { |p| sql.sub!(/(\?)/, p) }
-        @connection.execute sql
+        @connection.execute sql, params
       end
 
       # Returns the statement identifier for the client side cache

data/lib/active_record/connection_adapters/crate_adapter.rb

@@ -11,7 +11,6 @@ require 'active_record/connection_adapters/statement_pool'
 require 'active_record/connection_adapters/column'
 require 'active_record/connection_adapters/crate/schema_statements'
 require 'active_record/connection_adapters/crate/database_statements'
-require 'active_record/connection_adapters/crate/quoting'
 require 'active_support/core_ext/kernel'
 
 begin
@@ -37,7 +36,6 @@ module ActiveRecord
 
       include Crate::SchemaStatements
       include DatabaseStatements
-      include Crate::Quoting
 
       ADAPTER_NAME = 'Crate'.freeze
 
@@ -85,7 +83,7 @@ module ActiveRecord
 
       # Adds `:array` as a valid migration key
       def migration_keys
-        super + [:array, :object_schema_behaviour, :object_schema_behaviour]
+        super + [:array, :object_schema_behaviour, :object_schema]
       end
 
 

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

@@ -1,3 +1,3 @@
 module ActiverecordCrateAdapter
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/data_types/array_spec.rb

@@ -23,25 +23,39 @@ describe "Post#array" do
 
 
   describe "#array column type" do
-    let(:array) {%w(hot fresh)}
-    let(:votes) {[9,8,7]}
-    let(:bool_arr) {[true, false, true]}
-    let(:post) {Post.create!(title: 'Arrays are awesome', tags: array, votes: votes, bool_arr: bool_arr )}
-
-    it 'should store and return an array' do
-      p = Post.find(post.id)
-      p.tags.should be_a Array
-      p.votes.should be_a Array
-      p.bool_arr.should be_a Array
-      p.tags.should eq array
-      p.votes.should eq votes
-      p.bool_arr.should eq bool_arr
+    let(:array) { %w(hot fresh) }
+    let(:votes) { [9, 8, 7] }
+    let(:bool_arr) { [true, false, true] }
+    let(:post) { Post.create!(title: 'Arrays are awesome', tags: array, votes: votes, bool_arr: bool_arr) }
+
+    context 'create' do
+      it 'should store and return an array' do
+        p = Post.find(post.id)
+        p.tags.should be_a Array
+        p.votes.should be_a Array
+        p.bool_arr.should be_a Array
+        p.tags.should eq array
+        p.votes.should eq votes
+        p.bool_arr.should eq bool_arr
+      end
+
+      it 'should find the post by array value' do
+        post = Post.create!(title: 'Arrays are awesome', tags: array, votes: votes)
+        refresh_posts
+        Post.where("'fresh' = ANY (tags)").should include(post)
+      end
     end
 
-    it 'should find the post by array value' do
-      post = Post.create!(title: 'Arrays are awesome', tags: array, votes: votes)
-      refresh_posts
-      Post.where("'fresh' = ANY (tags)").should include(post)
+    context '#update' do
+      it 'should update and existing array value' do
+        post = Post.create!(title: 'Arrays are awesome', tags: array, votes: votes)
+        refresh_posts
+        new_tags = %w(ok)
+        post.update_attributes!(tags: new_tags)
+        refresh_posts
+        post.reload
+        post.tags.should eq new_tags
+      end
     end
 
   end

data/spec/models/post_spec.rb

@@ -31,9 +31,16 @@ describe Post do
 
   context 'persistance' do
 
+    before do
+      @post = Post.create!(params)
+    end
+
+    after do
+      @post.destroy
+    end
+
     it 'should persist the record to the database' do
-      post = Post.create!(params)
-      post.persisted?.should be_true
+      @post.persisted?.should be_true
       refresh_posts
       Post.count.should eq 1
     end
@@ -58,7 +65,7 @@ describe Post do
     end
 
     after do
-      #@post.destroy
+      @post.destroy
     end
 
     context 'find' do
@@ -66,6 +73,13 @@ describe Post do
         post = Post.where(id: @post.id).first
         post.id.should eq(@post.id)
       end
+
+      it 'should find the crated record by title' do
+        refresh_posts
+        Post.where(title: @post.title).count.should eq 1
+        post = Post.where(title: @post.title).first
+        post.id.should eq(@post.id)
+      end
     end
 
     context 'update' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-crate-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Christoph Klocker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -125,7 +126,6 @@ files:
 - history.txt
 - lib/active_record/attribute_methods/crate_object.rb
 - lib/active_record/connection_adapters/crate/database_statements.rb
-- lib/active_record/connection_adapters/crate/quoting.rb
 - lib/active_record/connection_adapters/crate/schema_statements.rb
 - lib/active_record/connection_adapters/crate_adapter.rb
 - lib/activerecord-crate-adapter.rb
@@ -178,4 +178,3 @@ test_files:
 - spec/models/post_spec.rb
 - spec/spec_helper.rb
 - spec/test_server.rb
-has_rdoc: 

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

@@ -1,22 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module Crate
-      module Quoting
-        # Quotes the column value to help prevent
-        # {SQL injection attacks}[http://en.wikipedia.org/wiki/SQL_injection].
-        def quote(value, column = nil)
-          # records are quoted as their primary key
-          return value.quoted_id if value.respond_to?(:quoted_id)
-
-          if value.is_a?(Array)
-            "#{value}".gsub('"', "'")
-          elsif column.sql_type == 'object'
-            "{ #{value} }"
-          else
-            super(value, column)
-          end
-        end
-      end
-    end
-  end
-end