sequel 1.5.1 → 2.0.0

data/spec/spec.opts

@@ -1,5 +0,0 @@
---colour
---backtrace
---format
-specdoc
---diff

data/spec/spec_helper.rb

@@ -22,12 +22,14 @@ class MockDataset < Sequel::Dataset
   end
   
   def fetch_rows(sql)
+    return if sql =~ /information_schema/
     @db.execute(sql)
     yield({:id => 1, :x => 1})
   end
 end
 
 class MockDatabase < Sequel::Database
+  @@quote_identifiers = false
   attr_reader :sqls
   
   def execute(sql)
@@ -52,7 +54,17 @@ class << Sequel::Model
     @dataset.instance_variable_set(:@columns, cols) if @dataset
     define_method(:str_columns){cols.map{|x|x.to_s.freeze}}
     def_column_accessor(*cols)
+    @columns = cols
+    @db_schema = {}
+    cols.each{|c| @db_schema[c] = {}}
   end
 end
 
 Sequel::Model.db = MODEL_DB = MockDatabase.new
+
+class Spec::Example::ExampleGroup
+  def self.pt_specify(*args, &block)
+    specify(*args, &block) if defined?(ParseTree)
+  end 
+end
+

data/spec/validations_spec.rb

@@ -56,6 +56,7 @@ describe Validation do
   setup do
     @c = Class.new do
       include Validation
+      attr_reader :before_validation, :after_validation
       
       def self.validates_coolness_of(attr)
         validates_each(attr) {|o, a, v| o.errors[a] << 'is not cool' if v != :cool}
@@ -64,6 +65,7 @@ describe Validation do
     
     @d = Class.new do
       attr_accessor :errors
+      attr_reader :before_validation, :after_validation
       def initialize; @errors = Validation::Errors.new; end
     end
   end
@@ -111,6 +113,7 @@ describe "A Validation instance" do
   setup do
     @c = Class.new do
       attr_accessor :score
+      attr_reader :before_validation, :after_validation
       
       include Validation
       
@@ -147,6 +150,7 @@ describe Validation::Generator do
     
     @c = Class.new do
       include Validation
+      attr_reader :before_validation, :after_validation
       
       def self.validates_blah
         $testit = 1324
@@ -166,6 +170,7 @@ describe "Validations" do
   setup do
     @c = Class.new do
       attr_accessor :value
+      attr_reader :before_validation, :after_validation
       include Validation
     end
     @m = @c.new
@@ -268,6 +273,22 @@ describe "Validations" do
     @m.should be_valid
     @m.value = '123.1231'
     @m.should be_valid
+    @m.value = '+1'
+    @m.should be_valid
+    @m.value = '-1'
+    @m.should be_valid
+    @m.value = '+1.123'
+    @m.should be_valid
+    @m.value = '-0.123'
+    @m.should be_valid
+    @m.value = '-0.123E10'
+    @m.should be_valid
+    @m.value = '32.123e10'
+    @m.should be_valid
+    @m.value = '+32.123E10'
+    @m.should be_valid
+    @m.should be_valid
+    @m.value = '.0123'
   end
 
   specify "should validate numericality_of with only_integer" do
@@ -294,6 +315,7 @@ context "Superclass validations" do
   setup do
     @c1 = Class.new do
       include Validation
+      attr_reader :before_validation, :after_validation
       attr_accessor :value
       validates_length_of :value, :minimum => 5
     end
@@ -344,6 +366,7 @@ context ".validates with block" do
   specify "should support calling .each" do
     @c = Class.new do
       attr_accessor :vvv
+      attr_reader :before_validation, :after_validation
       
       include Validation
       validates do

metadata

@@ -1,33 +1,36 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
-date: 2008-04-30 00:00:00 -07:00
-summary: "The Database Toolkit for Ruby: Model Classes"
-require_paths: 
-- lib
-email: code@jeremyevans.net
-homepage: http://sequel.rubyforge.org
-rubyforge_project: sequel
-description: "The Database Toolkit for Ruby: Model Classes"
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.4
-  version: 
+  version: 2.0.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Jeremy Evans
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-06-01 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: sequel_core
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
+description: "The Database Toolkit for Ruby: Model Classes"
+email: code@jeremyevans.net
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- CHANGELOG
+- COPYING
 files: 
 - COPYING
 - README
@@ -35,18 +38,18 @@ files:
 - spec/associations_spec.rb
 - spec/base_spec.rb
 - spec/caching_spec.rb
-- spec/deprecated_relations_spec.rb
+- spec/model_spec.rb
 - spec/eager_loading_spec.rb
 - spec/hooks_spec.rb
-- spec/model_spec.rb
+- spec/record_spec.rb
 - spec/plugins_spec.rb
 - spec/rcov.opts
-- spec/record_spec.rb
-- spec/schema_spec.rb
 - spec/spec.opts
+- spec/schema_spec.rb
 - spec/spec_helper.rb
 - spec/validations_spec.rb
 - spec/inflector_spec.rb
+- spec/association_reflection_spec.rb
 - lib/sequel.rb
 - lib/sequel_model.rb
 - lib/sequel_model
@@ -59,35 +62,42 @@ files:
 - lib/sequel_model/record.rb
 - lib/sequel_model/schema.rb
 - lib/sequel_model/validations.rb
-- lib/sequel_model/deprecated.rb
-- lib/sequel_model/inflections.rb
 - lib/sequel_model/inflector.rb
+- lib/sequel_model/association_reflection.rb
 - CHANGELOG
-test_files: []
-
+has_rdoc: true
+homepage: http://sequel.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --quiet
 - --line-numbers
 - --inline-source
+- --title
+- "Sequel: The Database Toolkit for Ruby: Model Classes"
+- --main
+- README
 - --exclude
 - ^(examples|extras)/
-extra_rdoc_files: 
-- README
-- CHANGELOG
-- COPYING
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.4
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: sequel_core
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.5.1
-    version: 
+rubyforge_project: sequel
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: "The Database Toolkit for Ruby: Model Classes"
+test_files: []
+

data/lib/sequel_model/deprecated.rb

@@ -1,81 +0,0 @@
-module Sequel
-  class Model
-    include Sequel::Deprecation
-    extend Sequel::Deprecation
-
-    # Check the Model.associate method to remove the :from option
-
-    def self.is_dataset_magic_method?(m) #:nodoc:
-      method_name = m.to_s
-      Sequel::Dataset::MAGIC_METHODS.each_key do |r|
-        return true if method_name =~ r
-      end
-      false
-    end
-
-    def self.method_missing(m, *args, &block) #:nodoc:
-      Thread.exclusive do
-        if dataset.respond_to?(m) || is_dataset_magic_method?(m)
-          instance_eval("def #{m}(*args, &block); deprecate('Sequel::Model.method_missing', 'Please define Sequel::Model.#{m} or use def_dataset_method :#{m}'); dataset.#{m}(*args, &block); end")
-        end
-      end
-      respond_to?(m) ? send(m, *args, &block) : super(m, *args)
-    end
-
-    def method_missing(m, *args, &block) #:nodoc:
-      if m.to_s =~ /=\z/
-        attribute = m.to_s.chop
-        values.keys.each do |k|
-          next unless k.to_s == attribute
-          deprecate("Sequel::Model#method_missing", "Use model[:#{attribute}] = ...")
-          return self[attribute.to_sym] = args.first
-        end
-        super
-      else
-        attribute = m.to_s
-        values.keys.each do |k|
-          next unless k.to_s == attribute
-          deprecate("Sequel::Model#method_missing", "Use model[:#{attribute}]")
-          return self[attribute.to_sym]
-        end
-        super
-      end
-    end
-
-    def self.create_with_params(params) #:nodoc:
-      deprecate("Sequel::Model.create_with_params", "Use .create")
-      create(params)
-    end
-
-    def self.create_with(params) #:nodoc:
-      deprecate("Sequel::Model.create_with", "Use .create")
-      create(params)
-    end
-
-    def update_with(params) #:nodoc:
-      deprecate("Sequel::Model#update_with", "Use #update_with_params")
-      update_with_params(params)
-    end
-
-    def new_record? #:nodoc:
-      deprecate("Sequel::Model#new_record?", "Use #new?")
-      new?
-    end
-
-    def set(values) #:nodoc:
-      deprecate("Sequel::Model#set", "Use #update_values")
-      update_values(values)
-    end
-
-    def update(values) #:nodoc:
-      deprecate("Sequel::Model#update", "Use #update_values")
-      update_values(values)
-    end
-
-    # deprecated, please use many_to_one instead
-    def self.one_to_one(*args, &block) #:nodoc:
-      deprecate("Sequel::Model.one_to_one", "Use many_to_one")
-      many_to_one(*args, &block)
-    end
-  end
-end

data/lib/sequel_model/inflections.rb

@@ -1,112 +0,0 @@
-Inflector.inflections do |inflect|
-  inflect.plural(/$/, 's')
-  inflect.plural(/s$/i, 's')
-  inflect.plural(/(ax|test)is$/i, '\1es')
-  inflect.plural(/(octop|vir)us$/i, '\1i')
-  inflect.plural(/(alias|status)$/i, '\1es')
-  inflect.plural(/(bu)s$/i, '\1ses')
-  inflect.plural(/(buffal|tomat)o$/i, '\1oes')
-  inflect.plural(/([ti])um$/i, '\1a')
-  inflect.plural(/sis$/i, 'ses')
-  inflect.plural(/(?:([^f])fe|([lr])f)$/i, '\1\2ves')
-  inflect.plural(/(hive)$/i, '\1s')
-  inflect.plural(/([^aeiouy]|qu)y$/i, '\1ies')
-  inflect.plural(/(x|ch|ss|sh)$/i, '\1es')
-  inflect.plural(/(matr|vert|ind)ix|ex$/i, '\1ices')
-  inflect.plural(/([m|l])ouse$/i, '\1ice')
-  inflect.plural(/^(ox)$/i, '\1en')
-  inflect.plural(/(quiz)$/i, '\1zes')
-
-  inflect.singular(/s$/i, '')
-  inflect.singular(/(n)ews$/i, '\1ews')
-  inflect.singular(/([ti])a$/i, '\1um')
-  inflect.singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis')
-  inflect.singular(/(^analy)ses$/i, '\1sis')
-  inflect.singular(/([^f])ves$/i, '\1fe')
-  inflect.singular(/(hive)s$/i, '\1')
-  inflect.singular(/(tive)s$/i, '\1')
-  inflect.singular(/([lr])ves$/i, '\1f')
-  inflect.singular(/([^aeiouy]|qu)ies$/i, '\1y')
-  inflect.singular(/(s)eries$/i, '\1eries')
-  inflect.singular(/(m)ovies$/i, '\1ovie')
-  inflect.singular(/(x|ch|ss|sh)es$/i, '\1')
-  inflect.singular(/([m|l])ice$/i, '\1ouse')
-  inflect.singular(/(bus)es$/i, '\1')
-  inflect.singular(/(o)es$/i, '\1')
-  inflect.singular(/(shoe)s$/i, '\1')
-  inflect.singular(/(cris|ax|test)es$/i, '\1is')
-  inflect.singular(/(octop|vir)i$/i, '\1us')
-  inflect.singular(/(alias|status)es$/i, '\1')
-  inflect.singular(/^(ox)en/i, '\1')
-  inflect.singular(/(vert|ind)ices$/i, '\1ex')
-  inflect.singular(/(matr)ices$/i, '\1ix')
-  inflect.singular(/(quiz)zes$/i, '\1')
-
-  inflect.irregular('person', 'people')
-  inflect.irregular('man', 'men')
-  inflect.irregular('child', 'children')
-  inflect.irregular('sex', 'sexes')
-  inflect.irregular('move', 'moves')
-
-  inflect.uncountable(%w(equipment information rice money species series fish sheep))
-end
-
-module Inflections #:nodoc:
-
-  def pluralize
-    Inflector.pluralize(self)
-  end
-
-  def singularize
-    Inflector.singularize(self)
-  end
-
-  def camelize(first_letter = :upper)
-    case first_letter
-      when :upper then Inflector.camelize(self, true)
-      when :lower then Inflector.camelize(self, false)
-    end
-  end
-  alias_method :camelcase, :camelize
-
-  def titleize
-    Inflector.titleize(self)
-  end
-  alias_method :titlecase, :titleize
-
-  def underscore
-    Inflector.underscore(self)
-  end
-
-  def dasherize
-    Inflector.dasherize(self)
-  end
-
-  def demodulize
-    Inflector.demodulize(self)
-  end
-
-  def tableize
-    Inflector.tableize(self)
-  end
-
-  def classify
-    Inflector.classify(self)
-  end
-
-  def humanize
-    Inflector.humanize(self)
-  end
-
-  def foreign_key(separate_class_name_and_id_with_underscore = true)
-    Inflector.foreign_key(self, separate_class_name_and_id_with_underscore)
-  end
-
-  def constantize
-    Inflector.constantize(self)
-  end
-end
-
-class String
-  include Inflections
-end