From 169a5f0dd9e45f74c7e92f19682479f824217b05 Mon Sep 17 00:00:00 2001 From: stve Date: Tue, 10 Feb 2015 21:41:20 -0500 Subject: [PATCH] pluralize API modules so filenames aren't the same --- lib/instapaper/api.rb | 16 ++++++++-------- lib/instapaper/api/{account.rb => accounts.rb} | 2 +- lib/instapaper/api/{bookmark.rb => bookmarks.rb} | 2 +- lib/instapaper/api/{folder.rb => folders.rb} | 2 +- .../api/{highlight.rb => highlights.rb} | 2 +- .../api/{account_spec.rb => accounts_spec.rb} | 2 +- .../api/{bookmark_spec.rb => bookmarks_spec.rb} | 2 +- .../api/{folder_spec.rb => folders_spec.rb} | 2 +- .../{highlight_spec.rb => highlights_spec.rb} | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) rename lib/instapaper/api/{account.rb => accounts.rb} (93%) rename lib/instapaper/api/{bookmark.rb => bookmarks.rb} (99%) rename lib/instapaper/api/{folder.rb => folders.rb} (98%) rename lib/instapaper/api/{highlight.rb => highlights.rb} (98%) rename spec/instapaper/api/{account_spec.rb => accounts_spec.rb} (93%) rename spec/instapaper/api/{bookmark_spec.rb => bookmarks_spec.rb} (99%) rename spec/instapaper/api/{folder_spec.rb => folders_spec.rb} (98%) rename spec/instapaper/api/{highlight_spec.rb => highlights_spec.rb} (97%) diff --git a/lib/instapaper/api.rb b/lib/instapaper/api.rb index 4d6eea0..d655c5d 100644 --- a/lib/instapaper/api.rb +++ b/lib/instapaper/api.rb @@ -1,16 +1,16 @@ -require 'instapaper/api/account' -require 'instapaper/api/bookmark' -require 'instapaper/api/folder' -require 'instapaper/api/highlight' +require 'instapaper/api/accounts' +require 'instapaper/api/bookmarks' +require 'instapaper/api/folders' +require 'instapaper/api/highlights' require 'instapaper/api/oauth' require 'instapaper/api/utils' module Instapaper module API - include Instapaper::API::Account - include Instapaper::API::Bookmark - include Instapaper::API::Folder - include Instapaper::API::Highlight + include Instapaper::API::Accounts + include Instapaper::API::Bookmarks + include Instapaper::API::Folders + include Instapaper::API::Highlights include Instapaper::API::OAuth include Instapaper::API::Utils end diff --git a/lib/instapaper/api/account.rb b/lib/instapaper/api/accounts.rb similarity index 93% rename from lib/instapaper/api/account.rb rename to lib/instapaper/api/accounts.rb index 3199d61..98b3558 100644 --- a/lib/instapaper/api/account.rb +++ b/lib/instapaper/api/accounts.rb @@ -3,7 +3,7 @@ require 'instapaper/user' module Instapaper module API # Defines methods related to accounts - module Account + module Accounts # Returns the currently logged in user. def verify_credentials perform_post_with_object('/api/1/account/verify_credentials', {}, Instapaper::User) diff --git a/lib/instapaper/api/bookmark.rb b/lib/instapaper/api/bookmarks.rb similarity index 99% rename from lib/instapaper/api/bookmark.rb rename to lib/instapaper/api/bookmarks.rb index 26d8ffd..88f833b 100644 --- a/lib/instapaper/api/bookmark.rb +++ b/lib/instapaper/api/bookmarks.rb @@ -3,7 +3,7 @@ require 'instapaper/bookmark' module Instapaper module API # Defines methods related to bookmarks - module Bookmark + module Bookmarks # Lists the user's unread bookmarks, and can also synchronize reading positions. # @option limit: Optional. A number between 1 and 500, default 25. # @option folder_id: Optional. Possible values are unread (default), starred, archive, or a folder_id value from /api/1/folders/list. diff --git a/lib/instapaper/api/folder.rb b/lib/instapaper/api/folders.rb similarity index 98% rename from lib/instapaper/api/folder.rb rename to lib/instapaper/api/folders.rb index 1a28e9c..11f3f31 100644 --- a/lib/instapaper/api/folder.rb +++ b/lib/instapaper/api/folders.rb @@ -3,7 +3,7 @@ require 'instapaper/folder' module Instapaper module API # Defines methods related to folders - module Folder + module Folders # List the account's user-created folders. # @note This only includes organizational folders and does not include RSS-feed folders or starred-subscription folders def folders diff --git a/lib/instapaper/api/highlight.rb b/lib/instapaper/api/highlights.rb similarity index 98% rename from lib/instapaper/api/highlight.rb rename to lib/instapaper/api/highlights.rb index 9adccc0..74df005 100644 --- a/lib/instapaper/api/highlight.rb +++ b/lib/instapaper/api/highlights.rb @@ -3,7 +3,7 @@ require 'instapaper/highlight' module Instapaper module API # Defines methods related to highlights - module Highlight + module Highlights # List highlights for a bookmark def highlights(bookmark_id) perform_post_with_objects("/api/1.1/bookmarks/#{bookmark_id}/highlights", {}, Instapaper::Highlight) diff --git a/spec/instapaper/api/account_spec.rb b/spec/instapaper/api/accounts_spec.rb similarity index 93% rename from spec/instapaper/api/account_spec.rb rename to spec/instapaper/api/accounts_spec.rb index 5c2e7b9..8daba4e 100644 --- a/spec/instapaper/api/account_spec.rb +++ b/spec/instapaper/api/accounts_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Instapaper::Client::Account do +describe Instapaper::Client::Accounts do let(:client) { Instapaper::Client.new } describe '.verify_credentials' do diff --git a/spec/instapaper/api/bookmark_spec.rb b/spec/instapaper/api/bookmarks_spec.rb similarity index 99% rename from spec/instapaper/api/bookmark_spec.rb rename to spec/instapaper/api/bookmarks_spec.rb index 8c9005a..fe2105a 100644 --- a/spec/instapaper/api/bookmark_spec.rb +++ b/spec/instapaper/api/bookmarks_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Instapaper::Client::Bookmark do +describe Instapaper::Client::Bookmarks do let(:client) { Instapaper::Client.new(consumer_key: 'CK', consumer_secret: 'CS', oauth_token: 'OT', oauth_token_secret: 'OS') } describe '#bookmarks' do diff --git a/spec/instapaper/api/folder_spec.rb b/spec/instapaper/api/folders_spec.rb similarity index 98% rename from spec/instapaper/api/folder_spec.rb rename to spec/instapaper/api/folders_spec.rb index eb5166c..9ad906b 100644 --- a/spec/instapaper/api/folder_spec.rb +++ b/spec/instapaper/api/folders_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Instapaper::Client::Folder do +describe Instapaper::Client::Folders do let(:client) { Instapaper::Client.new(consumer_key: 'CK', consumer_secret: 'CS', oauth_token: 'OT', oauth_token_secret: 'OS') } describe '#folders' do diff --git a/spec/instapaper/api/highlight_spec.rb b/spec/instapaper/api/highlights_spec.rb similarity index 97% rename from spec/instapaper/api/highlight_spec.rb rename to spec/instapaper/api/highlights_spec.rb index 66ca6c5..fb83c16 100644 --- a/spec/instapaper/api/highlight_spec.rb +++ b/spec/instapaper/api/highlights_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Instapaper::Client::Highlight do +describe Instapaper::Client::Highlights do let(:client) { Instapaper::Client.new(consumer_key: 'CK', consumer_secret: 'CS', oauth_token: 'OT', oauth_token_secret: 'OS') } describe '#highlights' do