beezwax 0.1.4 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/lib/btrieve/btrieve_core.rb

@@ -31,14 +31,7 @@ module Btrieve
 
   def self.create_string_buffer(size)
     0.chr*(size)
-  end
-  
-  #def dir_voodoo(session)
-  #  wd=Dir.pwd
-  #  Dir.chdir(session.pathname)
-  #  yield
-  #  Dir.chdir(wd)    
-  #end
+  end  
   
 end
 
@@ -60,8 +53,6 @@ end
 require_relative 'btrieve_session'
 require_relative 'btrieve_table'
 require_relative 'btrieve_schema'
-require_relative 'btrieve_meta'
+require_relative 'btrieve_map'
 require_relative 'btrieve_record'
 require_relative 'btrieve_model'
-require_relative 'fos_code'
-

data/lib/btrieve/btrieve_map.rb

@@ -0,0 +1,28 @@
+class BtrieveMap
+  include Btrieve
+
+  attr_accessor :mapping
+  
+  def initialize()
+    @mapping={}
+  end
+
+  def up(tablename, column_name, value)
+    db_cast(tablename, column_name, value, :up)
+  end
+
+  def down(tablename, column_name, value)
+    db_cast(tablename, column_name, value, :down)
+  end
+
+  private
+
+  def db_cast(tablename, column_name, value, mode)
+    table=mapping[tablename.to_s]
+    return value if(table.nil?)
+    column=table[column_name.to_s]
+    return value if(column.nil?)
+    column[mode].call(value)
+  end
+
+end

data/lib/btrieve/btrieve_record.rb

@@ -61,18 +61,12 @@ class BtrieveRecord
     schema_key=get_schema_key(key_name)
     return nil if(schema_key.nil?)
     raw_data=@data_buffer.unpack(schema_key[:unpacker])[0]
-    meta = @session.btrieve_meta
-    return raw_data if meta.nil?    # BS LOC - I'm ashamed
-    meta.up(@btrieve_table.tablename, key_name, raw_data)
+    btrieve_map = @session.btrieve_map
+    btrieve_map.up(@btrieve_table.tablename, key_name, raw_data)
   end
-
-#  def [](key_name)
-#    schema_key = get_schema_key(key_name)
-#    @data_buffer.unpack(schema_key[:unpacker])[0] if schema_key
-#  end
   
   def []=(key_name, raw_data)
-    value=@session.btrieve_meta.down(@btrieve_table.tablename, key_name, raw_data)
+    value=@session.btrieve_map.down(@btrieve_table.tablename, key_name, raw_data)
     schema_key = get_schema_key(key_name)
     packer_string = schema_key[:unpacker]
     match = packer_string.match(/@(\d+)([a-zA-Z]+)(\d*)/)

data/lib/btrieve/btrieve_session.rb

@@ -1,7 +1,8 @@
 class BtrieveSession
   SESSIONS = {}
   include Btrieve
-  attr_reader :pathname, :client_id, :cache, :model_classes, :btrieve_schema, :btrieve_meta
+  attr_reader :pathname, :client_id, :cache, :model_classes, :btrieve_schema
+  attr_accessor :btrieve_map
 
   def self.set_context(pathname)
     session = get_session
@@ -43,7 +44,7 @@ class BtrieveSession
     @client_id = "#{0.chr*12}#{[0x5257].pack('S')}#{rand(65535)}"
     btr_op(self, SET_DIRECTORY, NULL_BUFFER, NULL_BUFFER, @pathname, NULL_KEY)
     @btrieve_schema = BtrieveSchema.new(self)
-    @btrieve_meta = BtrieveMeta.new(self)
+    @btrieve_map = BtrieveMap.new()
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beezwax
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Patrick Lardin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -07:00
+date: 2010-08-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,13 +53,12 @@ files:
 - lib/beezwax.rb
 - lib/btrieve/btrieve_const.rb
 - lib/btrieve/btrieve_core.rb
-- lib/btrieve/btrieve_meta.rb
+- lib/btrieve/btrieve_map.rb
 - lib/btrieve/btrieve_model.rb
 - lib/btrieve/btrieve_record.rb
 - lib/btrieve/btrieve_schema.rb
 - lib/btrieve/btrieve_session.rb
 - lib/btrieve/btrieve_table.rb
-- lib/btrieve/fos_code.rb
 - test/helper.rb
 - test/test_beezwax.rb
 has_rdoc: true

data/lib/btrieve/btrieve_meta.rb

@@ -1,63 +0,0 @@
-class BtrieveMeta
-  include Btrieve
-
-  TO_FOS_DATE=lambda{|date|Date.strptime(date,"%Y%m%d").jd-Date.parse("1900/01/01").jd+1}
-  FROM_FOS_DATE=lambda{|day|Date.jd(day.to_i+Date.parse("1900/01/01").jd-1)}
-  TO_FOS_TIME=lambda{|time|time[0,2].to_i*60+time[3,2].to_i}
-  FROM_FOS_TIME=lambda{|time|"#{time.to_i/60}:#{(time.to_i%60).to_s.rjust(2,"0")}"}
-
-  def initialize(session)
-    @session=session
-    @mapping={
-      "passengers"=>{
-#        "birthday"=>{:up=>FROM_FOS_DATE, :down=>TO_FOS_DATE},
-#        "last flown"=>{:up=>FROM_FOS_DATE, :down=>TO_FOS_DATE}
-      },
-      "trip legs"=>{
-#        "dept date act local"=>{:up=>FROM_FOS_DATE, :down=>TO_FOS_DATE},
-#        "dept time act local"=>{:up=>FROM_FOS_TIME, :down=>TO_FOS_TIME},
-#        "arr date act local"=>{:up=>FROM_FOS_DATE, :down=>TO_FOS_DATE},
-#        "arriv time act local"=>{:up=>FROM_FOS_TIME, :down=>TO_FOS_TIME},
-#        "flight time actual"=>{:up=>FROM_FOS_TIME, :down=>TO_FOS_TIME},
-#        "leg type code"=>{:up=>FROM_FOS_CODE('trip_type___'), :down=>TO_FOS_CODE('trip_type___')},
-#        "leg purpose code"=>{:up=>FROM_FOS_CODE('purpose_____'), :down=>TO_FOS_CODE('purpose_____')}
-      }
-    }
-    @codes={}
-    codes_table=@session.get_table("codes")[0]
-    codes_table.each_record(BtrCodes::READ_ONLY_MODE) do |row|
-      group=row[:name]
-      code=row[:code]
-      description=row[:description]
-      value=row[:value]
-      group_map=@codes[group]||={}
-      group_map[value]=FosCode.new(group, value, code, description)
-    end
-  end
-
-  def up(tablename, column_name, value)
-    db_cast(tablename, column_name, value, :up)
-  end
-
-  def down(tablename, column_name, value)
-    db_cast(tablename, column_name, value, :down)
-  end
-
-  private
-
-  def db_cast(tablename, column_name, value, mode)
-    table=@mapping[tablename.to_s]
-    return value if(table.nil?)
-    column=table[column_name.to_s]
-    return value if(column.nil?)
-    column[mode].call(value)
-  end
-
-  def FROM_FOS_CODE(groupname)
-    lambda{|value|@codes[groupname][value]}
-  end
-
-  def TO_FOS_CODE(groupname)
-    lambda{|value|@codes[groupname][value].value}
-  end
-end

data/lib/btrieve/fos_code.rb

@@ -1,13 +0,0 @@
-class FosCode
-  attr_reader :group, :value, :code, :description
-  def initialize(group, value, code, description)
-    @group=group
-    @value=value
-    @code=code
-    @description=description
-  end
-
-  def to_s
-    @description
-  end
-end