wolfram 0.1.0 → 0.1.1

data/.gemspec

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + "/lib/wolfram/version"
 Gem::Specification.new do |s|
   s.name        = "wolfram"
   s.version     = Wolfram::VERSION
-  s.authors     = ["Gabriel Horner"]
+  s.authors     = ["Gabriel Horner", "Ian White"]
   s.email       = "gabriel.horner@gmail.com"
   s.homepage    = "http://github.com/cldwalker/wolfram"
   s.summary = "Wolfram V2 API client"

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 0.1.1
+* Fix requerying by state
+
 == 0.1.0
 * Initial release
 

data/lib/wolfram/pod.rb

@@ -52,7 +52,7 @@ module Wolfram
       include XmlContainer
 
       def self.collection(xml, options = {})
-        Nokogiri::XML(xml.to_s).search('subpod').map {|s_xml| new(s_xml, options)}
+        Nokogiri::XML(xml.to_s).search('subpod').map {|s_xml| new(s_xml, options) }
       end
 
       def initialize(xml, options = {})
@@ -71,14 +71,17 @@ module Wolfram
     end
 
     class State
-      attr_reader :name
+      attr_reader :name, :input
 
       def self.collection(xml, options = {})
-        Nokogiri::XML(xml.to_s).search('state').map {|s_xml| new(s_xml['name'], options)}
+        Nokogiri::XML(xml.to_s).search('state').map {|s_xml|
+          new(s_xml['name'], options.merge(:input => s_xml['input']))
+        }
       end
 
       def initialize(name, options = {})
         @query = options[:query]
+        @input = options[:input]
         @name = name
       end
 
@@ -95,12 +98,7 @@ module Wolfram
       end
 
       def requery
-        if podstate = @query.params[:podstate]
-          podstate = State.new("#{podstate.name},#{name}", :query => @query)
-        else
-          podstate = self
-        end
-
+        podstate = @query.params[:podstate] ? [@query.params[:podstate], input] : input
         Query.new(@query.input, @query.options.merge(:podstate => podstate))
       end
 

data/lib/wolfram/query.rb

@@ -25,8 +25,8 @@ module Wolfram
     end
 
     # the uri that this query will issue a get request to
-    def uri
-      "#{query_uri}?#{Util.to_param(params)}"
+    def uri(hash=params)
+      "#{query_uri}?#{Util.to_param(hash)}"
     end
 
     def params

data/lib/wolfram/result.rb

@@ -5,7 +5,7 @@ module Wolfram
     include Enumerable
     extend Util
 
-    delegate :[], :each, :to => :pods
+    delegate :each, :to => :pods
     delegate :uri, :to => :query
 
     attr_reader :assumptions, :pods, :query
@@ -19,6 +19,10 @@ module Wolfram
       types.each {|mod| extend mod}
     end
 
+    def [](key)
+      key.is_a?(String) ? pods.find {|e| e.title == key } : pods[key]
+    end
+
     def success?
       success
     end

data/lib/wolfram/util.rb

@@ -5,6 +5,7 @@ module Wolfram
 
     # From activesupport
     def self.to_query(obj, key)
+      obj.is_a?(Array) ? obj.map {|e| to_query(e, key) } * '&' :
       "#{CGI.escape(key.to_s).gsub(/%(5B|5D)/n) { [$1].pack('H*') }}=#{CGI.escape(obj.to_s)}"
     end
 

data/lib/wolfram/version.rb

@@ -1,3 +1,3 @@
 module Wolfram
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: wolfram
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Gabriel Horner
+- Ian White
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 -05:00
+date: 2011-02-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency