rails 3.0.3, negating arel condition is not(c) instead of c.not now
This commit is contained in:
parent
e92e9947b8
commit
60ab4db8c1
30 changed files with 46 additions and 47 deletions
2
Gemfile
2
Gemfile
|
@ -1,6 +1,6 @@
|
||||||
source 'http://rubygems.org'
|
source 'http://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '3.0.0'
|
gem 'rails', '3.0.3'
|
||||||
#gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3'
|
#gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3'
|
||||||
|
|
||||||
gem 'compass', '~> 0.10.1'
|
gem 'compass', '~> 0.10.1'
|
||||||
|
|
84
Gemfile.lock
84
Gemfile.lock
|
@ -37,35 +37,34 @@ GEM
|
||||||
specs:
|
specs:
|
||||||
RocketAMF (0.2.1)
|
RocketAMF (0.2.1)
|
||||||
abstract (1.0.0)
|
abstract (1.0.0)
|
||||||
actionmailer (3.0.0)
|
actionmailer (3.0.3)
|
||||||
actionpack (= 3.0.0)
|
actionpack (= 3.0.3)
|
||||||
mail (~> 2.2.5)
|
mail (~> 2.2.9)
|
||||||
actionpack (3.0.0)
|
actionpack (3.0.3)
|
||||||
activemodel (= 3.0.0)
|
activemodel (= 3.0.3)
|
||||||
activesupport (= 3.0.0)
|
activesupport (= 3.0.3)
|
||||||
builder (~> 2.1.2)
|
builder (~> 2.1.2)
|
||||||
erubis (~> 2.6.6)
|
erubis (~> 2.6.6)
|
||||||
i18n (~> 0.4.1)
|
i18n (~> 0.4)
|
||||||
rack (~> 1.2.1)
|
rack (~> 1.2.1)
|
||||||
rack-mount (~> 0.6.12)
|
rack-mount (~> 0.6.13)
|
||||||
rack-test (~> 0.5.4)
|
rack-test (~> 0.5.6)
|
||||||
tzinfo (~> 0.3.23)
|
tzinfo (~> 0.3.23)
|
||||||
activemodel (3.0.0)
|
activemodel (3.0.3)
|
||||||
activesupport (= 3.0.0)
|
activesupport (= 3.0.3)
|
||||||
builder (~> 2.1.2)
|
builder (~> 2.1.2)
|
||||||
i18n (~> 0.4.1)
|
i18n (~> 0.4)
|
||||||
activerecord (3.0.0)
|
activerecord (3.0.3)
|
||||||
activemodel (= 3.0.0)
|
activemodel (= 3.0.3)
|
||||||
activesupport (= 3.0.0)
|
activesupport (= 3.0.3)
|
||||||
arel (~> 1.0.0)
|
arel (~> 2.0.2)
|
||||||
tzinfo (~> 0.3.23)
|
tzinfo (~> 0.3.23)
|
||||||
activeresource (3.0.0)
|
activeresource (3.0.3)
|
||||||
activemodel (= 3.0.0)
|
activemodel (= 3.0.3)
|
||||||
activesupport (= 3.0.0)
|
activesupport (= 3.0.3)
|
||||||
activesupport (3.0.0)
|
activesupport (3.0.3)
|
||||||
addressable (2.2.1)
|
addressable (2.2.1)
|
||||||
arel (1.0.1)
|
arel (2.0.3)
|
||||||
activesupport (~> 3.0.0)
|
|
||||||
builder (2.1.2)
|
builder (2.1.2)
|
||||||
closure-compiler (0.3.3)
|
closure-compiler (0.3.3)
|
||||||
compass (0.10.5)
|
compass (0.10.5)
|
||||||
|
@ -82,14 +81,15 @@ GEM
|
||||||
hoptoad_notifier (2.3.12)
|
hoptoad_notifier (2.3.12)
|
||||||
activesupport
|
activesupport
|
||||||
builder
|
builder
|
||||||
i18n (0.4.1)
|
i18n (0.4.2)
|
||||||
jammit (0.5.3)
|
jammit (0.5.3)
|
||||||
closure-compiler (>= 0.1.0)
|
closure-compiler (>= 0.1.0)
|
||||||
yui-compressor (>= 0.9.1)
|
yui-compressor (>= 0.9.1)
|
||||||
mail (2.2.6.1)
|
mail (2.2.9.1)
|
||||||
activesupport (>= 2.3.6)
|
activesupport (>= 2.3.6)
|
||||||
mime-types
|
i18n (>= 0.4.1)
|
||||||
treetop (>= 1.4.5)
|
mime-types (~> 1.16)
|
||||||
|
treetop (~> 1.4.8)
|
||||||
mime-types (1.16)
|
mime-types (1.16)
|
||||||
msgpack (0.4.3)
|
msgpack (0.4.3)
|
||||||
openneo-auth-signatory (0.0.4)
|
openneo-auth-signatory (0.0.4)
|
||||||
|
@ -101,21 +101,21 @@ GEM
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
rack-test (0.5.6)
|
rack-test (0.5.6)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.0.0)
|
rails (3.0.3)
|
||||||
actionmailer (= 3.0.0)
|
actionmailer (= 3.0.3)
|
||||||
actionpack (= 3.0.0)
|
actionpack (= 3.0.3)
|
||||||
activerecord (= 3.0.0)
|
activerecord (= 3.0.3)
|
||||||
activeresource (= 3.0.0)
|
activeresource (= 3.0.3)
|
||||||
activesupport (= 3.0.0)
|
activesupport (= 3.0.3)
|
||||||
bundler (~> 1.0.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.0.0)
|
railties (= 3.0.3)
|
||||||
rails_warden (0.5.2)
|
rails_warden (0.5.2)
|
||||||
warden
|
warden
|
||||||
railties (3.0.0)
|
railties (3.0.3)
|
||||||
actionpack (= 3.0.0)
|
actionpack (= 3.0.3)
|
||||||
activesupport (= 3.0.0)
|
activesupport (= 3.0.3)
|
||||||
rake (>= 0.8.4)
|
rake (>= 0.8.7)
|
||||||
thor (~> 0.14.0)
|
thor (~> 0.14.4)
|
||||||
rake (0.8.7)
|
rake (0.8.7)
|
||||||
rdiscount (1.6.5)
|
rdiscount (1.6.5)
|
||||||
rspec (2.0.0.beta.22)
|
rspec (2.0.0.beta.22)
|
||||||
|
@ -135,8 +135,8 @@ GEM
|
||||||
daemons (>= 1.0.9)
|
daemons (>= 1.0.9)
|
||||||
eventmachine (>= 0.12.6)
|
eventmachine (>= 0.12.6)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
thor (0.14.2)
|
thor (0.14.4)
|
||||||
treetop (1.4.8)
|
treetop (1.4.9)
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
tzinfo (0.3.23)
|
tzinfo (0.3.23)
|
||||||
warden (1.0.1)
|
warden (1.0.1)
|
||||||
|
@ -163,7 +163,7 @@ DEPENDENCIES
|
||||||
mysqlplus!
|
mysqlplus!
|
||||||
openneo-auth-signatory (~> 0.0.4)
|
openneo-auth-signatory (~> 0.0.4)
|
||||||
rack-fiber_pool
|
rack-fiber_pool
|
||||||
rails (= 3.0.0)
|
rails (= 3.0.3)
|
||||||
rails_warden (~> 0.5.2)
|
rails_warden (~> 0.5.2)
|
||||||
rdiscount (~> 1.6.5)
|
rdiscount (~> 1.6.5)
|
||||||
rspec-rails (~> 2.0.0.beta.22)
|
rspec-rails (~> 2.0.0.beta.22)
|
||||||
|
|
|
@ -120,7 +120,7 @@ class Item < ActiveRecord::Base
|
||||||
ids_to_delete = self.parent_swf_asset_relationships.
|
ids_to_delete = self.parent_swf_asset_relationships.
|
||||||
select(:id).
|
select(:id).
|
||||||
joins(:object_asset).
|
joins(:object_asset).
|
||||||
where(rels[:swf_asset_id].in(new_swf_asset_ids).not).
|
where(rels[:swf_asset_id].not_in(new_swf_asset_ids)).
|
||||||
where(swf_assets[:body_id].in([@current_body_id, 0])).
|
where(swf_assets[:body_id].in([@current_body_id, 0])).
|
||||||
map(&:id)
|
map(&:id)
|
||||||
unless ids_to_delete.empty?
|
unless ids_to_delete.empty?
|
||||||
|
@ -262,7 +262,7 @@ class Item < ActiveRecord::Base
|
||||||
SearchFilterScopes << name.to_s
|
SearchFilterScopes << name.to_s
|
||||||
scope "search_filter_#{name}", lambda { |str, negative|
|
scope "search_filter_#{name}", lambda { |str, negative|
|
||||||
condition = yield(str)
|
condition = yield(str)
|
||||||
condition = condition.not if negative
|
condition = not(condition) if negative
|
||||||
rel = where(condition)
|
rel = where(condition)
|
||||||
rel = rel & args[:scope] if args[:scope]
|
rel = rel & args[:scope] if args[:scope]
|
||||||
rel
|
rel
|
||||||
|
|
|
@ -91,7 +91,7 @@ class PetType < ActiveRecord::Base
|
||||||
end
|
end
|
||||||
unneeded_item_ids = Item.select(items[:id]).joins(:parent_swf_asset_relationships => :object_asset).
|
unneeded_item_ids = Item.select(items[:id]).joins(:parent_swf_asset_relationships => :object_asset).
|
||||||
where(SwfAsset.arel_table[:body_id].in([0, self.body_id])).map(&:id)
|
where(SwfAsset.arel_table[:body_id].in([0, self.body_id])).map(&:id)
|
||||||
Item.where(items[:id].in(unneeded_item_ids).not).
|
Item.where(items[:id].not_in(unneeded_item_ids)).
|
||||||
where(species_condition)
|
where(species_condition)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
OpenneoImpressItems::Application.routes.draw do |map|
|
OpenneoImpressItems::Application.routes.draw do |map|
|
||||||
root :to => 'outfits#new'
|
root :to => 'outfits#new'
|
||||||
match '/' => 'items#index', :as => :items
|
|
||||||
match '/index.js' => 'items#index', :format => :js
|
match '/index.js' => 'items#index', :format => :js
|
||||||
match '/items.json' => 'items#index', :format => :json
|
match '/items.json' => 'items#index', :format => :json
|
||||||
|
|
||||||
|
|
BIN
vendor/cache/actionmailer-3.0.0.gem
vendored
BIN
vendor/cache/actionmailer-3.0.0.gem
vendored
Binary file not shown.
BIN
vendor/cache/actionmailer-3.0.3.gem
vendored
Normal file
BIN
vendor/cache/actionmailer-3.0.3.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/actionpack-3.0.0.gem
vendored
BIN
vendor/cache/actionpack-3.0.0.gem
vendored
Binary file not shown.
BIN
vendor/cache/actionpack-3.0.3.gem
vendored
Normal file
BIN
vendor/cache/actionpack-3.0.3.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activemodel-3.0.0.gem
vendored
BIN
vendor/cache/activemodel-3.0.0.gem
vendored
Binary file not shown.
BIN
vendor/cache/activemodel-3.0.3.gem
vendored
Normal file
BIN
vendor/cache/activemodel-3.0.3.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activerecord-3.0.0.gem
vendored
BIN
vendor/cache/activerecord-3.0.0.gem
vendored
Binary file not shown.
BIN
vendor/cache/activerecord-3.0.3.gem
vendored
Normal file
BIN
vendor/cache/activerecord-3.0.3.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activeresource-3.0.0.gem
vendored
BIN
vendor/cache/activeresource-3.0.0.gem
vendored
Binary file not shown.
BIN
vendor/cache/activeresource-3.0.3.gem
vendored
Normal file
BIN
vendor/cache/activeresource-3.0.3.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activesupport-3.0.0.gem
vendored
BIN
vendor/cache/activesupport-3.0.0.gem
vendored
Binary file not shown.
BIN
vendor/cache/activesupport-3.0.3.gem
vendored
Normal file
BIN
vendor/cache/activesupport-3.0.3.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/arel-1.0.1.gem
vendored
BIN
vendor/cache/arel-1.0.1.gem
vendored
Binary file not shown.
BIN
vendor/cache/arel-2.0.3.gem
vendored
Normal file
BIN
vendor/cache/arel-2.0.3.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/i18n-0.4.1.gem
vendored
BIN
vendor/cache/i18n-0.4.1.gem
vendored
Binary file not shown.
BIN
vendor/cache/i18n-0.4.2.gem
vendored
Normal file
BIN
vendor/cache/i18n-0.4.2.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/mail-2.2.6.1.gem
vendored
BIN
vendor/cache/mail-2.2.6.1.gem
vendored
Binary file not shown.
BIN
vendor/cache/mail-2.2.9.1.gem
vendored
Normal file
BIN
vendor/cache/mail-2.2.9.1.gem
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
vendor/cache/railties-3.0.0.gem
vendored
BIN
vendor/cache/railties-3.0.0.gem
vendored
Binary file not shown.
BIN
vendor/cache/railties-3.0.3.gem
vendored
Normal file
BIN
vendor/cache/railties-3.0.3.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/thor-0.14.2.gem
vendored
BIN
vendor/cache/thor-0.14.2.gem
vendored
Binary file not shown.
BIN
vendor/cache/thor-0.14.4.gem
vendored
Normal file
BIN
vendor/cache/thor-0.14.4.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/treetop-1.4.8.gem
vendored
BIN
vendor/cache/treetop-1.4.8.gem
vendored
Binary file not shown.
BIN
vendor/cache/treetop-1.4.9.gem
vendored
Normal file
BIN
vendor/cache/treetop-1.4.9.gem
vendored
Normal file
Binary file not shown.
Loading…
Reference in a new issue