hey 1.1.0 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmY2YmFlMzU2NzVlZjJmNTA0ODZmODFhMzg4YmE5MjNlMGJhZmZiYg==
+    NGVjMjMzNjEwMzU0Y2U1MTkyMzU0Nzk0MDQzYzQ2Y2E5ZDcwNmFmZA==
   data.tar.gz: !binary |-
-    Yjk4MWVjYzJjZmUyZDIyOTMyNDhkMmIwZTNiNWFlNDQxNmQ1OWU2OQ==
+    YjQ0YmU3YzY0M2JiNjM2MWI1Zjg5NTNjNDAwNWYzNjU4MGQxY2FlZg==
 SHA512:
   metadata.gz: !binary |-
-    YzA2NzQwNTRkZWY0M2FhNGJiODk1MjQzYTFjZWNmNmE4ZTE2ZWFiZjIxNzhk
-    OGMzM2VkZmYzMmRhYWFlZDFiYjYzN2IxYTkyNmM0MjQ3MDIwMGI5MDE3YmVm
-    OWRjMWI0NzBkNzZkNGE2YzdjOWI4YWY3YmQxNDkzMDQyZDhkY2Q=
+    OTY2NTJiMzYwOTM4ZWMwNDA0NjcwODdhNjA0Y2RhNzE3Y2YxNTM4NGYwMjdk
+    OWU1YWVjYWY5NzEzMzZjYjNmN2MyMmE2MTUxMzZkOGRlODBlNjc0ZTE5MzZk
+    ZTg0YTYwYmFkYzQxYzI0YWE0MDgxNzEyZGQ4MzQ3YzFjM2VhYWQ=
   data.tar.gz: !binary |-
-    N2EyOTY0YjlkMGI5OWIzZjUwNjRmMmRmYWEwZTIzNWYyM2VjYjgzZDgzZWNl
-    ZTk0NzYyM2M4NmQxMDYyMTliYWU1MGJjYjNmMjAyMWNkOWM5ZWQ4OWYwMjky
-    MzA5YWQ0MWFhNmZkYmI0NTA1ZWQ1NDMxOTZiNGFkZmE3ODAxZGQ=
+    N2M4YTM5YWE2MGRiNjljNzEyNjBiYzU5YzU2ZTAyNGQ1MDk0NGI2YmI0Zjg2
+    NmIzNGRhZjYxNzBmYjk1MGQzZjQxN2ZkODJlZTdiYzNkM2NmOGFkYjA3MmI1
+    NzU0MmE5MWIzMjc5YjlkMjFmM2ZjYTU5NzA5NTY0YmJlM2Q1NGI=

data/README.md

@@ -20,16 +20,16 @@ Then:
 
 ```ruby
 Hey.api_token = '3858f62230ac3c915f300c664312c63f'
-Hey::Yo.all
+Hey::Yo.all # or yo a specific user...
+Hey::Yo.user "WORLDCUP"
+Hey::Subscriber.count
 
 # or set api_token on a Yo instance:
 
-Hey::Yo.new(api_token: '3858f62230ac3c915f300c664312c63f').all
-
-# or Yo a specific user:
-
-Hey::Yo.user "WORLDCUP" # or...
-Hey::Yo.new(api_token: '3858f62230ac3c915f300c664312c63f').user "WORLDCUP"
+yo = Hey::Yo.new(api_token: '3858f62230ac3c915f300c664312c63f')
+yo.all
+yo.user "WORLDCUP"
+yo.subscribers.count
 ```
 
 That's it!

data/lib/hey.rb

@@ -1,6 +1,5 @@
-require 'net/http'
-require 'json'
 require 'hey/yo'
+require 'hey/subscriber'
 
 module Hey
   

data/lib/hey/dispatcher.rb

@@ -0,0 +1,58 @@
+require 'json'
+require 'net/http'
+
+module Hey
+  class Dispatcher
+    
+    # (Optional) Should be set if an API token hasn't be set
+    # on the Hey module.
+    attr_accessor :api_token
+    
+    # Optionally accepts a hash containing an API token.
+    # Defaults to the API token set on the Hey module.
+    # 
+    #  Hey::Yo.new api_token: '3858f62230ac3c915f300c664312c63f'
+    def initialize options = {}
+      @api_token = options[:api_token] || Hey.api_token
+    end
+    
+    private
+    
+    def uri route, data = nil #:nodoc:
+      URI("http://api.justyo.co/#{route}/#{data}")
+    end
+    
+    def get route #:nodoc:
+      response = Net::HTTP.get_response uri(route, "?api_token=#{api_token}")
+      raise_for_invalid_code! response
+      response
+    end
+    
+    def post route, params = {} #:nodoc:
+      params = params.merge api_token: api_token
+      response = Net::HTTP.post_form uri(route), params
+      raise_for_invalid_code! response
+      response
+    end
+    
+    def raise_for_missing_api_token! #:nodoc:
+      raise MissingAPITokenError unless api_token
+    end
+    
+    def raise_for_invalid_code! response #:nodoc:
+      body = get_response_body(response)
+      return unless body && body["code"] == 141
+      case body["error"]
+      when "NO SUCH USER"
+        raise NoSuchUserError 
+      else
+        raise InvalidAPITokenError
+      end
+    end
+    
+    def get_response_body request #:nodoc:
+      request && request.body ? JSON.parse(request.body) : nil
+    end
+    
+  end
+end

data/lib/hey/subscriber.rb

@@ -0,0 +1,24 @@
+require 'hey/dispatcher'
+
+module Hey
+  # Sends requests to the Yo API subscriber endpoint.
+  class Subscriber < Dispatcher
+    
+    # Sends a request to the +subscribers_count+ endpoint.
+    # Raises a +MissingAPITokenError+ error if an API token
+    # hasn't been set on the Hey module or Yo instance.
+    def count
+      raise_for_missing_api_token!
+      response = get 'subscribers_count'
+      body = get_response_body response
+      body['count']
+    end
+    
+    # Sends a request to the +subscribers_count+ endpoint using the
+    # API token set on the Hey module.
+    def self.count
+      new.count
+    end
+    
+  end
+end

data/lib/hey/version.rb

@@ -1,3 +1,3 @@
 module Hey
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/hey/yo.rb

@@ -1,25 +1,16 @@
+require 'hey/dispatcher'
+require 'hey/subscriber'
+
 module Hey
-  # Sends requests to the Yo API endpoint.
-  class Yo
-    
-    # (Optional) Should be set if an API token hasn't be set
-    # on the Hey module.
-    attr_accessor :api_token
-    
-    # Optionally accepts a hash containing an API token.
-    # Defaults to the API token set on the Hey module.
-    # 
-    #  Hey::Yo.new api_token: '3858f62230ac3c915f300c664312c63f'
-    def initialize options = {}
-      @api_token = options[:api_token] || Hey.api_token
-    end
+  # Sends requests to the Yo API yo endpoints.
+  class Yo < Dispatcher
     
     # Sends a request to the +yoall+ endpoint.
     # Raises a +MissingAPITokenError+ error if an API token
     # hasn't been set on the Hey module or Yo instance.
     def all
-      raise MissingAPITokenError unless api_token
-      post_request 'yoall'
+      raise_for_missing_api_token!
+      post 'yoall'
     end
     
     # Sends a request to a user using the +yo+ endpoint.
@@ -28,8 +19,17 @@ module Hey
     #
     #  Hey::Yo.new.user "worldcup"
     def user name
-      raise MissingAPITokenError unless api_token
-      post_request 'yo', username: name
+      raise_for_missing_api_token!
+      post 'yo', username: name
+    end
+    
+    # Accesses subscriber endpoints using the same API key
+    #
+    #  yo = Hey::Yo.new api_token: '3858f62230ac3c915f300c664312c63f'
+    #  yo.subscribers.count
+    #  # => 2
+    def subscribers
+      Hey::Subscriber.new api_token: api_token
     end
     
     # Sends a request to the +yoall+ endpoint using the
@@ -47,26 +47,5 @@ module Hey
       new.user name
     end
     
-    private
-    
-    def post_request method, params = {} #:nodoc:
-      params = params.merge api_token: api_token
-      uri = URI("http://api.justyo.co/#{method}/")
-      request = Net::HTTP.post_form uri, params
-      raise_for_invalid_code! request
-      request
-    end
-    
-    def raise_for_invalid_code! request #:nodoc:
-      response = JSON.parse(request.body)
-      return unless response["code"] && response["code"] == 141
-      case response["error"]
-      when "NO SUCH USER"
-        raise NoSuchUserError 
-      else
-        raise InvalidAPITokenError
-      end
-    end
-    
   end
 end

data/test/dispatcher_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+require 'hey/dispatcher'
+
+class DispatcherTest < Minitest::Test
+  
+  def teardown
+    WebMock.reset!
+    Hey.api_token = nil
+  end
+  
+  def test_sets_api_token_on_instance
+    dispatcher = Hey::Dispatcher.new api_token: 'foo'
+    assert_equal 'foo', dispatcher.api_token
+  end
+  
+  def test_defaults_to_hey_api_token
+    Hey.api_token = 'bar'
+    dispatcher = Hey::Dispatcher.new
+    assert_equal 'bar', dispatcher.api_token
+  end
+  
+  def test_get_request
+    stub_get = stub_request(:get, "http://api.justyo.co/bar/?api_token=foo")
+    dispatcher = Hey::Dispatcher.new api_token: 'foo'
+    dispatcher.send :get, 'bar'
+    assert_requested stub_get
+  end
+  
+  def test_post_request
+    stub_post = stub_request(:post, "http://api.justyo.co/bar/")
+      .with(:body => {"api_token"=>"foo"})
+    dispatcher = Hey::Dispatcher.new api_token: 'foo'
+    dispatcher.send :post, 'bar'
+    assert_requested stub_post
+  end
+  
+end

data/test/subscriber_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+require 'hey/subscriber'
+
+class SubscriberTest < Minitest::Test
+  
+  def teardown
+    WebMock.reset!
+    Hey.api_token = nil
+  end
+  
+  def test_count_sends_api_request
+    stub_get = stub_request(:get, "http://api.justyo.co/subscribers_count/?api_token=foo")
+      .to_return(body: '{"count": 2}')
+    count = Hey::Subscriber.new(api_token: 'foo').count
+    assert_requested stub_get
+    assert_equal count, 2
+  end
+  
+  def test_class_method_all_sends_api_request
+    stub_get = stub_request(:get, "http://api.justyo.co/subscribers_count/?api_token=foo")
+      .to_return(body: '{"count": 2}')
+    Hey.api_token = 'foo'
+    count = Hey::Subscriber.count
+    assert_requested stub_get
+    assert_equal count, 2
+  end
+  
+end

data/test/test_helper.rb

@@ -1,4 +1,3 @@
 require 'minitest'
 require 'minitest/autorun'
-require 'minitest/mock'
-require 'minitest/stub_const'
+require 'webmock/minitest'

data/test/yo_test.rb

@@ -4,38 +4,38 @@ require 'hey/yo'
 class YoTest < Minitest::Test
   
   def teardown
+    WebMock.reset!
     Hey.api_token = nil
   end
   
-  def test_sets_api_token_on_instance
-    yo = Hey::Yo.new(api_token: 'foo')
-    assert_equal 'foo', yo.api_token
-  end
-  
-  def test_defaults_to_hey_api_token
-    Hey.api_token = 'bar'
-    yo = Hey::Yo.new
-    assert_equal 'bar', yo.api_token
-  end
-  
   def test_all_sends_api_request
-    yo = Hey::Yo.new(api_token: 'foo')
-    assert_sends_yo {yo.all}
+    stub_post = stub_request(:post, "http://api.justyo.co/yoall/")
+      .with(:body => {"api_token"=>"foo"})
+    Hey::Yo.new(api_token: 'foo').all
+    assert_requested stub_post
   end
   
   def test_class_method_all_sends_api_request
+    stub_post = stub_request(:post, "http://api.justyo.co/yoall/")
+      .with(:body => {"api_token"=>"foo"})
     Hey.api_token = 'foo'
-    assert_sends_yo {Hey::Yo.all}
+    Hey::Yo.all
+    assert_requested stub_post
   end
   
   def test_user_sends_api_request
-    yo = Hey::Yo.new(api_token: 'foo')
-    assert_sends_yo {yo.user('YOJOBS')}
+    stub_post = stub_request(:post, "http://api.justyo.co/yo/")
+      .with(:body => {"api_token"=>"foo", "username"=>"YOJOBS"})
+    Hey::Yo.new(api_token: 'foo').user('YOJOBS')
+    assert_requested stub_post
   end
   
   def test_class_method_user_sends_api_request
+    stub_post = stub_request(:post, "http://api.justyo.co/yo/")
+      .with(:body => {"api_token"=>"foo", "username"=>"YOJOBS"})
     Hey.api_token = 'foo'
-    assert_sends_yo {Hey::Yo.user('YOJOBS')}
+    Hey::Yo.user('YOJOBS')
+    assert_requested stub_post
   end
   
   def test_raises_no_api_token_error
@@ -46,14 +46,11 @@ class YoTest < Minitest::Test
     end
   end
   
-  def assert_sends_yo(&block)
-    mock_response = Net::HTTPResponse.new('1.1', '201', 'CREATED')
-    mock_response.stub(:read_body, "{\"code\": 201}") do
-      mock = MiniTest::Mock.new
-      mock.expect(:post_form, mock_response, [URI, Hash])
-      Net.stub_const(:HTTP, mock, &block)
-      assert mock.verify
-    end
+  def test_subscribers_returns_subscriber
+    yo = Hey::Yo.new api_token: 'foo'
+    subscriber = yo.subscribers
+    assert subscriber.is_a?(Hey::Subscriber)
+    assert_equal subscriber.api_token, yo.api_token
   end
   
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hey
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jack Jennings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.3'
 - !ruby/object:Gem::Dependency
-  name: minitest-stub-const
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -75,9 +75,13 @@ files:
 - README.md
 - Rakefile
 - lib/hey.rb
+- lib/hey/dispatcher.rb
+- lib/hey/subscriber.rb
 - lib/hey/version.rb
 - lib/hey/yo.rb
+- test/dispatcher_test.rb
 - test/hey_test.rb
+- test/subscriber_test.rb
 - test/test_helper.rb
 - test/yo_test.rb
 homepage: https://github.com/jackjennings/hey
@@ -105,6 +109,8 @@ signing_key:
 specification_version: 4
 summary: Sends a yo
 test_files:
+- test/dispatcher_test.rb
 - test/hey_test.rb
+- test/subscriber_test.rb
 - test/test_helper.rb
 - test/yo_test.rb