disqus_api 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94064c79aa3d3d6496c03ea346cc067cdd9a3bef
-  data.tar.gz: 4f26931c8cb89148feac62ca8e2a1003ccb505ef
+  metadata.gz: 769f50840efa5768cca4a732b479d8373b05d504
+  data.tar.gz: 164e1da0c1030901bfbadfff2d02f81f1aebb9f5
 SHA512:
-  metadata.gz: 248ac9a87774b6cfcbc2dd7b2266980cbe3cf342a7994acaec1ebc1960a6d94a90d65af947ddc9c75b8015661d0554156d773d75ab6de16e62568644663a75f1
-  data.tar.gz: 8c1cbe082f3dbbf3480e95a9f7b207f001f57d600d026ca9381feb334c2854dce2430465bfcd7e31519668979fe7b3fbae4f9bdd7d801994c751dd462ffeb516
+  metadata.gz: 5e661a1ca4277bfd1fa5066897b386be717f06cff40b970024a67dc69aadfc209adaa6e27914dd6323493cc30fb19a317414b7dd5862e1bb9e5ddb6146207a05
+  data.tar.gz: da7f5c8664a7055529a77369481a247543cb8e1c9a34bc39f91b1274eaf85a88b8601fa6f3077fcfd222be4335de5a2ca765ffdcd6bee580ccd4238f7a15fe5d

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
   - "1.9.3"
-  - "2.0.0"
+  - "2.0.0"
+  - "2.1.1"
+  - "2.2.0"

data/Gemfile

@@ -2,6 +2,3 @@ source "https://rubygems.org"
 
 gemspec
 
-group :test do
-  gem "rspec"
-end

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2015 einzige
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -29,16 +29,16 @@ For **Rails** users:
 
 Put in your `config/disqus_api.yml`:
 
-```ruby
+```yaml
 development:
   api_secret: development_secret_key
-  api_key: 'public key',
-  access_token: 'token from app settings'}
+  api_key: 'public key'
+  access_token: 'token from app settings'
 
 production:
   api_secret: production_secret_key
-  api_key: 'public key',
-  access_token: 'token from app settings'}
+  api_key: 'public key'
+  access_token: 'token from app settings'
 
 # ... any other env
 ```
@@ -100,7 +100,7 @@ first_page  = DisqusApi.v3.posts.list(forum: 'my_forum', limit: 10)
 
 second_page = first_page.next
 third_page  = second_page.next
-first_page  = thrid_page.prev.prev
+first_page  = third_page.prev.prev
 # ...
 ```
 
@@ -186,7 +186,7 @@ rspec
 rake # rake gem must be installed
 ```
 
-In order to test on a real Discus account
+In order to test on a real Disqus account
 - specify `spec/config/disqus.yml` (see `spec/config/disqus.yml.example` for details)
 - run specs passing `USE_DISQUS_ACCOUNT` environment variable:
 
@@ -203,3 +203,7 @@ USE_DISQUS_ACCOUNT=1 rspec
 - Commit and push until you are happy with your contribution
 - Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 - Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+------------
+
+This project is licensed under the terms of the [MIT license](https://github.com/toptal/disqus_api/blob/master/LICENSE.txt).

data/disqus_api.gemspec

@@ -1,8 +1,9 @@
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name = %q{disqus_api}
-  s.version = "0.0.4"
+  s.version = DisqusApi::VERSION
 
   s.date = %q{2013-12-09}
   s.authors = ["Sergei Zinin (einzige)"]
@@ -19,8 +20,10 @@ Gem::Specification.new do |s|
   s.summary = %q{Disqus API for Ruby}
 
   s.add_runtime_dependency 'activesupport', ">= 3.0.0"
-  s.add_runtime_dependency 'faraday', ">= 0.8"
-  s.add_runtime_dependency 'faraday_middleware', ">= 0.9"
+  s.add_runtime_dependency 'faraday', "~> 0.9.2"
+  s.add_runtime_dependency 'faraday_middleware', "~> 0.10.0"
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec-its'
+  s.add_development_dependency 'rake'
 end
 

data/lib/apis/3.0.yml

@@ -29,6 +29,7 @@ posts:
   report: post
   highlight: post
   approve: post
+  update: post
 blacklists:
   add: post
   list: get

data/lib/disqus_api.rb

@@ -11,10 +11,9 @@ require 'disqus_api/namespace'
 require 'disqus_api/request'
 require 'disqus_api/response'
 require 'disqus_api/invalid_api_request_error'
-require 'disqus_api/rails'
+require 'disqus_api/railtie' if defined?(Rails)
 
 module DisqusApi
-  VERSION = '0.0.4'
 
   def self.adapter
     @adapter || Faraday.default_adapter

data/lib/disqus_api/railtie.rb

@@ -0,0 +1,15 @@
+module DisqusApi
+  class Railtie < Rails::Railtie
+    initializer 'disqus_api.initialize' do
+      config_path = File.join(Rails.root, 'config', "disqus_api.yml")
+
+      if File.exist?(config_path)
+        DisqusApi.config = YAML.load_file(File.join(Rails.root, 'config', "disqus_api.yml"))[Rails.env]
+      else
+        unless Rails.env.test?
+          puts "WARNING: No config/disqus_api.yml provided for Disqus API. Make sure to set configuration manually."
+        end
+      end
+    end
+  end
+end

data/lib/version.rb

@@ -0,0 +1,3 @@
+module DisqusApi
+  VERSION = "0.0.5"
+end

data/spec/disqus_api/api_spec.rb

@@ -6,24 +6,24 @@ describe DisqusApi::Api do
   let(:version) { '3.0' }
   let(:specifications) { {'users' => 'details'} }
 
-  its(:version) { should == version }
-  its(:specifications) { should == specifications }
+  its(:version) { should eq(version) }
+  its(:specifications) { should eq(specifications) }
   its(:namespaces) { should have_key(:users) }
-  its(:endpoint) { should == 'https://disqus.com/api/3.0/' }
+  its(:endpoint) { should eq('https://disqus.com/api/3.0/') }
   it { should respond_to(:users) }
   its(:users) { should be_a(DisqusApi::Namespace) }
-  its(:connection_options) { should == {headers: {"Accept"=>"application/json", "User-Agent"=>"DisqusAgent"},
-                                        ssl: {verify: false},
-                                        url: "https://disqus.com/api/3.0/"} }
+  its(:connection_options) { should eq ({headers: {"Accept"=>"application/json", "User-Agent"=>"DisqusAgent"},
+                                         ssl: {verify: false},
+                                         url: "https://disqus.com/api/3.0/"}) }
 
   describe "unregistered namespace metacalls" do
-    it { should_not respond_to(:foo) }
+    it { is_expected.not_to respond_to(:foo) }
     specify { expect { api.foo }.to raise_error(ArgumentError) }
   end
 
   describe "#connection" do
     subject { api.connection }
-    it { should be_a(Faraday::Connection) }
+    it { is_expected.to be_a(Faraday::Connection) }
     its(:params) { should have_key('api_key') }
     its(:params) { should have_key('api_secret') }
     its(:params) { should have_key('access_token') }
@@ -33,7 +33,7 @@ describe DisqusApi::Api do
     let(:request_path) { '/api/3.0/users/details.json' }
 
     it 'performs GET request' do
-      api.get(request_path)['code'].should == 0
+      expect(api.get(request_path)['code']).to eq(0)
     end
 
     context "invalid request" do
@@ -49,10 +49,11 @@ describe DisqusApi::Api do
   describe "#post", perform_requests: true do
     let(:request_type) { :post }
     let(:request_path) { '/api/3.0/forums/create.json' }
+    let(:request_args) { {name: 'TestRspec', short_name: 'tspec', website: 'http://disqus.com'} } # no way!
 
-    context local: true do
+    context "local", local: true do
       it 'performs POST request' do
-        api.post(request_path)['code'].should == 0
+        expect(api.post(request_path, request_args)['code']).to eq(0)
       end
     end
 
@@ -65,4 +66,4 @@ describe DisqusApi::Api do
       end
     end
   end
-end
+end

data/spec/disqus_api/namespace_spec.rb

@@ -6,11 +6,11 @@ describe DisqusApi::Namespace do
   let(:specifications) { {'users' => {'details' => 'get'}} }
 
   let(:namespace_name) { 'users' }
-  subject(:namespace) { described_class.new(api, namespace_name) }
+  subject(:namespace) { DisqusApi::Namespace.new(api, namespace_name) }
 
-  its(:api) { should == api }
-  its(:specification) { should == {'details' => 'get'} }
-  its(:name) { should == namespace_name }
+  its(:api) { is_expected.to eq(api) }
+  its(:specification) { is_expected.to eq({'details' => 'get'}) }
+  its(:name) { is_expected.to eq(namespace_name) }
 
   it { should respond_to :details }
 
@@ -21,26 +21,26 @@ describe DisqusApi::Namespace do
 
   describe "#build_action_request" do
     subject(:request) { namespace.build_action_request('details', {args: true}) }
-    its(:path) { should == 'users/details.json' }
-    its(:api) { should == api }
-    its(:arguments) { should == {args: true} }
+    its(:path) { is_expected.to eq('users/details.json') }
+    its(:api) { is_expected.to eq(api) }
+    its(:arguments) { is_expected.to eq({args: true}) }
   end
 
-  context perform_requests: true do
+  context 'requests', perform_requests: true do
     let(:request_path) { '/api/3.0/users/details.json' }
 
     its(:details) { should be_a(Hash) }
     its(:details) { should be_a(::DisqusApi::Response) }
 
     it 'performs requests' do
-      namespace.details['code'].should == 0
+      expect(namespace.details['code']).to eq(0)
     end
 
     describe "#request_action" do
       let(:response) { namespace.request_action('details') }
 
       it 'performs action request' do
-        response['code'].should == 0
+        expect(response['code']).to eq(0)
       end
 
       context "invalid request" do
@@ -50,4 +50,4 @@ describe DisqusApi::Namespace do
       end
     end
   end
-end
+end

data/spec/disqus_api/request_spec.rb

@@ -33,13 +33,13 @@ describe DisqusApi::Request do
 
   describe "#perform" do
     it 'sends request through API' do
-      request.perform['code'].should == 0
+      expect(request.perform['code']).to eq(0)
     end
   end
 
   describe ".perform" do
     it 'sends request through API' do
-      described_class.perform(api, namespace, action, arguments)['code'].should == 0
+      expect(described_class.perform(api, namespace, action, arguments)['code']).to eq(0)
     end
   end
-end
+end

data/spec/disqus_api/response_spec.rb

@@ -14,30 +14,30 @@ describe DisqusApi::Response do
   let(:response_body) { {} }
 
   before do
-    request.should_receive(:perform).with(arguments).and_return(response_body)
+    expect(request).to receive(:perform).with(arguments).and_return(response_body)
   end
 
   describe "#has_next?" do
     context "has" do
       let(:response_body) { {'cursor' => {'hasNext' => true}} }
-      its(:has_next?) { should be_true }
+      its(:has_next?) { is_expected.to be true }
     end
 
     context 'has not' do
       let(:response_body) { {'cursor' => {'hasNext' => false}} }
-      its(:has_next?) { should be_false }
+      its(:has_next?) { is_expected.to be false  }
     end
   end
 
   describe "#has_prev?" do
     context "has" do
       let(:response_body) { {'cursor' => {'hasPrev' => true}} }
-      its(:has_prev?) { should be_true }
+      its(:has_prev?) { is_expected.to be true }
     end
 
     context 'has not' do
       let(:response_body) { {'cursor' => {'hasPrev' => false}} }
-      its(:has_prev?) { should be_false }
+      its(:has_prev?) { is_expected.to be false }
     end
   end
 
@@ -67,7 +67,7 @@ describe DisqusApi::Response do
       let(:next_page_response) { double('next_page_response') }
 
       before do
-        request.should_receive(:response).with({limit: 1, cursor: 'another_page'}).and_return(next_page_response)
+        expect(request).to receive(:response).with({limit: 1, cursor: 'another_page'}).and_return(next_page_response)
       end
 
       its(:next) { should == next_page_response }
@@ -85,7 +85,7 @@ describe DisqusApi::Response do
       let(:prev_page_response) { double('prev_page_response') }
 
       before do
-        request.should_receive(:response).with({limit: 1, cursor: 'another_page'}).and_return(prev_page_response)
+        expect(request).to receive(:response).with({limit: 1, cursor: 'another_page'}).and_return(prev_page_response)
       end
 
       its(:prev) { should == prev_page_response }
@@ -102,9 +102,9 @@ describe DisqusApi::Response do
 
     context "building a enumerator" do
       before do
-        request.should_not_receive(:prev)
-        request.should_not_receive(:next)
-        request.should_not_receive(:perform)
+        expect(request).not_to receive(:prev)
+        expect(request).not_to receive(:next)
+        expect(request).not_to receive(:perform)
       end
 
       describe "#each_page" do
@@ -118,7 +118,7 @@ describe DisqusApi::Response do
 
     context "multiple pages" do
       before do
-        request.should_receive(:perform).with(arguments.merge(cursor: 'another_page')).and_return(another_page_response_body)
+        expect(request).to receive(:perform).with(arguments.merge(cursor: 'another_page')).and_return(another_page_response_body)
       end
 
       let(:page_1_elem_1) { double('page_1_elem_1') }
@@ -134,17 +134,17 @@ describe DisqusApi::Response do
 
       describe "#next!" do
         before { response.next! }
-        it { should be_a(described_class) }
+        it { is_expected.to be_a(described_class) }
 
         it 'steps on next page' do
-          response['page'].should == 2
+          expect(response['page']).to eq(2)
         end
 
         context "no next" do
           before { response.next! }
 
           it 'does nothing' do
-            response['page'].should == 2
+            expect(response['page']).to eq(2)
           end
         end
       end
@@ -158,29 +158,29 @@ describe DisqusApi::Response do
         }
 
         before { response.prev! }
-        it { should be_a(described_class) }
+        it { is_expected.to be_a(described_class) }
 
         it 'steps on previous page' do
-          response['page'].should == 1
+          expect(response['page']).to eq(1)
         end
 
         context "no previous" do
           before { response.prev! }
 
           it 'does nothing' do
-            response['page'].should == 1
+            expect(response['page']).to eq(1)
           end
         end
       end
 
       describe "#each_page" do
         it 'returns each page' do
-          subject.each_page.to_a.should == [[page_1_elem_1], [page_2_elem_1]]
+          expect(subject.each_page.to_a).to eq([[page_1_elem_1], [page_2_elem_1]])
         end
 
         it 'iterates through each page' do
-          page_1_elem_1.should_receive(:get_block_message)
-          page_2_elem_1.should_receive(:get_block_message)
+          expect(page_1_elem_1).to receive(:get_block_message)
+          expect(page_2_elem_1).to receive(:get_block_message)
 
           subject.each_page { |page| page.each(&:get_block_message) }
         end
@@ -188,16 +188,16 @@ describe DisqusApi::Response do
 
       describe "#each_resource" do
         it 'returns each record iterator' do
-          subject.each_resource.to_a.should == [page_1_elem_1, page_2_elem_1]
+          expect(subject.each_resource.to_a).to eq([page_1_elem_1, page_2_elem_1])
         end
 
         it 'iterates through each resource' do
-          page_1_elem_1.should_receive(:get_block_message)
-          page_2_elem_1.should_receive(:get_block_message)
+          expect(page_1_elem_1).to receive(:get_block_message)
+          expect(page_2_elem_1).to receive(:get_block_message)
 
           subject.each_resource(&:get_block_message)
         end
       end
     end
   end
-end
+end

data/spec/disqus_api_spec.rb

@@ -5,7 +5,7 @@ describe DisqusApi, perform_requests: true do
     let(:request_path) { '/api/3.0/users/details.json' }
 
     it 'performs requests' do
-      DisqusApi.v3.users.details['code'].should == 0
+      expect(DisqusApi.v3.users.details['code']).to eq(0)
     end
   end
 
@@ -18,7 +18,7 @@ describe DisqusApi, perform_requests: true do
     end
 
     it 'fetches all comments' do
-      DisqusApi.v3.posts.list(forum: 'my_forum', limit: 1).all.should == %w{first_one second_one third_one}
+      expect(DisqusApi.v3.posts.list(forum: 'my_forum', limit: 1).all).to eq(%w{first_one second_one third_one})
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'disqus_api'
+require 'rspec/its'
 
 def load_disqus_config(fname)
   DisqusApi.config = YAML.load_file(File.join(File.dirname(__FILE__), "config/#{fname}"))
@@ -33,7 +34,7 @@ end
 
 RSpec.configure do |config|
   config.mock_with :rspec
-  config.color_enabled = true
+  config.color = true
   config.formatter = :documentation
 
   if ENV['USE_DISQUS_ACCOUNT']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disqus_api
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sergei Zinin (einzige)
@@ -28,30 +28,30 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides clean Disqus API for your Ruby app with a nice interface.
 email: szinin@gmail.com
 executables: []
@@ -77,6 +105,7 @@ files:
 - .travis.yml
 - Gemfile
 - Guardfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - disqus_api.gemspec
@@ -85,9 +114,10 @@ files:
 - lib/disqus_api/api.rb
 - lib/disqus_api/invalid_api_request_error.rb
 - lib/disqus_api/namespace.rb
-- lib/disqus_api/rails.rb
+- lib/disqus_api/railtie.rb
 - lib/disqus_api/request.rb
 - lib/disqus_api/response.rb
+- lib/version.rb
 - spec/config/disqus.yml.example
 - spec/disqus_api/api_spec.rb
 - spec/disqus_api/namespace_spec.rb
@@ -115,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Disqus API for Ruby

data/lib/disqus_api/rails.rb

@@ -1,17 +0,0 @@
-if defined?(Rails)
-  module DisqusApi
-    class Railtie < Rails::Railtie
-      initializer 'disqus_api.initialize' do
-        config_path = File.join(Rails.root, 'config', "disqus_api.yml")
-
-        if File.exist?(config_path)
-          DisqusApi.config = YAML.load_file(File.join(Rails.root, 'config', "disqus_api.yml"))[Rails.env]
-        else
-          unless Rails.env.test?
-            puts "WARNING: No config/disqus_api.yml provided for Disqus API. Make sure to set configuration manually."
-          end
-        end
-      end
-    end
-  end
-end