kelredd-resourceful 0.4.5 → 0.4.6

data/lib/resourceful/agent/base.rb

@@ -37,11 +37,10 @@ module Resourceful
       protected
 
       def check_config(path, opts) # :nodoc:
-        raise Resourceful::Exceptions::ConfigurationError, "invalid Mechanize agent" unless agent && agent_url && !agent_url.empty?
+        raise Resourceful::Exceptions::ConfigurationError, "invalid agent" unless agent && agent_url && !agent_url.empty?
         opts ||= {}
         opts[:force] ||= false
         if path =~ /^(.+)\.(.+)$/
-          path = $1
           opts[:format] ||= $2
         end
         opts[:format] ||= Resourceful::Resource::Json.to_s
@@ -50,7 +49,7 @@ module Resourceful
       end
       
       def self.resource_path(path, format, params) # :nodoc:
-        "#{path}.#{format}#{params.to_http_query_str unless params.empty?}"
+        "#{path}#{params.to_http_query_str unless params.empty?}"
       end
       
       def summary(verb, full_resource_path) # :nodoc:

data/lib/resourceful/agent/mechanize.rb

@@ -5,21 +5,30 @@ module Resourceful
   module Agent
     class Mechanize < Resourceful::Agent::Base
       
+      ATTRS = [:agent_alias]
+      ATTRS.each { |a| attr_reader a }
+      
       def initialize(args={})
+        ATTRS.each { |a| instance_variable_set("@#{a.to_s}", args.delete(a)) }
         super(args)
         self.log = yield if block_given?
-        @mechanize = ::WWW::Mechanize.new { |obj| obj.log = @logger }
+        @mechanize = ::WWW::Mechanize.new do |obj|
+          obj.log = @logger
+          obj.user_agent_alias = @agent_alias unless @agent_alias.nil?
+        end
       end
 
       def get(path, opts={})
         super(path, opts) do |path|
+          resp = ""
           @mechanize.get("#{@host}#{path}") do |page|
-            if block_given?
+            resp = if block_given?
               yield page
             else
               page
             end
-          end.body
+          end
+          resp.body
         end
       end
     

data/lib/resourceful/extensions.rb

@@ -1,3 +1,25 @@
+module Resourceful
+  module Extensions   
+    module NilClass
+      
+      module ClassMethods; end
+      def self.included(klass)
+        klass.extend(ClassMethods) if klass.kind_of?(Class)
+      end
+
+      module ClassMethods
+      end
+
+      unless nil.respond_to?(:to_boolean) 
+        def to_boolean
+          !!self
+        end
+      end
+      
+    end
+  end
+end
+
 module Resourceful
   module Extensions   
     module String
@@ -24,7 +46,7 @@ module Resourceful
       
       unless "".respond_to?(:to_boolean) 
         def to_boolean
-          self =~ /^(true|1)$/i ? true : false
+          self.nil? || self.empty? || self =~ /^(false|0)$/i ? false : true
         end
       end
       
@@ -95,6 +117,10 @@ module Resourceful
   end
 end
 
+class NilClass
+  include Resourceful::Extensions::NilClass
+end
+
 class String
   include Resourceful::Extensions::String
 end

data/lib/resourceful/model/base.rb

@@ -9,20 +9,30 @@ module Resourceful
       end
       
       def self.get(path, opts={})
-        get_proc = opts.delete(:get_proc)
-        set_agent.get(path, opts, &get_proc)
+        block = opts.delete(:on_response)
+        set_agent.get(path, opts, &block)
       end
       def self.get_collection(path, opts={})
-        get_proc = opts.delete(:get_proc)
-        (yield set_agent.get(path, opts, &get_proc)).collect{|data| new(data)}
+        block = opts.delete(:on_response)
+        (yield set_agent.get(path, opts, &block)).collect{|data| new(data)}
       end
 
       def initialize(data)
       end
       
+      def data
+        @data
+      end
+      
+      def attributes
+        @attributes ||= @@attributes[self.class.name].inject({}) { |hsh, key| hsh[key] = self.send(key); hsh }
+      end
+      
       protected
       
       def self.attribute(name, type, config={})
+        clean_name = name.to_s.gsub(/\W/,'')
+        add_to_attributes(name.to_s)
         config ||= {}
         config[:path] ||= name
         content_method = case type.to_sym
@@ -32,6 +42,8 @@ module Resourceful
           'to_i'
         when :float
           'to_f'
+        when :currency
+          'from_currency_to_f'
         when :date
           'to_date'
         when :datetime
@@ -42,10 +54,10 @@ module Resourceful
           'to_s'
         end
         define_method(name) do
-          instance_variable_get("@#{name}") || \
-            instance_variable_set("@#{name}", \
+          instance_variable_get("@#{clean_name}") || \
+            instance_variable_set("@#{clean_name}", \
               if ((a = attribute(config)) && a.kind_of?(String))
-                a.send(content_method)
+                self.class.get_value(a, config).send(content_method)
               else
                 a
               end
@@ -102,6 +114,21 @@ module Resourceful
       
       private
       
+      def self.add_to_attributes(name)
+        @@attributes ||= {}
+        klass_name = self.name
+        @@attributes[klass_name] ||= []
+        @@attributes[klass_name] << name
+      end
+
+      def self.get_value(attribute, opts={})
+        if opts[:value]
+          (attribute =~ opts[:value]) ? ($1 || $&) : nil
+        else
+          attribute
+        end
+      end
+      
       def self.set_agent
         unless @@agent.kind_of?(Resourceful::Agent::Base)
           @@agent = @@agent.call 

data/lib/resourceful/model/json.rb

@@ -5,19 +5,21 @@ module Resourceful
       
       attr_reader :json
 
-      def self.get(path, params, force=false)
+      def self.get(path, params, force=false, &block)
         opts = {
           :format => 'json',
           :params => params || {},
-          :force => force
+          :force => force,
+          :on_response => block
         }
         new(super(path, opts))
       end
-      def self.get_collection(path, params, force=false)
+      def self.get_collection(path, params, force=false, &block)
         opts = {
           :format => 'json',
           :params => params || {},
-          :force => force
+          :force => force,
+          :on_response => block
         }
         super(path, opts) do |data|
           data
@@ -29,9 +31,9 @@ module Resourceful
         @data = json
       end
       
-      def attributes
-        @data
-      end
+      #def attributes
+      #  @data
+      #end
       
       protected
       

data/lib/resourceful/model/xml.rb

@@ -5,22 +5,24 @@ module Resourceful
       
       attr_reader :xml
 
-      def self.get(path, params, xpath, force=false)
+      def self.get(path, params, search, force=false, &block)
         opts = {
           :format => 'xml',
           :params => params || {},
-          :force => force
+          :force => force,
+          :on_response => block
         }
-        new(super(path, opts).xpath(xpath))
+        new(super(path, opts).search(search))
       end
-      def self.get_collection(path, params, xpath, force=false)
+      def self.get_collection(path, params, search, force=false, &block)
         opts = {
           :format => 'xml',
           :params => params || {},
-          :force => force
+          :force => force,
+          :on_response => block
         }
         super(path, opts) do |data|
-          data.xpath(xpath)
+          data.search(search)
         end
       end
 
@@ -33,7 +35,7 @@ module Resourceful
       
       def attribute(config)
         begin
-          get_node("./#{config[:path]}").content
+          get_node("#{config[:path]}").send((config[:content] || 'content').to_s)
         rescue Exception => err
           nil
         end          
@@ -41,14 +43,14 @@ module Resourceful
         
       def child(config)
         begin
-          get_node("./#{config[:path]}")
+          get_node("#{config[:path]}")
         rescue Exception => err
           nil
         end
       end
         
       def self.get_node(xml, path)
-        xml.xpath(path.to_s).first
+        xml.search(path.to_s).first
       end
       def get_node(path)
         self.class.get_node(@data, path)

data/lib/resourceful/version.rb

@@ -3,7 +3,7 @@ module Resourceful
     
     MAJOR = 0
     MINOR = 4
-    TINY  = 5
+    TINY  = 6
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kelredd-resourceful
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-04 00:00:00 -07:00
+date: 2009-08-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency