Skip to content
Browse files

Code clean up, updated README.

Closes #86.
  • Loading branch information...
1 parent 34a2f89 commit 97045bbffc7f02951ff0590742d59088c8ec0809 @gaelian gaelian committed Jan 9, 2016
Showing with 14 additions and 19 deletions.
  1. +10 −13 Gemfile.lock
  2. +4 −0 README.textile
  3. +0 −6 db/migrate/20151220095617_update_tagging_tables.rb
View
23 Gemfile.lock
@@ -1,18 +1,7 @@
-GIT
- remote: https://github.com/jdelStrother/rspec-activemodel-mocks.git
- revision: 1211c347c5a574739616ccadf4b3b54686f9051f
- branch: read_attribute
- specs:
- rspec-activemodel-mocks (1.0.1)
- activemodel (>= 3.0)
- activesupport (>= 3.0)
- rspec-mocks (>= 2.99, < 4.0)
-
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
- aaronh-chronic (0.3.9)
actionmailer (4.2.4)
actionpack (= 4.2.4)
actionview (= 4.2.4)
@@ -48,6 +37,8 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
+ acts-as-taggable-on (3.5.0)
+ activerecord (>= 3.2, < 5)
addressable (2.3.8)
arel (6.0.3)
builder (3.2.2)
@@ -57,6 +48,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
+ chronic (0.10.2)
coderay (1.0.9)
cucumber (1.3.20)
builder (>= 2.1.2)
@@ -166,6 +158,10 @@ GEM
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
+ rspec-activemodel-mocks (1.0.2)
+ activemodel (>= 3.0)
+ activesupport (>= 3.0)
+ rspec-mocks (>= 2.99, < 4.0)
rspec-collection_matchers (1.1.2)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.3.2)
@@ -218,8 +214,9 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.2.9)
- aaronh-chronic
activerecord-jdbcsqlite3-adapter (= 1.3.0.beta2)
+ acts-as-taggable-on (~> 3.5)
+ chronic
coderay (~> 1.0.5)
cucumber-rails
cucumber-websteps
@@ -237,7 +234,7 @@ DEPENDENCIES
rack-openid
rails (~> 4.2.4)
rspec
- rspec-activemodel-mocks!
+ rspec-activemodel-mocks
rspec-collection_matchers
rspec-rails
ruby-openid
View
4 README.textile
@@ -73,6 +73,10 @@ h3. Using OpenID 2.0 for authentication
Open up <code>config/enki.yml</code> and make sure that one or more of your OpenID identity URLs are included in the <code>open_id</code> value(s).
+h2. Upgrading to Enki 2016
+
+As of January 2016, Enki no longer uses "acts_as_taggable_on_steroids":https://github.com/jviney/acts_as_taggable_on_steroids as it has been replaced with "ActsAsTaggableOn":https://github.com/mbleigh/acts-as-taggable-on. Commit "5e97796":https://github.com/xaviershay/enki/commit/5e977967cfeae6b98976b82b9bf260ee276be00f contains database migrations that update the existing tag-related tables to be compatible with ActsAsTaggableOn. This is a non-destructive migration so any existing tag records in your database should be unaffected. However, just to be safe you may wish to back up your database before running <code>bundle install</code> and <code>rake db:migrate</code> to upgrade your Enki install.
+
h2. Upgrading to Enki 2015
As of April 2015, Enki no longer uses the "open_id_authentication":https://github.com/Velir/open_id_authentication gem. Commit "ec85aef":https://github.com/xaviershay/enki/commit/ec85aef26ee82f17e8225be5cbe03ea459d1f112 contains database migrations that remove both tables used by open_id_authentication and add a new table to store OmniAuth response information. Should you wish to keep any data that you may have currently stored in either the open_id_authentication_nonces or open_id_authentication_associations tables, retrieve this information before you run <code>rake db:migrate</code> to upgrade your Enki install.
View
6 db/migrate/20151220095617_update_tagging_tables.rb
@@ -4,19 +4,14 @@ def up
change_column_null :tags, :taggings_count, true
change_table :taggings do |t|
- #t.references :tag
-
# You should make sure that the column created is
# long enough to store the required class names.
- # t.references :taggable, polymorphic: true
t.references :tagger, polymorphic: true
t.string :taggable_type, null: false, default: 'Post'
# Limit is created to prevent MySQL error on index
# length for MyISAM table type: http://bit.ly/vgW2Ql
t.string :context, limit: 128, default: 'tags', null: false
-
- #t.datetime :created_at
end
# set default before to force the db filling this field
change_column_default(:taggings, :taggable_type, nil)
@@ -35,7 +30,6 @@ def up
end
#create new index structures
-
add_index :tags, :name, unique: true
add_index :taggings,
[:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type],

0 comments on commit 97045bb

Please sign in to comment.
Something went wrong with that request. Please try again.