gnip-rule 0.2 → 0.3

data/.travis.yml

@@ -2,4 +2,6 @@ language: ruby
 rvm:
   - 1.9.3
   - 1.8.7
+  - jruby-19mode
+  - rbx-19mode
 script: rspec spec

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'rspec', :cli => '--drb --format Fuubar --color', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/README.md

@@ -1,4 +1,4 @@
-# gnip-rule [![Build Status](https://secure.travis-ci.org/eriwen/gnip-rule.png)](http://travis-ci.org/eriwen/gnip-rule)
+# gnip-rule [![Build Status](https://secure.travis-ci.org/eriwen/gnip-rule.png)](http://travis-ci.org/eriwen/gnip-rule) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/eriwen/gnip-rule)
 This gem simplifies the effort to add/delete/list rules using the [Gnip Rules API](http://support.gnip.com/customer/portal/articles/477713-rules-methods-documentation). It handles HTTP request/response and helps your rules conform to Gnip's restrictions.
 
 ## Installation

data/gnip-rule.gemspec

@@ -20,8 +20,26 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rake', '~> 0.9.2'
+  s.add_development_dependency 'rspec', '~> 2.10.0'
+  s.add_development_dependency 'webmock', '~> 1.8.11'
+  s.add_development_dependency 'guard', '~> 1.4.0'
+  s.add_development_dependency 'guard-rspec', '~> 1.2.0'
+  s.add_development_dependency 'fuubar', '~> 1.1.0'
 
-  s.add_dependency 'curb', '>= 0.8.0', '< 0.9.0'
-  s.add_dependency 'json', '>= 1.6.0', '< 1.7.0'
+  if RbConfig::CONFIG['host_os'] =~ /darwin/
+    s.add_development_dependency 'rb-fsevent'
+    s.add_development_dependency 'ruby_gntp'
+  elsif RbConfig::CONFIG['host_os'] =~ /linux/
+    s.add_development_dependency 'rb-inotify'
+    s.add_development_dependency 'libnotify'
+  elsif RbConfig::CONFIG['host_os'] =~ /msmin|mingw/
+    s.add_development_dependency 'wdm'
+    s.add_development_dependency 'rb-notifu'
+  end
+
+  s.add_dependency 'rest-client', '~> 1.6.7'
+  s.add_dependency 'json', '~> 1.7.0'
+  s.add_dependency 'jruby-openssl' if RUBY_PLATFORM == 'java'
+  s.add_dependency 'openssl' if RUBY_PLATFORM == 'ruby'
 end

data/lib/gnip-rule/client.rb

@@ -1,4 +1,4 @@
-require 'curb'
+require 'rest-client'
 require 'json'
 require 'gnip-rule/rule'
 
@@ -18,21 +18,14 @@ module GnipRule
     end
 
     def delete(value, tag=nil)
-      post("#{@url}?_method=delete", jsonify_rules(value, tag))
+      post("#@url?_method=delete", jsonify_rules(value, tag))
     end
 
     def list()
-      rules = nil
-      Curl::Easy.http_get(@url) do |curl|
-        curl.http_auth_types = :basic
-        curl.username = @username
-        curl.password = @password
-        curl.on_body do |obj|
-          rules = JSON.parse(obj)['rules'].collect { |o| Rule.new(o['value'], o['tag']) }
-          obj.size
-        end
-      end
-      rules
+      response = RestClient::Request.new(:method => :get, :url => @url,
+                                         :user => @username, :password => @password,
+                                         :headers => { :accept => :json }).execute
+      JSON.parse(response.to_s)['rules'].collect { |o| Rule.new(o['value'], o['tag']) }
     end
 
     def jsonify_rules(values, tag=nil)
@@ -49,18 +42,8 @@ module GnipRule
 
     protected
     def post(url, data)
-      err = nil
-      Curl::Easy.http_post(url, data) do |curl|
-        curl.http_auth_types = :basic
-        curl.username = @username
-        curl.password = @password
-        curl.on_complete do |res|
-          if res.response_code >= 400
-            err = "Got #{res.response_code}; body: #{res.body_str}"
-          end
-        end
-      end
-      raise err if err
+      RestClient::Request.new(:method => :post, :url => url, :payload => data,
+          :user => @username, :password => @password, :headers => { :content_type => :json, :accept => :json }).execute
     end
   end
 end

data/lib/gnip-rule/version.rb

@@ -1,3 +1,3 @@
 module GnipRule
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

data/spec/gnip-rule/client_spec.rb

@@ -3,38 +3,55 @@ require 'spec-helper'
 require 'gnip-rule/client'
 
 describe GnipRule::Client do
-  let(:fake_curb) { double("Curl::Easy") }
-  before do
-    Curl::Easy.stub(:http_post => fake_curb)
-    Curl::Easy.stub(:http_get => fake_curb)
-  end
-
-  subject { GnipRule::Client.new('https://api.gnip.com:443/accounts/foo/publishers/twitter/streams/track/prod/rules.json', 'username', 'password') }
+  let(:base_url) { 'https://api.gnip.com:443/accounts/foo/publishers/twitter/streams/track/prod/rules.json' }
+  let(:base_url_with_auth) { 'https://username:password@api.gnip.com:443/accounts/foo/publishers/twitter/streams/track/prod/rules.json' }
+  subject { GnipRule::Client.new(base_url, 'username', 'password') }
 
   describe '#initialize' do
     it 'should convert XML URLs to JSON' do
-      subject.url.should == 'https://api.gnip.com:443/accounts/foo/publishers/twitter/streams/track/prod/rules.json'
+      subject.url.should == base_url
     end
   end
 
   describe '#add' do
     it 'should POST rule to the given URL with given credentials' do
-      Curl::Easy.should_receive(:http_post)
+      stub_request(:post, base_url_with_auth).
+          with(:body => '{"rules":[{"value":"value","tag":"tag"}]}').
+          to_return(:status => 200, :body => '', :headers => {})
       subject.add('value', 'tag')
     end
+
+    it 'should raise an error if Gnip returns HTTP error' do
+      stub_request(:post, base_url_with_auth).
+          with(:body => '{"rules":[{"value":"value","tag":"tag"}]}').
+          to_return(:status => 401, :body => 'Error message', :headers => {})
+      lambda { subject.add('value', 'tag') }.should raise_error
+    end
   end
 
   describe '#delete' do
     it 'should POST rule json to a URL with given credentials' do
-      Curl::Easy.should_receive(:http_post)
+      stub_request(:post, "#{base_url_with_auth}?_method=delete").
+          with(:body => '{"rules":[{"value":"value","tag":"tag"}]}').
+          to_return(:status => 200, :body => '', :headers => {})
       subject.delete('value', 'tag')
     end
   end
 
   describe '#list' do
     it 'should GET a URL with given credentials' do
-      Curl::Easy.should_receive(:http_get)
-      subject.list()
+      stub_request(:get, base_url_with_auth).
+          to_return(:status => 200, :body => '{"rules":[{"value":"foo","tag":"baz"},{"value":"bar","tag":"baz"}]}')
+      rules = subject.list()
+      rules.size.should == 2
+      rules.map { |r| r.valid?.should == true }
+    end
+
+    it 'should raise an error if Gnip returns HTTP error' do
+      stub_request(:get, base_url).
+          with(:body => '{"rules":[{"value":"value","tag":"tag"}]}').
+          to_return(:status => 401, :body => 'Error message', :headers => {})
+      lambda { subject.list() }.should raise_error
     end
   end
 

data/spec/spec-helper.rb

@@ -2,3 +2,4 @@ require 'bundler'
 Bundler.setup
 
 require 'rspec'
+require 'webmock/rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gnip-rule
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.11
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,36 +124,43 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
-    - - <
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.6.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
@@ -65,10 +168,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.0
 description: Ruby library for working with the Gnip Rules API
@@ -84,6 +184,7 @@ files:
 - .travis.yml
 - CONTRIBUTING.md
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -123,3 +224,4 @@ test_files:
 - spec/gnip-rule/client_spec.rb
 - spec/gnip-rule/rule_spec.rb
 - spec/spec-helper.rb
+has_rdoc: