fossil 0.2.1 → 0.2.2

data/Rakefile

@@ -8,8 +8,11 @@
      gemspec.summary = "Sequel orm wrapper to FOS"  
      gemspec.description = "Access FOS/betrieve db with this Sequel based orm wrapper"  
      gemspec.email = "plardin@xojet.com"  
-     gemspec.homepage = ""  
-     gemspec.authors = ["Patrick Lardin, Daniel Sudol"]  
+     gemspec.homepage = ""
+     gemspec.add_dependency('sequel', '= 3.5.0')
+     gemspec.add_dependency('active_support', '= 2.3.5')
+     gemspec.add_development_dependency('rspec')
+     gemspec.authors = ["Patrick Lardin, Daniel Sudol"]
    end
    Jeweler::GemcutterTasks.new   
  rescue LoadError  

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   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-11}
+  s.date = %q{2010-01-12}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{plardin@xojet.com}
   s.files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "fossil.gemspec",
      "lib/fossil.rb",
+     "lib/hash_extentions.rb",
      "lib/models/ac_qualification.rb",
      "lib/models/aircraft.rb",
      "lib/models/aircraft_cost.rb",
@@ -117,22 +118,60 @@ Gem::Specification.new do |s|
      "lib/sequel/pervasive_adapter.rb",
      "lib/sequel/serializer/json_serializer.rb",
      "lib/sequel/serializer/serializer.rb",
-     "lib/sequel/serializer/xml_serializer.rb"
+     "lib/sequel/serializer/xml_serializer.rb",
+     "spec/be_model_with_values_matcher.rb",
+     "spec/be_model_with_values_matcher_spec.rb",
+     "spec/hash_extentions_spec.rb",
+     "spec/helper_classes.rb",
+     "spec/helper_methods.rb",
+     "spec/sequel/fos_dates_spec.rb",
+     "spec/sequel/model_patch_spec.rb",
+     "spec/sequel/pervasive_adapter_spec.rb",
+     "spec/sequel/serializer/json_serializer_spec.rb",
+     "spec/sequel/serializer/xml_serializer_spec.rb",
+     "spec/sequel/spec_helper_fos_tables.rb",
+     "spec/sequel/spec_helper_tables.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Sequel orm wrapper to FOS}
+  s.test_files = [
+    "spec/be_model_with_values_matcher.rb",
+     "spec/be_model_with_values_matcher_spec.rb",
+     "spec/hash_extentions_spec.rb",
+     "spec/helper_classes.rb",
+     "spec/helper_methods.rb",
+     "spec/sequel/fos_dates_spec.rb",
+     "spec/sequel/model_patch_spec.rb",
+     "spec/sequel/pervasive_adapter_spec.rb",
+     "spec/sequel/serializer/json_serializer_spec.rb",
+     "spec/sequel/serializer/xml_serializer_spec.rb",
+     "spec/sequel/spec_helper_fos_tables.rb",
+     "spec/sequel/spec_helper_tables.rb",
+     "spec/spec_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sequel>, ["= 3.5.0"])
+      s.add_runtime_dependency(%q<active_support>, ["= 2.3.5"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
     else
+      s.add_dependency(%q<sequel>, ["= 3.5.0"])
+      s.add_dependency(%q<active_support>, ["= 2.3.5"])
+      s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
+    s.add_dependency(%q<sequel>, ["= 3.5.0"])
+    s.add_dependency(%q<active_support>, ["= 2.3.5"])
+    s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
 

data/lib/fossil.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 
 begin
   gem 'sequel', '=3.5.0'
-  p require 'sequel'
+  require('sequel')
 rescue LoadError => e
   warn 'To use Fossil you need the sequel gem:'
   warn '$ sudo gem install sequel -v=3.5.0'
@@ -11,7 +11,7 @@ end
 
 begin
   gem 'activesupport', '=2.3.5'
-  p require 'active_support'
+  require('active_support')
 rescue LoadError => e
   p e
   warn 'To use Fossil you need the active_support gem:'
@@ -21,6 +21,7 @@ end
 
 dir = File.dirname(__FILE__)
 files = [File.join(dir,'number_helper.rb')] +
+        [File.join(dir,'hash_extentions.rb')] +
         [File.join(dir,'sequel','serializer','serializer.rb')] +
         Dir.glob(File.join(dir,'sequel','*.rb')) +
         Dir.glob(File.join(dir,'models','*.rb'))

data/lib/hash_extentions.rb

@@ -0,0 +1,20 @@
+class Hash 
+  def limit_to_keys(limit_keys)
+    dup.limit_to_keys!(limit_keys)
+  end
+
+  def limit_to_keys!(limit_keys)
+    keys.each { |key| delete(key) unless limit_keys.include? key }
+    self
+  end
+
+  def soft_delete(key)
+    cloned_hash = deep_clone
+    cloned_hash.delete(key)
+    cloned_hash
+  end
+
+  def deep_clone
+    Marshal::load(Marshal.dump(self))
+  end
+end

data/lib/sequel/pervasive_adapter.rb

@@ -11,12 +11,12 @@ module Sequel
         ds.extend(DatasetMethods)
         ds
       end
-
-      def connect(server)
-        conn = super(server)
-        conn.autocommit = false if RAILS_ENV == 'test'
-        conn
-      end
+      
+#      def connect(server)
+#        conn = super(server)
+#        conn.autocommit = false if RAILS_ENV == 'test'
+#        conn
+#      end
 
       def select_fields(table, *fields)
         dataset.select_fields(table, *fields)

data/spec/be_model_with_values_matcher.rb

@@ -0,0 +1,44 @@
+module BeModelWithValuesMatcher
+ 
+  class BeModelWithValues
+    def initialize(expected_hash, compare_as_strings=false)
+      @compare_as_strings = compare_as_strings
+      @expected_hash = expected_hash
+    end
+
+    def matches?(model)
+      @model_hash = model.fill_hash(@expected_hash.keys)
+      @diff_keys = @expected_hash.keys - @model_hash.keys
+      @diff_act_values = {}
+      @diff_exp_values = {}
+      return false unless @diff_keys.empty?
+      @model_hash.each do |k,v|
+        model_value = @compare_as_strings ? @model_hash[k].to_s : @model_hash[k]
+        expected_value = @compare_as_strings ? @expected_hash[k].to_s : @expected_hash[k]
+        unless model_value == expected_value
+          @diff_act_values[k] = v
+          @diff_exp_values[k] = @expected_hash[k]
+        end
+      end
+      return @diff_act_values.empty?
+    end
+
+    def failure_message
+      str = "expected:\n#{@expected_hash.inspect}\n but got:\n#{@model_hash.inspect}"
+      str += "\n\nmissing keys: #{@diff_keys.inspect}" unless @diff_keys.empty?
+      unless @diff_act_values.empty?
+        str += "\n\nunequal values: \nexpected: #{@diff_exp_values.inspect} \n but got:\n#{@diff_act_values.inspect}"
+      end
+      str
+    end
+  end
+
+  def be_model_with_values(expected)
+    BeModelWithValues.new(expected)
+  end
+
+  def be_model_with_values_as_strings(expected)
+    BeModelWithValues.new(expected,true)
+  end
+
+end

data/spec/be_model_with_values_matcher_spec.rb

@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/spec_helper'
+ 
+describe "spec matchers" do
+
+  describe "be_model_with_values matcher" do
+
+    it "should match a models values if they are all in the expected hash" do
+      dude = MockModel.new({:kid_date=>1, :kid_time=>2})
+      dude.should be_model_with_values( {:kid_date=>1, :kid_time=>2} )
+    end
+
+    it "should match (as strings) a models values if they are all in the expected hash" do
+      dude = MockModel.new({:kid_date=>"1", :kid_time=>"2"})
+      dude.should be_model_with_values_as_strings( {:kid_date=>1, :kid_time=>2} )
+    end
+
+    it "should fail match for models values if they are in the expected hash but of wrong type" do
+      dude = MockModel.new({:kid_date=>1, :kid_time=>"2"})
+      begin
+        dude.should be_model_with_values( {:kid_date=>1, :kid_time=>2} )
+      rescue => e
+        e.message.should match("unequal values: \nexpected: \\{:kid_time=>2\\} \n but got:\n\\{:kid_time=>\"2\"\\}")
+      end
+    end
+
+    it "should fail if model does not have all the keys as expected hash" do
+      dude = MockModel.new({:kid_date=>1})
+      begin
+        dude.should be_model_with_values( {:kid_date=>1, :kid_time=>2} )
+      rescue => e
+        e.message.should match("missing keys: \\[:kid_time\\]")
+      end
+    end
+
+    it "should fail if one of the values does not match" do
+      dude = MockModel.new( {:kid_date=>1, :kid_time=>3} )
+      begin
+        dude.should be_model_with_values( {:kid_date=>1, :kid_time=>2} )
+      rescue => e
+        e.message.should match("unequal values: \nexpected: \\{:kid_time=>2\\} \n but got:\n\\{:kid_time=>3\\}")
+      end
+    end
+
+  end
+
+end

data/spec/hash_extentions_spec.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "hash extentions" do
+  it "limit_to_keys should limit keys in hash" do
+    h = {:bro1=>'me',:bro2=>'rob',:bro3=>'eric'}
+    h.limit_to_keys([:bro1,:bro2]).should == {:bro1=>'me',:bro2=>'rob'}
+    h.should == {:bro1=>'me',:bro2=>'rob',:bro3=>'eric'}
+  end
+
+  it "limit_to_keys! should destructively limit keys in hash" do
+    h = {:bro1=>'me',:bro2=>'rob',:bro3=>'eric'}
+    h.limit_to_keys!([:bro1,:bro2]).should == {:bro1=>'me',:bro2=>'rob'}
+    h.should == {:bro1=>'me',:bro2=>'rob'}
+  end
+
+  it "soft deletes" do
+    h = {:dan=>1,:eric=>2}
+    h.soft_delete(:dan).should == {:eric=>2}
+  end
+end

data/spec/helper_classes.rb

@@ -0,0 +1,30 @@
+class MockDataset < Sequel::Dataset
+  def insert(*args); end
+  def insert_select(*args); end
+  def update(*args); end
+  def fetch_rows(sql); end
+  def quoted_identifier(c); end
+end
+
+class MockDatabase < Sequel::Database
+  def execute(sql, opts={}); end
+  def reset; end
+  def transaction(opts={}); end
+  def dataset; MockDataset.new(self); end
+end
+
+MOCK_DB = MockDatabase.new unless defined?(MOCK_DB)
+
+class MockModel < Sequel::Model(MOCK_DB)
+  def initialize(values)
+    @values = values
+  end
+  def respond_to?(m)
+    @values.has_key?(m)
+  end
+  def method_missing(m, *args, &block)
+    return @values[m] if @values.has_key?(m)
+    super(m, *args, &block)
+  end
+end
+

data/spec/helper_methods.rb

@@ -0,0 +1,49 @@
+module HelperMethods
+
+  def set_fos_db(models)
+    set_db(models,DB_FOS)
+  end
+
+  def set_demo_db(models)
+    set_db(models,DB_DEMO)
+  end
+
+  def set_db(models,db)
+    models.each{ |model| model.db=db }
+  end
+
+  # delete other rows, and create new one
+  def add_test_table_data(hash)
+    DB_DEMO[:test_table].delete
+    DB_DEMO[:test_table] << hash
+  end
+
+  def get_fos_fixture(file_name)
+    YAML.load_file(File.join(RAILS_ROOT,'spec','fos_fixtures',"#{file_name}.yml"))
+  end
+
+  def get_ipc_fixture(file_name)
+    YAML.load_file(File.join(RAILS_ROOT,'spec','ipc_fixtures',"#{file_name}.yml"))
+  end
+
+  # controller helpers
+  def should_render_json_for(obj,path)
+    mock(obj).to_fos_json(is_a(Hash)) {"json"}
+    call_controller path
+    response.body.should == "json"
+  end
+
+  def should_render_xml_for(obj,path)
+    request.env["HTTP_ACCEPT"] = "application/xml"
+    mock(obj).to_fos_xml(is_a(Hash)) {"xml"}
+    call_controller path
+    response.body.should == "xml"
+  end
+
+  def equal_xml(other)
+    simple_matcher("xml #{other} not equal") do |actual|
+      actual.gsub(/\s/,'').should == other.gsub(/\s/,'')
+    end
+  end
+
+end

data/spec/sequel/fos_dates_spec.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "fos_dates" do
+
+  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)
+  end
+
+  it "converts a Ruby Time to hundredths" do
+    Time.from_fos_time(100).in_hundredths.should ==  "1.7"
+  end
+
+  it "Date view defaults to y-m-d" do
+    Date.parse('Sept 9, 2009').to_s.should == "2009-09-09"
+  end
+
+  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

@@ -0,0 +1,281 @@
+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}
+  end
+
+  it "can update and save" do
+    add_test_table_data({:date_col => 123, :time_col=>60})
+    record = TestTable.first
+    record[:'goofy name col'] = 124
+    record.save_changes
+    TestTable.first[:'goofy name col'].should ==124
+  end
+
+  describe "select_fields method" do
+
+    it "works on model" do
+      dude = Dude.select_fields(:self => ['kid - date']).first
+      dude[:'kid - date'].should == 1
+    end
+
+    it "works on dataset" do
+      dude = Dude.filter(:'kid - date'=>1).select_fields(:self => ['kid - time']).first
+      dude[:'kid - time'].should == 1
+    end
+
+    it "selects column alias" do
+      Dude.column_alias  :kid_date, :'kid - date'
+      Dude.select_fields(:self => [:kid_date]).first.kid_date.should == 1
+    end
+
+    it "can select more than one table with columns of the same name" do
+      # dude = Dude.eager_graph(:horses).select(*(Dude.pk_for_select + Horse.pk_for_select(:table=>:horses,:alias=>true) + [:'dudes__name', :'horses__name___horses_name'])).all.first
+      dude = Dude.eager_graph(:horses).select_fields(:self => [:name], :horses => [:name]).all.first
+      dude.name.should == "dano"
+      dude.horses.first.name.should == 'pinto'
+    end
+
+    it "selects column alias from correct table" do
+      Dude.column_alias   :doo, :'kid - date'
+      Horse.column_alias  :hoo, :'kid - time'
+      dude = Dude.eager_graph(:horses).select_fields(:self => [:doo], :horses => [:hoo]).all.first
+      dude.doo.should == 1
+      dude.horses.first.hoo.should == 1
+    end
+
+    it "selects particular columns from joined tables" do
+      dude = Dude.eager_graph(:ranch_code, :my_friend, :horses).select_fields(:self => [:name], :ranch_code => [:code], :my_friend => [:name], :horses => [:name]).all.first
+      dude.ranch_code_code.should == "men"
+      dude.name.should == "dano"
+      dude.horses.first.name.should == 'pinto'
+      dude.my_friend.name.should == 'dans buddy'
+    end
+
+  end
+
+
+  describe "column_view" do
+
+    after :each do
+      TestTable.clear_schema
+    end
+
+    before do
+      add_test_table_data({:date_col => 123, :time_col=>60, :price=>1215, :paid=>1})
+      TestTable.column_view :date_col, :date
+      TestTable.column_view :time_col, :time
+      TestTable.column_view :time_col, :time, :my_special_name
+      TestTable.column_view :price,    :currency
+      TestTable.column_view :price,    :precision
+      TestTable.column_view :paid,     :boolean
+      @record = TestTable.first
+    end
+
+    it "creates method to display value" do
+      @record.should respond_to(:date_col_date)
+      @record.should respond_to(:date_col_date_view)
+      @record.should respond_to(:date_col_date_view_mdy)
+      @record.should respond_to(:date_col_date_view_mdy_ipc)
+      @record.should respond_to(:time_col_time)
+      @record.should respond_to(:time_col_time_view)
+      @record.should respond_to(:price_currency)
+      @record.should respond_to(:price_precision)
+      @record.should respond_to(:paid_boolean)
+      @record.should respond_to(:my_special_name)
+    end
+
+    it "shows correct date view" do
+      @record.date_col_date_view.should         == "1900-05-03"
+      @record.date_col_date_view_mdy.should     == "05/03/1900"
+      @record.date_col_date_view_mdy_ipc.should == "5/3/1900"
+    end
+
+    it "shows correct time view" do
+      @record.time_col_time_view.should   == "01:00"
+      @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"
+    end
+
+    it "shows correct currency view" do
+      @record.paid_boolean.should == "True"
+    end
+
+  end
+
+  describe "column_alias" do
+
+    before :each do
+      add_test_table_data({:id=>1, :'goofy name col' => 123})
+    end
+
+    after :each do
+      TestTable.clear_schema
+    end
+
+    it "makes alias" do
+      TestTable.column_alias  :'nice_name', :'goofy name col'
+
+      TestTable.first.should respond_to(:nice_name)
+      TestTable.first.nice_name.should == 123
+    end
+
+    it "alias name also had entry in datatypes" do
+      TestTable.column_alias  :'nice_name', :'goofy name col'
+
+      TestTable.db_schema[:nice_name].should_not be_nil
+    end
+
+    it "sets column type if param exists" do
+      TestTable.column_alias  :'new_date_col', :'goofy name col', :type => :date
+
+      TestTable.first.new_date_col.should be_a_kind_of(Date)
+      TestTable.first.new_date_col.should == Date.from_fos_days(123)
+    end
+
+    it "column alias expands to real column name in filtered search" do
+      TestTable.column_alias  :'goofy_col', :'goofy name col'
+      TestTable.filter(:goofy_col=>123).first.goofy_col.should == 123
+    end
+
+    it "column alias creates setter to real column name" do
+      TestTable.column_alias  :'goofy_col', :'goofy name col'
+      testrow = TestTable.first
+      testrow.goofy_col = 124
+      testrow.goofy_col.should == 124
+    end
+
+    # seems like ridiculous case, but it is a case in use
+    it "can makes an alias with same name and then an alias to that still works with existing record" do
+      add_test_table_data({:id=>2, :'date_col' => 10})
+      TestTable.column_alias  :date_col, :'date_col'  # our autogenerate script sometimes makes same name alias
+      TestTable.column_alias  :save_date_col, :date_col, :type => :integer
+      testrow = TestTable.first
+      testrow.save_date_col = 11
+      testrow.date_col.should == 11
+    end
+
+    it "can makes an alias with same name and then an alias to that still works with new record" do
+      TestTable.column_alias  :date_col, :'date_col'  # our autogenerate script sometimes makes same name alias
+      TestTable.column_alias  :save_date_col, :date_col, :type => :integer
+      testrow = TestTable.new({:save_date_col=>10})
+      testrow.save_date_col = 10
+      testrow.date_col.should == 10
+    end
+
+  end
+
+  describe "column_type" do
+
+    before :each do
+      add_test_table_data({:date_col => 123, :time_col=>60})
+    end
+
+    after :each do
+      TestTable.clear_schema
+    end
+
+    it "sets a date type" do
+      TestTable.column_type :date_col, :date
+
+      TestTable.first[:date_col].should be_a_kind_of(Date)
+      TestTable.first[:date_col].should == Date.from_fos_days(123)
+    end
+
+    it "sets a time type" do
+      TestTable.column_type :time_col, :time
+
+      TestTable.first[:time_col].should be_a_kind_of(DateTime)
+      TestTable.first[:time_col].should == Date.from_fos_days(0).to_time.utc + 60.minutes
+    end
+
+    it "should find rows" do
+      TestTable.filter('date_col < ?', Date.today).all.size.should == 1
+    end
+
+  end
+
+  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
+
+      TestTable.first.should respond_to(:datetime_col)
+      TestTable.first.datetime_col.should == Time.parse("2009-06-29 01:00 UTC")
+    end
+
+  end
+
+  describe "association methods" do
+
+    describe "code association" do
+
+      before(:each) do
+        set_demo_db([Code,Dude])
+      end
+
+      it "finds the associated code" do
+        Dude.first.ranch_code.description.should == 'manly ranch'
+      end
+
+      it "finds two associated codes" do
+        Dude.first.ranch_code.description.should == 'manly ranch'
+        Dude.first.pool_type.description.should == 'big round pool'
+      end
+
+      it "creates delegators for code and description" do
+        Dude.first.ranch_code_code.should == "men"
+        Dude.first.ranch_code_description.should == "manly ranch"
+      end
+
+      it "should create a class method to get all codes for that type" do
+        Dude.should respond_to(:get_all_ranch_codes)
+        Dude.get_all_ranch_codes.should have(1).things
+        Dude.get_all_ranch_codes.first.should == 'manly ranch'
+      end
+
+    end
+
+    describe "o_to_n" do
+
+      it "retrieves the association" do
+        Dude.first.horses.first.name.should == 'pinto'
+      end
+
+      it "retrieves association eagerly with eager graph" do
+        ds = Dude.eager_graph(:horses)
+        mock.proxy(ds).fetch_rows(is_a(String)).times(1)
+        ds.all.first.horses.first
+      end
+
+    end
+
+    describe "n_to_o" do
+
+      it "retrieves the association" do
+        Horse.first.dude.name.should == 'dano'
+      end
+
+      it "retrieves association eagerly" do
+        ds = Horse.eager_graph(:dude).select()
+        mock.proxy(ds).fetch_rows(is_a(String)).times(1)
+        ds.all.first.dude
+      end
+
+    end
+
+  end
+
+end

data/spec/sequel/serializer/json_serializer_spec.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper_tables' unless metaclass.class_variable_defined? :@@set_up_demo_tables
+
+describe "Sequel::Serializer" do
+  describe "to_fos_json method adds options to only for" do
+    it "single sequel model" do
+      add_test_table_data({:id=>1,:'goofy name col' => 123})
+      data = TestTable.first
+      mock(data).to_json({:only=>[]})
+      data.to_fos_json
+    end
+
+    it "an array of sequel models" do
+      add_test_table_data({:id=>1,:'goofy name col' => 123})
+      data = [TestTable.first]
+      mock(data).to_json({:only=>[]})
+      data.to_fos_json
+    end
+
+  end
+end

data/spec/sequel/serializer/xml_serializer_spec.rb

@@ -0,0 +1,105 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper_tables' unless metaclass.class_variable_defined? :@@set_up_demo_tables
+require 'active_resource'
+
+describe "Sequel::Serializer" do
+ 
+  describe "to_fos_xml method adds options to skip instructions, dasherize, and only for" do
+    it "single sequel model" do
+      add_test_table_data({:id=>1,:'goofy name col' => 123})
+      data = TestTable.first
+      mock(data).to_xml({:dasherize=>false, :skip_instruct=>true, :only=>[]})
+      data.to_fos_xml
+    end
+
+    it "an array of sequel models" do
+      add_test_table_data({:id=>1,:'goofy name col' => 123})
+      data = [TestTable.first]
+      mock(data).to_xml({:dasherize=>false, :skip_instruct=>true, :only=>[]})
+      data.to_fos_xml
+    end
+  end
+
+  it "to_xml works with references to aliased columns" do
+    add_test_table_data({:id=>1,:'goofy name col' => 123})
+    TestTable.column_alias  :'nice_name', :'goofy name col'
+
+    TestTable.first.to_fos_xml(:only => :nice_name).should equal_xml(
+      %{
+         <test_table>
+            <nice_name>123</nice_name>
+         </test_table>
+       } )
+  end
+
+  it "to_fos_xml with many to one assoc" do
+    Dude.o_to_n :horses, :class=>:Horse, :prefix => 'dude'
+
+    Dude.first.to_fos_xml(:only=> :name, :include=> :horses).should equal_xml(
+    %{  <dude>
+          <name>dano</name>
+          <horses type="array">
+            <horse> <name>pinto</name> </horse>
+            <horse> <name>silver</name> </horse>
+          </horses>
+        </dude>
+    })
+  end
+
+
+  it "to_xml with many to one assoc" do
+    Horse.n_to_o :dude, :class=>:Dude, :prefix=>'dude'
+
+    Horse.first.to_fos_xml(:only=> [:name], :include=> :dude).should equal_xml(
+      %{  <horse>
+            <name>pinto</name>
+            <dude> <name>dano</name> </dude>
+          </horse>
+       })
+  end
+
+  it "to_xml with array of horses" do
+    Horse.n_to_o :dude, :class=>:Dude, :prefix=>'dude'
+
+    Horse.all.to_fos_xml(:only=> [:name], :include=> :dude).should equal_xml(
+      %{  <horses type="array">
+            <horse> <name>pinto</name>
+              <dude> <name>dano</name> </dude>
+            </horse>
+            <horse> <name>silver</name>
+              <dude> <name>dano</name> </dude>
+            </horse>
+          </horses>
+        } )
+  end
+
+  it "converts to ActiveResource::Base from xml" do
+    class Dudeman < ActiveResource::Base; self.site = ""; end
+    hash = Hash.from_xml( Dude.first.to_xml(:only=> :name, :include=> :horses) )
+    dudeman = Dudeman.new( hash.values.first )
+    dudeman.name.should == 'dano'
+    dudeman.horses.size.should == 2
+    dudeman.horses.first.name == 'pinto'
+  end
+
+end
+
+
+#  it "creates sql model from xml" do
+#    hash = Hash.from_xml( Dude.first.to_xml(:only=> :name, :include=> :horses) )
+#    d = Dude.new(hash.values.first)
+#  end
+
+#  it "can take the flatten option to flatten associations" do
+#    Horse.n_to_o :dude, :class=>:Dude, :prefix=>'dude'
+#
+#    Horse.all.to_xml(:flatten=>true, :only=> [:name], :include=> :dude).should equal_xml(
+#      %{ <?xml version="1.0" encoding="UTF-8"?>
+#          <horses type="array">
+#            <horse>
+#              <name>pinto</name>
+#              <name>dano</name>
+#            </horse>
+#          </horses>
+#        } )
+#  end

data/spec/sequel/spec_helper_fos_tables.rb

@@ -0,0 +1,94 @@
+DB_DEMO.create_table! :ztrip_legs do
+  Integer :'kid - date'
+  Integer :'kid - time'
+  Integer :'kid - user'
+  Integer :'kid - mult'
+  Integer :'kid - comm'
+  String  :'name'
+  Integer :'ranch code'
+  Integer :'my friend kid - date'
+  Integer :'my friend kid - time'
+  Integer :'my friend kid - user'
+  Integer :'my friend kid - mult'
+  Integer :'my friend kid - comm'
+end
+
+DB_DEMO.create_table! :'my friends' do
+  Integer :'kid - date'
+  Integer :'kid - time'
+  Integer :'kid - user'
+  Integer :'kid - mult'
+  Integer :'kid - comm'
+  String  :name
+end
+
+DB_DEMO.create_table! :'zcrew legs' do
+  String  :'name'
+  Integer :'kid - date'
+  Integer :'kid - time'
+  Integer :'kid - user'
+  Integer :'kid - mult'
+  Integer :'kid - comm'
+  Integer :'dude kid - date'
+  Integer :'dude kid - time'
+  Integer :'dude kid - user'
+  Integer :'dude kid - mult'
+  Integer :'dude kid - comm'
+end
+
+DB_DEMO.create_table! :codes do
+  Integer :'kid - date'
+  Integer :'kid - time'
+  Integer :'kid - user'
+  Integer :'kid - mult'
+  Integer :'kid - comm'
+  String  :'description'
+  String  :'code'
+  Integer :'value'
+  String  :'name'
+end
+
+
+DB_DEMO[:dudes] << { :name=>'dano',:'ranch code'=>1,
+  :'kid - date'=>1,:'kid - time'=>1,:'kid - user'=>1,:'kid - mult'=>1,:'kid - comm'=>1,
+  :'my friend kid - date'=>1,:'my friend kid - time'=>1,:'my friend kid - user'=>1,:'my friend kid - mult'=>1,:'my friend kid - comm'=>1}
+
+DB_DEMO[:'my friends'] << {:name=>'good buddy',
+  :'kid - date'=>1,:'kid - time'=>1,:'kid - user'=>1,:'kid - mult'=>1,:'kid - comm'=>1}
+
+DB_DEMO[:'the horses'] << {:name=>'pinto',
+  :'kid - date'=>1,:'kid - time'=>1,:'kid - user'=>1,:'kid - mult'=>1,:'kid - comm'=>1,
+  :'dude kid - date'=>1,:'dude kid - time'=>1,:'dude kid - user'=>1,:'dude kid - mult'=>1,:'dude kid - comm'=>1}
+
+DB_DEMO[:codes] << {:value=>1, :name=>'ranch_id__', :description=>'manly ranch', :code=>'men',
+  :'kid - date'=>1,:'kid - time'=>1,:'kid - user'=>1,:'kid - mult'=>1,:'kid - comm'=>1}
+
+
+class TestTable < Sequel::Model(:test_table)
+  set_primary_key [:id]
+end
+
+class Dude < Sequel::Model(:dudes)
+  set_primary_key [:'kid - date',:'kid - time',:'kid - user',:'kid - mult',:'kid - comm']
+end
+
+class MyFriend < Sequel::Model(:'my friends')
+  set_primary_key [:'kid - date',:'kid - time',:'kid - user',:'kid - mult',:'kid - comm']
+end
+
+class Horse < Sequel::Model(:'the horses')
+  set_primary_key [:'kid - date',:'kid - time',:'kid - user',:'kid - mult',:'kid - comm']
+end
+
+class Code < Sequel::Model(:codes)
+  set_primary_key [:'kid - date',:'kid - time',:'kid - user',:'kid - mult',:'kid - comm']
+  def Code.get_codes(code_name)
+    self.filter(:name=>code_name).collect(&:description)
+  end
+end
+
+
+module CodeGroup
+  def CodeGroup.ranch_id; 'ranch_id__'; end
+end
+

data/spec/sequel/spec_helper_tables.rb

@@ -0,0 +1,169 @@
+DB_DEMO.create_table!(:test_table) do
+  Integer :id
+  Integer :'goofy name col'
+  Integer :'date_col'
+  Integer :'time_col'
+  Integer :'price'
+  Integer :'paid'
+end
+
+DB_DEMO.create_table! :dudes do
+  Integer :'kid - date'
+  Integer :'kid - time'
+  Integer :'kid - user'
+  Integer :'kid - mult'
+  Integer :'kid - comm'
+  String  :'name'
+  Integer :'ranch code'
+  Integer :'pool type'
+  Integer :'my friend kid - date'
+  Integer :'my friend kid - time'
+  Integer :'my friend kid - user'
+  Integer :'my friend kid - mult'
+  Integer :'my friend kid - comm'
+end
+
+DB_DEMO.create_table! :'my friends' do
+  Integer :'kid - date'
+  Integer :'kid - time'
+  Integer :'kid - user'
+  Integer :'kid - mult'
+  Integer :'kid - comm'
+  String  :name
+end
+
+DB_DEMO.create_table! :'the horses' do
+  String  :'name'
+  String  :'goofy name'
+  Integer :'kid - date'
+  Integer :'kid - time'
+  Integer :'kid - user'
+  Integer :'kid - mult'
+  Integer :'kid - comm'
+  Integer :'dude kid - date'
+  Integer :'dude kid - time'
+  Integer :'dude kid - user'
+  Integer :'dude kid - mult'
+  Integer :'dude kid - comm'
+end
+
+DB_DEMO.create_table! :codes do
+  Integer :'kid - date'
+  Integer :'kid - time'
+  Integer :'kid - user'
+  Integer :'kid - mult'
+  Integer :'kid - comm'
+  String  :'description'
+  String  :'code'
+  Integer :'value'
+  String  :'name'
+end
+
+module CodeGroup
+  def CodeGroup.ranch_id; 'ranch_id__'; end
+  def CodeGroup.pool_type; 'pool_id___'; end
+end
+
+Sequel::Model.db = DB_DEMO
+
+class TestTable < Sequel::Model(:test_table)
+  set_primary_key [:id]
+end
+
+class Dude < Sequel::Model(:dudes)
+  set_primary_key [:'kid - date',:'kid - time',:'kid - user',:'kid - mult',:'kid - comm']
+
+  code_association :ranch_code, :'ranch code', :ranch_id
+  code_association :pool_type, :'pool type', :pool_type
+  column_alias  :kid_date, :'kid - date'
+  o_to_n :horses, :class=>:Horse, :prefix => 'dude'
+  n_to_o :one_horse, :class=>:Horse, :prefix => 'dude'
+#  many_to_one :one_horse, :class => :Horse, :key=>nil,
+#    :eager_loader=>(proc do |key_hash, parents, associations|
+#      id_map = {}
+#      parents.each do |p|
+#        key_arr = primary_key.map{|k| p[k]}
+#        id_map[key_arr] = p
+#      end
+#      prefix = 'dude'
+#      parent_to_child_keys = primary_key.collect{|k| (prefix + " " + k.to_s).to_sym }
+#      Horse.filter(parent_to_child_keys=>id_map.keys).all do |h|
+#        parent_key_values = parent_to_child_keys.collect{|k| h[k]}
+#        id_map[parent_key_values].associations[:one_horse] = h
+#      end
+#    end)
+#
+#  one_to_many :my_horses, :class => :Horse, :key=>nil,
+#    :eager_loader=>(proc do |key_hash, parents, associations|
+#      id_map = {}
+#      parents.each do |p|
+#        key_arr = key_hash.keys[0].map{|k| p[k]}
+#        id_map[key_arr] = p
+#      end
+#      prefix = 'dude'
+#      parent_keys = key_hash.keys[0].collect{|j| (prefix + " " + j.to_s).to_sym }
+#      Horse.filter(parent_keys => id_map.keys).all do |h|
+#        parent_key_values = parent_keys.collect{|k| h[k]}
+#        if d = id_map[parent_key_values]
+#          d.associations[:my_horses] = [] unless d.associations[:my_horses]
+#          d.associations[:my_horses] << h
+#        end
+#      end
+#    end
+#    )
+
+  #:graph_only_conditions => { :'dude kid - date'=>:"kid - date", :'dude kid - time'=>:"kid - time", :'dude kid - user'=>:"kid - user", :'dude kid - mult'=>:"kid - mult", :'dude kid - comm'=>:"kid - comm", :pinto_horse__name=>'pinto'}
+  n_to_o :my_friend, :class=>:MyFriend, :prefix=>'my friend'
+end
+
+class MyFriend < Sequel::Model(:'my friends')
+  set_primary_key [:'kid - date',:'kid - time',:'kid - user',:'kid - mult',:'kid - comm']
+end
+
+
+class Horse < Sequel::Model(:'the horses')
+  set_primary_key [:'kid - date',:'kid - time',:'kid - user',:'kid - mult',:'kid - comm']
+
+#  validations do
+#    presence_of :name
+#  end
+  n_to_o :dude, :class=>:Dude, :prefix=>'dude'
+end
+
+#require 'memcache'
+#CACHE = MemCache.new 'localhost:11211', :namespace => 'cachetest'
+#Horse.plugin :caching, CACHE
+
+class Code < Sequel::Model(:codes)
+  set_primary_key [:'kid - date',:'kid - time',:'kid - user',:'kid - mult',:'kid - comm']
+
+  def Code.get_codes(code_name)
+    self.filter(:name=>code_name).collect(&:description)
+  end
+end
+
+DB_DEMO[:dudes] << { :name=>'dano',:'ranch code'=>1,:'pool type'=>2,
+  :'kid - date'=>1,:'kid - time'=>1,:'kid - user'=>1,:'kid - mult'=>1,:'kid - comm'=>1,
+  :'my friend kid - date'=>1,:'my friend kid - time'=>1,:'my friend kid - user'=>1,:'my friend kid - mult'=>1,:'my friend kid - comm'=>1}
+DB_DEMO[:dudes] << { :name=>'eric',
+  :'kid - date'=>2,:'kid - time'=>2,:'kid - user'=>2,:'kid - mult'=>2,:'kid - comm'=>2,
+  :'my friend kid - date'=>2,:'my friend kid - time'=>2,:'my friend kid - user'=>2,:'my friend kid - mult'=>2,:'my friend kid - comm'=>2}
+
+DB_DEMO[:'my friends'] << {:name=>'dans buddy',
+  :'kid - date'=>1,:'kid - time'=>1,:'kid - user'=>1,:'kid - mult'=>1,:'kid - comm'=>1}
+DB_DEMO[:'my friends'] << {:name=>'erics buddy',
+  :'kid - date'=>2,:'kid - time'=>2,:'kid - user'=>2,:'kid - mult'=>2,:'kid - comm'=>2}
+
+DB_DEMO[:'the horses'] << {:name=>'pinto', :'goofy name'=>'pinto-meister',
+  :'kid - date'=>1,:'kid - time'=>1,:'kid - user'=>1,:'kid - mult'=>1,:'kid - comm'=>1,
+  :'dude kid - date'=>1,:'dude kid - time'=>1,:'dude kid - user'=>1,:'dude kid - mult'=>1,:'dude kid - comm'=>1}
+DB_DEMO[:'the horses'] << {:name=>'silver', :'goofy name'=>'heio silver',
+  :'kid - date'=>2,:'kid - time'=>2,:'kid - user'=>2,:'kid - mult'=>2,:'kid - comm'=>2,
+  :'dude kid - date'=>1,:'dude kid - time'=>1,:'dude kid - user'=>1,:'dude kid - mult'=>1,:'dude kid - comm'=>1}
+
+DB_DEMO[:codes] << {:value=>1, :name=>'ranch_id__', :description=>'manly ranch', :code=>'men',
+  :'kid - date'=>1,:'kid - time'=>1,:'kid - user'=>1,:'kid - mult'=>1,:'kid - comm'=>1}
+DB_DEMO[:codes] << {:value=>2, :name=>'pool_id___', :description=>'big round pool', :code=>'splash',
+  :'kid - date'=>2,:'kid - time'=>2,:'kid - user'=>2,:'kid - mult'=>2,:'kid - comm'=>2}
+
+@@set_up_demo_tables = true

data/spec/spec.opts

@@ -0,0 +1,4 @@
+--colour
+--format progress
+--loadby mtime
+--reverse

data/spec/spec_helper.rb

@@ -0,0 +1,55 @@
+RAILS_ENV = "test"
+
+require 'rubygems'
+
+require 'lib/fossil'
+require 'spec'
+require 'rr'
+
+unless defined?(DB_DEMO) #and defined?(DB_FOS)
+  DB_DEMO = Sequel.odbc('demodata')#, :loggers=>[Logger.new($stdout)])
+  DB_DEMO.extend(Sequel::Pervasive::DatabaseMethods)
+
+  DB_FOS = Sequel.odbc('fos')#, :loggers=>[Logger.new($stdout)])
+  DB_FOS.extend(Sequel::Pervasive::DatabaseMethods)
+end
+
+require File.dirname(__FILE__) + "/helper_methods"
+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 ###################
+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
+    def begin_transaction_sql; "BEGIN" end
+    def commit_transaction_sql; "COMMIT" end
+    def rollback_transaction_sql; "ROLLBACK" end
+  end
+
+  module Sequel::Pervasive::DatasetMethods
+    def quoted_identifier(name, convert=true)
+      convert ? "`#{convert_aliased_col_to_real_col(name)}`" : "`#{name}`"
+    end
+
+    def select_clause_methods
+      super
+    end
+
+    def select_limit_sql(sql)
+      super(sql)
+    end
+  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.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -9,10 +9,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -08:00
+date: 2010-01-12 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: sequel
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.5.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: active_support
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.3.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Access FOS/betrieve db with this Sequel based orm wrapper
 email: plardin@xojet.com
 executables: []
@@ -26,6 +55,7 @@ files:
 - VERSION
 - fossil.gemspec
 - lib/fossil.rb
+- lib/hash_extentions.rb
 - lib/models/ac_qualification.rb
 - lib/models/aircraft.rb
 - lib/models/aircraft_cost.rb
@@ -127,6 +157,20 @@ files:
 - lib/sequel/serializer/json_serializer.rb
 - lib/sequel/serializer/serializer.rb
 - lib/sequel/serializer/xml_serializer.rb
+- spec/be_model_with_values_matcher.rb
+- spec/be_model_with_values_matcher_spec.rb
+- spec/hash_extentions_spec.rb
+- spec/helper_classes.rb
+- spec/helper_methods.rb
+- spec/sequel/fos_dates_spec.rb
+- spec/sequel/model_patch_spec.rb
+- spec/sequel/pervasive_adapter_spec.rb
+- spec/sequel/serializer/json_serializer_spec.rb
+- spec/sequel/serializer/xml_serializer_spec.rb
+- spec/sequel/spec_helper_fos_tables.rb
+- spec/sequel/spec_helper_tables.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -155,5 +199,17 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Sequel orm wrapper to FOS
-test_files: []
-
+test_files: 
+- spec/be_model_with_values_matcher.rb
+- spec/be_model_with_values_matcher_spec.rb
+- spec/hash_extentions_spec.rb
+- spec/helper_classes.rb
+- spec/helper_methods.rb
+- spec/sequel/fos_dates_spec.rb
+- spec/sequel/model_patch_spec.rb
+- spec/sequel/pervasive_adapter_spec.rb
+- spec/sequel/serializer/json_serializer_spec.rb
+- spec/sequel/serializer/xml_serializer_spec.rb
+- spec/sequel/spec_helper_fos_tables.rb
+- spec/sequel/spec_helper_tables.rb
+- spec/spec_helper.rb