squeel 1.0.0 → 1.0.1

data/Gemfile

@@ -3,7 +3,7 @@ gemspec
 
 gem 'rake'
 
-rails = ENV['RAILS'] || 'master'
+rails = ENV['RAILS'] || '3-2-stable'
 arel = ENV['AREL'] || 'master'
 
 arel_opts = case arel

data/lib/squeel/nodes/key_path.rb

@@ -12,8 +12,9 @@ module Squeel
 
       # We need some methods to fall through to the endpoint or create a new
       # stub of the given name
-      %w(id == != =~ !~ desc).each do |method_name|
-        undef_method method_name if method_defined?(method_name) || private_method_defined?(method_name)
+      %w(id type == != =~ !~ desc).each do |method_name|
+        undef_method method_name if method_defined?(method_name) ||
+          private_method_defined?(method_name)
       end
 
       # @return [Array<Symbol, Stub, Join>] The path

data/lib/squeel/nodes/stub.rb

@@ -24,7 +24,12 @@ module Squeel
       alias :< :lt
       alias :<= :lteq
 
-      undef_method :id if method_defined?(:id)
+      # We dn't want these default Object methods, because if we're
+      # calling them we are probably talking about a column name
+      [:id, :type].each do |column_method|
+        undef_method column_method if method_defined?(column_method) ||
+          private_method_defined?(column_method)
+      end
 
       # @return [Symbol] The symbol contained by this stub
       attr_reader :symbol
@@ -129,4 +134,4 @@ module Squeel
 
     end
   end
-end
+end

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/squeel/nodes/key_path_spec.rb

@@ -26,6 +26,11 @@ module Squeel
         expect { @k.another }.to raise_error NoMethodError
       end
 
+      it 'allows specification of a type column' do
+        node = @k.type
+        node.should be_a KeyPath # not a Class (Ruby 1.8 Object#type)
+      end
+
       it 'sends missing calls to its endpoint if the endpoint responds to them' do
         @k.third.fourth.fifth.matches('Joe%')
         @k.endpoint.should be_a Predicate
@@ -105,4 +110,4 @@ module Squeel
 
     end
   end
-end
+end

data/spec/squeel/nodes/stub_spec.rb

@@ -33,6 +33,18 @@ module Squeel
         keypath.path_with_endpoint.should eq [@s, Stub.new(:another)]
       end
 
+      it 'creates a KeyPath when sent #id' do
+        keypath = @s.id
+        keypath.should be_a KeyPath
+        keypath.path_with_endpoint.should eq [@s, Stub.new(:id)]
+      end
+
+      it 'creates a KeyPath when sent #type' do
+        keypath = @s.type
+        keypath.should be_a KeyPath
+        keypath.path_with_endpoint.should eq [@s, Stub.new(:type)]
+      end
+
       it 'creates a KeyPath with a join endpoint when sent a method with a Class param' do
         keypath = @s.another(Person)
         keypath.should be_a KeyPath
@@ -202,4 +214,4 @@ module Squeel
 
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-22 00:00:00.000000000 -04:00
+date: 2012-05-02 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70321134916300 !ruby/object:Gem::Requirement
+  requirement: &70156349477400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321134916300
+  version_requirements: *70156349477400
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70321134915080 !ruby/object:Gem::Requirement
+  requirement: &70156349476680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321134915080
+  version_requirements: *70156349476680
 - !ruby/object:Gem::Dependency
   name: polyamorous
-  requirement: &70321134914020 !ruby/object:Gem::Requirement
+  requirement: &70156349475880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70321134914020
+  version_requirements: *70156349475880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70321134911960 !ruby/object:Gem::Requirement
+  requirement: &70156349475260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70321134911960
+  version_requirements: *70156349475260
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70321134928680 !ruby/object:Gem::Requirement
+  requirement: &70156349474620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70321134928680
+  version_requirements: *70156349474620
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70321134927360 !ruby/object:Gem::Requirement
+  requirement: &70156349473320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70321134927360
+  version_requirements: *70156349473320
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70321134925640 !ruby/object:Gem::Requirement
+  requirement: &70156349488720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +88,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70321134925640
+  version_requirements: *70156349488720
 description: ! "\n      Squeel unlocks the power of ARel in your Rails 3 application
   with\n      a handy block-based syntax. You can write subqueries, access named\n
   \     functions provided by your RDBMS, and more, all without writing\n      SQL
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1688941417700106629
+      hash: 3396698856870050214
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1688941417700106629
+      hash: 3396698856870050214
 requirements: []
 rubyforge_project: squeel
 rubygems_version: 1.3.9.4