woahdae-consumer 0.8.1 → 0.8.2

data/Manifest.txt

@@ -6,6 +6,7 @@ README.rdoc
 Rakefile
 app_generators/consumer/USAGE
 app_generators/consumer/consumer_generator.rb
+app_generators/consumer/templates/.gitignore
 app_generators/consumer/templates/LICENSE
 app_generators/consumer/templates/README.rdoc
 app_generators/consumer/templates/Rakefile
@@ -38,6 +39,7 @@ examples/active_record/xml/book.xml
 examples/active_record/xml/book_with_contributors.xml
 examples/active_record/xml/contributor.xml
 examples/active_record/xml/contributor_with_books.xml
+examples/shipping/.gitignore
 examples/shipping/environment.rb
 examples/shipping/rate.rb
 examples/shipping/shipping.yml.sample
@@ -48,8 +50,6 @@ lib/consumer.rb
 lib/consumer/helper.rb
 lib/consumer/mapping.rb
 lib/consumer/request.rb
-rails_generators/request/USAGE
-rails_generators/request/request_generator.rb
 script/console
 script/destroy
 script/generate
@@ -63,9 +63,7 @@ spec/xml/rate_response.xml
 spec/xml/rate_response_error.xml
 tasks/rspec.rake
 test/test_consumer_generator.rb
-test/test_consumer_plugin_request_generator.rb
 test/test_generator_helper.rb
-test/test_rails_request_generator.rb
 website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js

data/consumer.gemspec

@@ -1,10 +1,12 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{consumer}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Woody Peterson"]
-  s.date = %q{2009-01-29}
+  s.date = %q{2009-02-05}
   s.default_executable = %q{consumer}
   s.description = %q{Consumer is a library for consuming xml resources via Builder, libxml, and some request sending / response marshaling glue. It comes with an app generator that creates an empty ready-for-rails gem that itself comes with a generator for making the request/response classes, config files, and specs (see script/generate after creating a new Consumer project).}
   s.email = ["woody.peterson@gmail.com"]
@@ -17,32 +19,32 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{consumer}
-  s.rubygems_version = %q{1.2.0}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{Consumer is a library for consuming xml resources via Builder, libxml, and some request sending / response marshaling glue}
-  s.test_files = ["test/test_consumer_generator.rb", "test/test_consumer_plugin_request_generator.rb", "test/test_generator_helper.rb", "test/test_rails_request_generator.rb"]
+  s.test_files = ["test/test_consumer_generator.rb", "test/test_generator_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if current_version >= 3 then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])
       s.add_runtime_dependency(%q<libxml-ruby>, [">= 0.8.3"])
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
-      s.add_development_dependency(%q<newgem>, [">= 1.0.7"])
+      s.add_development_dependency(%q<newgem>, [">= 1.1.0"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.0.2"])
       s.add_dependency(%q<libxml-ruby>, [">= 0.8.3"])
       s.add_dependency(%q<builder>, [">= 2.1.2"])
-      s.add_dependency(%q<newgem>, [">= 1.0.7"])
+      s.add_dependency(%q<newgem>, [">= 1.1.0"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.0.2"])
     s.add_dependency(%q<libxml-ruby>, [">= 0.8.3"])
     s.add_dependency(%q<builder>, [">= 2.1.2"])
-    s.add_dependency(%q<newgem>, [">= 1.0.7"])
+    s.add_dependency(%q<newgem>, [">= 1.1.0"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end

data/examples/active_record/ar_spec.rb

@@ -1,7 +1,7 @@
 require 'spec'
 require 'environment'
 
-# Very broad tests to see ROXML working with Active Record
+# Very broad tests to see Consumer working with Active Record
 
 describe "ROXML in ActiveRecord" do
   before(:all) do

data/lib/consumer.rb

@@ -20,9 +20,9 @@ class String
 end
 
 module Consumer
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end
 
 require 'consumer/mapping'
 require 'consumer/request'
-require 'consumer/helper'
+require 'consumer/helper'

data/lib/consumer/mapping.rb

@@ -19,7 +19,7 @@ module Consumer::Mapping
   # === Returns
   # Nothing in particular
   def association_from_xml(xml, association, klass = nil)
-    klass ||= association.to_s.capitalize.singularize.constantize 
+    klass ||= association.to_s.capitalize.singularize.camelcase.constantize 
 
     association_instance = klass.from_xml(xml)
     return if association_instance.nil?
@@ -103,7 +103,7 @@ module Consumer::Mapping
         
         map[:associations].each do |association|
           # TODO: spec
-          instance.association_from_xml(xml, association)
+          instance.association_from_xml(node.to_s, association)
         end
         
         b = map[:block]

data/lib/consumer/request.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'net/https'
 require 'yaml'
+require 'ruby-debug'
 
 ##
 # === Class Attrubutes
@@ -69,6 +70,20 @@ class Consumer::Request
   include Consumer
  
   class << self
+		def basic_authentication(*args)
+			@request_user, @request_pass = args if !args.empty?
+		end
+		
+		def request_user(user = nil)
+			@request_user = user if user
+			@request_user
+		end
+
+		def request_pass(pass = nil)
+			@request_pass = pass if pass
+			@request_pass
+		end
+
     def url(url = nil)
       @url = url if url
       @url
@@ -148,18 +163,18 @@ class Consumer::Request
  
     @request_xml = self.to_xml_etc
     
-    http, uri = Helper.http_from_url(self.url)
     head = defined?(self.headers) ? self.headers : {}
-    
-    puts "\n##### Request to #{url}:\n\n#{@request_xml}\n" if $DEBUG
-    debugger if $POST_DEBUGGER
-    resp = http.post(uri.request_uri, @request_xml, head)
-    
-    if resp.response.code == "302" # moved
-      puts "\n##### Redirected to #{resp['Location']}\n" if $DEBUG
-      http, uri = Helper.http_from_url(resp['Location'])
-      resp = http.post(uri.request_uri, @request_xml, head)
-    end
+
+		resp = nil
+		
+		uri = URI.parse self.url
+
+		Net::HTTP.start(uri.host,uri.port) {|http|
+			req = Net::HTTP::Get.new(uri.request_uri)
+			req.basic_auth request_user, request_pass if request_user and request_pass
+			req.body = @request_xml
+			resp = http.request(req)
+		}
     
     @response_xml = resp.body
     puts "\n##### Response:\n\n#{Helper.tidy(@response_xml)}\n" if $DEBUG
@@ -168,7 +183,7 @@ class Consumer::Request
  
     return response_class.from_xml(@response_xml)
   end
-  
+
   def self.do(args = {})
     self.new(args).do
   end
@@ -198,6 +213,14 @@ class Consumer::Request
     raise "Invalid response_class; see docs for naming conventions etc" if !ret
     return Object.const_get(ret)
   end
+
+	def request_user
+		self.class.request_user
+	end
+
+	def request_pass
+		self.class.request_pass
+	end
  
   def error_paths
     self.class.error_paths
@@ -218,7 +241,7 @@ class Consumer::Request
   def defaults
     self.class.defaults
   end
-  
+
   def config_root
     if defined?(RAILS_ROOT)
       RAILS_ROOT + "/config"
@@ -277,4 +300,4 @@ private
       hash.each {|k,v| hash[k.to_sym] = v;hash.delete(k.to_s)}
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: woahdae-consumer
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Woody Peterson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-29 00:00:00 -08:00
+date: 2009-02-05 00:00:00 -08:00
 default_executable: consumer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.7
+        version: 1.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -175,6 +175,4 @@ specification_version: 2
 summary: Consumer is a library for consuming xml resources via Builder, libxml, and some request sending / response marshaling glue
 test_files: 
 - test/test_consumer_generator.rb
-- test/test_consumer_plugin_request_generator.rb
 - test/test_generator_helper.rb
-- test/test_rails_request_generator.rb