spire_io 1.2 → 1.2.1

data/lib/spire/api/application.rb

@@ -188,6 +188,16 @@ class Spire
         }
       end
 
+      define_request(:reset_member_password) do |email|
+        url = @resources["members"]["url"]
+        {
+          :method => :post,
+          :url => url,
+          :query => { :email => email },
+          :body => ""
+        }
+      end
+
       #Authenticates with the application using basic auth
       def authenticate(login, password)
         response = request(:authenticate, {:login => login, :password => password})
@@ -206,6 +216,18 @@ class Spire
         API::Member.new(@spire, response.data)
       end
 
+      #If you do not give a new password, you will get back an authenticated member but have to change
+      #the password at a later time (using the returned capability)
+      def reset_password(reset_key, new_password = nil)
+        hsh = {:reset_key => reset_key}
+        hsh[:password] = new_password if new_password
+        response = request(:authenticate_with_post, hsh)
+        unless response.status == 201
+          raise "Error reseting password for application #{self.name}: (#{response.status}) #{response.body}"
+        end
+        API::Member.new(@spire, response.data)
+      end
+
       def create_member(member_data)
         response = request(:create_member, member_data)
         unless response.status == 201
@@ -214,6 +236,15 @@ class Spire
         API::Member.new(@spire, response.data)
       end
       
+      #Resets a members password based on email
+      def request_member_password_reset(email)
+        response = request(:reset_member_password, email)
+        unless response.status == 202
+          raise "Error reseting password for email #{email} in app #{self.name}: (#{response.status}) #{response.body}"
+        end
+        true
+      end
+
       def members
         @members || members!
       end

data/lib/spire/api/subscription.rb

@@ -3,7 +3,7 @@ class Spire
 
     class Subscription < Resource
 
-      attr_reader :last
+      attr_accessor :last
       def resource_name
         "subscription"
       end
@@ -14,9 +14,12 @@ class Spire
           :url => @url,
           :query => {
             "timeout" => options[:timeout],
+            "limit" => options[:limit],
+            "min_timestamp" => options[:min_timestamp],
+            "max_timestamp" => options[:max_timestamp],
+            "delay" => options[:delay],
             "last" => options[:last],
-            "order-by" => options[:order_by],
-            "delay" => options[:delay]
+            "order-by" => options[:order_by]
           },
           :headers => {
             "Authorization" => "Capability #{@capabilities["events"]}",
@@ -50,10 +53,6 @@ class Spire
       end
 
       def retrieve_events(options={})
-        options[:last] ||= "0"
-        options[:delay] ||= 0
-        options[:order_by] ||= "desc"
-
         response = request(:events, options)
         unless response.status == 200
           raise "Error retrieving messages from #{self.class.name}: (#{response.status}) #{response.body}"
@@ -91,7 +90,7 @@ class Spire
 
       def long_poll(options={})
         options[:timeout] ||= 30
-        options[:last] = @last
+        options[:last] = @last if @last
         retrieve_events(options)
       end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spire_io
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 2
-  version: "1.2"
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Dan Yoder
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-07 00:00:00 -07:00
+date: 2012-05-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency