Commit 63c73582
Changed files (3)
app/models/creation.rb
@@ -4,4 +4,9 @@ class Creation < ActiveRecord::Base
attr_accessible :user_id, :story, :name, :image, :remote_image_url
belongs_to :user
mount_uploader :image, ImageUploader
+
+ define_index do
+ indexes :name
+ indexes user.name :as => :artist, :sortable => true
+ end
end
Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.3'
+gem 'rails'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -15,6 +15,9 @@ gem 'omniauth'
gem 'rmagick'
gem 'bcrypt-ruby'
gem 'json'
+gem 'thinking-sphinx'
+#gem 'postgres'
+#gem 'pg'
# Use unicorn as the web server
# gem 'unicorn'
Gemfile.lock
@@ -3,37 +3,37 @@ GEM
specs:
RedCloth (4.2.7)
abstract (1.0.0)
- actionmailer (3.0.3)
- actionpack (= 3.0.3)
- mail (~> 2.2.9)
- actionpack (3.0.3)
- activemodel (= 3.0.3)
- activesupport (= 3.0.3)
+ actionmailer (3.0.7)
+ actionpack (= 3.0.7)
+ mail (~> 2.2.15)
+ actionpack (3.0.7)
+ activemodel (= 3.0.7)
+ activesupport (= 3.0.7)
builder (~> 2.1.2)
erubis (~> 2.6.6)
- i18n (~> 0.4)
+ i18n (~> 0.5.0)
rack (~> 1.2.1)
- rack-mount (~> 0.6.13)
- rack-test (~> 0.5.6)
+ rack-mount (~> 0.6.14)
+ rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.3)
- activesupport (= 3.0.3)
+ activemodel (3.0.7)
+ activesupport (= 3.0.7)
builder (~> 2.1.2)
- i18n (~> 0.4)
- activerecord (3.0.3)
- activemodel (= 3.0.3)
- activesupport (= 3.0.3)
+ i18n (~> 0.5.0)
+ activerecord (3.0.7)
+ activemodel (= 3.0.7)
+ activesupport (= 3.0.7)
arel (~> 2.0.2)
tzinfo (~> 0.3.23)
- activeresource (3.0.3)
- activemodel (= 3.0.3)
- activesupport (= 3.0.3)
- activesupport (3.0.3)
+ activeresource (3.0.7)
+ activemodel (= 3.0.7)
+ activesupport (= 3.0.7)
+ activesupport (3.0.7)
addressable (2.2.4)
- arel (2.0.9)
+ arel (2.0.10)
bcrypt-ruby (2.1.4)
builder (2.1.2)
- carrierwave (0.5.3)
+ carrierwave (0.5.4)
activesupport (~> 3.0)
configuration (1.2.0)
devise (1.3.4)
@@ -47,12 +47,12 @@ GEM
addressable (~> 2.2.4)
multipart-post (~> 1.1.0)
rack (< 2, >= 1.1.0)
- heroku (2.1.4)
+ heroku (2.2.0)
launchy (>= 0.3.2)
rest-client (~> 1.6.1)
term-ansicolor (~> 1.0.5)
i18n (0.5.0)
- jquery-rails (1.0.2)
+ jquery-rails (1.0.7)
railties (~> 3.0)
thor (~> 0.14)
json (1.5.1)
@@ -65,52 +65,52 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
- multi_json (1.0.2)
+ multi_json (1.0.3)
multi_xml (0.2.2)
- multipart-post (1.1.1)
+ multipart-post (1.1.2)
net-ldap (0.2.2)
nokogiri (1.4.4)
- oa-basic (0.2.5)
- oa-core (= 0.2.5)
+ oa-basic (0.2.6)
+ oa-core (= 0.2.6)
rest-client (~> 1.6.0)
- oa-core (0.2.5)
- oa-enterprise (0.2.5)
+ oa-core (0.2.6)
+ oa-enterprise (0.2.6)
addressable (= 2.2.4)
net-ldap (~> 0.2.2)
nokogiri (~> 1.4.2)
- oa-core (= 0.2.5)
+ oa-core (= 0.2.6)
pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1)
- oa-more (0.2.5)
+ oa-more (0.2.6)
multi_json (~> 1.0.0)
- oa-core (= 0.2.5)
+ oa-core (= 0.2.6)
rest-client (~> 1.6.0)
- oa-oauth (0.2.5)
+ oa-oauth (0.2.6)
faraday (~> 0.6.1)
multi_json (~> 1.0.0)
multi_xml (~> 0.2.2)
- oa-core (= 0.2.5)
+ oa-core (= 0.2.6)
oauth (~> 0.4.0)
oauth2 (~> 0.4.1)
- oa-openid (0.2.5)
- oa-core (= 0.2.5)
+ oa-openid (0.2.6)
+ oa-core (= 0.2.6)
rack-openid (~> 1.3.1)
ruby-openid-apps-discovery (~> 1.2.0)
oauth (0.4.4)
oauth2 (0.4.1)
faraday (~> 0.6.1)
multi_json (>= 0.0.5)
- omniauth (0.2.5)
- oa-basic (= 0.2.5)
- oa-core (= 0.2.5)
- oa-enterprise (= 0.2.5)
- oa-more (= 0.2.5)
- oa-oauth (= 0.2.5)
- oa-openid (= 0.2.5)
+ omniauth (0.2.6)
+ oa-basic (= 0.2.6)
+ oa-core (= 0.2.6)
+ oa-enterprise (= 0.2.6)
+ oa-more (= 0.2.6)
+ oa-oauth (= 0.2.6)
+ oa-openid (= 0.2.6)
orm_adapter (0.0.5)
polyglot (0.3.1)
- pyu-ruby-sasl (0.0.3.2)
- rack (1.2.2)
+ pyu-ruby-sasl (0.0.3.3)
+ rack (1.2.3)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-openid (1.3.1)
@@ -118,28 +118,29 @@ GEM
ruby-openid (>= 2.1.8)
rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.3)
- actionmailer (= 3.0.3)
- actionpack (= 3.0.3)
- activerecord (= 3.0.3)
- activeresource (= 3.0.3)
- activesupport (= 3.0.3)
+ rails (3.0.7)
+ actionmailer (= 3.0.7)
+ actionpack (= 3.0.7)
+ activerecord (= 3.0.7)
+ activeresource (= 3.0.7)
+ activesupport (= 3.0.7)
bundler (~> 1.0)
- railties (= 3.0.3)
- railties (3.0.3)
- actionpack (= 3.0.3)
- activesupport (= 3.0.3)
+ railties (= 3.0.7)
+ railties (3.0.7)
+ actionpack (= 3.0.7)
+ activesupport (= 3.0.7)
rake (>= 0.8.7)
thor (~> 0.14.4)
- rake (0.8.7)
+ rake (0.9.0)
rest-client (1.6.1)
mime-types (>= 1.16)
+ riddle (1.3.3)
rmagick (2.13.1)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
rspec-mocks (~> 2.6.0)
- rspec-core (2.6.0)
+ rspec-core (2.6.3)
rspec-expectations (2.6.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.6.0)
@@ -156,6 +157,9 @@ GEM
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
term-ansicolor (1.0.5)
+ thinking-sphinx (2.0.5)
+ activerecord (>= 3.0.3)
+ riddle (>= 1.3.3)
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
@@ -179,8 +183,9 @@ DEPENDENCIES
jquery-rails
json
omniauth
- rails (= 3.0.3)
+ rails
rmagick
rspec-rails
sqlite3-ruby
+ thinking-sphinx
webrat