sqwiggle-ruby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01fdd1607b0180d92e3f9ca6c1f9dfe1e3445154
-  data.tar.gz: 3dbf59ea942e0c1dc08939f41cda5074e41b7085
+  metadata.gz: c96444e1599a78bc667b4fa719e89ba6657c5669
+  data.tar.gz: 3db518ea9a461c24af426565f8c84791b104c588
 SHA512:
-  metadata.gz: 3a2072b170981a7a5e09af1f4997fd9ca8a8a1c7ccf847838169390e98d808aec4b4978b712ab2e30d6b9cf5e3e8315af8c78621fe8a2e5342eb5536d8cc18c3
-  data.tar.gz: 2a2ffc8b4474f777804ac47aec0ab17b6c706ade7dcdf4620066abbe9be268a51c1b5b5b2633267d6fcf114b56ef2d8ff108e1bf77d4642020935513d341273b
+  metadata.gz: 6f73fb590c240d8ed98eb995539dc1caafcc54c663636dbd8f7781d94606bd6fef456b647cfea2460256dae52d0a92b5deefd7f107ae38ecb0aec12f3a97228b
+  data.tar.gz: 2e0464663d867a7c6c2ef9cce8d91cd940316f215485046b1946e48a39ce309e67743e641b256ebd0c7b39775a13c91d2dfc9cf19cec2af6825a646edf0de63d

data/README.md

@@ -1,4 +1,8 @@
-# Sqwiggle::Ruby
+# Ruby Client for the Sqwiggle API
+
+The API and this gem are currently in ~~BETA~~ ALPHA
+
+Comments, pull requests, discussion and input are all welcome at this stage.
 
 ![Build Status](https://api.travis-ci.org/sqwiggle/sqwiggle-ruby.png)
 
@@ -20,7 +24,12 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Create an API Client at https://www.sqwiggle.com/company/clients
+
+## TODO
+
+ * Compile todo list
+
 
 ## Contributing
 

data/lib/sqwiggle-ruby.rb

@@ -2,25 +2,30 @@ require 'faraday'
 require 'json'
 require 'virtus'
 
-require "sqwiggle/version"
-
-require "sqwiggle/error_handler"
-require "sqwiggle/service"
-require "sqwiggle/client"
-require "sqwiggle/resource"
+module Sqwiggle
+  module Api
+    require "sqwiggle/api/error_handler"
+    require "sqwiggle/api/service"
+    require "sqwiggle/api/client"
+    require "sqwiggle/api/resource"
 
-require "sqwiggle/errors/authentication_error"
-require "sqwiggle/errors/authorization_error"
-require "sqwiggle/errors/bad_request_error"
-require "sqwiggle/errors/not_found_error"
-require "sqwiggle/errors/payment_required_error"
-require "sqwiggle/errors/server_error"
+    require "sqwiggle/api/errors/authentication_error"
+    require "sqwiggle/api/errors/authorization_error"
+    require "sqwiggle/api/errors/bad_request_error"
+    require "sqwiggle/api/errors/not_found_error"
+    require "sqwiggle/api/errors/payment_required_error"
+    require "sqwiggle/api/errors/server_error"
 
-require "sqwiggle/invite"
-require "sqwiggle/message"
-require "sqwiggle/user"
+    require "sqwiggle/api_client"
+    require "sqwiggle/invite"
+    require "sqwiggle/message"
+    require "sqwiggle/conversation"
+    require "sqwiggle/user"
+    require "sqwiggle/room"
+    require "sqwiggle/notification"
+    require "sqwiggle/version"
+  end
 
-module Sqwiggle
   class << self
     attr_accessor :token
   end

data/lib/sqwiggle/api/client.rb

@@ -0,0 +1,72 @@
+module Sqwiggle
+  module Api
+    class Client
+      class NoTokenError < StandardError;end;
+
+      attr_accessor :token
+      attr_writer :url #for testing purposes
+
+      def initialize(token=nil)
+        unless @token = token || Sqwiggle.token
+          raise NoTokenError 
+        end
+      end
+
+      def self.service(key, klass)
+        define_method key, -> {
+          instance_eval('Service').new instance_eval(klass), self
+        }
+      end
+
+      service :api_clients, 'ApiClient'
+      service :conversations, 'Conversation'
+      service :invites, 'Invite'
+      service :messages, 'Message'
+      service :organization, 'Organization'
+      service :users, 'User'
+      service :rooms, 'Room'
+
+      def ==(val)
+        self.class == val.class && val.token == token
+      end
+
+      def get(endpoint, params={})
+        connection.get endpoint, params
+      end
+
+      def put(endpoint, params)
+        connection.put endpoint, params
+      end
+
+      def post(endpoint, params)
+        connection.post endpoint, params
+      end
+
+      def delete(endpoint)
+        connection.delete endpoint
+      end
+
+      def inspect
+        #This is purely to stop huge console output when inspecting resource
+        #objects as they contain a reference to the loading client
+        "#<Sqwiggle::Api::Client # (#{object_id})>"
+      end
+
+      private
+
+      def url
+        @url || 'https://api.sqwiggle.com/'
+      end
+
+      def connection
+        @connection ||= Faraday.new(url:url) do |f|
+          f.request  :url_encoded             # form-encode POST params
+          f.adapter  Faraday.default_adapter  # make requests with Net::HTTP
+          f.basic_auth token, 'X'
+          f.use ErrorHandler
+        end
+      end
+
+    end
+  end
+end

data/lib/sqwiggle/api/error_handler.rb

@@ -0,0 +1,14 @@
+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
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Sqwiggle
+  module Api
+    module Errors
+      class AuthenticationError < StandardError;end;
+    end
+  end
+end
+

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

@@ -0,0 +1,7 @@
+module Sqwiggle
+  module Api
+    module Errors
+      class AuthorizationError < StandardError;end;
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Sqwiggle
+  module Api
+    module Errors
+      class BadRequestError < StandardError;end;
+    end
+  end
+end
+

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

@@ -0,0 +1,7 @@
+module Sqwiggle
+  module Api
+    module Errors
+      class NotFoundError < StandardError;end;
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Sqwiggle
+  module Api
+    module Errors
+      class PaymentRequiredError < StandardError;end;
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Sqwiggle
+  module Api
+    module Errors
+      class ServerError < StandardError;end;
+    end
+  end
+end

data/lib/sqwiggle/api/resource.rb

@@ -0,0 +1,71 @@
+module Sqwiggle
+  module Api
+    class Resource
+
+      include Virtus.model
+
+      attribute :client, Client, default: :default_client 
+      attribute :id, Integer
+
+      def default_client
+        Client.new
+      end
+
+      class << self
+
+        attr_accessor :endpoint
+
+        def all(client=Client.new)
+          [].tap do |result|
+            JSON.parse(client.get(self.endpoint).body).each do |item|
+              result << self.new(item.merge client:client)
+            end
+          end
+        end
+
+        def find(id, client=Client.new)
+          attrs = JSON.parse client.get("#{endpoint}/#{id}").body
+          attrs.merge! client:client
+          self.new attrs
+        end
+
+        def create(params, client=Client.new)
+          attrs = JSON.parse(client.post("#{endpoint}", params).body)
+          attrs.merge! client:client
+          self.new attrs
+        end
+
+        def endpoint
+          @endpoint || default_endpoint
+        end
+
+        def default_endpoint
+          "/#{self.to_s.downcase.split('::').last}s"
+        end
+
+      end
+
+      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
+      end
+
+      def save
+        if(id != nil)
+          update(self.attributes)
+        else
+          self.attributes = self.class.create(attributes, client).attributes
+        end
+        true
+      end
+
+    end
+  end
+end

data/lib/sqwiggle/api/service.rb

@@ -0,0 +1,21 @@
+module Sqwiggle
+  module Api
+    class Service
+
+      attr_reader :klass, :client
+
+      def initialize(klass, client)
+        @klass, @client = klass, client
+      end
+
+      def all
+        klass.all client
+      end
+
+      def find(id)
+        klass.find id, client
+      end
+
+    end
+  end
+end

data/lib/sqwiggle/api_client.rb

@@ -0,0 +1,5 @@
+module Sqwiggle
+  class ApiClient < Api::Resource
+    attribute :name, String
+  end
+end

data/lib/sqwiggle/attachment.rb

@@ -0,0 +1,10 @@
+module Sqwiggle
+  class Attachment < Api::Resource
+    attribute :type, String
+    attribute :url, String
+    attribute :description, String
+    attribute :image, String
+    attribute :status, String
+    attribute :animated, String
+  end
+end

data/lib/sqwiggle/conversation.rb

@@ -0,0 +1,9 @@
+module Sqwiggle
+  class Conversation < Api::Resource
+     attribute :room_id, Integer
+     attribute :status, String
+     attribute :participating, Array
+     attribute :participated, Array
+     attribute :created_at, DateTime
+  end
+end

data/lib/sqwiggle/error.rb

@@ -0,0 +1,17 @@
+module Sqwiggle
+  class Error < StandardError
+
+    attr_reader :status
+    attr_reader :error_type
+    attr_reader :param
+
+    def initialize(response)
+      h = JSON.parse(response.body)
+      @status = response.status
+      @type = h['type']
+      @param = h['param']
+      super(message)
+    end
+
+  end
+end

data/lib/sqwiggle/invite.rb

@@ -1,6 +1,9 @@
 module Sqwiggle
-  class Invite < Resource
-    self.endpoint = '/invites'
+  class Invite < Api::Resource
     attribute :email, String
+    attribute :created_at, DateTime
+    attribute :url, String
+    attribute :from_id, Integer
+    attribute :avatar, String
   end
 end

data/lib/sqwiggle/message.rb

@@ -1,12 +1,21 @@
 module Sqwiggle
-  class Message < Resource
+  class Message < Api::Resource
 
     attribute :text, String
     attribute :type, String
     attribute :author, Hash
+    attribute :room_id, Integer
+    attribute :attachments, Array
+    attribute :mentions, Array
+    attribute :updated_at, DateTime
+    attribute :created_at, DateTime
 
     def author
-      #overriding logic here
+      if @author[:type] == 'user'
+        client.users.find(@author[:id])
+      elsif @author[:type] == 'client'
+        client.api_clients.find(@author[:id])
+      end
     end
 
   end

data/lib/sqwiggle/notification.rb

@@ -0,0 +1,23 @@
+module Sqwiggle
+  class Notification < Api::Resource
+    attribute :login, String
+    attribute :logout, String
+    attribute :workroom_enter, String
+    attribute :workroom_leave, String
+    attribute :conversation_enter, String
+    attribute :conversation_leave, String
+    attribute :stream_item, String
+    attribute :stream_item_in_conversation, String
+    attribute :mention, String
+    attribute :sqwiggle_news_updates, String
+    attribute :sqwiggle_tips, String
+    attribute :onboard_invite, String
+    attribute :onboard_busy, String
+    attribute :onboard_conversation_start, String
+    attribute :onboard_conversation_leave, String
+    attribute :onboard_mentions, String
+    attribute :onboard_notifications, String
+    attribute :onboard_chrome_access, String
+    attribute :onboard_invited, String
+  end
+end

data/lib/sqwiggle/organization.rb

@@ -0,0 +1,5 @@
+module Sqwiggle
+  class Organization < Api::Resource
+    attribute :name, String
+  end
+end

data/lib/sqwiggle/room.rb

@@ -0,0 +1,8 @@
+module Sqwiggle
+  class Room < Api::Resource
+    attribute :name, String
+    attribute :path, String
+    attribute :user_count, Integer
+    attribute :created_at, DateTime
+  end
+end

data/lib/sqwiggle/user.rb

@@ -1,6 +1,19 @@
 module Sqwiggle
-  class User < Resource
+  class User < Api::Resource
     self.endpoint = '/users'
-    attribute :name
+    attribute :name, String
+    attribute :role, String
+    attribute :media, Hash
+    attribute :status, String
+    attribute :message, String
+    attribute :email, String
+    attribute :confirmed, Boolean
+    attribute :time_zone, String
+    attribute :time_zone_offset, Float
+    attribute :created_at, DateTime
+    attribute :last_connected_at, DateTime
+    attribute :last_active_at, DateTime
+    attribute :last_still, String
+    attribute :avatar, String
   end
 end

data/lib/sqwiggle/version.rb

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

data/spec/{client_spec.rb → api/client_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Sqwiggle::Client do
+describe Sqwiggle::Api::Client do
 
 
   describe ".new" do
@@ -12,23 +12,35 @@ describe Sqwiggle::Client do
         Sqwiggle.token = 'global_token'
       end
       context "without specifying a token in the initializer" do
-        subject { Sqwiggle::Client.new }
+        subject { Sqwiggle::Api::Client.new }
         its(:token) { should be == 'global_token' }
       end
       context "with specifying a token in the initializer" do
-        subject { Sqwiggle::Client.new 'local_token' }
+        subject { Sqwiggle::Api::Client.new 'local_token' }
         its(:token) { should be == 'local_token' }
       end
     end
     context "without a globally specified token" do
       it "Raises an error" do
-        expect { Sqwiggle::Client.new }.to raise_error(Sqwiggle::Client::NoTokenError)
+        expect { Sqwiggle::Api::Client.new }.to raise_error(Sqwiggle::Api::Client::NoTokenError)
       end
     end
   end
 
+  describe 'services' do
+    before do
+      Sqwiggle.token = '12345'
+    end
+    it { should respond_to :messages }
+    it { should respond_to :users }
+    it { should respond_to :conversations }
+    it { should respond_to :rooms }
+    it { should respond_to :invites }
+    it { should respond_to :api_clients }
+  end
+
   describe "#get" do
-    subject { Sqwiggle::Client.new 'local_token' }
+    subject { Sqwiggle::Api::Client.new 'local_token' }
     let(:endpoint) { '/users/1' }
 
     it "delegates to Faraday" do

data/spec/{resource_spec.rb → api/resource_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Sqwiggle::Resource do
+describe Sqwiggle::Api::Resource do
   
   let(:client) { double('mock_client') }
   let(:response) { double('faraday_response') }
@@ -14,7 +14,7 @@ describe Sqwiggle::Resource do
     it "calls the index endpoint" do
       response.stub(:body).and_return("[{\"a\":1,\"b\":2}]")
       client.should_receive(:get).with('/resources')
-      Sqwiggle::Resource.all(client)
+      Sqwiggle::Api::Resource.all(client)
     end
   end
 
@@ -22,7 +22,7 @@ describe Sqwiggle::Resource do
     it "calls the index endpoint" do
       response.stub(:body).and_return("{\"a\":1,\"b\":2}")
       client.should_receive(:get).with('/resources/1')
-      Sqwiggle::Resource.find(1, client)
+      Sqwiggle::Api::Resource.find(1, client)
     end
   end
 

data/spec/conversation_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+describe Sqwiggle::Conversation do
+  it_behaves_like "a resource"
+  subject { described_class.new }
+  it { should respond_to :participating }
+  it { should respond_to :participated }
+  it { should respond_to :status }
+  it { should respond_to :room_id }
+  it { should respond_to :created_at }
+end
+
+
+

data/spec/errors_spec.rb

@@ -14,7 +14,7 @@ describe "api error handling" do
     end
 
     it "raises an exception" do
-      expect{Sqwiggle::Message.all}.to raise_error(Sqwiggle::Errors::BadRequestError)
+      expect{Sqwiggle::Message.all}.to raise_error(Sqwiggle::Api::Errors::BadRequestError)
     end
 
   end
@@ -31,7 +31,7 @@ describe "api error handling" do
     end
 
     it "raises an exception" do
-      expect{Sqwiggle::Message.all}.to raise_error(Sqwiggle::Errors::AuthenticationError)
+      expect{Sqwiggle::Message.all}.to raise_error(Sqwiggle::Api::Errors::AuthenticationError)
     end
   end
 
@@ -47,7 +47,7 @@ describe "api error handling" do
     end
 
     it "raises an exception" do
-      expect{Sqwiggle::Message.all}.to raise_error(Sqwiggle::Errors::PaymentRequiredError)
+      expect{Sqwiggle::Message.all}.to raise_error(Sqwiggle::Api::Errors::PaymentRequiredError)
     end
   end
 
@@ -63,7 +63,7 @@ describe "api error handling" do
     end
 
     it "raises an exception" do
-      expect{Sqwiggle::Message.all}.to raise_error(Sqwiggle::Errors::AuthorizationError)
+      expect{Sqwiggle::Message.all}.to raise_error(Sqwiggle::Api::Errors::AuthorizationError)
     end
   end
 
@@ -79,7 +79,7 @@ describe "api error handling" do
     end
 
     it "raises an exception" do
-      expect{Sqwiggle::Message.all}.to raise_error(Sqwiggle::Errors::NotFoundError)
+      expect{Sqwiggle::Message.all}.to raise_error(Sqwiggle::Api::Errors::NotFoundError)
     end
   end
 
@@ -95,7 +95,7 @@ describe "api error handling" do
     end
 
     it "raises an exception" do
-      expect{Sqwiggle::Message.all}.to raise_error(Sqwiggle::Errors::ServerError)
+      expect{Sqwiggle::Message.all}.to raise_error(Sqwiggle::Api::Errors::ServerError)
     end
   end
 

data/spec/invite_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+describe Sqwiggle::Invite do
+  it_behaves_like "a resource"
+  subject { described_class.new }
+  it { should respond_to :from_id }
+  it { should respond_to :email }
+  it { should respond_to :avatar }
+  it { should respond_to :url }
+  it { should respond_to :created_at }
+end
+
+
+

data/spec/message_spec.rb

@@ -2,10 +2,33 @@ require 'spec_helper'
 
 describe Sqwiggle::Message do
 
+  before do
+    Sqwiggle.token = 'token'
+  end
+
   it_behaves_like "a resource"
 
-  before do
-    Sqwiggle.token = 'some_token'
+  describe "attributes" do
+    subject { described_class.new }
+    it { should respond_to :room_id }
+    it { should respond_to :text }
+    it { should respond_to :author }
+    it { should respond_to :attachments }
+    it { should respond_to :mentions }
+    it { should respond_to :created_at }
+    it { should respond_to :updated_at }
+  end
+
+  subject do
+    Sqwiggle::Message.new({
+      id:1,
+      text:'dutch coffee',
+      author: {
+        id:1,
+        type:'user',
+        name:'Some Name'
+      }
+    })
   end
 
   describe "initialization" do
@@ -19,4 +42,108 @@ describe Sqwiggle::Message do
       m.text.should be == 'some text'
     end
   end
+
+  describe "#author" do
+    context "with a user" do
+      before do
+        stub_request(:get, "https://token:X@api.sqwiggle.com/users/1").to_return({
+          :body => "{\"id\":1, \"name\":\"Some Name\"}"
+        })
+      end
+
+      specify { subject.author.should be_kind_of(Sqwiggle::User) }
+      specify { subject.author.id.should == 1 }
+    end
+
+    context "with an api client" do
+      subject do
+        Sqwiggle::Message.new({
+          text:'dutch coffee',
+          author: {
+            id:1,
+            type:'client',
+            name:'Github'
+          }
+        })
+      end
+      it "should return an api client"
+      # specify { subject.author.should be_kind_of(Sqwiggle::ApiClient) }
+      # specify { subject.author.id.should == 1 }
+    end
+  end
+
+  describe "#update" do
+    before do
+      stub_request(:put, "https://token:X@api.sqwiggle.com/messages/1").with({
+        :body => { :text => 'New Name' } 
+      }).to_return({
+        :body => "{\"id\":1, \"text\":\"New Name\"}"
+      })
+    end
+
+    it "updates the record" do
+      subject.update :text => 'New Name'
+      subject.text.should be == 'New Name'
+    end
+
+  end
+
+  describe ".create" do
+    before do
+      stub_request(:post, "https://token:X@api.sqwiggle.com/messages").with({
+        :body => { :text => 'The Name' } 
+      }).to_return({
+        :body => "{\"id\":1, \"text\":\"The Name\"}"
+      })
+    end
+
+    it "creates the message" do
+      m = Sqwiggle::Message.create :text =>'The Name'
+      m.class.should be == Sqwiggle::Message 
+      m.text.should be == "The Name"
+    end
+  end
+
+  describe "#save" do
+    context "with a new record" do
+      before do
+        stub_request(:post, "https://token:X@api.sqwiggle.com/messages").to_return({
+          :body => "{\"id\":1, \"text\":\"The Name\"}"
+        })
+      end
+      subject { Sqwiggle::Message.new(text:'The Name') }
+      it "saves the new record" do
+        subject.save.should be == true
+        subject.id.should be == 1
+        assert_requested :post, "https://token:X@api.sqwiggle.com/messages"
+      end
+    end
+
+    context "with an existing record" do
+      before do
+        stub_request(:put, "https://token:X@api.sqwiggle.com/messages/1").to_return({
+          :body => "{\"id\":1, \"text\":\"The Name\"}"
+        })
+      end
+      subject { Sqwiggle::Message.new(id:1, text:'The Name') }
+      it "saves the new record" do
+        subject.save.should be == true
+        assert_requested :put, "https://token:X@api.sqwiggle.com/messages/1"
+      end
+    end
+  end
+
+  describe "#delete" do
+    before do
+      stub_request(:post, "https://token:X@api.sqwiggle.com/messages").to_return({
+        :body => "{\"id\":1, \"text\":\"The Name\"}"
+      })
+      subject { Sqwiggle::Message.new(id:1, text:'The Name') }
+      it "saves the new record" do
+        subject.delete.should be == true
+        assert_requested :delete, "https://token:X@api.sqwiggle.com/messages/1"
+      end
+    end
+  end
+
 end

data/spec/resource_behaviour.rb

@@ -1,6 +1,8 @@
 shared_examples_for "a resource" do
   subject { described_class.new }
   specify { subject.should respond_to :id }
-  specify { subject.client.should be == Sqwiggle::Client.new }
+  specify { subject.client.should be == Sqwiggle::Api::Client.new }
+  specify { described_class.should respond_to :find }
+  specify { described_class.should respond_to :create }
 end
 

data/spec/room_spec.rb

@@ -0,0 +1,12 @@
+require "spec_helper"
+
+describe Sqwiggle::Room do
+  it_behaves_like "a resource"
+  subject { described_class.new }
+  it { should respond_to :path }
+  it { should respond_to :name }
+  it { should respond_to :user_count }
+  it { should respond_to :created_at }
+end
+
+

data/spec/sqwiggle_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Sqwiggle do
   specify { Sqwiggle }
-  specify { Sqwiggle::Client }
+  specify { Sqwiggle::Api::Client }
   specify { Sqwiggle::Message }
 
   describe ".token=" do

data/spec/user_spec.rb

@@ -2,5 +2,20 @@ require "spec_helper"
 
 describe Sqwiggle::User do
   it_behaves_like "a resource"
+  subject { described_class.new }
+  it { should respond_to :name }
+  it { should respond_to :role }
+  it { should respond_to :media }
+  it { should respond_to :status }
+  it { should respond_to :message }
+  it { should respond_to :email }
+  it { should respond_to :confirmed }
+  it { should respond_to :time_zone }
+  it { should respond_to :time_zone_offset }
+  it { should respond_to :created_at }
+  it { should respond_to :last_connected_at }
+  it { should respond_to :last_active_at }
+  it { should respond_to :last_still }
+  it { should respond_to :avatar }
 end
 

data/sqwiggle-ruby.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["luke@sqwiggle.com"]
   spec.description   = %q{Ruby wrapper for the sqwiggle API}
   spec.summary       = %q{Ruby wrapper for the sqwiggle API}
-  spec.homepage      = ""
+  spec.homepage      = "http://github.com/sqwiggle/sqwiggle-ruby"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqwiggle-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Luke Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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
@@ -78,34 +92,43 @@ files:
 - .travis.yml
 - Gemfile
 - LICENSE
-- LICENSE.txt
 - README.md
 - Rakefile
 - lib/sqwiggle-ruby.rb
-- lib/sqwiggle/client.rb
-- lib/sqwiggle/error_handler.rb
-- lib/sqwiggle/errors/authentication_error.rb
-- lib/sqwiggle/errors/authorization_error.rb
-- lib/sqwiggle/errors/bad_request_error.rb
-- lib/sqwiggle/errors/not_found_error.rb
-- lib/sqwiggle/errors/payment_required_error.rb
-- lib/sqwiggle/errors/server_error.rb
+- lib/sqwiggle/api/client.rb
+- lib/sqwiggle/api/error_handler.rb
+- lib/sqwiggle/api/errors/authentication_error.rb
+- lib/sqwiggle/api/errors/authorization_error.rb
+- lib/sqwiggle/api/errors/bad_request_error.rb
+- lib/sqwiggle/api/errors/not_found_error.rb
+- lib/sqwiggle/api/errors/payment_required_error.rb
+- lib/sqwiggle/api/errors/server_error.rb
+- lib/sqwiggle/api/resource.rb
+- lib/sqwiggle/api/service.rb
+- lib/sqwiggle/api_client.rb
+- lib/sqwiggle/attachment.rb
+- lib/sqwiggle/conversation.rb
+- lib/sqwiggle/error.rb
 - lib/sqwiggle/invite.rb
 - lib/sqwiggle/message.rb
-- lib/sqwiggle/resource.rb
-- lib/sqwiggle/service.rb
+- lib/sqwiggle/notification.rb
+- lib/sqwiggle/organization.rb
+- lib/sqwiggle/room.rb
 - lib/sqwiggle/user.rb
 - lib/sqwiggle/version.rb
-- spec/client_spec.rb
+- spec/api/client_spec.rb
+- spec/api/resource_spec.rb
+- spec/conversation_spec.rb
 - spec/errors_spec.rb
+- spec/invite_spec.rb
 - spec/message_spec.rb
 - spec/resource_behaviour.rb
-- spec/resource_spec.rb
+- spec/room_spec.rb
 - spec/spec_helper.rb
 - spec/sqwiggle_spec.rb
 - spec/user_spec.rb
 - sqwiggle-ruby.gemspec
-homepage: ''
+homepage: http://github.com/sqwiggle/sqwiggle-ruby
 licenses:
 - MIT
 metadata: {}
@@ -130,11 +153,14 @@ signing_key:
 specification_version: 4
 summary: Ruby wrapper for the sqwiggle API
 test_files:
-- spec/client_spec.rb
+- spec/api/client_spec.rb
+- spec/api/resource_spec.rb
+- spec/conversation_spec.rb
 - spec/errors_spec.rb
+- spec/invite_spec.rb
 - spec/message_spec.rb
 - spec/resource_behaviour.rb
-- spec/resource_spec.rb
+- spec/room_spec.rb
 - spec/spec_helper.rb
 - spec/sqwiggle_spec.rb
 - spec/user_spec.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2013 Luke Roberts
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/sqwiggle/client.rb

@@ -1,47 +0,0 @@
-module Sqwiggle
-  class Client
-    class NoTokenError < StandardError;end;
-
-    attr_accessor :token
-    attr_writer :url #for testing purposes
-
-    def initialize(token=nil)
-      unless @token = token || Sqwiggle.token
-        raise NoTokenError 
-      end
-    end
-
-    def ==(val)
-      self.class == val.class && val.token == token
-    end
-
-    def get(endpoint, params={})
-      connection.get endpoint, params
-    end
-
-    def messages
-      Service.new Message, self
-    end
-
-    def users
-      Service.new User, self
-    end
-
-    private
-
-    def url
-      @url || 'https://api.sqwiggle.com/'
-    end
-
-    def connection
-      @connection ||= Faraday.new(url:url) do |f|
-        f.request  :url_encoded             # form-encode POST params
-        f.response :logger                  # log requests to STDOUT
-        f.adapter  Faraday.default_adapter  # make requests with Net::HTTP
-        f.basic_auth token, 'X'
-        f.use ErrorHandler
-      end
-    end
-
-  end
-end

data/lib/sqwiggle/error_handler.rb

@@ -1,12 +0,0 @@
-module Sqwiggle
-  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
-    end
-  end
-end

data/lib/sqwiggle/errors/authentication_error.rb

@@ -1,6 +0,0 @@
-module Sqwiggle
-  module Errors
-    class AuthenticationError < StandardError;end;
-  end
-end
-

data/lib/sqwiggle/errors/authorization_error.rb

@@ -1,5 +0,0 @@
-module Sqwiggle
-  module Errors
-    class AuthorizationError < StandardError;end;
-  end
-end

data/lib/sqwiggle/errors/bad_request_error.rb

@@ -1,6 +0,0 @@
-module Sqwiggle
-  module Errors
-    class BadRequestError < StandardError;end;
-  end
-end
-

data/lib/sqwiggle/errors/not_found_error.rb

@@ -1,5 +0,0 @@
-module Sqwiggle
-  module Errors
-    class NotFoundError < StandardError;end;
-  end
-end

data/lib/sqwiggle/errors/payment_required_error.rb

@@ -1,5 +0,0 @@
-module Sqwiggle
-  module Errors
-    class PaymentRequiredError < StandardError;end;
-  end
-end

data/lib/sqwiggle/errors/server_error.rb

@@ -1,5 +0,0 @@
-module Sqwiggle
-  module Errors
-    class ServerError < StandardError;end;
-  end
-end

data/lib/sqwiggle/resource.rb

@@ -1,39 +0,0 @@
-module Sqwiggle
-  class Resource
-    
-    include Virtus.model
-
-    attribute :client, Client, default: :default_client 
-    attribute :id, Integer
-
-    def default_client
-      Client.new
-    end
-
-    class << self
-      
-      attr_accessor :endpoint
-
-      def all(client=Client.new)
-        [].tap do |result|
-          JSON.parse(client.get(self.endpoint).body).each do |item|
-            result << self.new(item)
-          end
-        end
-      end
-
-      def find(id, client=Client.new)
-        self.new(JSON.parse(client.get("#{endpoint}/#{id}").body))
-      end
-
-      def endpoint
-        @endpoint || default_endpoint
-      end
-
-      def default_endpoint
-        "/#{self.to_s.downcase.split('::').last}s"
-      end
-
-    end
-  end
-end

data/lib/sqwiggle/service.rb

@@ -1,19 +0,0 @@
-module Sqwiggle
-  class Service
-
-    attr_reader :klass, :client
-
-    def initialize(klass, client)
-      @klass, @client = klass, client
-    end
-
-    def all
-      klass.all client
-    end
-
-    def find(id)
-      klass.find id, client
-    end
-
-  end
-end