quill-api-client 0.0.2 → 0.1.0

data/lib/quill/activity_model.rb

@@ -3,28 +3,13 @@ class Quill::ActivityModel < Quill::BaseModel
 
   special_attrs :name, :description
 
-  def self.key_attributes
-    [:_cid, :_uid]
-  end
-
-  def filter_params params
-    params[:cid] = _cid
-    params[:data].delete(:_cid)
-    params[:data].delete(:_uid)
-    params
-  end
-
-  def key_present?
-     _cid.present? && _uid.present?
-   end
-
   def find
-    api.activities.find(_uid, cid: _cid)
+    api.activities.find(id)
   end
 
   def persist_params params
-    if _uid.present?
-      api.activities.update(_uid, params)
+    if id.present?
+      api.activities.update(id, params)
     else
       api.activities.create(params)
     end

data/lib/quill/activity_session.rb

@@ -2,18 +2,18 @@ class Quill::ActivitySession < Quill::BaseModel
   special_attrs :percentage, :time_spent, :state, :completed_at, :activity_uid, :anonymous
 
   def find
-    if anonymous && _uid.blank?
+    if anonymous && id.blank?
       persist
     else
-      api.activity_sessions.find(_uid)
+      api.activity_sessions.find(id)
     end
   end
 
-  def activity(cid)
+  def activity
     raise if activity_uid.blank?
     return nil if activity_uid.blank?
     return @activity if @activity.present?
-    @activity = Story.new(_uid: activity_uid, _cid: cid)
+    @activity = Story.new(id: activity_uid, access_token: access_token)
   end
 
   def key_present?

data/lib/quill/base_model.rb

@@ -1,5 +1,6 @@
 class Quill::BaseModel
   include ActiveModel::Model
+  attr_accessor :id, :access_token
 
   def self.special_attrs *attrs
     return @special_attrs unless attrs.any?
@@ -14,7 +15,7 @@ class Quill::BaseModel
     return @attributes if defined?(@attributes)
     @attributes = attrs
 
-    (attrs.dup.unshift(*@special_attrs).unshift(*key_attributes)).each do |attr|
+    attrs.dup.unshift(*@special_attrs).each do |attr|
       class_eval <<-CODE
         def #{attr}
           @data[:#{attr}]
@@ -27,10 +28,6 @@ class Quill::BaseModel
     end
   end
 
-  def self.key_attributes
-    [:_uid]
-  end
-
   def initialize *args
     @data = {}
     super
@@ -42,7 +39,7 @@ class Quill::BaseModel
   end
 
   def persist
-    data = @data.except(*self.class.special_attrs.dup << :_uid)
+    data = @data.except(*self.class.special_attrs.dup)
     serialized_data = {}
 
     data.each do |key, value|
@@ -56,7 +53,9 @@ class Quill::BaseModel
     end
 
     params = filter_params(params) if respond_to?(:filter_params)
-    persist_params params
+    object = persist_params params
+    self.id = object.uid if id.blank?
+    true
   end
 
   def load_model_attributes
@@ -66,7 +65,7 @@ class Quill::BaseModel
     object.data = {} if object.data.nil?
     attrs = {}
 
-    attrs[:_uid] = object.uid
+    self.id = object.uid
 
     # load attributes defined on the superclass. These attributes
     # are designated by Quill.
@@ -87,22 +86,26 @@ class Quill::BaseModel
     save || raise
   end
 
+  def inspect
+    %Q|#<#{self.class.name} #{@data.map{|k,v| "#{k}=#{v.inspect}"}.join(' ')}>|
+  end
+
 protected
 
   def key_present?
-     _uid.present?
+     id.present?
   end
 
   def persist_params params
-    if _uid.present?
-      api.activity_sessions.update(_uid, params)
+    if id.present?
+      api.activity_sessions.update(id, params)
     else
       api.activity_sessions.create(params)
     end
   end
 
   def api
-    @api ||= Quill::Client.new
+    @api ||= Quill::Client.new(access_token: access_token)
   end
 
   def perform_validations(options={})

data/lib/quill/client.rb

@@ -1,60 +1,83 @@
-class Quill::Client
-  class InvalidKeys < Exception ; end
-  delegate :get, :post, :put, to: :connection
+module Quill
+  class Client
+    class InvalidKeys < Exception ; end
+    attr_accessor :token, :client, :config
+    delegate :get, :post, :put, to: :token
+    include EndpointDefinitions
 
-  
-    def activities
-      Endpoint.new(self, "activities", {"attributes"=>{"data"=>{}, "name"=>nil, "description"=>nil}, "readonly_attributes"=>{"cid"=>nil}})
+    def initialize options = {}
+      @config = Configuration.new(options, api_url: 'http://api.quill.org/')
+      raise ArgumentError if config.access_token.blank?
     end
-  
-    def activity_sessions
-      Endpoint.new(self, "activity_sessions", {"attributes"=>{"percentage"=>nil, "time_spent"=>nil, "state"=>nil, "completed_at"=>nil, "data"=>{}, "temporary"=>nil, "activity_uid"=>nil}, "readonly_attributes"=>{"anonymous"=>nil}})
-    end
-  
 
-  def connection
-    Faraday.new(url: ENV['QUILL_API_URL']) do |conn|
-      conn.request :json
-      conn.response :json
-      conn.adapter Faraday.default_adapter
+    def token
+      @token ||= OAuth2::AccessToken.new client, config.access_token
     end
-  end
-
-  class Endpoint
-    attr_accessor :name, :api
 
-    def initialize api, name, definition
-      @api = api
-      @name = name
-      @attributes = definition['attributes'].keys
-      @readonly_attributes = definition['readonly_attributes'].try(:keys) || []
+    def client
+      @client ||= OAuth2::Client.new(config.client_id, config.client_secret, site: config.api_url, raise_errors: false) do |conn|
+        conn.request :json
+        conn.response :json
+        conn.adapter Faraday.default_adapter
+      end
     end
 
-    def find id, params = {}
-      check_keys(params)
-      response = api.get([name,id].join('/'), params)
-      Hashie::Mash.new(response.body['object'])
+    def get path, params = {}
+      request :get, path, params
     end
 
-    def create params
-      check_keys(params)
-      response = api.post(name, params)
-      Hashie::Mash.new(response.body['object'])
+    def post path, params = {}
+      request :post, path, params
     end
 
-    def update id, params
-      check_keys(params)
-      response = api.put([name,id].join('/'), params)
-      Hashie::Mash.new(response.body['object'])
+    def put path, params = {}
+      request :put, path, params
     end
 
-    def list
+    def request verb, path, params = {}
+      key = if verb == :get then :params else :body end
+      response = token.request verb, path, key => params
+      raise response.error if response.status == 401
+      response
     end
 
-    def check_keys params
-      # raise @readonly_attributes.inspect
-      invalid_keys = params.stringify_keys.keys - @attributes - @readonly_attributes
-      raise InvalidKeys, "Endpoint ##{name} does not support key(s) #{invalid_keys.join(', ')}" unless invalid_keys.empty?
+    class Endpoint
+      attr_accessor :name, :api
+
+      def initialize api, name, definition
+        @api = api
+        @name = name
+        @attributes = definition['attributes'].keys
+        @readonly_attributes = definition['readonly_attributes'].try(:keys) || []
+      end
+
+      def find id, params = {}
+        check_keys(params)
+        response = api.get([name,id].join('/'), params)
+        Hashie::Mash.new(response.body['object'])
+      end
+
+      def create params
+        check_keys(params)
+        response = api.post(name, params)
+        Hashie::Mash.new(response.body['object'])
+      end
+
+      def update id, params
+        check_keys(params)
+        response = api.put([name,id].join('/'), params)
+        Hashie::Mash.new(response.body['object'])
+      end
+
+      def list
+      end
+
+      def check_keys params
+        # raise @readonly_attributes.inspect
+        invalid_keys = params.stringify_keys.keys - @attributes - @readonly_attributes
+        raise InvalidKeys, "Endpoint ##{name} does not support key(s) #{invalid_keys.join(', ')}" unless invalid_keys.empty?
+      end
     end
   end
+
 end

data/lib/quill/configuration.rb

@@ -0,0 +1,33 @@
+module Quill
+
+  class Configuration
+    def initialize options = {}, defaults = {}
+      options.assert_valid_keys(*@@keys)
+      @config = {}
+
+      @@keys.each do |key|
+        @config[key] = options[key] || @@env["#{@@namespace.to_s.upcase}_#{key.to_s.upcase}"] || defaults[key]
+      end
+    end
+
+    def method_missing method
+      super unless @@keys.include? method
+      @config[method]
+    end
+
+    class << self
+      def keys *args
+        @@keys = args
+      end
+
+      def namespace namespace
+        @@namespace = namespace
+      end
+
+      def env env
+        @@env = env
+      end
+    end
+  end
+
+end

data/lib/quill/endpoint_definitions.rb

@@ -0,0 +1,13 @@
+module Quill
+  module EndpointDefinitions
+
+    def activities
+      Client::Endpoint.new(self, "activities", {"attributes"=>{"data"=>{}, "name"=>nil, "description"=>nil}, "readonly_attributes"=>{"cid"=>nil}})
+    end
+
+    def activity_sessions
+      Client::Endpoint.new(self, "activity_sessions", {"attributes"=>{"percentage"=>nil, "time_spent"=>nil, "state"=>nil, "completed_at"=>nil, "data"=>{}, "temporary"=>nil, "activity_uid"=>nil}, "readonly_attributes"=>{"anonymous"=>nil}})
+    end
+
+  end
+end

data/lib/quill/oauth.rb

@@ -0,0 +1,11 @@
+module Quill
+
+  class Oauth < OAuth2::Client
+
+    def initialize(client_id=nil, client_secret=nil, opts={}, &block)
+      config = Configuration.new({}, site_url: 'http://www.quill.org/')
+      super(client_id || config.client_id, client_secret || config.client_secret, opts.reverse_merge(site: config.site_url), &block)
+    end
+  end
+
+end

data/lib/quill.rb

@@ -1,6 +1,13 @@
 module Quill
-  autoload :ActivityModel,    'quill/activity_model'
-  autoload :ActivitySession,  'quill/activity_session'
-  autoload :BaseModel,        'quill/base_model'
-  autoload :Client,           'quill/client'
+  autoload :ActivityModel,       'quill/activity_model'
+  autoload :ActivitySession,     'quill/activity_session'
+  autoload :BaseModel,           'quill/base_model'
+  autoload :Client,              'quill/client'
+  autoload :Configuration,       'quill/configuration'
+  autoload :EndpointDefinitions, 'quill/endpoint_definitions'
+  autoload :Oauth, 'quill/oauth'
+
+  Configuration.namespace :quill
+  Configuration.keys :api_url, :client_id, :client_secret, :access_token, :site_url
+  Configuration.env ENV
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quill-api-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
-dependencies: []
+date: 2014-02-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: oauth2
+  requirement: &70318755727340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70318755727340
 description: Wrapper to Quill API
 email: quinn@tastehoneyco.com
 executables: []
@@ -21,6 +32,9 @@ files:
 - lib/quill/activity_session.rb
 - lib/quill/base_model.rb
 - lib/quill/client.rb
+- lib/quill/configuration.rb
+- lib/quill/endpoint_definitions.rb
+- lib/quill/oauth.rb
 - lib/quill-api-client.rb
 - lib/quill.rb
 homepage: https://github.com/empirical/quill-platform