fossil 0.5.3 → 0.5.5

data/Rakefile

@@ -9,7 +9,7 @@
      gemspec.description = "Access FOS/betrieve db with this Sequel based orm wrapper"  
      gemspec.email = "plardin@xojet.com"  
      gemspec.homepage = ""
-     gemspec.add_dependency('sequel', '= 3.14.0')
+     gemspec.add_dependency('sequel', '= 3.16.0')
      gemspec.add_dependency('ruby-odbc')
      gemspec.add_development_dependency('rspec')
      gemspec.authors = ["Patrick Lardin, Daniel Sudol"]

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.5

data/fossil.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.5.3"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Lardin, Daniel Sudol"]
@@ -192,16 +192,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sequel>, ["= 3.14.0"])
+      s.add_runtime_dependency(%q<sequel>, ["= 3.16.0"])
       s.add_runtime_dependency(%q<ruby-odbc>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<sequel>, ["= 3.14.0"])
+      s.add_dependency(%q<sequel>, ["= 3.16.0"])
       s.add_dependency(%q<ruby-odbc>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<sequel>, ["= 3.14.0"])
+    s.add_dependency(%q<sequel>, ["= 3.16.0"])
     s.add_dependency(%q<ruby-odbc>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end

data/lib/date_extentions.rb

@@ -1,4 +1,4 @@
-p require 'date'
+require 'date'
 
 class DateTime
   # Converts self to a Ruby Date object; time portion is discarded

data/lib/fossil.rb

@@ -1,10 +1,10 @@
 require 'rubygems'
 
 begin
-  gem 'sequel', '=3.14.0'
+  gem 'sequel', '=3.16.0'
   require('sequel')
 rescue LoadError => e
-  raise("To use Fossil you need the sequel gem:\n '$ sudo gem install sequel -v=3.14.0'")
+  raise("To use Fossil you need the sequel gem:\n '$ sudo gem install sequel -v=3.16.0'")
 end
 
 dir = File.dirname(__FILE__)
@@ -16,7 +16,6 @@ files = [File.join(dir,'number_helper.rb')] +
         Dir.glob(File.join(dir,'sequel','*.rb')) +
         Dir.glob(File.join(dir,'models','*.rb'))
 
-Sequel.extension(:blank, :inflector) 
 
 class MockDataset < Sequel::Dataset
   def insert(*args); end

data/lib/sequel/metaprogramming.rb

@@ -1,5 +1,13 @@
+module Sequel
+  module Metaprogramming
+    # Defines an class method within a class
+    def inst_def name, &blk
+      instance_eval { define_method name, &blk }
+    end
+  end
+end
+
 # why the lucky stiff's helper for making metaclasses
-# easily available and usable
 class Object
   # The hidden singleton lurks behind everyone
   def metaclass; class << self; self; end; end
@@ -24,4 +32,3 @@ class Object
     instance_eval { define_method name, &blk }
   end
 end
-

data/lib/sequel/model_patch.rb

@@ -4,6 +4,8 @@ class Sequel::Model
 
   self.use_transactions=false
   plugin :validation_helpers
+  Sequel.extension :blank
+  Sequel.extension :inflector
 
   def self.find_children
     Module.constants.find_all do |c_klass|

data/lib/sequel/pervasive_adapter.rb

@@ -82,6 +82,7 @@ module Sequel
 
           if rows = s.fetch_all
             rows.each do |row|
+
               hash = {}
               cols.each{|n, i| hash[n] = convert_odbc_value(row[i], get_column_type(@columns[i]))}
               yield hash
@@ -159,7 +160,7 @@ module Sequel
             end
           end
         end
-        
+
         clone(:select => s.flatten)
       end
 

data/lib/sequel/serializer/json_serializer.rb

@@ -72,7 +72,6 @@ module Sequel
     #                   {"comments": [{"body": "Don't think too hard"}],
     #                    "title": "So I was thinking"}]}
     def to_json(options = {})
-
 #      if include_root_in_json
 #        "{#{self.class.json_class_name}: #{JsonSerializer.new(self, options).to_s}}"
 #      else

data/spec/models/trip_leg_spec.rb

@@ -4,6 +4,7 @@ describe TripLeg do
 
   it "catering association works with eager graph" do
     set_fos_db([TripLeg,Comment])
+    p TripLeg.db
     t = TripLeg.filter(:'trip legs__kid_date'=>66254).eager_graph(:aircraft).limit(1).all.first
     t.departure_general_comment
   end

data/spec/sequel/fos_dates_spec.rb

@@ -41,7 +41,6 @@ describe "fos_dates" do
 
   it "DateTime from fos date time" do
     DateTime.from_fos_date_time(40209,100).should == DateTime.new(2010,2,1,1,40,0)
-    p DateTime.from_fos_date_time(0,1440)
     DateTime.from_fos_date_time(0,100).should == DateTime.new(1899,12,31,1,40,0)
   end
 

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ unless defined?(DB_DEMO)
   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 = Sequel.odbc('fos')#, :loggers=>[Logger.new($stdout)])
   DB_FOS.extend(Sequel::Pervasive::DatabaseMethods)
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -27,9 +27,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 3
-        - 14
+        - 16
         - 0
-        version: 3.14.0
+        version: 3.16.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency