usaidwat 0.1.3 → 0.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9f557c3aa3e4261f4f2c28783728e17c5043fdca
+  data.tar.gz: 9fa6307833d5f28c44425e9cd2469b46a67229d4
+SHA512:
+  metadata.gz: bcda2502165ff5d8c73dbfa11ae4c593856c874514b88ae36c6c651bd568a8e1afcaabc746f7e74639f060a7b3f66bb840484a7544f71ae57a021dac8d4f4126
+  data.tar.gz: 4d2f7b4c5e44fd2025de35c64c6d68dd3fe40b8a22fe23a9a15bcb234442a1f672424630594dc15173997e417b243b80796b3461eea97c0caceb0134644fff2c

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in usaidwat.gemspec
 gemspec
+
+group :optional do
+  gem 'nyan-cat-formatter'
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Michael Dippery
+Copyright (c) 2012-2014 Michael Dippery
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -3,4 +3,12 @@ require "bundler/gem_tasks"
 desc "Clean built products"
 task :clean do
   rm_rf "pkg", :verbose => true
+  rm Dir.glob("*.gem"), :verbose => true
+end
+
+namespace :test do
+  desc "Run the fake web service"
+  task :server do
+    system "bundle exec ruby features/server/reddit.rb"
+  end
 end

data/features/browse.feature

@@ -40,19 +40,19 @@ Feature: Browse comments
     When I run `usaidwat -t mipadi`
     Then it should pass with:
       """
-      apple            6
-      AskReddit        61
-      battlefield3     2
-      books            2
-      django           1
-      Games            1
-      nyc              1
-      personalfinance  1
-      photography      1
-      programming      20
-      redditcasual     1
-      wikipedia        1
-      worldnews        2
+      apple              6
+      AskReddit         61
+      battlefield3       2
+      books              2
+      django             1
+      Games              1
+      nyc                1
+      personalfinance    1
+      photography        1
+      programming       20
+      redditcasual       1
+      wikipedia          1
+      worldnews          2
       """
     
   Scenario: Tally comments when user has no comments

data/lib/usaidwat/application.rb

@@ -1,40 +1,46 @@
 module USaidWat
   class << self
     def application
-      @application ||= USaidWat::Application.new
+      client = ENV['USAIDWAT_ENV'] == 'cucumber' ? USaidWat::Client::TestRedditor : USaidWat::Client::Redditor
+      @application ||= USaidWat::Application.new(client)
     end
   end
-  
+
   class Application
+    def initialize(client)
+      @client = client
+    end
+
     def run(argv)
-      @opts, args = handle_arguments(argv)
-      @redditor = USaidWat::Client::Redditor.new(args.first)
-      return tally_comments if @opts[:tally]
+      trap("INT") { puts; exit 0 }
+      opts, args = handle_arguments(argv)
+      @redditor = @client.new(args.first)
+      return tally_comments if opts[:tally]
       return list_comments_for_subreddit(args[1]) if args.length == 2
       return list_all_comments
     end
-    
+
     def usage(code=0)
       puts "Usage: usaidwat [-t] <user> [<subreddit>]"
       exit code
     end
-    
+
     def version(code=0)
       puts "usaidwat v#{USaidWat::VERSION}"
       exit 0
     end
-    
+
     def quit(message, code=0)
       puts message
       exit code
     end
-    
+
     def list_all_comments
       quit "#{@redditor.username} has no comments." if @redditor.comments.empty?
       formatter = USaidWat::CLI::CommentFormatter.new
       @redditor.comments.each { |c| print formatter.format(c) }
     end
-    
+
     def list_comments_for_subreddit(subreddit)
       comments = @redditor.comments
       comments = comments.reject { |c| c.subreddit != subreddit }
@@ -42,7 +48,7 @@ module USaidWat
       formatter = USaidWat::CLI::CommentFormatter.new
       comments.each { |c| print formatter.format(c) }
     end
-    
+
     def tally_comments
       quit "#{@redditor.username} has no comments." if @redditor.comments.empty?
       # Unfortunately Snooby cannot return comments for a specific
@@ -58,11 +64,11 @@ module USaidWat
       subreddits = buckets.keys.sort { |a,b| a.downcase <=> b.downcase }
       subreddits.each do |subreddit|
         tally = buckets[subreddit]
-        printf "%-*s  %s\n", longest_subreddit, subreddit, tally
+        printf "%-*s  %3d\n", longest_subreddit, subreddit, tally
       end
       exit 0
     end
-    
+
     private
       def handle_arguments(argv)
         usage(1) if argv.length == 0

data/lib/usaidwat/client.rb

@@ -1,32 +1,40 @@
 require 'snooby'
+require 'usaidwat/service'
 
 module USaidWat
   module Client
     class ReachabilityError < RuntimeError; end
-    
-    class Redditor
+
+    class BaseRedditor
       attr_reader :username
-      
+
       def initialize(username)
-        enable_test_urls if ENV['USAIDWAT_ENV'] == 'cucumber'
         @username = username
-        @service  = Snooby::Client.new("usaidwat v#{USaidWat::VERSION}")
       end
-      
+
       def comments
         @service.user(username).comments(100)
       rescue TypeError
         raise ReachabilityError, "Reddit unreachable"
       end
-      
+
       def to_s
         "#{username}"
       end
-      
-      private
-        def enable_test_urls
-          Snooby::Paths.each { |k,v| Snooby::Paths[k] = v.sub(%r{http://www.reddit.com}, "http://localhost:4567") }
-        end
+    end
+
+    class Redditor < BaseRedditor
+      def initialize(username)
+        @service = Snooby::Client.new("usaidwat v#{USaidWat::VERSION}")
+        super
+      end
+    end
+
+    class TestRedditor < BaseRedditor
+      def initialize(username)
+        @service = USaidWat::Service::MockService.new
+        super
+      end
     end
   end
 end

data/lib/usaidwat/service.rb

@@ -0,0 +1,34 @@
+module USaidWat
+  module Service
+    class MockComment
+      attr_reader :subreddit, :body, :id, :link_id
+
+      def initialize(dict)
+        data = dict['data']
+        @subreddit = data['subreddit']
+        @body = data['body']
+        @id = data['id']
+        @link_id = data['link_id']
+      end
+    end
+
+    class MockUser
+      def initialize(username)
+        @username = username
+      end
+
+      def comments(n)
+        path = File.join(File.dirname(__FILE__), "..", "..", "features", "fixtures", "#{@username}.json")
+        json = IO.read(path)
+        json = JSON.parse(json)
+        json['data']['children'].map { |d| MockComment.new(d) }
+      end
+    end
+
+    class MockService
+      def user(username)
+        MockUser.new(username)
+      end
+    end
+  end
+end

data/lib/usaidwat/version.rb

@@ -1,3 +1,3 @@
 module USaidWat
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'usaidwat'
+require 'usaidwat/service'
 require 'webmock/rspec'
 
 

data/spec/usaidwat/service_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+module USaidWat
+  module Service
+    describe MockService do
+      let (:service) { MockService.new }
+
+      describe "#user" do
+        it "returns a mock user" do
+          service.user("mipadi").should respond_to(:comments)
+        end
+      end
+    end
+
+    describe MockUser do
+      let (:user) { MockUser.new("mipadi") }
+
+      describe "#comments" do
+        it "should return an array of comments" do
+          user.comments(100).should respond_to(:count)
+          user.comments(100).should respond_to(:reject)
+          user.comments(100).should respond_to(:empty?)
+          user.comments(100).should respond_to(:each)
+          user.comments(100).count.should == 100
+        end
+      end
+    end
+
+    describe MockComment do
+      let (:comment) { MockUser.new("mipadi").comments(100).first }
+
+      describe "#subreddit" do
+        it "should return a string denoting what subreddit it belongs to" do
+          comment.subreddit.should == "wikipedia"
+        end
+      end
+
+      describe "#body" do
+        it "should return the comment's body" do
+          comment.body.should == "Yep. My first experience with a Heisenbug occurred in a C++ program, and disappeared when I tried to print a variable with printf (only to reappear when that call was removed)."
+        end
+      end
+
+      describe "#id" do
+        it "should return an ID" do
+          comment.id.should == "c79peed"
+        end
+      end
+
+      describe "#link_id" do
+        it "should return a link ID" do
+          comment.link_id.should == "t3_142t4w"
+        end
+      end
+    end
+  end
+end

data/usaidwat.gemspec

@@ -24,5 +24,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('cucumber', '~> 1.2.1')
   gem.add_development_dependency('aruba', '~> 0.5.1')
   gem.add_development_dependency('webmock', '~> 1.9.0')
-  gem.add_development_dependency('sinatra', '~> 1.3.1')
 end

metadata

@@ -1,128 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: usaidwat
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
 - Michael Dippery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-25 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: snooby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.0
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
 description: View a user's last 100 Reddit comments, organized by subreddit.
 email:
 - michael@monkey-robot.com
@@ -131,7 +102,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.textile
@@ -141,50 +112,50 @@ files:
 - features/fixtures/blank.json
 - features/fixtures/mipadi.json
 - features/help.feature
-- features/server/reddit.rb
 - features/step_definitions/reddit_steps.rb
 - features/support/aruba.rb
 - lib/usaidwat.rb
 - lib/usaidwat/application.rb
 - lib/usaidwat/client.rb
 - lib/usaidwat/formatter.rb
+- lib/usaidwat/service.rb
 - lib/usaidwat/version.rb
 - spec/spec_helper.rb
 - spec/usaidwat/client_spec.rb
 - spec/usaidwat/formatter_spec.rb
+- spec/usaidwat/service_spec.rb
 - usaidwat.gemspec
 homepage: https://github.com/mdippery/usaidwat
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Answers the age-old question, "Where does a Redditor comment the most?"
 test_files:
 - features/browse.feature
 - features/fixtures/blank.json
 - features/fixtures/mipadi.json
 - features/help.feature
-- features/server/reddit.rb
 - features/step_definitions/reddit_steps.rb
 - features/support/aruba.rb
 - spec/spec_helper.rb
 - spec/usaidwat/client_spec.rb
 - spec/usaidwat/formatter_spec.rb
+- spec/usaidwat/service_spec.rb

data/features/server/reddit.rb

@@ -1,14 +0,0 @@
-require 'sinatra/base'
-
-class Reddit < Sinatra::Base
-  get '/user/*/comments.json' do
-    user = params[:splat].first
-    puts user
-    root = File.expand_path('../../', __FILE__)
-    json = File.read(File.join(root, 'fixtures', "#{user}.json"))
-    content_type :json
-    json
-  end
-  
-  run! if app_file == $0
-end