breadboard 1.0.1 → 1.1.0.rc1

data/CHANGELOG

@@ -1,3 +1,6 @@
+v1.1.0.rc1
+  set user, password parameters with block instead of hash (see the README).
+
 v1.0.0
   No change since beta 2; after using beta 2 in several production apps and not running into any more bugs, i've decided it's good for 1.0.0 GA.
 

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    breadboard (1.0.0)
+    breadboard (1.0.2)
       activeresource (~> 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
+    activemodel (3.0.11)
+      activesupport (= 3.0.11)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
+    activeresource (3.0.11)
+      activemodel (= 3.0.11)
+      activesupport (= 3.0.11)
+    activesupport (3.0.11)
     builder (2.1.2)
     cucumber (0.10.2)
       builder (>= 2.1.2)

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0.rc1

data/features/configure.feature

@@ -26,3 +26,11 @@ Feature: Configuring Breadboard
   Scenario: configuring the method for determining the Rails environment
     Given I have required breadboard
     Then I should be able to override the default Rails.env environment retrieval in case I'm not in a rails app
+
+  Scenario: Configure Breadboard with hash instead of url
+    Given I have required breadboard
+    Then I should be able to configure breadboard with hash
+
+  Scenario: Configure model with user, password
+    Given I have required breadboard
+    Then I should be able to configure model with user, password

data/features/step_definitions/active_resource_steps.rb

@@ -137,15 +137,15 @@ Given /^my Rails environment is "([^"]*)"$/ do |environment|
 end
 
 Then /^I should recieve the value configured in the Breadboard "([^"]*)" environment settings for that model$/ do |environment|
-  NoSiteAttribute.site.to_s.should == Breadboard.config.NoSiteAttribute.send(environment.to_sym)
+  NoSiteAttribute.site.should == Breadboard.config.NoSiteAttribute.send(environment.to_sym).site
 end
 
 Then /^I should recieve the value configured in the Breadboard "([^"]*)" environment settings for the ancestor of that model$/ do |environment|
-  NoSiteAttribute.site.to_s.should == Breadboard.config.Parent.send(environment.to_sym)
+  NoSiteAttribute.site.should == Breadboard.config.Parent.send(environment.to_sym).site
 end
 
 Then /^I should recieve the value configured in the Breadboard "([^"]*)" environment settings in the breadboard defaults section$/ do |environment|
-  NoSiteAttribute.site.to_s.should == Breadboard.config.default.send(environment.to_sym)
+  NoSiteAttribute.site.should == Breadboard.config.default.send(environment.to_sym).site
 end
 
 Then /^ActiveResource should ignore more generic configurations in Breadboard$/ do

data/features/step_definitions/configure_steps.rb

@@ -87,3 +87,51 @@ Then /^I should be able to override the default Rails\.env environment retrieval
   end
   Breadboard.env.should == "override!"
 end
+
+Then /^I should be able to configure breadboard with hash$/ do
+  Breadboard.configure do
+    default do
+      all do
+        site "http://localhost:3000"
+        user "admin"
+        password "password"
+      end
+
+      development "http://test"
+    end
+  end
+
+  Breadboard.config.default.all.to_s.should == "http://localhost:3000"
+  Breadboard.config.default.all.site.to_s.should == "http://localhost:3000"
+  Breadboard.config.default.all.user.should == "admin"
+  Breadboard.config.default.all.password.should == "password"
+
+  Breadboard.config.default.development.to_s.should == "http://test"
+end
+
+Then /^I should be able to configure model with user, password$/ do
+  class Venue < ActiveResource::Base
+  end
+
+  Breadboard.configure do
+    env {"production"}
+
+    model Venue do
+      all do
+        site "http://localhost:3000"
+        user "admin"
+        password "password"
+      end
+
+      production do
+        site "http://livesite"
+        user "admin"
+        password "secret"
+      end
+    end
+  end
+  
+  Venue.site.to_s.should == "http://livesite"
+  Venue.password.should == "secret"
+end
+

data/lib/breadboard.rb

@@ -2,5 +2,6 @@ require 'active_resource'
 require 'active_support/core_ext/string'
 require 'breadboard/breadboard'
 require 'breadboard/config'
+require 'breadboard/env_config'
 require 'breadboard/environment'
 require 'breadboard/active_resource'

data/lib/breadboard/active_resource.rb

@@ -1,16 +1,22 @@
 module ActiveResource
   class Base
     class << self
-      def site_with_breadboard
-        @site || Breadboard.service_for(self)
+      class_eval do
+        %w(site user password).each do |attr|
+          define_method "#{attr}_with_breadboard" do
+            @site || begin
+              setting = Breadboard.service_for(self)
+              setting.kind_of?(Breadboard::Config::EnvConfig) ? setting.send(attr) : setting
+            end
+          end
+          alias_method_chain attr, :breadboard
+        end
       end
 
       def connection_with_breadboard(reset=false)
         @connection ||= nil
         connection_without_breadboard(reset)
       end
-
-      alias_method_chain :site, :breadboard
       alias_method_chain :connection, :breadboard
     end
   end

data/lib/breadboard/breadboard.rb

@@ -19,19 +19,11 @@ module Breadboard
     model_superclass_chain.each do |klass|
       klass_symbol = klass.to_s.to_sym
       site = config.send(klass_symbol).send(environment) || config.send(klass_symbol).send(:all)
-      if site
-        site = site.call if site.respond_to? :call
-        site = URI.parse site
+      if site and !site.empty?
         return site
       end
     end
-
-    site = config.default.send(environment) || config.default.send(:all)
-    if site
-      site = site.call if site.respond_to? :call
-      site = URI.parse site
-      return site
-    end
+    return config.default.send(environment) || config.default.send(:all)
   end
 
   def reset

data/lib/breadboard/env_config.rb

@@ -0,0 +1,28 @@
+module Breadboard
+  module Config
+    # holds site, user, password values for an environment instance
+    class EnvConfig
+      def initialize
+        @config = {}
+      end
+
+      def site=(url)
+        @config[:site] = url
+      end
+
+      def method_missing(method_name, *args, &block)
+        return @config[method_name] if args.length == 0
+        @config[method_name] = args.first
+      end
+
+      def to_s
+        @config[:site].to_s
+      end
+
+      def empty?
+        @config.empty?
+      end
+    end
+  end
+end
+

data/lib/breadboard/environment.rb

@@ -7,12 +7,21 @@ module Breadboard
 
       def test(url=nil)
         return @environments[:test] if url.nil?
-        @environments[:test] = url
+        @environments[:test] = URI.parse url
       end
 
       def method_missing(method_name, *args, &block)
-        return @environments[method_name] if args.length == 0
-        @environments[method_name] = args.first
+        if block_given?
+          @environments[method_name] ||= EnvConfig.new
+          @environments[method_name].instance_eval &block
+        else
+          if args.length == 0
+            @environments[method_name]
+          else
+            @environments[method_name] ||= EnvConfig.new
+            @environments[method_name].site  URI.parse args.first
+          end
+        end
       end
     end
   end

data/readme.md

@@ -76,6 +76,19 @@ Now suppose you have a 'Book' model that needs to connect to a different service
       end
     end
 
+If you need to set user and password for a restful service, you can do so with a block
+
+    Breadboard.configure do
+      model Book do
+        production do
+          site     "http://my.book.production.service.provider"
+          user     "user1"
+          password "password"
+        end
+      end
+    end
+
+
 ## Configuring the environment
 
 By default, Breadboard will check `Rails.env` to see what environment your app is in. 

metadata

@@ -1,72 +1,80 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: breadboard
-version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 15424039
+  prerelease: 6
+  segments: 
+  - 1
+  - 1
+  - 0
+  - rc
+  - 1
+  version: 1.1.0.rc1
 platform: ruby
-authors:
+authors: 
 - Matt Parker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-04-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activeresource
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
         version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.4.0
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 2
+        - 4
+        - 0
         version: 2.4.0
-description: ! 'Breadboard allows you to define what services your ActiveResource
-  derived classes connect to based on your rails environment. '
+  type: :development
+  version_requirements: *id003
+description: "Breadboard allows you to define what services your ActiveResource derived classes connect to based on your rails environment. "
 email: moonmaster9000@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - readme.md
-files:
+files: 
 - .gitignore
 - .rvmrc
 - CHANGELOG
@@ -87,33 +95,43 @@ files:
 - lib/breadboard/active_resource.rb
 - lib/breadboard/breadboard.rb
 - lib/breadboard/config.rb
+- lib/breadboard/env_config.rb
 - lib/breadboard/environment.rb
 - readme.md
 homepage: http://github.com/moonmaster9000/breadboard
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple, environment-based service provider configuration for ActiveResource
-test_files:
+test_files: 
 - features/active_resource.feature
 - features/configure.feature
 - features/reset.feature