github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ruby 1.9.2 compliant

Browse Source
This commit is contained in:
dinedine 2010-11-08 18:42:14 +01:00
parent 2d4f77c5ca
commit bbb09b58cf
8 changed files with 53 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -8,7 +8,7 @@ gem 'warden'
gem 'devise', '= 1.1.3'
gem 'mongoid', '2.0.0.beta.19'
gem 'bson_ext', '1.1.1'
gem 'bson_ext', '1.1.2'
gem 'locomotive_mongoid_acts_as_tree', '0.1.5.1', :require => 'mongoid_acts_as_tree'
gem 'will_paginate'

66
Gemfile.lock
View File

@ -1,15 +1,15 @@
GIT
remote: git://github.com/floehopper/mocha.git
revision: e0a00a7b2adf8f11d3679879df9a5c47a5c36189
revision: 89a334f490fc8e01d02e4a7c4ff0afbb323f0ef9
specs:
mocha (0.9.8.20100819090654)
mocha (0.9.9.20101022133622)
rake
GIT
remote: http://github.com/ianwhite/pickle.git
revision: 65ba8b7337f38d0ab4c153b3ab687e13de7086c7
revision: 55f2af5ff3f036f742605b34f5940ec663ff461a
specs:
pickle (0.4.2)
pickle (0.4.3)
cucumber (>= 0.8)
rake
rspec (>= 1.3)
@ -47,20 +47,24 @@ GEM
activemodel (= 3.0.1)
activesupport (= 3.0.1)
activesupport (3.0.1)
archive-tar-minitar (0.5.2)
arel (1.0.1)
activesupport (~> 3.0.0)
autotest (4.4.1)
autotest (4.4.2)
bcrypt-ruby (2.1.2)
bson (1.1.1)
bson_ext (1.1.1)
bson (1.1.2)
bson_ext (1.1.2)
builder (2.1.2)
capybara (0.3.9)
capybara (0.4.0)
celerity (>= 0.7.9)
culerity (>= 0.2.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (>= 0.0.3)
selenium-webdriver (>= 0.0.27)
xpath (~> 0.1.2)
celerity (0.8.2)
cgi_multipart_eof_fix (2.5.0)
childprocess (0.1.3)
ffi (~> 0.6.3)
@ -80,8 +84,8 @@ GEM
activesupport (>= 3.0.0)
locomotive_carrierwave
mongoid (>= 2.0.0.beta.18)
daemons (1.1.0)
database_cleaner (0.5.2)
daemons (1.0.10)
database_cleaner (0.6.0)
delayed_job (2.1.0.pre2)
activesupport (~> 3.0)
daemons
@ -122,13 +126,13 @@ GEM
growl-glue (1.0.7)
haml (3.0.18)
has_scope (0.5.0)
heroku (1.10.16)
heroku (1.12.1)
json_pure (>= 1.2.0, < 1.5.0)
launchy (~> 0.3.2)
rest-client (>= 1.4.0, < 1.7.0)
httparty (0.6.1)
crack (= 0.1.8)
i18n (0.4.1)
i18n (0.4.2)
inherited_resources (1.1.2)
has_scope (~> 0.5.0)
responders (~> 0.6.0)
@ -138,16 +142,19 @@ GEM
configuration (>= 0.0.5)
rake (>= 0.8.1)
linecache (0.43)
linecache19 (0.5.11)
ruby_core_source (>= 0.1.4)
locomotive_carrierwave (0.5.0.1.beta2)
activesupport (~> 3.0)
locomotive_liquid (2.2.2)
locomotive_mongoid_acts_as_tree (0.1.5.1)
bson (>= 0.20.1)
mongoid (<= 2.0.0.beta.19)
mail (2.2.7)
mail (2.2.9)
activesupport (>= 2.3.6)
mime-types
treetop (>= 1.4.5)
i18n (~> 0.4.1)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
mimetype-fu (0.1.2)
mongo (1.0.9)
@ -157,11 +164,9 @@ GEM
mongo (= 1.0.9)
tzinfo (~> 0.3.22)
will_paginate (~> 3.0.pre)
mongrel (1.1.5)
cgi_multipart_eof_fix (>= 2.4)
daemons (>= 1.0.3)
fastthread (>= 1.0.1)
gem_plugin (>= 0.2.3)
mongrel (1.2.0.pre2)
daemons (~> 1.0.10)
gem_plugin (~> 0.2.3)
net-ssh (2.0.23)
nokogiri (1.4.3.1)
polyglot (0.3.1)
@ -205,7 +210,17 @@ GEM
ruby-debug-base (~> 0.10.3.0)
ruby-debug-base (0.10.3)
linecache (>= 0.3)
ruby-debug-base19 (0.11.24)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby_core_source (>= 0.1.4)
ruby-debug19 (0.11.6)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby-debug-base19 (>= 0.11.19)
ruby-hmac (0.4.0)
ruby_core_source (0.1.4)
archive-tar-minitar (>= 0.5.2)
rubyzip (0.9.4)
selenium-webdriver (0.0.29)
childprocess (>= 0.0.7)
@ -214,7 +229,7 @@ GEM
rubyzip
spork (0.8.4)
term-ansicolor (1.0.5)
thor (0.14.3)
thor (0.14.4)
treetop (1.4.8)
polyglot (>= 0.3.1)
trollop (1.16.2)
@ -222,6 +237,8 @@ GEM
warden (0.10.7)
rack (>= 1.0.0)
will_paginate (3.0.pre2)
xpath (0.1.2)
nokogiri (~> 1.3)
yard (0.6.1)
PLATFORMS
@ -231,7 +248,7 @@ DEPENDENCIES
RedCloth
actionmailer-with-request
autotest
bson_ext (= 1.1.1)
bson_ext (= 1.1.2)
capybara
cgi_multipart_eof_fix
cucumber (= 0.8.5)
@ -257,12 +274,13 @@ DEPENDENCIES
mimetype-fu
mocha!
mongoid (= 2.0.0.beta.19)
mongrel
mongrel (>= 1.2.0.pre2)
pickle!
rails (>= 3.0.0)
rmagick (= 2.12.2)
rspec-rails (>= 2.0.0.beta.18)
ruby-debug
ruby-debug19
rubyzip
spork
warden

2
app/models/extensions/page/tree.rb
View File

@ -31,7 +31,7 @@ module Models
def sort_children!(ids)
ids.each_with_index do |id, position|
child = self.children.detect { |p| p._id == id }
child = self.children.detect { |p| p._id == BSON::ObjectId(id) }
child.position = position
child.save
end

2
doc/TODO
View File

@ -5,6 +5,8 @@ BOARD:
- editable elements should wrap a tag: div, h1, ...etc (default span)
- edit images (upload new ones, ...etc) => wait for aloha or send them an email ?
- ruby 1.9.2
- jammit: assets
- refactor slugify method (use parameterize + create a module)
- global regions: keyword in editable element (http://www.mongodb.org/display/DOCS/Updating)

2
lib/locomotive/liquid/filters/html.rb
View File

@ -134,7 +134,7 @@ module Locomotive
# <key1>="<value1>", <key2>="<value2", ...etc
def inline_options(options = {})
return '' if options.empty?
(options.stringify_keys.to_a.collect { |a, b| "#{a}=\"#{b}\"" }).join(' ') << ' '
(options.stringify_keys.sort.to_a.collect { |a, b| "#{a}=\"#{b}\"" }).join(' ') << ' '
end
# Get the url to be used in html tags such as image_tag, flash_tag, ...etc

9
lib/locomotive/misc_form_builder.rb
View File

@ -34,14 +34,9 @@ module Locomotive
end
end
def normalize_model_name(name)
if name =~ /(.+)\/(.+)/
[$1, $2]
else
super
end
def model_name
@object.present? ? (@object.class.name || @object.class.model_name) : @object_name.to_s.classify
end
end
end

2
spec/models/page_spec.rb
View File

@ -1,3 +1,5 @@
# coding: utf-8
require 'spec_helper'
describe Page do

2
spec/models/theme_asset_spec.rb
View File

@ -1,3 +1,5 @@
# coding: utf-8
require 'spec_helper'
describe ThemeAsset do