keikokuc 0.4 → 0.5

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+
+rvm:
+  - "1.9.3"
+  - "1.9.2"
+  - rbx-19mode
+  - "1.8.7"
+
+script: bundle exec rspec -b spec

data/README.md

@@ -2,6 +2,7 @@
 
 Wrapper to the keikoku API
 
+[![Build Status](https://secure.travis-ci.org/hgmnz/keikokuc.png)](http://travis-ci.org/hgmnz/keikokuc)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/hgmnz/keikokuc)
 
 ## Installation

data/keikokuc.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path('../lib/keikokuc/version', __FILE__)
-require 'factory_girl'
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Harold Giménez"]
@@ -19,6 +18,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rest-client'
   gem.add_dependency 'yajl-ruby'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'factory_girl'
   gem.add_development_dependency 'sham_rack'
 end

data/lib/keikokuc/client.rb

@@ -107,8 +107,8 @@ class Keikokuc::Client
 private
   def notifications_api # :nodoc:
     @notifications_api ||= RestClient::Resource.new(api_url,
-                                                    user: user,
-                                                    password: password)
+                                                    :user     => user,
+                                                    :password => password)
   end
 
   def api_url # :nodoc:

data/lib/keikokuc/notification.rb

@@ -37,7 +37,6 @@ class Keikokuc::Notification
         send("#{attribute}=", opts[attribute.to_sym])
       end
     end
-    @read   = false
     @client = opts[:client]
   end
 
@@ -90,6 +89,6 @@ class Keikokuc::Notification
   end
 
   def client # :nodoc:
-    @client ||= Keikokuc::Client.new(producer_api_key: producer_api_key)
+    @client ||= Keikokuc::Client.new(:producer_api_key => producer_api_key)
   end
 end

data/lib/keikokuc/notification_list.rb

@@ -46,7 +46,8 @@ class Keikokuc::NotificationList
     result, error = client.get_notifications
     if error.nil?
       @notifications = result.map do |attributes|
-        attributes.merge!(client: client, remote_id: attributes.delete(:id))
+        attributes.merge!(:client    => client,
+                          :remote_id => attributes.delete(:id))
         Keikokuc::Notification.new(attributes)
       end
     end
@@ -87,13 +88,14 @@ class Keikokuc::NotificationList
 
   # Internal: assigns notifications
   #
-  # Allos notifications to be injected, useful in tests
+  # Allows notifications to be injected, useful in tests
   def notifications=(new_notification)
     @notifications = new_notification
   end
 
 private
   def client # :nodoc:
-    @client ||= Client.new(user: user, password: password)
+    @client ||= Client.new(:user     => user,
+                           :password => password)
   end
 end

data/lib/keikokuc/version.rb

@@ -1,3 +1,3 @@
 module Keikokuc
-  VERSION = "0.4"
+  VERSION = "0.5"
 end

data/spec/keikoku/client_spec.rb

@@ -11,17 +11,17 @@ module Keikokuc
 
     it 'publishes a new notification' do
       ShamRack.mount(fake_keikoku, "keikoku.herokuapp.com", 443)
-      fake_keikoku.register_publisher({api_key: 'abc'})
-      client = Client.new(producer_api_key: 'abc')
-      result, error = client.post_notification(message:  'hello',
-                                               severity: 'info')
+      fake_keikoku.register_publisher({:api_key => 'abc'})
+      client = Client.new(:producer_api_key => 'abc')
+      result, error = client.post_notification(:message  => 'hello',
+                                               :severity => 'info')
       expect(result[:id]).not_to be_nil
       expect(error).to be_nil
     end
 
     it 'handles invalid notifications' do
       ShamRack.at('keikoku.herokuapp.com', 443) do |env|
-        [422, {}, StringIO.new(Yajl::Encoder.encode({ errors: :srorre }))]
+        [422, {}, StringIO.new(Yajl::Encoder.encode({ :errors => :srorre }))]
       end
 
       response, error = Client.new.post_notification({})
@@ -31,10 +31,10 @@ module Keikokuc
 
     it 'handles authentication failures' do
       ShamRack.mount(fake_keikoku, "keikoku.herokuapp.com", 443)
-      fake_keikoku.register_publisher({api_key: 'abc'})
-      client = Client.new(producer_api_key: 'bad one')
-      result, error = client.post_notification(message:  'hello',
-                                               severity: 'info')
+      fake_keikoku.register_publisher({:api_key => 'abc'})
+      client = Client.new(:producer_api_key => 'bad one')
+      result, error = client.post_notification(:message  => 'hello',
+                                               :severity => 'info')
       expect(result[:id]).to be_nil
       expect(error).to eq Client::Unauthorized
     end
@@ -52,12 +52,12 @@ module Keikokuc
 
     it 'gets all notifications for a user' do
       ShamRack.mount(fake_keikoku, "keikoku.herokuapp.com", 443)
-      fake_keikoku.register_publisher(api_key: 'abc')
-      fake_keikoku.register_user(email: 'harold@heroku.com', password: 'pass')
-      build(:notification, account_email: 'harold@heroku.com', message: 'find me!', producer_api_key: 'abc').publish
-      build(:notification, account_email: 'another@heroku.com', producer_api_key: 'abc').publish
+      fake_keikoku.register_publisher(:api_key => 'abc')
+      fake_keikoku.register_user(:email => 'harold@heroku.com', :password => 'pass')
+      build_notification(:account_email => 'harold@heroku.com', :message => 'find me!', :producer_api_key => 'abc').publish
+      build_notification(:account_email => 'another@heroku.com', :producer_api_key => 'abc').publish
 
-      client = Client.new(user: 'harold@heroku.com', password: 'pass')
+      client = Client.new(:user => 'harold@heroku.com', :password => 'pass')
 
       notifications, error = client.get_notifications
 
@@ -76,8 +76,8 @@ module Keikokuc
 
     it 'handles authentication failures' do
       ShamRack.mount(fake_keikoku, "keikoku.herokuapp.com", 443)
-      fake_keikoku.register_user(email: 'harold@heroku.com', password: 'pass')
-      client = Client.new(user: 'harold@heroku.com', password: 'bad-pass')
+      fake_keikoku.register_user(:email => 'harold@heroku.com', :password => 'pass')
+      client = Client.new(:user => 'harold@heroku.com', :password => 'bad-pass')
 
       response, error = client.get_notifications
 
@@ -90,10 +90,11 @@ module Keikokuc
     include_context 'client specs'
     it 'marks the notification as read' do
       ShamRack.mount(fake_keikoku, "keikoku.herokuapp.com", 443)
-      fake_keikoku.register_publisher(api_key: 'abc')
-      fake_keikoku.register_user(email: 'harold@heroku.com', password: 'pass')
-      client = Client.new(user: 'harold@heroku.com', password: 'pass')
-      notification = build(:notification, account_email: 'harold@heroku.com', producer_api_key: 'abc')
+      fake_keikoku.register_publisher(:api_key => 'abc')
+      fake_keikoku.register_user(:email => 'harold@heroku.com', :password => 'pass')
+      client = Client.new(:user => 'harold@heroku.com', :password => 'pass')
+      notification = build_notification(:account_email    => 'harold@heroku.com',
+                                        :producer_api_key => 'abc')
       notification.publish or raise "Notification publish error"
 
       response, error = client.read_notification(notification.remote_id)
@@ -105,8 +106,10 @@ module Keikokuc
 
     it 'handles authentication errors' do
       ShamRack.mount(fake_keikoku, "keikoku.herokuapp.com", 443)
-      fake_keikoku.register_user(email: 'harold@heroku.com', password: 'pass')
-      client = Client.new(user: 'harold@heroku.com', password: 'bad-pass')
+      fake_keikoku.register_user(:email    => 'harold@heroku.com',
+                                 :password => 'pass')
+      client = Client.new(:user     => 'harold@heroku.com',
+                          :password => 'bad-pass')
       response, error = client.read_notification(1)
       expect(response).to be_empty
       expect(error).to eq(Client::Unauthorized)

data/spec/keikoku/notification_list_spec.rb

@@ -8,18 +8,18 @@ module Keikokuc
     let(:user_notifications) do
       [
         {
-          id:           1,
-          target_name:  'flying-monkey-123',
-          message:      'Database HEROKU_POSTGRESQL_BROWN is over row limits',
-          url:          'https://devcenter.heroku.com/how-to-fix-problem',
-          severity:     'info'
+          :id          => 1,
+          :target_name => 'flying-monkey-123',
+          :message     => 'Database HEROKU_POSTGRESQL_BROWN is over row limits',
+          :url         => 'https://devcenter.heroku.com/how-to-fix-problem',
+          :severity    => 'info'
         },
         {
-          id:           2,
-          target_name:  'rising-cloud-42',
-          message:      'High OOM rates',
-          url:          'https://devcenter.heroku.com/oom',
-          severity:     'fatal'
+          :id          => 2,
+          :target_name => 'rising-cloud-42',
+          :message     => 'High OOM rates',
+          :url         => 'https://devcenter.heroku.com/oom',
+          :severity    => 'fatal'
         }
       ]
     end
@@ -31,7 +31,7 @@ module Keikokuc
     it 'finds all notifications for the current user' do
       fake_client.should_receive(:get_notifications).
         and_return([user_notifications, nil])
-      list = build(:notification_list, client: fake_client)
+      list = build_notification_list(:client => fake_client)
 
       result = list.fetch
       expect(result).to be_true
@@ -52,15 +52,15 @@ module Keikokuc
     include_context 'with user notifications'
 
     it 'marks all notifications as read' do
-      fake_client.stub(get_notifications: [user_notifications, nil])
+      fake_client.stub(:get_notifications => [user_notifications, nil])
 
       now = Time.now
       fake_client.should_receive(:read_notification).with(1).
-        and_return([{read_at: now}, nil])
+        and_return([{:read_at => now}, nil])
       fake_client.should_receive(:read_notification).with(2).
-        and_return([{read_at: now}, nil])
+        and_return([{:read_at => now}, nil])
 
-      list = build(:notification_list, client: fake_client)
+      list = build_notification_list(:client => fake_client)
 
       list.fetch or raise "error fetching"
 
@@ -73,15 +73,15 @@ module Keikokuc
     end
 
     it 'returns false if any notification fails to be marked as read' do
-      fake_client.stub(get_notifications: [user_notifications, nil])
+      fake_client.stub(:get_notifications => [user_notifications, nil])
 
       now = Time.now
       fake_client.should_receive(:read_notification).with(1).
-        and_return([{read_at: now}, nil])
+        and_return([{:read_at => now}, nil])
       fake_client.should_receive(:read_notification).with(2).
         and_return([[], :an_error])
 
-      list = build(:notification_list, client: fake_client)
+      list = build_notification_list(:client => fake_client)
 
       list.fetch or raise "error fetching"
 
@@ -93,8 +93,8 @@ module Keikokuc
     include_context 'specs with a fake client'
     include_context 'with user notifications'
     it 'is true when there are no notifications' do
-      fake_client.stub(get_notifications: [user_notifications, nil])
-      notification_list = build(:notification_list, client: fake_client)
+      fake_client.stub(:get_notifications => [user_notifications, nil])
+      notification_list = build_notification_list(:client => fake_client)
 
       expect(notification_list.empty?).to be_true
 
@@ -106,9 +106,9 @@ module Keikokuc
 
   describe NotificationList, '#notifications=' do
     it 'assigns notifications' do
-      list = build(:notification_list)
-      list.notifications = [build(:notification, message: 'one'),
-                            build(:notification, message: 'two')]
+      list = build_notification_list
+      list.notifications = [build_notification(:message => 'one'),
+                            build_notification(:message => 'two')]
 
       expect(list.map { |n| n.message }).to eq(%w[one two])
     end

data/spec/keikoku/notification_spec.rb

@@ -8,11 +8,11 @@ module Keikokuc
         should_receive(:post_notification).with do |args|
           expect(args[:message]).to eq('hello')
           expect(args[:account_email]).to eq('harold@heroku.com')
-        end.and_return([{ id: 1 }, nil])
+        end.and_return([{ :id => 1 }, nil])
 
-      notification = build(:notification, message: 'hello',
-                                          account_email: 'harold@heroku.com',
-                                          client: fake_client)
+      notification = build_notification(:message       => 'hello',
+                                        :account_email => 'harold@heroku.com',
+                                        :client        => fake_client)
 
       result = notification.publish
       expect(result).to be_true
@@ -26,10 +26,11 @@ module Keikokuc
         should_receive(:post_notification).with do |args|
           expect(args[:message]).to be_nil
         end.
-        and_return([{ errors: { attributes: { message: ['is not present'] }}},
+        and_return([{ :errors => { :attributes => { :message => ['is not present'] }}},
                    Keikokuc::Client::InvalidNotification])
 
-      notification = build(:notification, message: nil, client: fake_client)
+      notification = build_notification(:message => nil,
+                                        :client  => fake_client)
 
       result = notification.publish
       expect(result).to be_false
@@ -39,7 +40,7 @@ module Keikokuc
     end
 
     it 'stores attributes as instance vars' do
-      notification = Notification.new(message: 'foo')
+      notification = Notification.new(:message => 'foo')
       expect(notification.message).to eq('foo')
     end
   end
@@ -50,9 +51,9 @@ module Keikokuc
 
       fake_client.should_receive(:read_notification).
         with('1234').
-        and_return([{read_at: Time.now}, nil])
+        and_return([{:read_at => Time.now}, nil])
 
-      notification = Notification.new(remote_id: '1234', client: fake_client)
+      notification = Notification.new(:remote_id => '1234', :client => fake_client)
 
       result = notification.read
       expect(result).to be_true
@@ -67,7 +68,8 @@ module Keikokuc
         with('1234').
         and_return([{}, :some_error])
 
-      notification = Notification.new(remote_id: '1234', client: fake_client)
+      notification = Notification.new(:remote_id => '1234',
+                                      :client    => fake_client)
 
       result = notification.read
       expect(result).to be_false
@@ -79,7 +81,7 @@ module Keikokuc
 
   describe Notification, '#read?' do
     it 'is true if the read_at is known' do
-      notification = build(:notification, read_at: nil)
+      notification = build_notification(:read_at => nil)
       expect(notification.read?).to be_false
 
       notification.read_at = Time.now
@@ -90,13 +92,13 @@ module Keikokuc
 
   describe Notification, '#client' do
     it 'defaults to a properly constructer Keikokuc::Client' do
-      notification = build(:notification, producer_api_key: 'fake-api-key')
+      notification = build_notification(:producer_api_key => 'fake-api-key')
       expect(notification.client).to be_kind_of(Keikokuc::Client)
       expect(notification.client.producer_api_key).to eq('fake-api-key')
     end
 
     it 'can be injected' do
-      notification = Notification.new(client: :foo)
+      notification = Notification.new(:client => :foo)
       expect(notification.client).to eq(:foo)
     end
   end

data/spec/spec_helper.rb

@@ -5,21 +5,20 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 require 'keikokuc'
-require 'factories'
 require 'support/fake_keikoku'
+require 'support/factories'
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
+  config.include Factories
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
 
-  config.include FactoryGirl::Syntax::Methods
-
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end

data/spec/support/factories.rb

@@ -0,0 +1,19 @@
+module Factories
+  def build_notification(opts = {})
+    defaults = {
+      :message       => 'Your database is over limits',
+      :target_name   => 'cloudy-skies-243',
+      :severity      => 'info',
+      :account_email => 'harold@heroku.com'
+    }
+    Keikokuc::Notification.new(defaults.merge(opts))
+  end
+
+  def build_notification_list(opts = {})
+    defaults = {
+      :user     => 'user@example.com',
+      :password => 'pass'
+    }
+    Keikokuc::NotificationList.new(defaults.merge(opts))
+  end
+end

data/spec/support/fake_keikoku.rb

@@ -31,9 +31,9 @@ class FakeKeikoku
     with_rack_env(env) do
       if request_path == '/api/v1/notifications' && request_verb == 'POST'
         if publisher_by_api_key(request_api_key)
-          notification = Notification.new({id: next_id}.merge(request_body))
+          notification = Notification.new({:id => next_id}.merge(request_body))
           @notifications << notification
-          [200, { }, [Yajl::Encoder.encode({id: notification.id})]]
+          [200, { }, [Yajl::Encoder.encode({:id => notification.id})]]
         else
           [401, { }, ["Not authorized"]]
         end
@@ -50,7 +50,7 @@ class FakeKeikoku
             notification.to_hash[:id].to_s == $1.to_s
           end
           notification.mark_read_by!(current_user)
-          [200, {}, [Yajl::Encoder.encode({read_by: current_user, read_at: Time.now})]]
+          [200, {}, [Yajl::Encoder.encode({:read_by => current_user, :read_at => Time.now})]]
         else
           [401, { }, ["Not authorized"]]
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keikokuc
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70278490000460 !ruby/object:Gem::Requirement
+  requirement: &70352657568460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70278490000460
+  version_requirements: *70352657568460
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70278489999820 !ruby/object:Gem::Requirement
+  requirement: &70352657568040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70278489999820
+  version_requirements: *70352657568040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70278489999380 !ruby/object:Gem::Requirement
+  requirement: &70352657567620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278489999380
-- !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: &70278489998960 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70278489998960
+  version_requirements: *70352657567620
 - !ruby/object:Gem::Dependency
   name: sham_rack
-  requirement: &70278489998500 !ruby/object:Gem::Requirement
+  requirement: &70352657567200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278489998500
+  version_requirements: *70352657567200
 description: Keikoku client
 email:
 - harold.gimenez@gmail.com
@@ -75,6 +64,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -86,11 +76,11 @@ files:
 - lib/keikokuc/notification.rb
 - lib/keikokuc/notification_list.rb
 - lib/keikokuc/version.rb
-- spec/factories.rb
 - spec/keikoku/client_spec.rb
 - spec/keikoku/notification_list_spec.rb
 - spec/keikoku/notification_spec.rb
 - spec/spec_helper.rb
+- spec/support/factories.rb
 - spec/support/fake_keikoku.rb
 homepage: https://github.com/hgmnz/keikokuc
 licenses: []
@@ -118,9 +108,9 @@ specification_version: 3
 summary: Keikoku is an experimental notification system on Heroku. This gem interfaces
   with the keikoku API to be used bynotification producers and consumers
 test_files:
-- spec/factories.rb
 - spec/keikoku/client_spec.rb
 - spec/keikoku/notification_list_spec.rb
 - spec/keikoku/notification_spec.rb
 - spec/spec_helper.rb
+- spec/support/factories.rb
 - spec/support/fake_keikoku.rb

data/spec/factories.rb

@@ -1,19 +0,0 @@
-FactoryGirl.define do
-  factory :notification, class: Keikokuc::Notification do
-    skip_create
-
-    message       'Your database is over limits'
-    target_name   'cloudy-skies-243'
-    severity      'info'
-    account_email 'harold@heroku.com'
-
-    initialize_with { new(attributes) }
-  end
-
-  factory :notification_list, class: Keikokuc::NotificationList do
-    user     'user@example.com'
-    password 'pass'
-
-    initialize_with { new(attributes) }
-  end
-end