Skip to content

Commit

Permalink
update annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
nabeta committed May 9, 2015
1 parent 054e3db commit d93bd97
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 28 deletions.
9 changes: 4 additions & 5 deletions app/models/news_feed.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,10 @@ def self.fetch_feeds
#
# id :integer not null, primary key
# library_group_id :integer default(1), not null
# title :string(255)
# url :string(255)
# title :string
# url :string
# body :text
# position :integer
# created_at :datetime not null
# updated_at :datetime not null
# created_at :datetime
# updated_at :datetime
#

7 changes: 3 additions & 4 deletions app/models/news_post.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ def self.per_page
# note :text
# position :integer
# draft :boolean default(FALSE), not null
# created_at :datetime not null
# updated_at :datetime not null
# url :string(255)
# created_at :datetime
# updated_at :datetime
# url :string
#

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class AddSettingsToLibraryGroup < ActiveRecord::Migration
def change
add_column :library_groups, :settings, :text
end
end
3 changes: 2 additions & 1 deletion spec/dummy/db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20140811031145) do
ActiveRecord::Schema.define(version: 20150221063719) do

create_table "accepts", force: :cascade do |t|
t.integer "basket_id"
Expand Down Expand Up @@ -100,6 +100,7 @@
t.datetime "updated_at"
t.text "admin_networks"
t.string "url", default: "http://localhost:3000/"
t.text "settings"
end

add_index "library_groups", ["short_name"], name: "index_library_groups_on_short_name"
Expand Down
5 changes: 5 additions & 0 deletions spec/fixtures/library_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ one:
note:
my_networks: 0.0.0.0/0
url: "http://localhost:3000/"
settings: <% if Rails::VERSION::MAJOR > 3 %>
"{\"max_number_of_results\":200,\"family_name_first\":true,\"book_jacket_source\":\"google\",\"screenshot_generator\":\"mozshot\"}"
<% else %>
"---\n:max_number_of_results: 200\n:family_name_first: true\n:book_jacket_source: \"google\"\n:screenshot_generator: \"mozshot\""
<% end %>


# == Schema Information
Expand Down
9 changes: 4 additions & 5 deletions spec/fixtures/news_feeds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@ news_feed_00002:
#
# id :integer not null, primary key
# library_group_id :integer default(1), not null
# title :string(255)
# url :string(255)
# title :string
# url :string
# body :text
# position :integer
# created_at :datetime not null
# updated_at :datetime not null
# created_at :datetime
# updated_at :datetime
#

7 changes: 3 additions & 4 deletions spec/fixtures/news_posts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ news_post_00002:
# note :text
# position :integer
# draft :boolean default(FALSE), not null
# created_at :datetime not null
# updated_at :datetime not null
# url :string(255)
# created_at :datetime
# updated_at :datetime
# url :string
#

9 changes: 4 additions & 5 deletions spec/models/news_feed_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,10 @@
#
# id :integer not null, primary key
# library_group_id :integer default(1), not null
# title :string(255)
# url :string(255)
# title :string
# url :string
# body :text
# position :integer
# created_at :datetime not null
# updated_at :datetime not null
# created_at :datetime
# updated_at :datetime
#

7 changes: 3 additions & 4 deletions spec/models/news_post_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
# note :text
# position :integer
# draft :boolean default(FALSE), not null
# created_at :datetime not null
# updated_at :datetime not null
# url :string(255)
# created_at :datetime
# updated_at :datetime
# url :string
#

0 comments on commit d93bd97

Please sign in to comment.