passaporteweb-client 0.0.11 → 0.0.12

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 1.9.2
+  - 1.9.3
+  - 2.0.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    passaporteweb-client (0.0.11)
+    passaporteweb-client (0.0.12)
       multi_json (~> 1.7.1)
       rest-client (~> 1.6.7)
 

data/README.rdoc

@@ -43,7 +43,7 @@ Or install it yourself as:
   * {GET /notifications/api/}[https://app.passaporteweb.com.br/static/docs/notificacao.html#get-notifications-api] ==> PassaporteWeb::Notification.find_all
   * {POST /notifications/api/}[https://app.passaporteweb.com.br/static/docs/notificacao.html#post-notifications-api] ==> PassaporteWeb::Notification#save
   * {GET /notifications/api/count/}[https://app.passaporteweb.com.br/static/docs/notificacao.html#get-notifications-api-count] ==> PassaporteWeb::Notification.count
-  * {PUT /notifications/api/:uuid/}[https://app.passaporteweb.com.br/static/docs/notificacao.html#put-notifications-api-uuid] ==> PassaporteWeb::Notification#save
+  * {PUT /notifications/api/:uuid/}[https://app.passaporteweb.com.br/static/docs/notificacao.html#put-notifications-api-uuid] ==> PassaporteWeb::Notification#read!
   * {DELETE /notifications/api/:uuid/}[https://app.passaporteweb.com.br/static/docs/notificacao.html#delete-notifications-api-uuid] ==> PassaporteWeb::Notification#destroy
 * {Gerência de contas}[https://app.passaporteweb.com.br/static/docs/account_manager.html]
   * {PUT /organizations/api/activate/}[https://app.passaporteweb.com.br/static/docs/account_manager.html#put-organizations-api-activate] ==> (not implemented yet)

data/lib/passaporte_web/notification.rb

@@ -84,17 +84,38 @@ module PassaporteWeb
 
     # TODOC
     #
-    # API methods:
-    # * <tt>POST /notifications/api/</tt> (on create)
-    # * <tt>PUT /notifications/api/:uuid/</tt> (on update)
+    # API method: <tt>POST /notifications/api/</tt>
     #
-    # API documentation:
-    # * https://app.passaporteweb.com.br/static/docs/notificacao.html#post-notifications-api
-    # * https://app.passaporteweb.com.br/static/docs/notificacao.html#put-notifications-api-uuid
-    # TOSPEC
-    # TOSPEC
+    # API documentation: https://app.passaporteweb.com.br/static/docs/notificacao.html#post-notifications-api
     def save(auth_type='user')
-      self.persisted? ? update : create(auth_type)
+      if self.persisted?
+        @errors = {message: 'notification already persisted, call #read! to mark it as read'}
+        false
+      else
+        create(auth_type)
+      end
+    end
+
+    # TODOC
+    #
+    # API method: <tt>PUT /notifications/api/:uuid/</tt>
+    #
+    # API documentation: https://app.passaporteweb.com.br/static/docs/notificacao.html#put-notifications-api-uuid
+    def read!
+      raise 'notification not persisted' unless self.persisted?
+      unless self.read_at.nil?
+        @errors = {message: 'notification already read'}
+        return false
+      end
+      response = Http.put("/notifications/api/#{self.uuid}/", {}, {}, 'user')
+      raise "unexpected response: #{response.code} - #{response.body}" unless response.code == 200
+      attributes_hash = MultiJson.decode(response.body)
+      set_attributes(attributes_hash)
+      @errors = {}
+      true
+    rescue *[RestClient::BadRequest] => e
+      @errors = MultiJson.decode(e.response.body)
+      false
     end
 
     # TODOC
@@ -102,10 +123,9 @@ module PassaporteWeb
     # API method: <tt>DELETE /notifications/api/:uuid/</tt>
     #
     # API documentation: https://app.passaporteweb.com.br/static/docs/notificacao.html#delete-notifications-api-uuid
-    # TOSPEC
     def destroy
       return false unless self.persisted?
-      response = Http.delete('/notifications/api/:uuid/')
+      response = Http.delete("/notifications/api/#{self.uuid}/", {}, 'application')
       raise "unexpected response: #{response.code} - #{response.body}" unless response.code == 204
       @errors = {}
       @persisted = false
@@ -151,24 +171,6 @@ module PassaporteWeb
       false
     end
 
-    def update
-      # TODO validar atributos?
-      response = Http.put(
-        "/notifications/api/#{self.uuid}/",
-        {},
-        {},
-        'user'
-      )
-      raise "unexpected response: #{response.code} - #{response.body}" unless response.code == 200
-      attributes_hash = MultiJson.decode(response.body)
-      set_attributes(attributes_hash)
-      @errors = {}
-      true
-    rescue *[RestClient::BadRequest] => e
-      @errors = MultiJson.decode(e.response.body)
-      false
-    end
-
     def create_body
       self.attributes.select { |key, value| CREATABLE_ATTRIBUTES.include?(key) && (!value.nil? && !value.to_s.empty?) }
     end

data/lib/passaporte_web/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module PassaporteWeb
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/spec/passaporte_web/notification_spec.rb

@@ -153,6 +153,11 @@ describe PassaporteWeb::Notification do
         end
       end
       context "on failure" do
+        it "should return false an do nothing if the Notification is already persisted" do
+          PassaporteWeb.configuration.user_token = "f01d30c0a2e878fecc838735560253f9e9395932f5337f40"
+          notification = described_class.find_all(1,20,nil,true).notifications.last
+          notification.save.should be_false
+        end
         it "should return false and set the errors with the reason for the failure, authenticated as the user" do
           PassaporteWeb.configuration.user_token = "f01d30c0a2e878fecc838735560253f9e9395932f5337f40"
           notification.target_url = 'lalalala'
@@ -172,22 +177,43 @@ describe PassaporteWeb::Notification do
         end
       end
     end
-    context "on update" do
-      let(:notification) { described_class.find_all.notifications.last }
-      before(:each) do
-        PassaporteWeb.configuration.user_token = "f01d30c0a2e878fecc838735560253f9e9395932f5337f40"
-      end
-      context "on success" do
-        it "should mark the Notification as read" do
-          notification.read_at.should be_nil
-          notification.save
-          notification.read_at.should_not be_nil
-        end
+  end
+
+  describe "#read!", vcr: true do
+    let(:notification) { described_class.find_all.notifications.last }
+    before(:each) do
+      PassaporteWeb.configuration.user_token = "3e4470e59d76f748e0081b514da62ed621a893c87facd4a6"
+    end
+    context "on success" do
+      it "should mark the Notification as read" do
+        notification.read_at.should be_nil
+        notification.read!.should be_true
+        notification.read_at.should_not be_nil
       end
-      context "on failure" do
-        it "should return false and set the errors with the reason for the failure"
+    end
+    context "on failure" do
+      it "should return false if the notification is already read" do
+        read_notification = described_class.find_all(1,20,nil,true).notifications.detect { |n| !n.read_at.nil? }
+        read_notification.read_at.should_not be_nil
+        read_notification.read!.should be_false
+        read_notification.errors.should == {message: 'notification already read'}
       end
     end
   end
 
+  describe "#destroy" do
+    it "should return false if the record is not persisted" do
+      notification = described_class.new(body: 'novinha', destination: 'a5868d14-6529-477a-9c6b-a09dd42a7cd2')
+      notification.destroy.should be_false
+    end
+    it "should destroy the notification on PassaporteWeb", vcr: true do
+      PassaporteWeb.configuration.user_token = "3e4470e59d76f748e0081b514da62ed621a893c87facd4a6"
+      count = described_class.count(true)
+      notification = described_class.find_all(1,20,nil,true).notifications.last
+      notification.should_not be_nil
+      notification.destroy.should be_true
+      described_class.count(true).should == (count - 1)
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passaporteweb-client
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -276,7 +276,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2546346199843108538
+      hash: -214247969600102075
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2546346199843108538
+      hash: -214247969600102075
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25