activerecord-datastore-adapter 0.0.1 → 0.0.3

data/Gemfile.lock

@@ -1,24 +1,24 @@
 PATH
   remote: .
   specs:
-    activerecord-datastore-adapter (0.0.1)
-      activerecord (>= 3.0.3)
+    activerecord-datastore-adapter (0.0.3)
+      activerecord (= 3.0.6)
       appengine-apis (= 0.0.22)
       arel (>= 2.0.7)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+      i18n (~> 0.5.0)
+    activerecord (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.5)
+    activesupport (3.0.6)
     appengine-apis (0.0.22)
       appengine-rack
     appengine-rack (0.0.12)
@@ -45,7 +45,6 @@ GEM
 
 PLATFORMS
   java
-  ruby
 
 DEPENDENCIES
   activerecord-datastore-adapter!

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 siddick.com
+
+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.

data/README.textile

@@ -2,13 +2,14 @@ h1. Datastore Adapter
 
 ActiveRecord Adatper for AppEngine Datastore. The AppEngine Datastore is not a relational database system. So, this adapter only support some basic features. 
 
-h2. Installation( under-construction )
+h2. Installation
 
 Use appengine-sdk (1.4.0)
 
 Create Rails 3 application:
 
-bc. rails new app_name -m http://siddick.github.com/datastore/rails3.rb
+bc. gem install rails --version=3.0.6
+rails new app_name -m http://siddick.github.com/datastore/rails3.rb
 cd app_name
 appcfg.rb run bin/rails g scaffold post title:string content:text  
 appcfg.rb run bin/rake db:migrate

data/activerecord-datastore-adapter.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "activerecord-datastore-adapter"
-  s.version     = "0.0.1"
+  s.version     = "0.0.3"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Mohammed Siddick"]
   s.email       = ["siddick@gmail.com"]
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency( 'appengine-apis', '0.0.22' )
-  s.add_dependency( 'activerecord', '>= 3.0.3' )
+  s.add_dependency( 'activerecord', '3.0.6' )
   s.add_dependency( 'arel', '>= 2.0.7' )
 end

data/examples/rails3.rb

@@ -7,31 +7,19 @@ disable_system_gems
 disable_rubygems
 bundle_path ".gems/bundler_gems"
 
-gem 'rails', '~> 3.0.5'
-gem 'activerecord-datastore-adapter'
+gem 'rails', '3.0.6'
+gem 'activerecord-datastore-adapter', '>= 0.0.3'
 gem 'jruby-rack', '1.0.5'
 
 GEMFILE
 end
 
-remove_file 'config/boot.rb'
-create_file 'config/boot.rb' do
-<<-BOOT
-
-String.class_eval do
-  alias :old_plus :+
-  def +( val )
-    if( val.is_a? Array )
-      [ self ] + val
-    else
-      old_plus val
-    end
-  end
-end
-BOOT
+gsub_file 'config/boot.rb', /^/ do
+  "# "
 end
 
 
+
 remove_file 'config/database.yml'
 create_file 'config/database.yml' do
 <<-DATABASE
@@ -60,6 +48,22 @@ gsub_file 'config/application.rb', /class Application < Rails::Application$/ do
   "
 end
 
+create_file 'config/initializers/rails_patch.rb' do
+<<-BOOT
+
+String.class_eval do
+  alias :old_plus :+
+  def +( val )
+    if( val.is_a? Array )
+      [ self ] + val
+    else
+      old_plus val
+    end
+  end
+end
+BOOT
+end
+
 create_file 'config/initializers/cache_store.rb' do
 <<-CACHE_STORE
 #require 'appengine-apis/memcache'

data/examples/{rails3_local.rb → rails3_edge.rb}

@@ -7,39 +7,15 @@ disable_system_gems
 disable_rubygems
 bundle_path ".gems/bundler_gems"
 
-gem 'rails', '~> 3.0.5'
-gem 'appengine-apis', '>= 0.0.22'
+gem 'rails', '3.0.6'
+gem 'activerecord-datastore-adapter', :git => 'git://github.com/siddick/datastore.git'
+gem 'jruby-rack', '1.0.5'
 
 GEMFILE
 end
 
-remove_file 'config/boot.rb'
-create_file 'config/boot.rb' do
-<<-BOOT
-  
-String.class_eval do
-  alias :old_plus :+
-  def +( val )
-    if( val.is_a? Array )
-      [ self ] + val
-    else
-      old_plus val
-    end
-  end
-end
-
-File.class_eval do
-  class << self
-    alias :old_expand_path :expand_path
-    def expand_path( *args )
-      fn = old_expand_path( *args )
-      fn.sub(/^.*file:/, 'file:') if fn
-    end
-  end
-end
-
-$LOAD_PATH.push( '../../lib' )
-BOOT
+gsub_file 'config/boot.rb', /^/ do
+  "# "
 end
 
 remove_file 'config/database.yml'
@@ -47,15 +23,15 @@ create_file 'config/database.yml' do
 <<-DATABASE
 development:
   adapter: datastore
-  database: development.yml
+  database: db/database.yml
 
 test:
   adapter: datastore
-  database: test.yml
+  database: db/test.yml
 
 production:
   adapter: datastore
-  database: development.yml
+  database: db/database.yml
 DATABASE
 end
 
@@ -70,6 +46,22 @@ gsub_file 'config/application.rb', /class Application < Rails::Application$/ do
   "
 end
 
+create_file 'config/initializers/rails_patch.rb' do
+<<-BOOT
+
+String.class_eval do
+  alias :old_plus :+
+  def +( val )
+    if( val.is_a? Array )
+      [ self ] + val
+    else
+      old_plus val
+    end
+  end
+end
+BOOT
+end
+
 create_file 'config/initializers/cache_store.rb' do
 <<-CACHE_STORE
 #require 'appengine-apis/memcache'

data/lib/active_record/connection_adapters/datastore_adapter.rb

@@ -17,6 +17,13 @@ module ActiveRecord
   end
 
   module ConnectionAdapters
+
+    class DataStoreColumn < Column
+      def self.binary_to_string value
+        AppEngine::Datastore::Blob.new(value)
+      end
+    end
+
     class DatastoreAdapter < AbstractAdapter
       ADAPTER_NAME = "Datastore"
 
@@ -114,7 +121,7 @@ module ActiveRecord
       def columns( table_name, name = nil)
         @connection.columns( table_name, name ).collect{|k,opt|
           is_primary = opt["type"] == "primary_key"
-          c = Column.new( k, opt["default"], is_primary ? "integer" : opt["type"].to_s, opt["null"] )
+          c = DataStoreColumn.new( k, opt["default"], is_primary ? "integer" : opt["type"].to_s, opt["null"] )
           c.primary = true if is_primary
           c
         } 

data/lib/arel/visitors/datastore.rb

@@ -58,7 +58,9 @@ module Arel
           :integer     => lambda{|k,i| i.to_i },
           :datetime    => lambda{|k,t| t.is_a?(Time)? t : Time.parse(t.to_s) },
           :date        => lambda{|k,t| t.is_a?(Date)? t : Date.parse(t.to_s) },
-          :float       => lambda{|k,f| f.to_f }
+          :float       => lambda{|k,f| f.to_f },
+          :text        => lambda{|k,t| AppEngine::Datastore::Text.new(t) },
+          :binary      => lambda{|k,t| AppEngine::Datastore::Blob.new(t) }
         }
         InScan = /'((\\.|[^'])*)'|(\d+)/
         def apply_filter( key, opt, value )
@@ -123,9 +125,13 @@ module Arel
         QString.new( @connection, c.froms.name, get_limit_and_offset(o) ).wheres( c.wheres ).orders(o.orders).projections( c.projections )
       end
 
+      def insert_type_case( value )
+        value.is_a?( ActiveSupport::TimeWithZone ) ? value.time : value
+      end
+
       def visit_Arel_Nodes_InsertStatement o
         e = AppEngine::Datastore::Entity.new(o.relation.name)
-        o.columns.each_with_index{|c,i| e[c.name] = o.values.left[i] }
+        o.columns.each_with_index{|c,i| e[c.name] = insert_type_case(o.values.left[i]) }
         e
       end
 

data/spec/datatypes_spec.rb

@@ -9,6 +9,7 @@ class User < ActiveRecord::Base
     t.datetime    :dob
     t.integer     :rating
     t.float       :score
+    t.binary      :data
 
     t.timestamps
   end
@@ -40,4 +41,24 @@ describe Person do
     users = User.where( " rating >= 1 and rating <= 3 " )
     users.all.size.should == 3
   end
+
+  it "check integer" do
+    user = User.create!( :name => "guest", :rating => "5a" )
+    user = User.find( user.id )
+    user.rating.should == 5
+  end
+
+  it "check datetime" do
+    user = User.create!( :name => "guest", :dob => "24 may, 2010" )
+    user = User.find( user.id )
+    user.dob.strftime("%Y-%m-%d").should == "2010-05-24"
+  end
+  
+  it "check binary" do
+    user = User.create!( :name => "guest", :dob => "24 may, 2010", :data => "testing" )
+    user.data.class.should == AppEngine::Datastore::Blob
+    user = User.find_by_name( "guest" )
+    user.data.should == "testing"
+    user.data.class.should == AppEngine::Datastore::Blob
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: activerecord-datastore-adapter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors: 
   - Mohammed Siddick
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +05:30
+date: 2011-04-11 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -30,9 +30,9 @@ dependencies:
     requirement: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - "="
           - !ruby/object:Gem::Version 
-            version: 3.0.3
+            version: 3.0.6
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -61,11 +61,12 @@ files:
   - .gitignore
   - Gemfile
   - Gemfile.lock
+  - MIT-LICENSE
   - README.textile
   - Rakefile
   - activerecord-datastore-adapter.gemspec
   - examples/rails3.rb
-  - examples/rails3_local.rb
+  - examples/rails3_edge.rb
   - lib/active_record/connection_adapters/datastore_adapter.rb
   - lib/active_record/datastore_associations_patch.rb
   - lib/arel/visitors/datastore.rb