fossil 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Lardin, Daniel Sudol"]
-  s.date = %q{2010-01-15}
+  s.date = %q{2010-01-24}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{plardin@xojet.com}
   s.files = [

data/lib/sequel/fos_dates.rb

@@ -11,44 +11,66 @@ class Date
   end
 end
 
-class Time
-  DATE_FORMATS[:hm] = "%H:%M"
+module TimeFunctions
 
-  alias :original_to_s :to_s
-  def to_s(args=nil)
-    args = :hm unless args
-    self.original_to_s(args)
+  def self.included(klass)
+    klass.send(:include,TimeFunctions::InstanceMethods)
+    klass.send(:extend,TimeFunctions::ClassMethods)
   end
 
-  # creates utc time from minutes
-  def self.from_fos_time(minutes)
-   DateTime.new(2000,1,1).advance(:minutes=>minutes).to_time
-  end
+  module InstanceMethods
+    def as_minutes
+      hour*60 + min
+    end
 
-  def as_minutes
-    hour*60 + min
-  end
+    def in_hundredths
+      return 0 if hour + min == 0
+      minutes = hour*60 + min
+      val = "#{minutes/60}.#{((100*(minutes.modulo(60)))/60).to_s.rjust(2, '0')}"
+      BigDecimal.new(val, 2).round(1).to_s
+    end
+
+    def in_hundredths_rounded_XOJET_style
+      return 0 if hour + min == 0
+      # It was determined that "ODD" increments of .05 (ie .15, .35, .55, .75, .95) of an hour (ie. 9,21,33,45,57 minutes) rounded UP whereas even increments of .05 rounded DOWN - sn
+      minutes = hour*60 + min
+      (minutes/60.0 + ([9, 21, 33, 45, 57].include?( min ) ? 0.001 : -0.001)).round(2)
+      #minutes/60.0
+    end
 
-  def in_hundredths
-    return 0 if hour + min == 0 
-    minutes = hour*60 + min
-    val = "#{minutes/60}.#{((100*(minutes.modulo(60)))/60).to_s.rjust(2,'0')}"
-    BigDecimal.new(val, 2).round(1).to_s
+    def in_tenths_rounded_XOJET_style
+      return 0 if hour + min == 0
+      # It was determined that "ODD" increments of .05 (ie .15, .35, .55, .75, .95) of an hour (ie. 9,21,33,45,57 minutes) rounded UP whereas even increments of .05 rounded DOWN - sn
+      minutes = hour*60 + min
+      (minutes/60.0 + ([9, 21, 33, 45, 57].include?( min ) ? 0.01 : -0.01)).round(1)
+    end
   end
-    
-  def in_hundredths_rounded_XOJET_style
-    return 0 if hour + min == 0
-    # It was determined that "ODD" increments of .05 (ie .15, .35, .55, .75, .95) of an hour (ie. 9,21,33,45,57 minutes) rounded UP whereas even increments of .05 rounded DOWN - sn
-    minutes = hour*60 + min
-    (minutes/60.0 + ([9, 21, 33, 45, 57].include?( min ) ? 0.001 : -0.001)).round(2)
-    #minutes/60.0
+
+  module ClassMethods
+    # creates utc time from days and minutes
+    def from_fos_date_time(days, minutes)
+      from_fos_time(days*1440 + minutes)
+    end
+
+    # creates utc time from minutes
+    def from_fos_time(minutes)
+      DateTime.new(1899, 12, 31).advance(:minutes=>minutes)
+    end
   end
+end
+
+class Time
+  include TimeFunctions
+  DATE_FORMATS[:hm] = "%H:%M"
+
+  alias :original_to_s :to_s
 
-  def in_tenths_rounded_XOJET_style
-    return 0 if hour + min == 0
-    # It was determined that "ODD" increments of .05 (ie .15, .35, .55, .75, .95) of an hour (ie. 9,21,33,45,57 minutes) rounded UP whereas even increments of .05 rounded DOWN - sn
-    minutes = hour*60 + min
-    (minutes/60.0 + ([9, 21, 33, 45, 57].include?( min ) ? 0.01 : -0.01)).round(1)
+  def to_s(args=nil)
+    args = :hm unless args
+    self.original_to_s(args)
   end
-    
+end
+
+class DateTime
+  include TimeFunctions
 end

data/lib/sequel/model_patch.rb

@@ -5,27 +5,16 @@ class Sequel::Model
   self.use_transactions=false
   plugin :validation_helpers
 
-  def fill_hash(arr)
-    arr.inject({}) do |hash,column|
-      hash[column]= self.send(column) if self.respond_to?(column)
-      hash 
+  # passing in an array of attribute names, fills a hash with values from the model.
+  def fill_hash(attributes)
+    attributes.inject({}) do |hash,attribute|
+      hash[attribute]= values[attribute] if values.has_key?(attribute)
+      hash
     end
   end
 
   class << self
 
-    def pk_for_select(options={})
-      table = options[:table] || table_name
-      use_alias = options[:alias]
-      primary_key.collect do |k|
-        if use_alias
-          k.qualify(table).as("#{table}_#{k}")
-        else
-          k.qualify(table)
-        end
-      end
-    end
-
     attr_accessor :datatypes, :aliases
 
     def clear_schema
@@ -50,61 +39,13 @@ class Sequel::Model
         key = primary_key
         graph_conditions = { :"#{prefix} kid - date" => :'kid - date', :"#{prefix} kid - time" => :'kid - time', :"#{prefix} kid - user" => :'kid - user', :"#{prefix} kid - mult" => :'kid - mult', :"#{prefix} kid - comm" => :'kid - comm' }
         dataset_filter = proc { class_name.to_s.constantize.filter( :"#{prefix} kid - date"=>self[:'kid - date'], :"#{prefix} kid - time"=>self[:'kid - time'], :"#{prefix} kid - user"=>self[:'kid - user'], :"#{prefix} kid - mult"=>self[:'kid - mult'], :"#{prefix} kid - comm"=>self[:'kid - comm']) }
-        eager_load_proc =
-          proc do |key_hash, parents, associations|
-            id_map = {}
-            filter_args = Hash.new{|k,v| k[v]=[]}
-            parents.each do |p|
-              key_arr = []
-              primary_key.each do |k|
-                key_arr << p[k]
-                filter_args[k] << p[k]
-              end
-              id_map[key_arr] = p
-            end
-            parent_keys = graph_conditions.keys
-            filter_expr = Sequel::SQL::BooleanExpression.new(
-              :OR,
-              *id_map.keys.map{|k| [ [graph_conditions.keys[0], k[0]], [graph_conditions.keys[1], k[1]], [graph_conditions.keys[2], k[2]], [graph_conditions.keys[3], k[3]], [graph_conditions.keys[4], k[4]] ].sql_expr}
-            )
-            class_name.to_s.constantize.filter(filter_expr).all do |h|
-              parent_key_values = parent_keys.collect{|k| h[k]}
-              if d = id_map[parent_key_values]
-                d.associations[assoc_name] = [] unless d.associations[assoc_name]
-                d.associations[assoc_name] << h
-              end
-            end
-          end
-
       when :many_to_one
         key = nil
         graph_conditions = { :'kid - date'=>:"#{prefix} kid - date", :'kid - time'=>:"#{prefix} kid - time", :'kid - user'=>:"#{prefix} kid - user", :'kid - mult'=>:"#{prefix} kid - mult", :'kid - comm'=>:"#{prefix} kid - comm" }
         dataset_filter = proc { class_name.to_s.constantize.filter( :"kid - date"=>self[:"#{prefix} kid - date"], :"kid - time"=>self[:"#{prefix} kid - time"], :"kid - user"=>self[:"#{prefix} kid - user"], :"kid - mult"=>self[:"#{prefix} kid - mult"], :"kid - comm"=>self[:"#{prefix} kid - comm"]) }
-        eager_load_proc =
-          proc do |key_hash, parents, associations|
-            id_map = {}
-            filter_args = Hash.new{|k,v| k[v]=[]}
-            parents.each do |p|
-              key_arr = []
-              primary_key.each do |k|
-                key_arr << p[k]
-                filter_args[k] << p[k]
-              end
-              id_map[key_arr] = p
-            end
-            parent_to_child_keys = graph_conditions.keys
-            filter_expr = Sequel::SQL::BooleanExpression.new(
-              :OR,
-              *id_map.keys.map{|k| [ [parent_to_child_keys[0], k[0]], [parent_to_child_keys[1], k[1]], [parent_to_child_keys[2], k[2]], [parent_to_child_keys[3], k[3]], [parent_to_child_keys[4], k[4]] ].sql_expr}
-            )
-            class_name.to_s.constantize.filter(filter_expr).all do |h|
-              parent_key_values = parent_to_child_keys.collect{|k| h[k]}
-              id_map[parent_key_values].associations[assoc_name] = h
-            end
-        end
       end
       graph_conditions.merge!(options[:graph_only_conditions]) if options[:graph_only_conditions]
-      send(assoc_type, assoc_name, :key=> key, :class => class_name, :dataset=> dataset_filter, :graph_only_conditions=>graph_conditions, :eager_loader => eager_load_proc )
+      send(assoc_type, assoc_name, :key=> key, :class => class_name, :dataset=> dataset_filter, :graph_only_conditions=>graph_conditions)
     end
 
     # for creating an association to the 'Codes' table
@@ -129,14 +70,12 @@ class Sequel::Model
       delegate :description, :to=> assoc_name, :prefix=>true,   :allow_nil => true
     end
 
+    # date_column,time_column should be a Fixnum because fos stores dates,times as numbers
     def column_def_datetime(datetime_column_name, date_column, time_column)
       inst_def datetime_column_name do
-        date = send(:[], date_column)
-        time = send(:[], time_column)
-        date = Date.from_fos_days(date) if date.is_a? Fixnum
-        loc_time = date.to_time
-        time_utc = Time.gm(loc_time.year, loc_time.month, loc_time.day)
-        time_utc + time.minutes
+        days = send(:[], date_column) || 0     # nil defaults to 0 days
+        minutes = send(:[], time_column) || 0  # nil defaults to 0 minutes
+        Time.from_fos_date_time(days, minutes) # returns utc time
       end
     end
 

data/spec/sequel/fos_dates_spec.rb

@@ -2,12 +2,22 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "fos_dates" do
 
+  it "Time and DateTime have proper class methods included from TimeFunctions" do
+    Time.should respond_to(:from_fos_time)
+    DateTime.should respond_to(:from_fos_time)
+  end
+
+  it "Time and DateTime have proper class methods included from TimeFunctions" do
+    Time.new.should respond_to(:as_minutes)
+    DateTime.new.should respond_to(:as_minutes)
+  end
+
   it "converts fos date number to a Ruby Date" do
     Date.from_fos_days(10).should == Date.new(1900,1,10)
   end
 
   it "converts fos time number to a Ruby Time" do
-    Time.from_fos_time(100).should ==  Time.utc(2000,"jan",1,1,40,0)
+    Time.from_fos_time(100).should == DateTime.new(1899,12,31,1,40,0)
   end
 
   it "converts a Ruby Time to hundredths" do
@@ -21,5 +31,4 @@ describe "fos_dates" do
   it "Time view defaults to M:H" do
     Time.parse('Sept 9, 2009 07:10').to_s.should == "07:10"
   end
-
 end

data/spec/sequel/model_patch_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/spec_helper_tables' unless metaclass.class_variable_defined? :@@set_up_demo_tables
-
+     
 describe "Sequel::Model extentions" do
-
+           
   it "has fill_hash method" do
     Dude.first.should respond_to(:fill_hash)
     Dude.first.fill_hash([:'kid - date']).should == {:'kid - date'=>1}
@@ -100,9 +100,9 @@ describe "Sequel::Model extentions" do
       @record.my_special_name_view.should == "01:00"
     end
 
-    it "shows correct currency view" do
-      @record.price_currency.should   == "12.15"
-      @record.price_precision.should  == "12.15"
+    it "shows correct currency view" do 
+      @record.price_currency.should   == 12.15
+      @record.price_precision.should  == 12.15
     end
 
     it "shows correct currency view" do
@@ -206,14 +206,22 @@ describe "Sequel::Model extentions" do
   describe "column_def" do
 
     before do
-      add_test_table_data({:date_col => 39992, :time_col=>60})
-    end
-
-    it "datetime" do
       TestTable.column_def_datetime :datetime_col, :date_col, :time_col
+    end
 
+    it "datetime makes method to represent datetime" do
+      add_test_table_data({:date_col => 39992, :time_col => 60})
       TestTable.first.should respond_to(:datetime_col)
-      TestTable.first.datetime_col.should == Time.parse("2009-06-29 01:00 UTC")
+    end
+
+    it "datetime can parse valid dates" do
+      add_test_table_data({:date_col => 39992, :time_col => 60})
+      TestTable.first.datetime_col.should == DateTime.new(2009,6,29,1,0,0)
+    end
+
+    it "datetime can handle nil date or time" do
+      add_test_table_data({:date_col => nil, :time_col => nil})
+      TestTable.first.datetime_col.should == DateTime.new(1899,12,31,0,0,0)
     end
 
   end

data/spec/spec_helper.rb

@@ -1,12 +1,8 @@
-RAILS_ENV = "test"
-
-require 'rubygems'
-
 require 'lib/fossil'
 require 'spec'
 require 'rr'
 
-unless defined?(DB_DEMO) #and defined?(DB_FOS)
+unless defined?(DB_DEMO)
   DB_DEMO = Sequel.odbc('demodata')#, :loggers=>[Logger.new($stdout)])
   DB_DEMO.extend(Sequel::Pervasive::DatabaseMethods)
 
@@ -19,16 +15,17 @@ require File.dirname(__FILE__) + "/helper_classes"
 ##### custom matchers #####
 require File.dirname(__FILE__) + "/be_model_with_values_matcher"
 
-
 Spec::Runner.configure do |config|
   config.include(HelperMethods)
   config.mock_with :rr
   config.include(BeModelWithValuesMatcher)
 end
 
-################ these are special modifictations for testing with mysql db on non win platform ###################
+# These are special modifictations for testing with mysql db instead of pervasive
+# if its not windows or linux where pervasive db is running ) .. modify the
+# pervasive adapter to act more like mysql, so that the tests can still run.
+# This is not ideal, but it works
 unless RUBY_PLATFORM =~ /mswin32|linux/
-  # if its not windows ( pervasive db ) .. modify the pervasive adapter to act more like mysql for certain things
 
   module Sequel::Pervasive::DatabaseMethods
     def auto_increment_sql; "AUTO_INCREMENT" end
@@ -52,4 +49,4 @@ unless RUBY_PLATFORM =~ /mswin32|linux/
   end
 
 end
-################                   end of special section                  ###################
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fossil
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 -08:00
+date: 2010-01-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency