guidestar 0.0.1 → 0.1.0

data/README.md

@@ -33,7 +33,7 @@ Once you initialize it, you can use it in your code via:
     results.total_count
     # => 1292
 
-    results.organizations.each do |org|
+    results.each do |org|
       org.name
       # => 'Monkey Paradise'
       org.ein
@@ -46,9 +46,14 @@ Once you initialize it, you can use it in your code via:
 
 For getting the next page of results, it behaves similarly to kaminari or will_paginate:
 
-    results.per(50).page(2).organizations
+    results.per(50).page(2).each { |more_orgs| puts more_orgs.name }
 
+If you need more direct access to the array of results, just hit:
 
+    results.organizations
+
+The way you use it is all super-flexible.  You can pass in your options beforehand or
+chain them along the way.
 
 ## Contributing
 

data/lib/guidestar.rb

@@ -16,6 +16,10 @@ module Guidestar
       yield self
       true
     end
+
+    def method_missing(method_name, *args)
+      Guidestar::Client.new.send(method_name.to_sym, *args)
+    end
   end
 
   Faraday.register_middleware :response,

data/lib/guidestar/request.rb

@@ -2,7 +2,8 @@ module Guidestar
   module Request
 
     def get(path, data={})
-      Guidestar::Result.new(get_raw(path, data),path,self)
+      set_params(data)
+      Guidestar::Result.new(path,self)
     end
 
     def get_raw(path, data={})
@@ -20,7 +21,8 @@ module Guidestar
       @options[:page_size]  = @options.delete(:per)       if @options[:per]
       @options[:zip_radius] = @options.delete(:zipradius) if @options[:zipradius]
       @options[:org_name]   = @options.delete(:name)      if @options[:name]
-      @options[:offset]     = (@options.delete(:page)-1)  if @options[:page]
+      @options[:offset]     = (@options.delete(:page)-1) * @options[:page_size].to_i if @options[:page]
+      @options[:ein]        = @options[:ein].to_s.insert(2,'-') if @options[:ein] && @options[:ein].to_s[2] != '-'
       builder = Nokogiri::XML::Builder.new do |xml|
         xml.query do
           xml.version @options[:version]

data/lib/guidestar/result.rb

@@ -1,38 +1,59 @@
 module Guidestar
   class Result
-    #
-    # Public: Returns the String xml of the response from Guidestar
-    attr_reader :xml
 
-    # Public: Returns the Integer number of results from the query
-    attr_reader :total_count
+    include Enumerable
+    extend Forwardable
+
+    def_delegators :organizations, :size, :length, :last
+    def_delegators :data, :xml, :total_count, :search_time
 
-    # Public: Returns the Float time in seconds to search
-    attr_reader :search_time
+    def initialize(path, client)
+      @path = path
+      @client = client
+      @options = {}
+      @data = Hashie::Mash.new
+    end
 
-    # Public: Returns an Array of organizations from the search
+    # Public: Contains the data we retrieve, or gets new data if there
+    # are new parameters on the request.
+    #
+    # Returns an Array of organizations from the search
     def organizations
       return @organizations if @organizations
-      parse_xml(@client.get_raw(@path, @options))
+      load_response
       @organizations
     end
 
-    def initialize(raw_response, path, client)
-      @path = path
-      @client = client
-      parse_xml(raw_response)
+    # Internal: Contains a few extra details that might be desired, like
+    # the total_count and search_time, which are also available via
+    # delegation
+    #
+    # Returns a Hash of extra data
+    def data
+      return @data if @organizations
+      load_response
+      @data
+    end
+
+    # Public: Iterates through the inner array to make data more accessible
+    def each(&block)
+      organizations.each(&block)
     end
 
     private
 
-    def parse_xml(raw_response)
-      @xml = ::MultiXml.parse(raw_response.body.string)['root']
-      @total_count = @xml['totalResults'].to_i
-      @search_time = @xml['searchTime'].to_f
-      @options = {}
+    def load_response
+      raw_response = @client.get_raw(@path, @options)
+      @data[:xml] = ::MultiXml.parse(raw_response.body.string)['root']
+      @data[:total_count] = @data[:xml]['totalResults'].to_i
+      @data[:search_time] = @data[:xml]['searchTime'].to_f
 
+      @options = {}
       @organizations = []
-      orgs = @xml['organizations']['organization']
+
+      orgs = @data[:xml]['organizations']['organization'] if @data[:xml]['organizations']
+      return if orgs.nil?
+
       orgs = [orgs] unless orgs.is_a?(Array)
       orgs.each do |org|
         org = Hashie::Mash.new clean_keys(org)

data/lib/guidestar/version.rb

@@ -1,3 +1,3 @@
 module Guidestar
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guidestar
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors: