sqwiggle-ruby 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c96444e1599a78bc667b4fa719e89ba6657c5669
-  data.tar.gz: 3db518ea9a461c24af426565f8c84791b104c588
+  metadata.gz: 337c69c157e6af33a4d852b43fd83867bde0fd27
+  data.tar.gz: 0caa91ae54889f9718ce9a847255a34f15bc8adf
 SHA512:
-  metadata.gz: 6f73fb590c240d8ed98eb995539dc1caafcc54c663636dbd8f7781d94606bd6fef456b647cfea2460256dae52d0a92b5deefd7f107ae38ecb0aec12f3a97228b
-  data.tar.gz: 2e0464663d867a7c6c2ef9cce8d91cd940316f215485046b1946e48a39ce309e67743e641b256ebd0c7b39775a13c91d2dfc9cf19cec2af6825a646edf0de63d
+  metadata.gz: be9226f208fcf0257a5f7b1de72c47f636f8700f652372a6f13b103e6b89ea3a8973cd6b97b2ed150e048465e07f0cd6c1c52c2797884198ec4c7b5b692a146f
+  data.tar.gz: 5fcb090da68dd6dbacaef49d580a913f8925487ad1937077708df6e2cd80fe6a1437958e42e5510a1b61d825080f788b7269c8da0094cd8c337439930948c64d

data/Gemfile

@@ -1,8 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'rspec'
-gem 'webmock'
-gem 'fuubar'
-
 # Specify your gem's dependencies in sqwiggle-ruby.gemspec
 gemspec

data/lib/sqwiggle/api/error_handler.rb

@@ -2,12 +2,12 @@ module Sqwiggle
   module Api
     class ErrorHandler < Faraday::Response::Middleware
       def on_complete(env)
-        raise Errors::BadRequestError         if env[:status] == 400
-        raise Errors::AuthenticationError     if env[:status] == 401
-        raise Errors::PaymentRequiredError    if env[:status] == 402
-        raise Errors::AuthorizationError      if env[:status] == 403
-        raise Errors::NotFoundError           if env[:status] == 404
-        raise Errors::ServerError             if env[:status] == 500
+        raise Errors::BadRequestError.new(env)  if env[:status] == 400
+        raise Errors::AuthenticationError       if env[:status] == 401
+        raise Errors::PaymentRequiredError      if env[:status] == 402
+        raise Errors::AuthorizationError        if env[:status] == 403
+        raise Errors::NotFoundError             if env[:status] == 404
+        raise Errors::ServerError               if env[:status] == 500
       end
     end
   end

data/lib/sqwiggle/api/errors/bad_request_error.rb

@@ -1,7 +1,23 @@
 module Sqwiggle
   module Api
     module Errors
-      class BadRequestError < StandardError;end;
+      class BadRequestError < StandardError;
+
+        attr_reader :body
+
+        def initialize(response)
+          @body = JSON.parse response.body
+        end
+
+        def message
+          {
+            type:body['type'],
+            param:body['param'],
+            message:body['message']
+          }.inspect
+        end
+
+      end
     end
   end
 end

data/lib/sqwiggle/api/resource.rb

@@ -29,12 +29,18 @@ module Sqwiggle
           self.new attrs
         end
 
-        def create(params, client=Client.new)
+        def create!(params, client=Client.new)
           attrs = JSON.parse(client.post("#{endpoint}", params).body)
           attrs.merge! client:client
           self.new attrs
         end
 
+        def create(params, client=Client.new)
+          create! params, client
+        rescue Errors::BadRequestError 
+          false
+        end
+
         def endpoint
           @endpoint || default_endpoint
         end
@@ -45,25 +51,38 @@ module Sqwiggle
 
       end
 
-      def update(params)
+      def update!(params)
         res = client.put("#{self.class.endpoint}/#{id}", params)
         attrs = JSON.parse(res.body, :symbolize_names => true)
         self.attributes = attrs
         self
       end
 
-      def delete
-        res = client.delete("#{self.class.endpoint}/#{id}")
-        res.status == 204
+      def update(params)
+        update! params
+      rescue Errors::BadRequestError 
+        false
+      end
+
+      def save!
+        return update!(self.attributes) if persisted?
+        self.attributes = self.class.create!(attributes, client).attributes
+        self
       end
 
       def save
-        if(id != nil)
-          update(self.attributes)
-        else
-          self.attributes = self.class.create(attributes, client).attributes
-        end
-        true
+        return update(self.attributes) if persisted?
+        self.attributes = self.class.create(attributes, client).attributes
+        self
+      end
+
+      def persisted?
+        (id != nil)
+      end
+
+      def delete
+        res = client.delete("#{self.class.endpoint}/#{id}")
+        res.status == 204
       end
 
     end

data/lib/sqwiggle/api/service.rb

@@ -16,6 +16,10 @@ module Sqwiggle
         klass.find id, client
       end
 
+      def new(params={})
+        klass.new ({client:client}.merge(params))
+      end
+
     end
   end
 end

data/lib/sqwiggle/message.rb

@@ -9,6 +9,8 @@ module Sqwiggle
     attribute :mentions, Array
     attribute :updated_at, DateTime
     attribute :created_at, DateTime
+    attribute :format, String
+    attribute :parse, Boolean, default:true
 
     def author
       if @author[:type] == 'user'

data/lib/sqwiggle/version.rb

@@ -1,3 +1,3 @@
 module Sqwiggle
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/api/errors/bad_request_error_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Sqwiggle::Api::Errors::BadRequestError do
+  let(:response) { double('response') }
+
+  before do
+    response.stub(:body) do
+      '{"type":"validation","message":"invalid request","param":"name"}'
+    end
+  end
+
+  subject { described_class.new response }
+  specify { subject.body['type'].should be == "validation" }
+  specify { subject.body['message'].should be == "invalid request" }
+  specify { subject.body['param'].should be == "name" }
+
+end

data/spec/errors_spec.rb

@@ -7,7 +7,7 @@ describe "api error handling" do
       Sqwiggle.token = 'token'
 
       stub_request(:get, "https://token:X@api.sqwiggle.com/messages").to_return({
-        :body => "[]", 
+        :body => '{"type": "validation","message":"invalid request","param":"name"}', 
         :status => 400, 
         :headers => { 'Content-Length' => 3 }
       })

data/spec/message_spec.rb

@@ -113,7 +113,7 @@ describe Sqwiggle::Message do
       end
       subject { Sqwiggle::Message.new(text:'The Name') }
       it "saves the new record" do
-        subject.save.should be == true
+        subject.save.should be_true
         subject.id.should be == 1
         assert_requested :post, "https://token:X@api.sqwiggle.com/messages"
       end
@@ -127,7 +127,7 @@ describe Sqwiggle::Message do
       end
       subject { Sqwiggle::Message.new(id:1, text:'The Name') }
       it "saves the new record" do
-        subject.save.should be == true
+        subject.save.should be_true
         assert_requested :put, "https://token:X@api.sqwiggle.com/messages/1"
       end
     end

data/sqwiggle-ruby.gemspec

@@ -24,4 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'fuubar'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqwiggle-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Luke Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -80,6 +80,48 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby wrapper for the sqwiggle API
 email:
 - luke@sqwiggle.com
@@ -117,6 +159,7 @@ files:
 - lib/sqwiggle/user.rb
 - lib/sqwiggle/version.rb
 - spec/api/client_spec.rb
+- spec/api/errors/bad_request_error_spec.rb
 - spec/api/resource_spec.rb
 - spec/conversation_spec.rb
 - spec/errors_spec.rb
@@ -154,6 +197,7 @@ specification_version: 4
 summary: Ruby wrapper for the sqwiggle API
 test_files:
 - spec/api/client_spec.rb
+- spec/api/errors/bad_request_error_spec.rb
 - spec/api/resource_spec.rb
 - spec/conversation_spec.rb
 - spec/errors_spec.rb