m4dbi 0.6.2 → 0.7.0

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: m4dbi
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors: 
 - Pistos
@@ -9,58 +10,46 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-10 00:00:00 -04:00
+date: 2011-08-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: metaid
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dbi
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: M4DBI provides models, associations and some convenient extensions to Ruby DBI.
+  version_requirements: *id001
+description: M4DBI provides models, associations and some convenient extensions to RDBI.
 email: pistos at purepistos dot net
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- HIM
-- READHIM
+- README
 - CHANGELOG
 - LICENCE
 files: 
-- HIM
-- READHIM
+- README
 - CHANGELOG
 - LICENCE
-- lib/m4dbi.rb
-- lib/m4dbi/row.rb
-- lib/m4dbi/array.rb
+- lib/m4dbi/database.rb
+- lib/m4dbi/model.rb
 - lib/m4dbi/traits.rb
 - lib/m4dbi/collection.rb
 - lib/m4dbi/hash.rb
-- lib/m4dbi/database-handle.rb
-- lib/m4dbi/model.rb
-- lib/m4dbi/timestamp.rb
-- spec/dbi.rb
-- spec/hash.rb
+- lib/m4dbi/array.rb
+- lib/m4dbi/error.rb
+- lib/m4dbi.rb
+- spec/database.rb
 - spec/model.rb
 - spec/helper.rb
+- spec/hash.rb
 has_rdoc: true
 homepage: http://purepistos.net/m4dbi
 licenses: []
@@ -71,26 +60,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: 
+- rdbi
 - bacon (optional)
-rubyforge_project: m4dbi
-rubygems_version: 1.3.4
+rubyforge_project: 
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Models (and More) for DBI
+summary: Models (and More) for RDBI
 test_files: 
-- spec/dbi.rb
-- spec/hash.rb
+- spec/database.rb
 - spec/model.rb
 - spec/helper.rb
+- spec/hash.rb

data/HIM

@@ -1,50 +0,0 @@
-== M4DBI - Models (and more) For DBI
-
-http://purepistos.net/m4dbi
-
-M4DBI is a Ruby library that provides ORM modelling to the Ruby DBI package
-( http://ruby-dbi.rubyforge.org/ ).
-
-=== Dependencies
-
-  - dbi (of course) http://ruby-dbi.rubyforge.org/
-    - DBDs for your choice of DBs
-  - metaid (gem install metaid)
-  - bacon (optional, for running tests; gem install bacon)
-    
-=== Installation
-
-==== Nightly Gem
-
-  wget http://rome.purepistos.net/m4dbi/m4dbi-nightly.gem
-  gem install m4dbi-nightly.gem
-  
-==== Repository
-
-To use the repository version, you need git ( http://git.or.cz ).
-Chances are, there is a git package for your Linux/UNIX flavour.
-
-  cd /where/you/want/m4dbi
-  git clone git://github.com/Pistos/m4dbi.git
-  
-Change the following to whatever the equivalent paths are for your system:
-
-  cd /usr/lib/ruby/site_ruby/1.8
-  ln -s /path/to/cloned/m4dbi/lib/m4dbi
-  ln -s /path/to/cloned/m4dbi/lib/m4dbi.rb
-
-=== Usage
-
-See http://rome.purepistos.net/m4dbi/examples/ .  These are automatically
-generated from the spec files under the spec/ dir.
-
-=== Source Code
-
-Browse source at http://github.com/Pistos/m4dbi/tree/master .
-See coverage at http://rome.purepistos.net/m4dbi/rcov .
-Very limited rdocs at http://rome.purepistos.net/m4dbi/rdoc .
-
-=== Feedback and Support
-
-On IRC: irc.freenode.net ##mathetes or ##ramaze .
-Use http://mibbit.com if you don't have an IRC client.

data/lib/m4dbi/database-handle.rb

@@ -1,117 +0,0 @@
-require 'dbi'
-require 'thread'
-
-module DBI
-  
-  # Here, we engage in some hackery to get database handles to provide us
-  # with the name of the database connected to.  For mystical reasons, this
-  # is hidden in normal DBI.
-  # Retrieve the database name with DatabaseHandle#dbname.
-  module DBD; module Pg
-    module ConnectionDatabaseNameAccessor
-      def dbname
-        @connection.db
-      end
-    end
-    module DatabaseNameAccessor
-      def dbname
-        @handle.dbname
-      end
-    end
-  end; end
-  
-  module DBD; module Mysql
-    module DatabaseNameAccessor
-      def dbname
-        select_column( "SELECT DATABASE()" )
-      end
-    end
-  end; end
-  
-  module DBD; module SQLite3
-    module DatabaseNameAccessor
-      def dbname
-        select_one( "PRAGMA database_list" )[ 2 ]
-      end
-    end
-  end; end
-  
-  class DatabaseHandle
-    attr_reader :transactions
-    
-    alias old_initialize initialize
-    def initialize( *args )
-      DBI::DatabaseHandle.last_handle = self
-      handle = old_initialize( *args )
-      @mutex = Mutex.new
-      @transactions = Array.new
-      
-      # Hackery to expose dbname.
-      if defined?( DBI::DBD::Pg::Database ) and ( DBI::DBD::Pg::Database === @handle )
-        @handle.extend DBI::DBD::Pg::ConnectionDatabaseNameAccessor
-        extend DBI::DBD::Pg::DatabaseNameAccessor
-      elsif defined?( DBI::DBD::Mysql::Database ) and ( DBI::DBD::Mysql::Database === @handle )
-        extend DBI::DBD::Mysql::DatabaseNameAccessor
-      elsif defined?( DBI::DBD::SQLite3::Database ) and ( DBI::DBD::SQLite3::Database === @handle )
-        extend DBI::DBD::SQLite3::DatabaseNameAccessor
-      end
-      # TODO: more DBDs
-      
-      handle
-    end
-    
-    # Atomically disable autocommit, do transaction, and reenable.
-    # Used for a single transaction when autocommit is normally left on.
-    # Only one thread can execute one_transaction at a time,
-    # since we need to thread protect the AutoCommit property of the
-    # database handle.
-    def one_transaction
-      @mutex.synchronize do
-        # Keep track of transactions for debugging purposes
-        transaction = { :time => ::Time.now, :stack => caller }
-        @transactions << transaction
-        
-        auto_commit = self[ 'AutoCommit' ]
-        self[ 'AutoCommit' ] = false
-        result = transaction do
-          yield self
-        end
-        self[ 'AutoCommit' ] = auto_commit
-        
-        @transactions.delete transaction
-        result
-      end
-    end
-    
-    def select_column( statement, *bindvars )
-      row = select_one( statement, *bindvars )
-      if row
-        row[ 0 ]
-      else
-        raise DBI::DataError.new( "Query returned no rows." )
-      end
-    end
-    
-    alias s select_all
-    alias s1 select_one
-    alias sc select_column
-    alias u do
-    alias i do
-    alias d do
-    
-    class << self
-      def last_handle
-        @handle# ||= create_handle
-      end
-      
-      def last_handle=( handle )
-        @handle = handle
-      end
-    end
-    
-  end
-end
-
-
-
-

data/lib/m4dbi/row.rb

@@ -1,35 +0,0 @@
-require 'dbi'
-
-module DBI
-  class Row
-    def method_missing( method, *args )
-      if method.to_s =~ /^(.+)=$/
-        field = $1
-        if not @column_names.include?( field )
-          field = convert_alternate_fieldname( field )
-        end
-        if @column_names.include?( field )
-          self[ field ] = args[ 0 ]
-        else
-          super
-        end
-      else
-        field = method.to_s
-        # We shouldn't use by_field directly and test for nil,
-        # because nil may be a valid value for the column.
-        if not @column_names.include?( field )
-          field = convert_alternate_fieldname( field )
-        end
-        if @column_names.include?( field )
-          by_field field
-        else
-          super
-        end
-      end
-    end
-
-    def convert_alternate_fieldname( field )
-      field.gsub( /(^_)|(_$)/ , '' )
-    end
-  end
-end

data/lib/m4dbi/timestamp.rb

@@ -1,20 +0,0 @@
-module DBI
-  class Timestamp
-    def method_missing( method, *args )
-      t = to_time
-      begin
-        t.send( method, *args )
-      rescue NoMethodError => e
-        raise NoMethodError.new(
-          "undefined method '#{method}' for #{self}",
-          method,
-          args
-        )
-      end
-    end
-    
-    def <=>( other )
-      to_time <=> other.to_time
-    end
-  end
-end

data/spec/dbi.rb

@@ -1,142 +0,0 @@
-require 'spec/helper'
-
-$dbh = connect_to_spec_database
-reset_data
-
-describe 'DBI::DatabaseHandle#select_column' do
-
-  it 'selects one column' do
-    name = $dbh.select_column(
-      "SELECT name FROM authors LIMIT 1"
-    )
-    name.class.should.not.equal Array
-    name.should.equal 'author1'
-
-    null = $dbh.select_column(
-      "SELECT c4 FROM many_col_table WHERE c3 = 40"
-    )
-    null.should.be.nil
-
-    should.raise( DBI::DataError ) do
-      $dbh.select_column( "SELECT name FROM authors WHERE 1+1 = 3" )
-    end
-  end
-
-  it 'selects one column of first row' do
-    name = $dbh.select_column(
-      "SELECT name FROM authors ORDER BY name DESC"
-    )
-    name.should.equal 'author3'
-  end
-
-  it 'selects first column of first row' do
-    name = $dbh.select_column(
-      "SELECT name, id FROM authors ORDER BY name DESC"
-    )
-    name.should.equal 'author3'
-  end
-end
-
-describe 'DBI::DatabaseHandle#one_transaction' do
-
-  it 'turns off autocommit for the duration of a single transaction' do
-    $dbh.d( "DELETE FROM many_col_table;" )
-    $dbh.i( "INSERT INTO many_col_table ( id, c1 ) VALUES ( 1, 10 );" )
-
-    # Here we will attempt to increment a value two times in parallel.
-    # If each multi-operation transaction is truly atomic, we expect that
-    # the final value will reflect two increments.
-    # If atomicity is not respected, the value should only reflect one
-    # increment.
-
-    # First, we test the non-transactional case, to show failure.
-
-    thread1 = Thread.new do
-      value = $dbh.sc "SELECT c1 FROM many_col_table WHERE id = 1;"
-      value.should.equal 10
-      sleep 1 # seconds
-      $dbh.u "UPDATE many_col_table SET c1 = ?", ( value + 1 )
-    end
-
-    sleep 0.5
-
-    thread2 = Thread.new do
-      value = $dbh.sc "SELECT c1 FROM many_col_table WHERE id = 1;"
-      value.should.equal 10
-      # Update right away
-      $dbh.u "UPDATE many_col_table SET c1 = ?", ( value + 1 )
-    end
-
-    thread2.join
-    thread1.join
-
-    value = $dbh.sc "SELECT c1 FROM many_col_table WHERE id = 1;"
-    # Failure; two increments should give a final value of 12.
-    value.should.equal( 10 + 1 )
-
-    # Now, we show that transactions keep things sane.
-
-    thread1 = Thread.new do
-      $dbh.one_transaction do |dbh|
-        value = dbh.sc "SELECT c1 FROM many_col_table WHERE id = 1;"
-        sleep 1 # seconds
-        dbh.u "UPDATE many_col_table SET c1 = ?", ( value + 1 )
-      end
-    end
-
-    sleep 0.5
-
-    thread2 = Thread.new do
-      $dbh.one_transaction do |dbh|
-        value = dbh.sc "SELECT c1 FROM many_col_table WHERE id = 1;"
-        # Update right away
-        dbh.u "UPDATE many_col_table SET c1 = ?", ( value + 1 )
-      end
-    end
-
-    thread2.join
-    thread1.join
-
-    value = $dbh.sc "SELECT c1 FROM many_col_table WHERE id = 1;"
-    value.should.equal( 11 + 1 + 1 )
-
-    reset_data
-  end
-
-end
-
-describe 'DBI::Row accessors' do
-
-  it 'provide read access via #fieldname' do
-    row = $dbh.select_one(
-      "SELECT * FROM posts ORDER BY author_id DESC LIMIT 1"
-    )
-    row.should.not.equal nil
-
-    row._id.should.be.same_as row[ 'id' ]
-    row.id_.should.be.same_as row[ 'id' ]
-    row.author_id.should.be.same_as row[ 'author_id' ]
-    row.text.should.be.same_as row[ 'text' ]
-
-    row.text.should.equal 'Second post.'
-  end
-
-  it 'provide in-memory (non-syncing) write access via #fieldname=' do
-    row = $dbh.select_one(
-      "SELECT * FROM posts ORDER BY author_id DESC LIMIT 1"
-    )
-    row.should.not.equal nil
-
-    old_id = row._id
-    row.id = old_id + 1
-    row._id.should.not.equal old_id
-    row._id.should.equal( old_id + 1 )
-
-    old_text = row.text
-    new_text = 'This is the new post text.'
-    row.text = new_text
-    row.text.should.not.equal old_text
-    row.text.should.equal new_text
-  end
-
-end