sequel 0.2.0 → 0.2.0.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 0.2.0.1 (2007-09-04)
+
+* Improved support for invoking methods with inline procs inside block filters.
+
 === 0.2.0 (2007-09-02)
 
 * Fixed Model.drop_table (thanks Duane Johnson.)

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "sequel"
-VERS = "0.2.0"
+VERS = "0.2.0.1"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "Sequel: Concise ORM for Ruby",
   "--opname", "index.html",

data/lib/sequel/dataset/sequelizer.rb

@@ -182,7 +182,11 @@ class Sequel::Dataset
         r = eval_expr(e[1], b)
         compare_expr(l, r)
       when :iter
-        eval_expr(e[3], b)
+        if e[1] == [:fcall, :proc]
+          eval_expr(e[3], b) # inline proc
+        else
+          ext_expr(e, b) # method call with inline proc
+        end
       when :dasgn, :dasgn_curr
         # assignment
         l = e[1]

data/spec/sequelizer_spec.rb

@@ -178,16 +178,27 @@ context "Proc#to_sql" do
   end
 
   specify "should support comparison to sub-queries" do
-    @ds2 = DB[:test].select(:node_id)
-    
-    proc {:id == @ds2}.to_sql.should == \
-      "(id IN (SELECT node_id FROM test))"
+    # @ds2 = DB[:test].select(:node_id)
+    # 
+    # proc {:id == @ds2}.to_sql.should == \
+    #   "(id IN (SELECT node_id FROM test))"
+    #   
+    # proc {:id == DB[:test].select(:node_id)}.to_sql.should == \
+    # "(id IN (SELECT node_id FROM test))"
+
+    proc {:id == DB[:test].select(:node_id).filter {:active == true}}.to_sql.should == \
+    "(id IN (SELECT node_id FROM test WHERE (active = 't')))"
   end
 
   specify "should support comparison to arrays" do
     proc {:id == [1, 3, 7, 15]}.to_sql.should == \
       "(id IN (1, 3, 7, 15))"
   end
+  
+  specify "should not literalize String#expr and String#lit" do
+    proc {'x'.lit == 1}.to_sql.should == "(x = 1)"
+    proc {'x.y'.expr == 1}.to_sql.should == "(x.y = 1)"
+  end
 
   specify "should support in/in? operator" do
     proc {:x.in [3, 4, 5]}.to_sql.should == "(x IN (3, 4, 5))"

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-09-03 00:00:00 +03:00
+  version: 0.2.0.1
+date: 2007-09-04 00:00:00 +03:00
 summary: Lightweight ORM library for Ruby
 require_paths: 
 - lib
@@ -33,46 +33,47 @@ files:
 - README
 - Rakefile
 - bin/sequel
-- spec/dataset_spec.rb
+- doc/rdoc
+- spec/adapters
 - spec/connection_pool_spec.rb
-- spec/database_spec.rb
 - spec/core_ext_spec.rb
-- spec/adapters
-- spec/adapters/sqlite_spec.rb
-- spec/adapters/mysql_spec.rb
-- spec/adapters/postgres_spec.rb
+- spec/database_spec.rb
+- spec/dataset_spec.rb
 - spec/migration_spec.rb
-- spec/schema_spec.rb
-- spec/schema_generator_spec.rb
-- spec/pretty_table_spec.rb
-- spec/spec_helper.rb
 - spec/model_spec.rb
+- spec/pretty_table_spec.rb
+- spec/schema_generator_spec.rb
+- spec/schema_spec.rb
 - spec/sequelizer_spec.rb
+- spec/spec_helper.rb
+- spec/adapters/mysql_spec.rb
+- spec/adapters/postgres_spec.rb
+- spec/adapters/sqlite_spec.rb
 - lib/sequel
-- lib/sequel/pretty_table.rb
-- lib/sequel/model.rb
-- lib/sequel/schema.rb
-- lib/sequel/sqlite.rb
-- lib/sequel/database.rb
-- lib/sequel/dataset.rb
-- lib/sequel/mysql.rb
-- lib/sequel/postgres.rb
+- lib/sequel.rb
+- lib/sequel/ado.rb
 - lib/sequel/connection_pool.rb
 - lib/sequel/core_ext.rb
+- lib/sequel/database.rb
+- lib/sequel/dataset
+- lib/sequel/dataset.rb
+- lib/sequel/dbi.rb
 - lib/sequel/error.rb
 - lib/sequel/expressions.rb
-- lib/sequel/dbi.rb
-- lib/sequel/odbc.rb
-- lib/sequel/dataset
-- lib/sequel/dataset/sql.rb
-- lib/sequel/dataset/sequelizer.rb
-- lib/sequel/dataset/convenience.rb
 - lib/sequel/migration.rb
+- lib/sequel/model.rb
+- lib/sequel/mysql.rb
+- lib/sequel/odbc.rb
+- lib/sequel/postgres.rb
+- lib/sequel/pretty_table.rb
 - lib/sequel/schema
-- lib/sequel/schema/schema_sql.rb
+- lib/sequel/schema.rb
+- lib/sequel/sqlite.rb
+- lib/sequel/dataset/convenience.rb
+- lib/sequel/dataset/sequelizer.rb
+- lib/sequel/dataset/sql.rb
 - lib/sequel/schema/schema_generator.rb
-- lib/sequel/ado.rb
-- lib/sequel.rb
+- lib/sequel/schema/schema_sql.rb
 - CHANGELOG
 test_files: []