arc 0.0.3 → 0.0.3.1

data/README.md

@@ -0,0 +1,109 @@
+#Arc (**Ar**el **C**onnection)
+Arc is a database connection engine that provides everything Arel needs to construct an AST.
+You can use sqlite, postgresql and/or mysql.
+
+Arc gives you:
+
+ - quoting and casting of values as they enter and exit the data store
+ - standard and **thread safe** CRUD interface for executing queries
+ - a hash-like interface that provides information about the tables and columns in your database (see below)
+
+There are two dependencies: [q][6] and arel itself.
+
+Arc lets you use arel without the cost of including active record as a dependency.
+
+[Arel][1] is a very capable and [inspired][2] bit of code which provides machinery for building an [abstract syntax tree][2](ast) of a complex sql query in pure ruby.
+
+
+##Arc is *not*:
+Arc isn't an ORM.
+There has been some [recent discussion][4] about the state of ruby ORMs.  Arc does not make any attempt to [pass judgement][5] against any of the fine ORMs out there.  Arc came out of a need for a lighter weight method for manipulating data in a database.  Arc gives developers flexibility to build their own frameworks and write smaller libraries with fewer dependencies.
+
+##Installation
+Add this to your Gemfile
+    gem 'pg' #'mysql2' or 'sqlite'
+    gem 'arc'
+
+##Basics
+####Connect to a database:
+
+    require 'arc'
+    @store = Arc::DataStores[:postgres].new({
+      database: arc_development,
+      host: localhost,
+      user: superman
+    })
+    @store[:superheros]
+    # => <Arc::DataStores::ObjectDefinitions::SqliteTable:0x007f86d4026f68 @name="superheros">
+    @store[:superheros].column_names
+    # => [:is_awesome, :name, :id ]
+    @store[:superheros][:id]
+    # => #<Arc::DataStores::ObjectDefinitions::SqliteColumn @name='id'>
+    @store[:superheros][:id].primary_key?
+    # => true
+    @store[:superheros][:is_awesome].type
+    # => :bool
+    
+####Execute a query
+Build an Arel query and pass it to one of the store's CRUD methods:
+
+"Read" Example:
+
+    s = Arel::Table.new :superheros
+    s.project(s[:name], s[:id], s[:is_awesome])
+    @store.read s
+    # => [{ :id => 1, :name => 'superman', :is_awesome => true  }
+    # =>  { :id => 2, :name => 'batman',   :is_awesome => false }
+    # =>  { :id => 3, :name => 'ironman',  :is_awesome => nil   }]
+
+"Create" example
+
+    im = Arel::InsertManager.new
+    im.insert([
+      [superheros[:name], 'green hornet'],
+      [superheros[:is_awesome], true]
+    ])
+    @store.create im
+    # => { :id => 4, :name => 'green hornet', :is_awesome => true }
+
+##Advanced
+Arc handles some of the more complex features of arel, like complex joins:
+
+    s = Arel::Table.new :superheros
+    sp = Arel::Table.new :superheros_powers
+    p = Arel::Table.new :powers
+    stmt = s.join(sp).on(s[:id].eq(sp[:superhero_id]))
+     .join(p).on(p[:id].eq(sp[:power_id]))
+     .project(
+       s[:name].as('superhero_name'),
+       p[:name].as('power_name')
+     )
+    @store.read stmt
+    # => [{:superhero_name => 'superman', :power_name => 'flight'},
+    # =>  {:superhero_name => 'superman', :power_name => 'x-ray-vision'},
+    # =>  {:superhero_name => 'batman', :power_name => "a belt'}]
+
+##TODO
+  Arc is a new library.  The test suite has excellent coverage, but bugs need to be identified, tested and fixed.
+  Next step is to add RDoc magic.
+  A long term goal would be to add on to the schema interface to allow for some ddl operations.
+  
+##Development
+Install dependencies with bundler
+Make sure you have bundler installed, point your terminal to the project's root directory and run
+
+    $ bundle install
+Running the tests:
+
+    $ rake test
+To run the tests agains a particular adapter
+
+    $ rake test:adapter[<your-adapter-here>]
+
+
+[1]: http://github.com/rails/arel
+[2]: http://twitter.com/#!/jacobsimeon/status/97183215013466113
+[3]: http://en.wikipedia.org/wiki/Abstract_syntax_tree
+[4]: http://solnic.eu/2011/11/29/the-state-of-ruby-orm.html
+[5]: https://github.com/garybernhardt/base
+[6]: http://github.com/jacobsimeon/q

data/README.md.orig

@@ -0,0 +1,74 @@
+#Arc (**AR**el **C**onnection)
+Arc lets you use arel without the cost of including active record as a dependency.
+[Arel][1] is a very capable and [inspired][2] bit of code which provides machinery for building an [abstract syntax tree][2](ast) of a complex sql query in pure ruby.
+
+##Arc is:
+Arc is a database connection engine that provides everything Arel needs to construct an AST
+Arc supports sqlite, postgresql and mysql
+
+    @store = Arel::Table.engine = Arc::DataStores[:sqlite].new :database => ":memory:"
+    superheros = Arel::Table.new :superheros
+    query = superheros.project(
+      superheros[:name],
+      superheros[:is_awesome]
+    )
+    @result = @store.read(query)
+    # => [{ :name => 'superman', :is_awesome => true },
+    # =>  { :name => 'batman', :is_awesome => false }]
+
+Arc handles quoting and casting of values when you create or update records and results are wrapped in lazy loading arrays and hashes.
+<<<<<<< HEAD
+    
+=======
+>>>>>>> e11634854b0583300a597ff8b7850d55048d8323
+    @result.class
+    # => Array
+    @result[0].class
+    # => Hash
+    @result[0][:is_awesome].class
+    # => TrueClass
+
+Arc provides a standard and **thread safe** CRUD interface for executing queries
+<<<<<<< HEAD
+    
+=======
+>>>>>>> e11634854b0583300a597ff8b7850d55048d8323
+    @store.read superheros.project(superheros[:name])
+    # => [<superhero names here>]
+    im = Arel::InsertManager
+    im.insert([superheros[name], 'ironman'])
+    @store.create im
+    # => { :id => 3, :name => 'batman', :is_awesome => nil }
+    Arel::Table.engine
+  
+Arc tells what kind of schema you're working with
+<<<<<<< HEAD
+    
+=======
+>>>>>>> e11634854b0583300a597ff8b7850d55048d8323
+    @store[:superheros]
+    # => <Arc::DataStores::ObjectDefinitions::SqliteTable:0x007f86d4026f68 @name="superheros">
+    @store[:superheros].column_names
+    # => [:is_awesome, :name, :id ]
+    @store[:superheros][:id]
+    # => #<Arc::DataStores::ObjectDefinitions::SqliteColumn @name='id'>
+    @store[:superheros][:id].primary_key?
+    # => true
+    @store[:superheros][:is_awesome].type
+    # => :bool
+  
+##Arc is *not*:
+Arc is **not** an ORM.
+There has been some [recent discussion][4] about the state of ruby ORMs.  Arc does not make any attempt to [pass judgement][5] against any of the fine ORMs out there.  Arc came out of a need for a lighter weight method for manipulating data in a database.  Arc gives developers flexibility to build their own frameworks and write smaller libraries with fewer dependencies.
+
+##Setup
+
+##Basics
+
+##Advanced
+
+[1]: http://github.com/rails/arel
+[2]: http://twitter.com/#!/jacobsimeon/status/97183215013466113
+[3]: http://en.wikipedia.org/wiki/Abstract_syntax_tree
+[4]: http://solnic.eu/2011/11/29/the-state-of-ruby-orm.html
+[5]: https://github.com/garybernhardt/base

data/Rakefile

@@ -1,4 +1,6 @@
 require 'bundler/gem_tasks'
+require 'yaml'
+
 task :test do
   ['sqlite', 'postgres', 'mysql'].each do |environment|
     puts "Running tests for environment #{environment}"
@@ -29,6 +31,16 @@ task :yank do
 end
 
 namespace :test do
+  task :integration do
+    before = ENV['ARC_ENV']
+    adapters = YAML::load(File.read("./spec/support/config.yml")).keys
+    adapters.each do |adapter|
+      ENV['ARC_ENV'] = adapter
+      puts "Running integration test for adapter: #{adapter}"
+      system "rspec spec/integration_spec.rb"
+    end
+    ENV['ARC_ENV'] = before
+  end
   task :adapter, :env do |task, args|
     ENV['ARC_ENV'] = args.env
     system 'rspec spec/data_stores/integration/'

data/lib/arc.rb

@@ -8,4 +8,12 @@ require 'q/symbol'
 require 'q/dispatcher'
 
 require "arc/version"
-require 'arc/data_stores'
+require 'arc/data_stores/abstract/store'
+
+module Arc
+  module DataStores
+    extend Q::Dispatcher
+    require_pattern "arc/data_stores/%s/store.rb"
+    constant_suffix "DataStore"
+  end
+end

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

@@ -12,7 +12,7 @@ module Arc
         def execute_ddl ddl
           case ddl
           when Array
-            ddl.each { |s| @data_store.execute s }            
+            ddl.each { |s| @data_store.execute s }
           when String
             execute_ddl ddl.split(';')
           end        

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

@@ -18,28 +18,66 @@ module Arc
         raise NotImplementedError
       end
       
-      def create query
-        #add new data
-        raise NotImplementedError
-      end
-
       def read query
-        #read existing data
-        raise NotImplementedError
+        case query
+        when String
+          execute(query).symbolize_keys!
+        when Arel::SelectManager
+          result_for query
+        end
       end
-
-      def update query
-        #update existing data
-        raise NotImplementedError
+      
+      def create stmt
+        case stmt
+        when String
+          execute stmt
+        when Arel::InsertManager
+          table = stmt.instance_variable_get(:@ast).relation
+          execute stmt.to_sql
+          projections = schema[table.name.to_sym].column_names.map{ |c| table[c.to_sym] }
+          read(
+            table.project(*projections).where(
+              table.primary_key.eq(
+                Arel.sql(last_insert_rowid(table.name, table.primary_key.name).to_s)
+              )
+            )
+          )[0]
+        end
       end
-
-      def destroy query
-        #destroy existing data
-        raise NotImplementedError
+      
+      def update stmt, id=nil
+        case stmt
+        when String
+          execute stmt
+        when Arel::UpdateManager
+          execute stmt.to_sql
+          if id
+            table = stmt.instance_variable_get(:@ast).relation
+            projections = schema[table.name.to_sym].column_names.map{ |c| table[c.to_sym] }
+            read(
+              table.project(*projections)
+                .where(table.primary_key.eq id)
+            )[0]
+          end
+        end
+      end
+      
+      def destroy stmt
+        case stmt
+        when String
+          execute stmt
+        when Arel::DeleteManager
+          execute stmt.to_sql
+        end
+      end
+      
+      def last_insert_rowid table_name, pk_name
+        'last_insert_rowid()'
       end
           
       def execute query
         #adapters should override this method to execute a query against the database
+        #the methods should return an array-like object of hash-like objects
         raise NotImplementedError
       end
       alias :with_store :with_resource

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

@@ -8,38 +8,16 @@ Mysql2::Client.default_query_options.merge!({
 module Arc::DataStores
   class MysqlDataStore < AbstractDataStore
     
-    def read query
-      case query
-      when String
-        execute(query).entries
-      when Arel::SelectManager
-        result_for query
-      end
-    end
-    
-    def create sql
-      table = sql.match(/\AINSERT into ([^ (]*)/i)[1]
-      execute sql
-      read("select * from #{table} where id = " + last_row_id.to_s).first
-    end
-    
-    def update sql
-      execute sql
-    end
-    
-    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|
+      result = with_store do |store|
         store.query query
       end
+      result.entries if result.respond_to? :entries
     end
     
     def schema
@@ -61,7 +39,7 @@ module Arc::DataStores
       Mysql2::Client.new @config
     end
     
-    def last_row_id
+    def last_insert_rowid table, column
       with_store do |store|
         store.last_id
       end

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

@@ -5,28 +5,10 @@ module Arc
   module DataStores
     class PostgresDataStore < AbstractDataStore
       
-      def read query
-        case query
-        when String
-          execute(query).to_a.symbolize_keys!
-        when Arel::SelectManager
-          result_for query
-        end
-      end
-      
-      def create sql
-        table = sql.match(/\AINSERT into ([^ (]*)/i)[1]
-        sql[-1] = sql[-1] == ';' ? '' : sql[-1]
-        sql += " RETURNING id" unless sql =~ /returning/
-        id = execute(sql).to_a[0].first[1]
-        read("select * from #{table} where id = #{id}")[0]
-      end
       def execute query
-        with_store { |connection| connection.exec query }
+        with_store { |connection| connection.exec query }.to_a.symbolize_keys!
       end
-      alias :destroy :execute
-      alias :update :execute
-  
+      
       def schema
         @schema ||= ObjectDefinitions::PostgresSchema.new self
       end
@@ -43,6 +25,10 @@ module Arc
         end
       end
       
+      def last_insert_rowid table, field
+        id = execute("SELECT currval('#{table}_#{field}_seq');")[0][:currval]
+      end
+      
       private
       def create_connection
         PGconn.connect({

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

@@ -4,33 +4,10 @@ require 'arc/data_stores/sqlite/object_definitions'
 module Arc
   module DataStores
     class SqliteDataStore < AbstractDataStore
-      
-      def read query
-        case query
-        when String
-          execute(query).symbolize_keys!
-        when Arel::SelectManager
-          result_for query
-        end
-      end
-      
-      def create sql
-        table = sql.match(/\AINSERT into ([^ (]*)/i)[1]
-        execute sql
-        read("select * from #{table} where id = last_insert_rowid();")[0]
-      end
-      
-      def update sql
-        execute sql
-      end
-      
-      def destroy sql
-        execute sql
-      end
 
       def execute query
         with_store do |connection|
-          result = connection.execute(query)
+          result = connection.execute(query).symbolize_keys!
         end
       end
       

data/lib/arc/version.rb

@@ -1,3 +1,3 @@
 module Arc
-  VERSION = "0.0.3"
+  VERSION = "0.0.3.1"
 end

data/spec/data_stores/abstract/arel_compatibility_spec.rb

@@ -3,59 +3,41 @@ require 'spec_helper'
 module Arc
   module DataStores
     describe ArelCompatibility do
-      it '#specifies which arel visitor to use' do
-        ArcTest.with_store do |s|
-          Arel::Visitors.for s
-        end
-      end      
-      it '#responds to #connection_pool#spec#config' do
-        ArcTest.with_store do |s|
-          s.connection_pool.spec.config[:adapter].should == ArcTest.config_key.to_s
-        end
+
+      before :all do
+        @s = ArcTest.get_store
       end
-      it 'responds to #with_connection and yields an object which has an execute method' do
-        ArcTest.with_store do |s|
-          s.with_connection do |connection|
-            s.connection.should respond_to(:execute)
-          end
+
+      it '#responds to #connection_pool#spec#config' do  
+        @s.connection_pool.spec.config[:adapter].should == ArcTest.adapter.to_s
+      end
+      it 'responds to #with_connection and yields an object which has an execute method' do        
+        @s.with_connection do |connection|
+          connection.should respond_to(:execute)
         end
       end
       it 'provides a visitor at #connection.visitor' do
-        ArcTest.with_store do |s|
-          s.stub!(:visitor).and_return("lol")
-          s.connection.visitor.should == "lol"
-        end
+        @s.stub!(:visitor).and_return("lol")
+        @s.connection.visitor.should == "lol"
       end
       it "aliases #quote_table to #quote_table_name" do
-        ArcTest.with_store do |s|
-          s.method(:quote_table).should == s.method(:quote_table_name)
-        end
+        @s.method(:quote_table).should == @s.method(:quote_table_name)
       end
       it 'aliases quote_column to #quote_column_name' do
-        ArcTest.with_store do |s|
-          s.method(:quote_column).should == s.method(:quote_column_name)
-        end
+        @s.method(:quote_column).should == @s.method(:quote_column_name)
       end
       it 'provides a table_exists? method' do
-        ArcTest.with_store do |s|
-          s.table_exists?(:superheros).should be_true
-        end
+        @s.table_exists?(:superheros).should be_true
       end
       it 'provides a hashlike object at #connection_pool.columns_hash' do
-        ArcTest.with_store do |s|
-          s.connection_pool.columns_hash.should be(s)
-        end
+        @s.connection_pool.columns_hash.should be(@s)
       end
       it 'responds to primary_key given a table name' do
-        ArcTest.with_store do |s|
-          s.connection.primary_key(:superheros).should be(:id)
-        end
+        @s.connection.primary_key(:superheros).should be(:id)
       end
       it 'should quote a hash' do
-        ArcTest.with_store do |s|
-          hash = {:a => :b}
-          s.quote_hash(hash).should == "'#{hash.to_yaml}'"
-        end
+        hash = {:a => :b}
+        @s.quote_hash(hash).should == "'#{hash.to_yaml}'"
       end
       
     end

data/spec/data_stores/abstract/store_spec.rb

@@ -6,7 +6,7 @@ module Arc
       before :each do
         @store = AbstractDataStore.new ArcTest.config[:empty]
         @query = "omg"
-        @sstore = Arc::DataStores[:sqlite].new ArcTest.config[:sqlite]
+        @sstore = Arc::DataStores[:sqlite].new ArcTest._config[:sqlite]
         @sstore.schema.execute_ddl File.read("spec/support/schemas/sqlite.sql")
         Arel::Table.engine = @sstore
       end

data/spec/data_stores/mysql/store_spec.rb

@@ -3,7 +3,7 @@ require 'arc/data_stores/mysql/store'
 
 describe Arc::DataStores::MysqlDataStore do
   before :each do
-    @store = Arc::DataStores[:mysql].new ArcTest.config[:mysql]    
+    @store = Arc::DataStores[:mysql].new ArcTest._config[:mysql]    
   end
   
   it 'saves binary data', :wip => true do

data/spec/data_stores/postgres/store_spec.rb

@@ -3,7 +3,7 @@ require 'arc/data_stores/postgres/store'
 
 describe Arc::DataStores::PostgresDataStore do
   before :each do
-    @store = Arc::DataStores[:postgres].new ArcTest.config[:postgres]
+    @store = Arc::DataStores[:postgres].new ArcTest._config[:postgres]
     ddl = File.read "spec/support/schemas/postgres.sql"
     @store.schema.execute_ddl ddl
   end

data/spec/integration_spec.rb

@@ -0,0 +1,127 @@
+require 'spec_helper'
+
+describe Arc do
+  #thread safety
+  #create a record
+  #read a record
+    #complex query
+  #update a record
+  #destroy a record
+  
+  #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
+  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 :all do
+    @store = ArcTest.get_store
+    @tables = Hash.new do |hash, key|
+      hash[key] = Arel::Table.new key
+    end
+  end
+
+  it "Safely executes queries initiated on different threads" do
+    threads = []
+    s = @tables[:superheros]
+    query = s.project( s[:name] )
+    result = @store.read(query)[0][:name]
+    5.times do
+      threads << Thread.start do
+        Thread.current[:result] = @store.read(query)[0][:name]
+      end
+    end
+    names = threads.map {|t| t.join; t[:result] }
+    names.each {|n| n.should == result }
+  end
+
+  describe '#create and #read'  do
+    before :each do
+      Timecop.freeze Time.now do
+        @created_at = Time.parse('2011-12-27 11:52:56 -0700')
+        properties = {
+          :name => "green hornet",
+          :born_on => @created_at,
+          :photo => File.read('spec/support/resources/ironman.gif'),
+          :created_at => @created_at
+        }
+        im = Arel::InsertManager.new Arel::Table.engine
+        im.insert values_array(:superheros, properties)
+        @result = @store.create im
+      end
+    end
+  
+    it 'creates a new record' do
+      superheros = @tables[:superheros]
+      query = @tables[:superheros]
+        .project(
+          superheros[:name],
+          superheros[:born_on],
+          superheros[:created_at],
+          superheros[:photo]
+        )
+        .where(@tables[:superheros][:name].eq('green hornet'))
+      result = @store.read query
+      result[0][:name].should == 'green hornet'
+      result[0][:born_on].should == Date.today
+      result[0][:created_at].should == @created_at
+      result[0][:photo].should == File.read('spec/support/resources/ironman.gif').force_encoding("BINARY")
+    end
+  
+    it 'returns the record with a populated primary key' do
+      @result[:id].should_not be_nil
+      @result[:name].should == 'green hornet'
+      @result[:born_on].should == Date.today
+    end
+  
+  end
+
+  describe '#update' do
+    it 'updates a record (and returns the updated record when passing an id)' do
+      s = @tables[:superheros]
+      stmt = s.project(s[:id]).where(s[:name].eq('megaman'))
+      id = @store.read(stmt)[0][:id]
+    
+      properties = {:name => 'batman'}
+      um = Arel::UpdateManager.new @store
+      um.table @tables[:superheros]
+      um.set(values_array(:superheros, properties))
+        .where(@tables[:superheros][:name].eq('megaman'))
+      result = @store.update um, id
+      result[:name].should == 'batman'
+      result[:born_on].should be_a(Date)
+    
+      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 
+      delete = Arel::DeleteManager.new @store
+      delete
+        .from(@tables[:superheros])
+        .where(@tables[:superheros][:name].eq('superman'))
+      @store.destroy delete
+      superman = get_hero('superman')
+      superman.size.should == 0
+      superman.size.should == 0
+      superman.should be_a(Enumerable)
+    end
+  end
+end

data/spec/quoting_spec.rb

@@ -71,12 +71,12 @@ module Arc
       end
       it 'quotes an object based on column type' do
         superman = "superman"
-        ArcTest.with_store do |store|
-          c = store[:superheros][:name]
-          quoter.quote(superman, c).should == "'superman'"
-          c = store[:superheros][:id]
-          quoter.quote(10, c).should == '10'
-        end
+        store = ArcTest.get_store
+        c = store[:superheros][:name]
+        quoter.quote(superman, c).should == "'superman'"
+        c = store[:superheros][:id]
+        quoter.quote(10, c).should == '10'
+        ArcTest.drop_store store
       end
       it 'quotes a bigdecimal' do
         big_decimal = BigDecimal.new((1 << 100).to_s)

data/spec/spec_helper.rb

@@ -6,76 +6,42 @@ require 'bundler/setup'
 require 'rspec'
 require 'arc'
 require 'arel'
-require 'q/resource_pool'
 require 'timecop'
 
-RSpec.configure do |config|
-  config.after(:all) do
-    ArcTest.drop
-  end
-end
-
 module ArcTest
   DEFAULT_ADAPTER = 'sqlite'
   
-  class StoreProvider < ResourcePool
-    def create_resource
-      Arc::DataStores[ArcTest.adapter].new ArcTest.current_config    
-    end
-  end  
-  
   class << self
-
-    def config_key
+    def env
       @config_key ||= (ENV['ARC_ENV'] ||= ArcTest::DEFAULT_ADAPTER).to_sym
-    end    
-    
-    def file_root
-      @file_root  ||= "#{File.dirname __FILE__}/support/schemas"      
-    end    
-    
-    def config
-      @config ||= YAML::load(File.read "#{File.dirname __FILE__}/support/config.yml").symbolize_keys!
     end
-    
-    def drop
-      return unless @schema_loaded
-      @drop_ddl ||= File.read "#{file_root}/drop_#{config_key}.sql"
-      provider.with_resource { |store| store.schema.execute_ddl @drop_ddl }
-      @schema_loaded = false
-    end
-    
-    def load_schema
-      return if @schema_loaded
-      @ddl ||= File.read "#{file_root}/#{config_key}.sql"
-      provider.with_resource { |store| store.schema.execute_ddl @ddl }
-      @schema_loaded = true
+    alias :adapter :env
+    def adapter
+      env
     end
     
-    def reset_schema
-      drop
-      load_schema
-    end      
-    
-    def with_store
-      reset_schema
-      provider.with_resource do |store|
-        yield store
+    def get_store
+      @store = begin
+        s = Arc::DataStores[ArcTest.adapter].new ArcTest.config
+        Arel::Table.engine = s
+        s.schema.execute_ddl File.read("spec/support/schemas/#{adapter}.sql")
+        load "spec/support/seed.rb"
+        s
       end
     end
     
-    def current_config
-      config[config_key]
+    def drop_store store
+      store.schema.execute_ddl File.read("spec/support/schemas/drop_#{adapter}.sql")
     end
     
-    def adapter
-      current_config[:adapter].to_sym
+    def _config
+      @config ||= YAML::load(File.read "spec/support/config.yml").symbolize_keys!
     end
     
-    private
-    def provider
-      @provider ||= StoreProvider.new nil
+    def config
+      _config[env]
     end
+
   end
 
 end

data/spec/support/seed.rb

@@ -54,7 +54,7 @@ data.each_pair do |name, tuples|
       [table[key], tuple[key]]
     end
     stmt.insert(values)
-    record = Arel::Table.engine.create(stmt.to_sql)
+    record = Arel::Table.engine.create(stmt)
     ids[name][record[:name]] = record[:id]
   end
 end
@@ -70,5 +70,5 @@ power_sets.each do |set|
     [power_map[:superhero_id], ids[:superheros][set[0]]],
     [power_map[:power_id], ids[:powers][set[1]]]
   ])
-  Arel::Table.engine.create im.to_sql
+  Arel::Table.engine.create im
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-27 00:00:00.000000000Z
+date: 2011-12-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: agent-q
-  requirement: &70144475547120 !ruby/object:Gem::Requirement
+  requirement: &70332275934140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144475547120
+  version_requirements: *70332275934140
 - !ruby/object:Gem::Dependency
   name: arel
-  requirement: &70144475546620 !ruby/object:Gem::Requirement
+  requirement: &70332275933640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144475546620
+  version_requirements: *70332275933640
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70144475546020 !ruby/object:Gem::Requirement
+  requirement: &70332275932980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144475546020
+  version_requirements: *70332275932980
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70144475545200 !ruby/object:Gem::Requirement
+  requirement: &70332275932240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144475545200
+  version_requirements: *70332275932240
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70144475544780 !ruby/object:Gem::Requirement
+  requirement: &70332275931820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144475544780
+  version_requirements: *70332275931820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70144475544360 !ruby/object:Gem::Requirement
+  requirement: &70332275931360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144475544360
+  version_requirements: *70332275931360
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70144475543720 !ruby/object:Gem::Requirement
+  requirement: &70332275930860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144475543720
+  version_requirements: *70332275930860
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70144475543240 !ruby/object:Gem::Requirement
+  requirement: &70332275930440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144475543240
+  version_requirements: *70332275930440
 description: Compatible with mysql, sqlite, and postgres
 email:
 - jacob.s.morris@gmail.com
@@ -109,11 +109,12 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
+- README.md
+- README.md.orig
 - Rakefile
 - arc.gemspec
 - lib/arc.rb
 - lib/arc/casting.rb
-- lib/arc/data_stores.rb
 - lib/arc/data_stores/abstract/arel_compatibility.rb
 - lib/arc/data_stores/abstract/object_definitions.rb
 - lib/arc/data_stores/abstract/store.rb
@@ -130,12 +131,11 @@ files:
 - spec/data_stores/abstract/arel_compatibility_spec.rb
 - spec/data_stores/abstract/object_definitions_spec.rb
 - spec/data_stores/abstract/store_spec.rb
-- spec/data_stores/integration/crud_spec.rb
-- spec/data_stores/integration/schema_spec.rb
 - spec/data_stores/mysql/store_spec.rb
 - spec/data_stores/postgres/store_spec.rb
 - spec/data_stores/sqlite/store_spec.rb
 - spec/data_stores_spec.rb
+- spec/integration_spec.rb
 - spec/quoting_spec.rb
 - spec/spec_helper.rb
 - spec/support/config.yml
@@ -180,12 +180,11 @@ test_files:
 - spec/data_stores/abstract/arel_compatibility_spec.rb
 - spec/data_stores/abstract/object_definitions_spec.rb
 - spec/data_stores/abstract/store_spec.rb
-- spec/data_stores/integration/crud_spec.rb
-- spec/data_stores/integration/schema_spec.rb
 - spec/data_stores/mysql/store_spec.rb
 - spec/data_stores/postgres/store_spec.rb
 - spec/data_stores/sqlite/store_spec.rb
 - spec/data_stores_spec.rb
+- spec/integration_spec.rb
 - spec/quoting_spec.rb
 - spec/spec_helper.rb
 - spec/support/config.yml

data/lib/arc/data_stores.rb

@@ -1,9 +0,0 @@
-require 'arc/data_stores/abstract/store'
-
-module Arc
-  module DataStores
-    extend Q::Dispatcher
-    require_pattern "arc/data_stores/%s/store.rb"
-    constant_suffix "DataStore"
-  end
-end

data/spec/data_stores/integration/crud_spec.rb

@@ -1,107 +0,0 @@
-require 'spec_helper'
-require 'pp'
-module Arc
-  module DataStores
-    describe 'The data store crud operations' do
-      #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
-      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 '#create and #read'  do
-        before :each do
-          Timecop.freeze Time.now do
-            @created_at = Time.parse('2011-12-27 11:52:56 -0700')
-            properties = {
-              :name => "green hornet",
-              :born_on => @created_at,
-              :photo => File.read('spec/support/resources/ironman.gif'),
-              :created_at => @created_at
-            }
-            im = Arel::InsertManager.new Arel::Table.engine
-            im.insert values_array(:superheros, properties)
-            @result = @store.create im.to_sql
-          end
-        end
-        
-        it 'creates a new record' do
-          superheros = @tables[:superheros]
-          query = @tables[:superheros]
-            .project(
-              superheros[:name],
-              superheros[:born_on],
-              superheros[:created_at],
-              superheros[:photo]
-            )
-            .where(@tables[:superheros][:name].eq('green hornet'))
-          result = @store.read query
-          result[0][:name].should == 'green hornet'
-          result[0][:born_on].should == Date.today
-          result[0][:created_at].should == @created_at
-          result[0][:photo].should == File.read('spec/support/resources/ironman.gif').force_encoding("BINARY")
-        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
-          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 
-          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
-
-    end
-  end
-end

data/spec/data_stores/integration/schema_spec.rb

@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-module Arc
-  module DataStores
-    module ObjectDefinitions
-      describe "All the Schemas!" do
-        it 'lists the table names' do
-          ArcTest.with_store do |store|
-            [:superheros, :powers, :superheros_powers].each do |t|
-              store.schema.table_names.should include(t)
-            end
-          end
-        end
-      
-        it 'provides a Table object for each table' do
-          ArcTest.with_store do |store|
-            heros = store[:superheros]
-            heros.should be_a(Table)
-            heros.column_names.should include(:id)
-            heros.column_names.should include(:name)
-          end
-        end
-      
-        it 'provides a Column object for each column' do
-          ArcTest.with_store do |store|
-            heros = store[:superheros]
-            id = heros[:id]
-            id.should be_a(Column)
-            id.pk?.should be_true
-            id.allows_null?.should be_false
-            id.default.should be_nil
-            id.name.should == "id"
-            id.type.should == :integer
-          
-            #name column
-            name = heros[:name]
-            name.should be_a(Column)
-            name.pk?.should be_false
-            name.allows_null?.should be_false
-            name.default.should be_nil
-            name.name.should == "name"
-            name.type.should == :varchar
-          end
-        end
-
-      end
-    end
-  end
-end