activemdb 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,9 @@
+== 0.2.2 / 2007-04-18
+
+Reworked conditions_hash call to handle either field or method names.
+Methodized the attributes hash for Base.
+Added much documentation
+
 == 0.2.1 / 2007-04-10
 
 Added typecasting so that the strings returned from mdb-sql become happy appropriate Ruby things.

data/lib/active_mdb.rb

@@ -1,6 +1,6 @@
 $:.unshift(File.dirname(__FILE__))
 module ActiveMDB
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end
 
 

data/lib/active_mdb/base.rb

@@ -128,34 +128,39 @@ module ActiveMDB
       # e.g. search_with_hash(:first_name => 'Matthew', :last_name => 'King')
       def conditions_from_hash(hash)
         MDBTools.compile_conditions(hash) do |column_name, value|
-          column = column_for(column_name)
+          column = column_for_method(column_name) || column_for_field(column_name)
+          raise ArgumentError, "No column corresponding to #{column_name}" unless column
           case column.klass.to_s
           when 'Fixnum', 'Float'
-            "#{column_name} = #{value}"
+            "#{column.name} = #{value}"
           when 'String'
-            "#{column_name} LIKE '%#{value}%'"
+            "#{column.name} LIKE '%#{value}%'"
           when 'Object'
             value = value ? 1 : 0
-            "#{column_name} IS #{value}"
+            "#{column.name} IS #{value}"
           end
         end
       end
       
       # given the name of a column, return the Column object
-      def column_for(column_name)
+      def column_for_field(column_name)
         columns.detect {|c| c.name == column_name.to_s}
       end
       
+      def column_for_method(method_name)
+        columns.detect {|c| c.method_name == method_name.to_s}
+      end
+      
       private
       
       def instantiate(record)
         new_hash = {}
         record.each do |name,value|
-          begin
-            new_hash[name] = column_for(name).type_cast(value)
-          rescue
-            raise "No column for #{name}"
-          end
+          # begin
+            new_hash[MDBTools.methodize(name)] = column_for_field(name).type_cast(value)
+          # rescue
+          #   raise "No column for #{name}"
+          # end
         end
         self.new new_hash
       end
@@ -166,7 +171,7 @@ module ActiveMDB
     private
     
     def method_missing(method_id, *args, &block)
-       method_name = method_id.to_s
+       method_name = MDBTools.methodize(method_id.to_s)
        if @attributes.include?(method_name)
          value = @attributes[method_name]
        else

data/lib/active_mdb/column.rb

@@ -46,6 +46,10 @@ class Column
     end
   end
   
+  def self.string_to_time(string)
+    string
+  end
+  
   # provided any argument, returns the mdb-tools version 
   # of truth (which is to say, 1 or 0)
   def self.value_to_boolean(value)

data/test/test_base.rb

@@ -18,6 +18,13 @@ class BaseTest < Test::Unit::TestCase
     set_primary_key 'Room'
   end
   
+  class Person < ActiveMDB::Base
+    set_mdb_file RETREAT_DB
+    set_table_name 'tblIndividData'
+    set_primary_key 'IndKey'
+  end
+
+  
   def test_setting_mdb_file
     assert_equal TEST_DB, Employee.mdb_file
   end
@@ -60,10 +67,12 @@ class BaseTest < Test::Unit::TestCase
   def test_instantiate
     hash = {"Department"=>"Engineering", "Gender"=>"M", "Room"=>"6072", "Title"=>"Programmer", "Emp_Id"=>"1045", "First_Name"=>"Robert", "Last_Name"=>"Weinfeld"}
     record = Employee.send(:instantiate, hash)
-    assert_equal hash, record.instance_variable_get('@attributes')
+    methodized_hash = {}
+    hash.each {|k,v| methodized_hash[MDBTools.methodize(k)] = v}
+    assert_equal methodized_hash, record.instance_variable_get('@attributes')
     hash = {"Area"=>"135.38","Entity_Handle"=>"9D7A","Room"=>"6004","Room_Type"=>"STOR-GEN"}
     record = Room.send(:instantiate, hash)
-    assert_kind_of Float, record.instance_variable_get('@attributes')['Area']
+    assert_kind_of Float, record.instance_variable_get('@attributes')['area']
   end
   
   def test_find_from_hash
@@ -97,10 +106,15 @@ class BaseTest < Test::Unit::TestCase
     assert_equal 2, Employee.find_all(:First_Name => 'G').size
   end
   
-  def test_column_for
-    assert_kind_of Column, Employee.column_for(:Room)
-    assert_nil Employee.column_for('foo')
+  def test_column_for_field
+    assert_kind_of Column, Employee.column_for_field(:Room)
+    assert_nil Employee.column_for_field('foo')
   end
   
+  def test_column_for_method
+    assert_kind_of Column, Employee.column_for_method(:room)
+  end
+
+  
 
 end

data/test/test_column.rb

@@ -16,4 +16,11 @@ class ColumnTest < Test::Unit::TestCase
   
 
   
+  # def test_string_to_time
+  #   time = '05/18/76 00:00:00'
+  #   t2 = "02/17/47 00:00:00"
+  #   assert_equal 1976, Column.string_to_time(time).year
+  #   assert_equal 5, Column.string_to_time(time).month
+  # end
+  
 end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
   TEST_DB =  File.join(File.dirname(__FILE__), '..', 'db', 'sample.mdb')
+  RETREAT_DB =  File.join(File.dirname(__FILE__), '..', 'db', 'retreat.mdb')
   NOT_A_DB =  File.join(File.dirname(__FILE__), '..', 'db', 'not_an_mdb.txt')
 
 class Test::Unit::TestCase

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: activemdb
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-04-10 00:00:00 -05:00
+  version: 0.2.2
+date: 2007-04-18 00:00:00 -05:00
 summary: ActiveRecordy wrapper around MDB Tools, allowing POSIX platforms to read MS Access (.mdb) files
 require_paths: 
 - lib