communicator 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    communicator (0.1.0)
+    communicator (0.1.1)
       activerecord (< 3.0.0)
       httparty (>= 0.6.1)
       json (>= 1.4.0)
       sinatra (~> 1.1.0)
-      sinatra-basic-auth
 
 GEM
   remote: http://rubygems.org/
@@ -26,8 +25,6 @@ GEM
     sinatra (1.1.0)
       rack (~> 1.1)
       tilt (~> 1.1)
-    sinatra-basic-auth (0.1.0)
-      sinatra
     sqlite3-ruby (1.3.2)
     tilt (1.1)
 
@@ -44,5 +41,4 @@ DEPENDENCIES
   rack-test (>= 0.5.6)
   shoulda (= 2.10.3)
   sinatra (~> 1.1.0)
-  sinatra-basic-auth
   sqlite3-ruby (>= 1.3.0)

data/README.rdoc

@@ -20,8 +20,38 @@ migrations from the gem:
   $ rake communicator:update_migrations
   $ rake db:migrate
   
-After doing these steps, you can proceed to configure either the server or client
-side as specified in the following subsections.
+After doing these steps, you can proceed to configure either the server or client.
+On both sides, you'll have to configure the client and server. You can do so
+by placing a configuration file in Rails.root/config/communicator.yml that looks
+somewhat like this:
+
+  defaults: &defaults
+    username: communicator
+    password: verysecret
+    base_uri: localhost:3001 # Can be ommitted for server config
+
+  test:
+    <<: *defaults
+  
+  development:
+    <<: *defaults
+  
+  production:
+    <<: *defaults
+    password: Uber!Secret
+    base_uri: 192.168.0.104:4000 # Can be ommitted for server config
+    
+The configuration for the current `Rails.env` will then be automatically loaded 
+when you `require 'communicator'`.
+
+You can also skip the YAML configuration and set up the credentials programmatically:
+
+  Communicator::Server.username = 'foo'
+  Communicator::Server.password = 'bar'
+  
+  Communicator::Client.username = 'foo'
+  Communicator::Client.password = 'bar'
+  Communicator::Client.base_uri 'localhost:1234'
   
 == Server side
   
@@ -29,8 +59,6 @@ On the server side, you can mount the server component in a Rails 2.3 app
 as a rack middleware inside environment.rb:
 
   require 'communicator'
-  Communicator::Server.username = 'foo'
-  Communicator::Server.password = 'bar'
   config.middleware.use 'Communicator::Server'
 
 It will then be mounted at /messages.json for GET and POST requests, requesting
@@ -42,9 +70,6 @@ Tell the client the server url and port as well as the auth credentials inside
 your environment.rb:
 
   require 'communicator'
-  Communicator::Client.username = 'test'
-  Communicator::Client.password = 'test'
-  Communicator::Client.base_uri 'localhost:3001'
     
 When everything's fine, you should be able to push and pull using the client:
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/communicator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{communicator}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christoph Olszowka"]
-  s.date = %q{2010-11-03}
+  s.date = %q{2010-11-04}
   s.description = %q{Data push/pull between apps with local inbound/outbound queue and easy publish/process interface}
   s.email = %q{christoph at olszowka de}
   s.extra_rdoc_files = [

data/lib/communicator.rb

@@ -51,4 +51,16 @@ require 'communicator/server'
 require 'communicator/client'
 require 'communicator/active_record_integration'
 require 'communicator/outbound_message'
-require 'communicator/inbound_message'
+require 'communicator/inbound_message'
+
+# Autoload config when present for rails
+if defined?(Rails)
+  config_path = File.join(Rails.root, 'config', 'communicator.yml')
+  if File.exist?(config_path)
+    config = YAML.load_file(config_path).with_indifferent_access[Rails.env]
+    puts "Config file for communicator found, but does not have configuration for env #{Rails.env}" unless config.kind_of?(Hash)
+    Communicator::Server.username = Communicator::Client.username = config[:username]
+    Communicator::Server.password = Communicator::Client.password = config[:password]
+    Communicator::Client.base_uri config[:base_uri]
+  end
+end

data/lib/communicator/server.rb

@@ -16,10 +16,6 @@ class Communicator::Server < Sinatra::Base
     end
   end
   
-  # use Rack::Auth::Basic do |username, password|
-  #   [username, password] == [Communicator::Server.username, Communicator::Server.password]
-  # end
-  
   helpers do
     def protected!
       unless authorized?
@@ -27,7 +23,7 @@ class Communicator::Server < Sinatra::Base
         throw(:halt, [401, "Not authorized\n"])
       end
     end
-
+  
     def authorized?
       @auth ||=  Rack::Auth::Basic::Request.new(request.env)
       @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [Communicator::Server.username, Communicator::Server.password]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: communicator
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Christoph Olszowka
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +01:00
+date: 2010-11-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency