kelredd-resourceful 0.7.24 → 0.7.25

data/lib/resourceful/model/json.rb

@@ -1,74 +1,74 @@
 require "resourceful/model/base"
 
-module Resourceful
-  module Model
+module Resourceful; end
 
-    class Json < Resourceful::Model::Base
-      
-      attr_reader :json
+module Resourceful::Model
 
-      def self.get(path, params, search=nil, force=false, &block)
-        opts = {
-          :format => 'json',
-          :params => params || {},
-          :force => force,
-          :on_response => block
-        }
-        new(get_result_data(super(path, opts), search))
-      end
-      def self.get_collection(path, params, search=nil, force=false, &block)
-        opts = {
-          :format => 'json',
-          :params => params || {},
-          :force => force,
-          :on_response => block
-        }
-        super(path, opts) do |data|
-          data.collect {|item| get_result_data(item, search) }
-        end
-      end
+  class Json < Resourceful::Model::Base
+    
+    attr_reader :json
 
-      def initialize(json=nil)
-        raise Resourceful::Exceptions::ModelError, "trying to initialize a Resourceful::Model::Json model with '#{json.class.name}' data" unless json.nil? || json.kind_of?(::Hash)
-        @data = json
-      end
-      
-      protected
-      
-      def push_data(verb, path, opts, data, search=nil)
-        self.class.get_result_data(super(verb, path, opts, data), search)
-      end
-      
-      def self.get_result_data(result, search)
-        hsh_keys = search.kind_of?(String) ? search.split(/\s+/) : nil
-        result_data = !hsh_keys.nil? && !hsh_keys.empty? && result.respond_to?(:get_value) ? (result.get_value(hsh_keys) || result) : result
-      end
-      
-      def self.format
-        Resourceful::Resource::Json.to_s
+    def self.get(path, params, search=nil, force=false, &block)
+      opts = {
+        :format => 'json',
+        :params => params || {},
+        :force => force,
+        :on_response => block
+      }
+      new(get_result_data(super(path, opts), search))
+    end
+    def self.get_collection(path, params, search=nil, force=false, &block)
+      opts = {
+        :format => 'json',
+        :params => params || {},
+        :force => force,
+        :on_response => block
+      }
+      super(path, opts) do |data|
+        data.collect {|item| get_result_data(item, search) }
       end
-      
-      def attribute(config)
-        begin
-          get_node(config[:path])
-        rescue Exception => err
-          nil
-        end
-      end        
+    end
 
-      def child(config)
-        attribute(config)
-      end
-        
-      def self.get_node(json, path_config)
-        paths = path_config.to_s.split('/')
-        paths.inject(json) { |val,path| val.fetch(path, nil) rescue nil }
-      end
-      def get_node(path_config)
-        self.class.get_node(@data, path_config)
+    def initialize(json=nil)
+      raise Resourceful::Exceptions::ModelError, "trying to initialize a Resourceful::Model::Json model with '#{json.class.name}' data" unless json.nil? || json.kind_of?(::Hash)
+      @data = json
+    end
+    
+    protected
+    
+    def push_data(verb, path, opts, data, search=nil)
+      self.class.get_result_data(super(verb, path, opts, data), search)
+    end
+    
+    def self.get_result_data(result, search)
+      hsh_keys = search.kind_of?(String) ? search.split(/\s+/) : nil
+      result_data = !hsh_keys.nil? && !hsh_keys.empty? && result.respond_to?(:get_value) ? (result.get_value(hsh_keys) || result) : result
+    end
+    
+    def self.format
+      Resourceful::Resource::Json.to_s
+    end
+    
+    def attribute(config)
+      begin
+        get_node(config[:path])
+      rescue Exception => err
+        nil
       end
+    end        
 
+    def child(config)
+      attribute(config)
+    end
+      
+    def self.get_node(json, path_config)
+      paths = path_config.to_s.split('/')
+      paths.inject(json) { |val,path| val.fetch(path, nil) rescue nil }
+    end
+    def get_node(path_config)
+      self.class.get_node(@data, path_config)
     end
 
   end
-end
+
+end

data/lib/resourceful/model/xml.rb

@@ -1,83 +1,83 @@
 require "resourceful/model/base"
 
-module Resourceful
-  module Model
+module Resourceful; end
 
-    class Xml < Resourceful::Model::Base
-      
-      attr_reader :xml
+module Resourceful::Model
 
-      def self.get(path, params, search, force=false, &block)
-        opts = {
-          :format => 'xml',
-          :params => params || {},
-          :force => force,
-          :on_response => block
-        }
-        data = super(path, opts)
-        new(data.search(search) || data)
-      end
-      def self.get_collection(path, params, search, force=false, &block)
-        opts = {
-          :format => 'xml',
-          :params => params || {},
-          :force => force,
-          :on_response => block
-        }
-        super(path, opts) do |data|
-          data.search(search) || data
-        end
-      end
+  class Xml < Resourceful::Model::Base
+    
+    attr_reader :xml
 
-      def initialize(xml=nil)
-        raise Resourceful::Exceptions::ModelError, "trying to initialize a Resourceful::Model::Xml model with '#{xml.class.name}' data" unless xml.nil? || xml.kind_of?(Nokogiri::XML::NodeSet) || xml.kind_of?(Nokogiri::XML::Element)
-        @data = xml
-      end
-      
-      protected
-      
-      def push_data(verb, path, opts, data, search=nil)
-        result = super(verb, path, opts, data)
-        search.nil? ? result : (result.search(search) || result)
+    def self.get(path, params, search, force=false, &block)
+      opts = {
+        :format => 'xml',
+        :params => params || {},
+        :force => force,
+        :on_response => block
+      }
+      data = super(path, opts)
+      new(data.search(search) || data)
+    end
+    def self.get_collection(path, params, search, force=false, &block)
+      opts = {
+        :format => 'xml',
+        :params => params || {},
+        :force => force,
+        :on_response => block
+      }
+      super(path, opts) do |data|
+        data.search(search) || data
       end
+    end
+
+    def initialize(xml=nil)
+      raise Resourceful::Exceptions::ModelError, "trying to initialize a Resourceful::Model::Xml model with '#{xml.class.name}' data" unless xml.nil? || xml.kind_of?(Nokogiri::XML::NodeSet) || xml.kind_of?(Nokogiri::XML::Element)
+      @data = xml
+    end
+    
+    protected
+    
+    def push_data(verb, path, opts, data, search=nil)
+      result = super(verb, path, opts, data)
+      search.nil? ? result : (result.search(search) || result)
+    end
+    
+    def self.format
+      Resourceful::Resource::Xml.to_s
+    end
+    
+    def attribute(config)
+      begin
+        node = get_node(config[:path])
+        node = node.first if node.respond_to?('first')
+        node.send((config[:content] || 'content').to_s)
+      rescue Exception => err
+        nil
+      end          
+    end
       
-      def self.format
-        Resourceful::Resource::Xml.to_s
+    def child(config)
+      begin
+        get_node(config[:path])
+      rescue Exception => err
+        nil
       end
+    end
       
-      def attribute(config)
-        begin
-          node = get_node(config[:path])
-          node = node.first if node.respond_to?('first')
-          node.send((config[:content] || 'content').to_s)
-        rescue Exception => err
-          nil
-        end          
-      end
-        
-      def child(config)
-        begin
-          get_node(config[:path])
-        rescue Exception => err
-          nil
-        end
-      end
-        
-      def self.get_node(xml, path)
-        path.to_s.empty? ? xml : xml.search(path.to_s)
-      end
-      def get_node(path)
-        self.class.get_node(@data, path)
-      end
-
-      def self.xml_root_name(xml)
-        xml.root.name
-      end
-      def xml_root_name
-        self.class.xml_root_name(@data)
-      end
+    def self.get_node(xml, path)
+      path.to_s.empty? ? xml : xml.search(path.to_s)
+    end
+    def get_node(path)
+      self.class.get_node(@data, path)
+    end
 
+    def self.xml_root_name(xml)
+      xml.root.name
+    end
+    def xml_root_name
+      self.class.xml_root_name(@data)
     end
 
   end
-end
+
+end

data/lib/resourceful/resource/cache.rb

@@ -1,51 +1,46 @@
-module Resourceful
-  module Resource
+module Resourceful; end
+
+module Resourceful::Resource
     
-    # The idea here is to put Resourceful into an eager loading "mode" while yielding to a block
-    # => while in this mode, resourceful models will try to load and cache data in batches
-    #def self.eager_load
-    #  @@
-    #end
-    class Cache
+  class Cache
 
-      attr_reader :store, :expiration
-      
-      EXPIRY_SECS = 60
-      
-      def self.key(host, verb, resource)
-        "#{host}_#{verb}_#{resource}"
-      end
+    attr_reader :store, :expiration
+    
+    EXPIRY_SECS = 60
+    
+    def self.key(host, verb, resource)
+      "#{host}_#{verb}_#{resource}"
+    end
 
-      def initialize(expiration=EXPIRY_SECS)
-        @expiration = (expiration && expiration.kind_of?(::Fixnum)) ? expiration : EXPIRY_SECS
-        @store = {}
-      end
+    def initialize(expiration=EXPIRY_SECS)
+      @expiration = (expiration && expiration.kind_of?(::Fixnum)) ? expiration : EXPIRY_SECS
+      @store = {}
+    end
 
-      def clear(key=nil)
-        if key
-          @store[key] = nil
-        else
-          @store = {}
-        end
-      end
-      
-      def read(key)
-        entry = @store[key]
-        expired?(entry) ? nil : entry[:value]
-      end
-      
-      def write(key, value)
-        @store[key] = {:value => value, :expires => Time.now.to_i + @expiration}
-        value
+    def clear(key=nil)
+      if key
+        @store[key] = nil
+      else
+        @store = {}
       end
+    end
+    
+    def read(key)
+      entry = @store[key]
+      expired?(entry) ? nil : entry[:value]
+    end
+    
+    def write(key, value)
+      @store[key] = {:value => value, :expires => Time.now.to_i + @expiration}
+      value
+    end
+    
+    private
+    
+    def expired?(entry)
+      (entry.nil? || !entry.kind_of?(::Hash) || entry[:expires] < Time.now.to_i)
       
-      private
-      
-      def expired?(entry)
-        (entry.nil? || !entry.kind_of?(::Hash) || entry[:expires] < Time.now.to_i)
-        
-      end
-
     end
+
   end
 end

data/lib/resourceful/resource/format.rb

@@ -1,65 +1,61 @@
 require 'nokogiri'
 require 'json'
 
-module Resourceful
-  module Resource
-    class Format
-      
-      SUPPORTED = ['json', 'xml']
-      
-      def self.get(format)
-        raise Resourceful::Exceptions::FormatError, "the format '#{format}' is not supported" unless SUPPORTED.include?(format.to_s)
-        self.send(format)
-      end
+module Resourceful; end
+
+module Resourceful::Resource
+  class Format
+    
+    SUPPORTED = ['json', 'xml']
+    
+    def self.get(format)
+      raise Resourceful::Exceptions::FormatError, "the format '#{format}' is not supported" unless SUPPORTED.include?(format.to_s)
+      self.send(format)
+    end
+    
+    def self.json
+      Resourceful::Resource::Json
+    end
       
-      def self.json
-        Resourceful::Resource::Json
-      end
-        
-      def self.xml
-        Resourceful::Resource::Xml
-      end
+    def self.xml
+      Resourceful::Resource::Xml
+    end
+    
+    def self.to_s
+      raise 'method not implemented by this format'
+    end
       
-      def self.to_s
-        raise 'method not implemented by this format'
-      end
-        
-      def self.build(str)
-        raise 'method not implemented by this format'
-      end
-        
+    def self.build(str)
+      raise 'method not implemented by this format'
     end
+      
   end
 end
 
-module Resourceful
-  module Resource
-    class Json < Resourceful::Resource::Format
+module Resourceful::Resource
+  class Json < Resourceful::Resource::Format
+    
+    def self.to_s
+      "json"
+    end
       
-      def self.to_s
-        "json"
-      end
-        
-      def self.build(json_str)
-        !json_str.nil? && !json_str.to_s.empty? && (json_str.to_s != 'null') ? JSON.parse(json_str.to_s) : nil
-      end
-        
+    def self.build(json_str)
+      !json_str.nil? && !json_str.to_s.empty? && (json_str.to_s != 'null') ? JSON.parse(json_str.to_s) : nil
     end
+      
   end
 end
 
-module Resourceful
-  module Resource
-    class Xml < Resourceful::Resource::Format
+module Resourceful::Resource
+  class Xml < Resourceful::Resource::Format
+    
+    def self.to_s
+      "xml"
+    end
       
-      def self.to_s
-        "xml"
-      end
-        
-      def self.build(xml_str)
-        Nokogiri::XML(xml_str.to_s)
-      end
-        
+    def self.build(xml_str)
+      Nokogiri::XML(xml_str.to_s)
     end
+      
   end
 end