arc 0.0.1.2 → 0.0.1.3

data/Rakefile

@@ -36,6 +36,9 @@ namespace :test do
   task :docs do
     `rspec spec -f h > doc/spec.html`
   end
+  task :wip do
+    system "rspec spec --tag wip"
+  end
 end
 
 #example use of passing arguments to rake

data/lib/arc/casting.rb

@@ -15,6 +15,8 @@ module Arc
       boolean:  'boolean', 
       bit:      'boolean',
       float:    'float'  ,
+      text:     'string' ,
+      bytea:    'binary' ,
     }
     
     CAST_METHODS = Hash.new do |cast_methods, key|

data/lib/arc/data_stores/mysql/object_definitions.rb

@@ -13,11 +13,24 @@ module Arc
         def fetch_item name
           MysqlTable.new name, @data_store
         end
+        
+        def execute_ddl ddl
+          case ddl
+          when Array
+            ddl = ddl.select do |stmt|
+              !stmt.nil? && !stmt.empty? && !stmt == "\n"
+            end
+            ddl.each { |s| @data_store.execute "#{s}" }
+          when String
+            execute_ddl ddl.split(';')
+          end        
+        end
+        
       end
     
       class MysqlTable < Table
         def raw_column_data
-          @data_store.read("SHOW FULL FIELDS FROM superheros").each do |r|
+          @data_store.read("show fields from #{self.name}").each do |r|
             r
           end
         end
@@ -25,8 +38,8 @@ module Arc
           raw_column_data.map {|c| c[:Field].to_sym }
         end
         def fetch_item name
-          return {} unless keys.include? name.to_sym
           c = raw_column_data.find{|c| c[:Field] == name.to_s}
+          throw "Column '#{name}' does not exist" unless keys.include? name.to_sym
           MysqlColumn.new @data_store,{
             name: c[:Field],
             allows_null: c[:Null] == "YES",
@@ -42,6 +55,7 @@ module Arc
           :int => :integer,
         }
         def type
+          @stype ||= ''
           @type ||= begin
             type_key = @stype.downcase.gsub(/\([\d,]*\)/, '').to_sym
             TYPES[type_key] || type_key

data/lib/arc/data_stores/mysql/store.rb

@@ -9,7 +9,7 @@ module Arc::DataStores
   class MysqlDataStore < AbstractDataStore
     
     def read query
-      execute(query)
+      execute(query).entries
     end
     
     def create sql
@@ -25,6 +25,11 @@ module Arc::DataStores
     def destroy sql
       execute sql
     end
+    
+    def quote_column_name table
+      "`#{table}`"
+    end
+    alias :quote_column :quote_column_name
 
     def execute query
       with_store do |store|

data/lib/arc/data_stores/postgres/object_definitions.rb

@@ -60,7 +60,7 @@ module Arc
       class PostgresColumn < Column
         def type
           return :varchar if @stype =~ /character varying/
-          return :time if @stype =~ /timestamp/
+          return :time if @stype =~ /time/
           @stype.to_sym
         end
       end

data/lib/arc/version.rb

@@ -1,3 +1,3 @@
 module Arc
-  VERSION = "0.0.1.2"
+  VERSION = "0.0.1.3"
 end

data/spec/data_stores/integration/crud_spec.rb

@@ -1,76 +1,93 @@
 require 'spec_helper'
-
+require 'pp'
 module Arc
   module DataStores
     describe 'The data store crud operations' do
-            
-      describe '#create' do
-        it 'creates a new record' do
-          ArcTest.with_store do |store|
-            query = "SELECT * FROM superheros WHERE name = 'green hornet'"
-            result = store.read query
-            result.size.should == 0
-          
-            store.create "INSERT INTO superheros (name) VALUES('green hornet');"
-            store.read(query).size.should == 1
-          
-            #cleanup
-            store.destroy "DELETE FROM superheros where name = 'green hornet'"
-          end
+      #convenience method for building a tree of arel values
+      def values_array table_name, hash
+        hash.keys.map do |attr|
+          [@tables[table_name][attr], hash[attr]]
         end
-        
-        it 'returns the record with a populated primary key' do
-          ArcTest.with_store do |store|
-            result = store.create "INSERT INTO superheros (name) VALUES('green lantern')"
-            result[:id].should_not be_nil
-            result[:name].should == 'green lantern'
-            #cleanup
-            store.destroy "DELETE FROM superheros where name = 'green lantern'"
-          end
+      end
+      
+      #grab a superhero record by name
+      def get_hero(hero_name)
+        query = @tables[:superheros]
+          .project('*')
+          .where(@tables[:superheros][:name].eq(hero_name))
+          .to_sql
+        @store.read query
+      end
+      
+      before :each do
+        ArcTest.with_store do |store|          
+          Arel::Table.engine = store
+          load "spec/support/seed.rb"
         end
+        @tables = Hash.new { |hash, key| hash[key] = Arel::Table.new key }
+        @store = Arel::Table.engine
       end
       
-      describe '#read' do
-        it 'reads existing data' do
-          heros = ['superman', 'batman', 'spiderman']
-          query = "SELECT * FROM superheros"
-          
-          ArcTest.with_store do |store|
-            result = store.read query
-            result.size.should == 3
-            result.each do |h| 
-              h.should be_a(Hash)
-              heros.should include(h[:name])
-            end
-          end
+      describe '#create and #read'  do
+        before :each do
+          properties = {
+            :name => "green hornet",
+            :born_on => Time.now,
+            :photo => "hello",
+            :created_at => Time.now 
+          }
+          im = Arel::InsertManager.new Arel::Table.engine
+          im.insert values_array(:superheros, properties)
+          @result = @store.create im.to_sql
+        end
+        
+        it 'creates a new record' do
+          query = @tables[:superheros]
+            .project('*')
+            .where(@tables[:superheros][:name].eq('green hornet'))
+            .to_sql
+          result = @store.read query
+          result[0][:name].should == 'green hornet'
+        end
+        
+        it 'returns the record with a populated primary key' do
+          @result[:id].should_not be_nil
+          @result[:name].should == 'green hornet'
         end
+        
       end
       
       describe '#update' do
         it 'updates a record and returns the updated record' do
-          ArcTest.with_store do |store|
-            query = "UPDATE superheros SET name = 'wussy' WHERE name = 'batman'"
-            result = store.update query
-            batman = store.read "SELECT * from superheros WHERE name = 'batman'"
-            batman.size.should == 0
-            batman.should be_a(Enumerable)
-            batman = store.read "SELECT * from superheros WHERE name = 'wussy'"
-            batman.first[:name].should == 'wussy'
-          end
+          properties = {:name => 'batman'}
+          um = Arel::UpdateManager.new @store
+          um.table @tables[:superheros]
+          um.set(values_array(:superheros, properties))
+            .where(@tables[:superheros][:name].eq('megaman'))
+          query = um.to_sql
+          result = @store.update query
+          
+          megaman = get_hero('megaman')
+          megaman.size.should == 0
+          megaman.should be_a(Enumerable)
+          
+          batman = get_hero('batman')
+          batman.size.should == 1
+          batman.first[:name].should == 'batman'
         end
       end
       
       describe '#destroy' do
         it 'deletes a record' do 
-          ArcTest.with_store do |store|
-            query = "SELECT * FROM superheros WHERE name = 'batman'"
-            batman = store.read query
-            batman.first[:name].should == 'batman'
-            store.destroy "DELETE FROM superheros WHERE name = 'batman'"
-            batman = store.read query
-            batman.size.should == 0
-            batman.should be_a(Enumerable)
-          end
+          delete = Arel::DeleteManager.new @store
+          delete
+            .from(@tables[:superheros])
+            .where(@tables[:superheros][:name].eq('superman'))
+          @store.destroy delete.to_sql
+          superman = get_hero('superman')
+          superman.size.should == 0
+          superman.size.should == 0
+          superman.should be_a(Enumerable)
         end        
       end
 

data/spec/data_stores/integration/schema_spec.rb

@@ -6,7 +6,9 @@ module Arc
       describe "All the Schemas!" do
         it 'lists the table names' do
           ArcTest.with_store do |store|
-            store.schema.table_names.should == [:superheros]
+            [:superheros, :powers, :superheros_powers].each do |t|
+              store.schema.table_names.should include(t)
+            end
           end
         end
       

data/spec/data_stores/mysql/store_spec.rb

@@ -2,6 +2,15 @@ require 'spec_helper'
 require 'arc/data_stores/mysql/store'
 
 describe Arc::DataStores::MysqlDataStore do
+  describe '#quote_table_name', :wip => true do
+    store = Arc::DataStores::MysqlDataStore.new ArcTest.config[:mysql]
+    store.quote_table_name('my-table').should == "`my-table`"
+  end
+  describe '#quote_column_name', :wip => true do
+    store = Arc::DataStores::MysqlDataStore.new ArcTest.config[:mysql]
+    store.quote_column_name('my-column').should == "`my-column`"    
+  end
+  
   describe "#schema" do
     it 'is an instance of Arc::DataStores::MysqlSchema' do
       store = Arc::DataStores::MysqlDataStore.new ArcTest.config[:mysql]

data/spec/data_stores/postgres/store_spec.rb

@@ -8,4 +8,14 @@ describe Arc::DataStores::PostgresDataStore do
       store.schema.should be_a(Arc::DataStores::ObjectDefinitions::PostgresSchema)
     end
   end
+  describe Arc::DataStores::ObjectDefinitions::PostgresColumn, :wip => true do
+    it 'returns a time type' do
+      c = Arc::DataStores::ObjectDefinitions::PostgresColumn.new(nil,
+        :type => "time without time zone"
+      )
+      stype = c.instance_variable_get :@stype
+      stype.should == "time without time zone"
+      c.type.should == :time
+    end    
+  end
 end

data/spec/quoting_spec.rb

@@ -26,6 +26,9 @@ module Arc
         quoter.quote("'").should == "''''"
         quoter.quote("my%String", String).should == "'my%String'"
       end
+      it 'quotes text' do
+        quoter.quote("hello world", "text").should == "'hello world'"
+      end
       it 'quotes a date object' do
         date = Date.today
         fmt = '%Y-%m-%d'

data/spec/support/schemas/mysql.sql

@@ -1,10 +1,22 @@
+DROP TABLE IF EXISTS superheros;
 CREATE TABLE superheros (
   id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
-	name VARCHAR(256) NOT NULL
+	name VARCHAR(256) NOT NULL,
+	born_on DATE NOT NULL,
+	photo BINARY NULL,
+	created_at TIME NOT NULL
+);
+
+DROP TABLE IF EXISTS powers;
+CREATE TABLE powers (
+  id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  name VARCHAR(256) NOT NULL,
+  description TEXT NOT NULL
+);
+
+DROP TABLE IF EXISTS superheros_powers;
+CREATE TABLE superheros_powers(
+  id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  superhero_id INTEGER NOT NULL,
+  power_id INTEGER NOT NULL
 );
-INSERT INTO superheros(name)
-VALUES('superman');
-INSERT INTO superheros(name)
-VALUES('spiderman');
-INSERT INTO superheros(name)
-VALUES('batman');

data/spec/support/schemas/postgres.sql

@@ -1,12 +1,26 @@
 BEGIN TRANSACTION;
+
+DROP TABLE IF EXISTS superheros;
 CREATE TABLE superheros (
   id SERIAL PRIMARY KEY,
-	name VARCHAR(256) NOT NULL
+	name VARCHAR(256) NOT NULL,
+	born_on DATE NOT NULL,
+	photo bytea NULL,
+	created_at TIME NOT NULL
 );
-INSERT INTO superheros(name)
-VALUES('superman');
-INSERT INTO superheros(name)
-VALUES('spiderman');
-INSERT INTO superheros(name)
-VALUES('batman');
+
+DROP TABLE IF EXISTS powers;
+CREATE TABLE powers (
+  id SERIAL PRIMARY KEY,
+  name VARCHAR(256) NOT NULL,
+  description TEXT NOT NULL
+);
+
+DROP TABLE IF EXISTS superheros_powers;
+CREATE TABLE superheros_powers(
+  id SERIAL PRIMARY KEY,
+  superhero_id INTEGER NOT NULL,
+  power_id INTEGER NOT NULL
+);
+
 COMMIT;

data/spec/support/schemas/sqlite.sql

@@ -1,12 +1,26 @@
 BEGIN TRANSACTION;
+
+DROP TABLE IF EXISTS superheros;
 CREATE TABLE superheros (
   id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	name VARCHAR(256) NOT NULL
+	name VARCHAR(256) NOT NULL,
+	born_on DATE NOT NULL,
+	photo BINARY NULL,
+	created_at TIME NOT NULL
 );
-INSERT INTO superheros(name)
-VALUES('superman');
-INSERT INTO superheros(name)
-VALUES('spiderman');
-INSERT INTO superheros(name)
-VALUES('batman');
+
+DROP TABLE IF EXISTS powers;
+CREATE TABLE powers (
+  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  name VARCHAR(256) NOT NULL,
+  description TEXT NOT NULL
+);
+
+DROP TABLE IF EXISTS superheros_powers;
+CREATE TABLE superheros_powers(
+  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  superhero_id INTEGER NOT NULL,
+  power_id INTEGER NOT NULL
+);
+
 COMMIT;

data/spec/support/seed.rb

@@ -0,0 +1,57 @@
+
+tables = Hash.new do |hash, key|
+  hash[key] = Arel::Table.new key
+end
+file_root = File.expand_path("../", __FILE__)
+data = {
+  :superheros => 
+  [
+    {
+      :name => 'superman',
+      :born_on => Time.now,
+      :photo => 'file',#File.read("#{file_root}/resources/superman.gif"),
+      :created_at => Time.now
+    },
+    {
+      :name => 'ironman',
+      :born_on => Time.now,
+      :photo => 'file',#File.read("#{file_root}/resources/ironman.gif"),
+      :created_at => Time.now
+    },
+    {
+      :name => 'megaman',
+      :born_on => Time.now,
+      :photo => 'file',#File.read("#{file_root}/resources/megaman.jpg"),
+      :created_at => Time.now
+    }
+  ],
+  :powers => 
+  [
+    {
+      :name => 'flight',
+      :description => "The ability to levitate in and move through the air.",
+    },
+    {
+      :name => 'money',
+      :description => 'The ability to act like the billionaire owner of apple computer.'
+    },
+    {
+      :name => 'ice blaster',
+      :description => 'Not really a power, but hey.  It shoots ice.'
+    }
+  ]
+}
+
+data.each_pair do |name, tuples|  
+  table = tables[name]
+  delete = Arel::DeleteManager.new Arel::Table.engine
+  Arel::Table.engine.destroy delete.from(table).to_sql
+  tuples.each do |tuple|
+    stmt = Arel::InsertManager.new Arel::Table.engine
+    values = tuple.keys.map do |key|
+      [table[key], tuple[key]]
+    end
+    stmt.insert(values)
+    Arel::Table.engine.create stmt.to_sql
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arc
 version: !ruby/object:Gem::Version
-  version: 0.0.1.2
+  version: 0.0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000Z
+date: 2011-12-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: agent-q
-  requirement: &70171055331800 !ruby/object:Gem::Requirement
+  requirement: &70338722320520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171055331800
+  version_requirements: *70338722320520
 - !ruby/object:Gem::Dependency
   name: arel
-  requirement: &70171055331380 !ruby/object:Gem::Requirement
+  requirement: &70338722319980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171055331380
+  version_requirements: *70338722319980
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70171055330960 !ruby/object:Gem::Requirement
+  requirement: &70338722319560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70171055330960
+  version_requirements: *70338722319560
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70171055330540 !ruby/object:Gem::Requirement
+  requirement: &70338722319020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70171055330540
+  version_requirements: *70338722319020
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70171055330100 !ruby/object:Gem::Requirement
+  requirement: &70338722318480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70171055330100
+  version_requirements: *70338722318480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70171055329640 !ruby/object:Gem::Requirement
+  requirement: &70338722294800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70171055329640
+  version_requirements: *70338722294800
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70171055329140 !ruby/object:Gem::Requirement
+  requirement: &70338722294240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70171055329140
+  version_requirements: *70338722294240
 - !ruby/object:Gem::Dependency
   name: ruby-debug
-  requirement: &70171055328680 !ruby/object:Gem::Requirement
+  requirement: &70338722293820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70171055328680
+  version_requirements: *70338722293820
 description: Compatible with mysql, sqlite, and postgres
 email:
 - jacob.s.morris@gmail.com
@@ -139,13 +139,17 @@ files:
 - spec/quoting_spec.rb
 - spec/spec_helper.rb
 - spec/support/config.yml
+- spec/support/resources/ironman.gif
+- spec/support/resources/megaman.jpg
 - spec/support/resources/rails.png
+- spec/support/resources/superman.gif
 - spec/support/schemas/drop_mysql.sql
 - spec/support/schemas/drop_postgres.sql
 - spec/support/schemas/drop_sqlite.sql
 - spec/support/schemas/mysql.sql
 - spec/support/schemas/postgres.sql
 - spec/support/schemas/sqlite.sql
+- spec/support/seed.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -184,10 +188,14 @@ test_files:
 - spec/quoting_spec.rb
 - spec/spec_helper.rb
 - spec/support/config.yml
+- spec/support/resources/ironman.gif
+- spec/support/resources/megaman.jpg
 - spec/support/resources/rails.png
+- spec/support/resources/superman.gif
 - spec/support/schemas/drop_mysql.sql
 - spec/support/schemas/drop_postgres.sql
 - spec/support/schemas/drop_sqlite.sql
 - spec/support/schemas/mysql.sql
 - spec/support/schemas/postgres.sql
 - spec/support/schemas/sqlite.sql
+- spec/support/seed.rb