ahub 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfb442b4a4c757931552161a6b829ec90efa4177
-  data.tar.gz: 324d4dffb5e41825ee53905e501db6dbaf7a99a7
+  metadata.gz: f15ac34fc04f78ba2a17031596dfb90dccbbf567
+  data.tar.gz: 98c3444ab17ff20dd792105d1aa8ed58f8b7b1f7
 SHA512:
-  metadata.gz: 8ddd10bc8ed3711ac85acd435c494265ef1f4c4c9d961e189242ba04d6473041d69ef8c7c5cd4a288e5e0df34a9e4061765f4d08c878021999f3eb19e1c3c1fd
-  data.tar.gz: 2f1a075a48a6db50b65aba5185ba491be4ab62b4b2afc24c0054dbc6414ede472183fa650f208e2f2b70241005efd50a2aea83dfcf9fe0a10ec4f13ebd362c18
+  metadata.gz: c3be66373cb10dfeaf82b7adb93387bd174beb8b2a61ff225d58b3d0b854386719641e98d7ca35510141b6ccab95b9f9c0571b5166347a2ef1953ae9a44d981f
+  data.tar.gz: 3762549149f4338b191ad195ff39ac736329482b70b4194ca8e6a4be0fefdc61231a126321c32898542811292e4a1330f05461140a32870a86f35f2f432b2352

data/lib/ahub/answer.rb

@@ -1,7 +1,6 @@
 module Ahub
   class Answer
-    extend Ahub::APIHelpers
-    include Ahub::ClassHelpers
+    include Ahub::APIResource
 
     def self.create(question_id:, body:, username:, password:)
       url = "#{Ahub::DOMAIN}/services/v2/question/#{question_id}/answer.json"
@@ -10,7 +9,7 @@ module Ahub
     end
 
     def initialize(attrs)
-      super(attrs)
+      super
       @author = Ahub::User.new(attrs[:author])
     end
 

data/lib/ahub/group.rb

@@ -1,7 +1,6 @@
 module Ahub
   class Group
-    extend Ahub::APIHelpers
-    include Ahub::ClassHelpers
+    include Ahub::APIResource
 
     def add(user_id)
       add_user(user_id)

data/lib/ahub/modules/api_resource.rb

@@ -0,0 +1,90 @@
+require 'base64'
+require 'active_support/inflector'
+require 'active_support/concern'
+
+module Ahub
+  module APIResource
+    extend ActiveSupport::Concern
+
+    included do
+    end
+
+    def update
+      raise NotImplementedError
+    end
+
+    def destroy
+      raise NotImplementedError
+    end
+
+    def initialize(attrs)
+      attrs.each_pair do |k,v|
+        self.instance_variable_set("@#{k.to_s.underscore}", v)
+
+        self.class.send(:define_method, k.to_s.underscore.to_sym) do
+          instance_variable_get("@#{__method__}")
+        end
+      end
+    end
+
+    class_methods do
+      def headers(username:'answerhub', password:'answerhub')
+        encoded = "Basic #{::Base64.strict_encode64("#{username}:#{password}")}"
+
+        {
+          'Authorization' => encoded,
+          'Accept' => "application/json",
+          'Content-type' => "application/json",
+        }
+      end
+
+      def admin_headers
+        headers(username: Ahub::ADMIN_USER, password: Ahub::ADMIN_PASS)
+      end
+
+      def find(id)
+        url = "#{base_url}/#{id}.json"
+
+        new get_resource(url: url, headers:admin_headers)
+      rescue RestClient::ResourceNotFound => e
+        nil
+      end
+
+      def find_all(params: nil, page: 1, pageSize: 30)
+        url = "#{base_url}.json?page=#{page}&pageSize=#{pageSize}"
+
+        if params
+          params.each{|k,v| url << "&#{k}=#{URI.encode(v)}"}
+        end
+
+        get_resources(url: url, headers: admin_headers, klass: self)
+      end
+
+      def base_url
+        class_name = name.gsub(/Ahub::/, '').downcase
+        "#{Ahub::DOMAIN}/services/v2/#{class_name}"
+      end
+
+      def object_id_from_response(response)
+        response.headers[:location].match(/(?<id>\d*)\.json/)[:id].to_i
+      end
+
+      def get_resource(url:, headers:)
+        JSON.parse(RestClient.get(url, admin_headers), symbolize_names:true)
+      end
+
+      def get_resources(url:, headers:, klass:)
+        JSON.parse(RestClient.get(url, admin_headers), symbolize_names:true)[:list].map do |node|
+          klass.new(node)
+        end
+      end
+
+      private
+
+      def create_resource(url:, payload:, headers:)
+        response = RestClient.post(url, payload.to_json, headers)
+        find(object_id_from_response(response))
+      end
+    end
+  end
+end

data/lib/ahub/question.rb

@@ -1,7 +1,6 @@
 module Ahub
   class Question
-    extend Ahub::APIHelpers
-    include Ahub::ClassHelpers
+    include Ahub::APIResource
 
     def self.create(title:, body:, topics:, space_id: nil, username:, password:)
       url = "#{base_url}.json"

data/lib/ahub/space.rb

@@ -1,6 +1,5 @@
 module Ahub
   class Space
-    extend Ahub::APIHelpers
-    include Ahub::ClassHelpers
+    include Ahub::APIResource
   end
 end

data/lib/ahub/topic.rb

@@ -1,6 +1,5 @@
 module Ahub
   class Topic
-    extend Ahub::APIHelpers
-    include Ahub::ClassHelpers
+    include Ahub::APIResource
   end
 end

data/lib/ahub/user.rb

@@ -1,7 +1,6 @@
 module Ahub
   class User
-    extend Ahub::APIHelpers
-    include Ahub::ClassHelpers
+    include Ahub::APIResource
 
     def self.create(username:, email:, password:nil)
       url = "#{base_url}.json"
@@ -25,14 +24,10 @@ module Ahub
       @groups = attrs[:groups].map{|group| Ahub::Group.new(group)} if attrs[:groups]
     end
 
-    def is_complete?
-      !!@complete
-    end
-
     def questions
       unless @questions
-        response = self.class.get_resource(url: "#{self.class.base_url}/#{id}/question.json", headers: self.class.admin_headers)
-        @questions = response[:list].map{ |question| Ahub::Question.new(question) }
+        url = "#{self.class.base_url}/#{id}/question.json"
+        @questions = self.class.get_resources(url: url, headers: self.class.admin_headers, klass: Ahub::Question)
       end
 
       @questions
@@ -40,8 +35,8 @@ module Ahub
 
     def answers
       unless @answers
-        response = self.class.get_resource(url: "#{self.class.base_url}/#{id}/answer.json", headers: self.class.admin_headers)
-        @answers = response[:list].map{ |answer| Ahub::Answer.new(answer) }
+        url = "#{self.class.base_url}/#{id}/answer.json"
+        @answers = self.class.get_resources(url: url, headers: self.class.admin_headers, klass: Ahub::Answer)
       end
 
       @answers

data/lib/ahub/version.rb

@@ -1,3 +1,3 @@
 module Ahub
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/lib/ahub.rb

@@ -1,8 +1,6 @@
 require 'dotenv'
 require 'rest_client'
-require 'active_support/inflector'
-require 'ahub/modules/api_helpers'
-require 'ahub/modules/class_helpers'
+require 'ahub/modules/api_resource'
 require 'ahub/version'
 require 'ahub/user'
 require 'ahub/question'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahub
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Abel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -133,8 +133,7 @@ files:
 - lib/ahub.rb
 - lib/ahub/answer.rb
 - lib/ahub/group.rb
-- lib/ahub/modules/api_helpers.rb
-- lib/ahub/modules/class_helpers.rb
+- lib/ahub/modules/api_resource.rb
 - lib/ahub/question.rb
 - lib/ahub/space.rb
 - lib/ahub/topic.rb

data/lib/ahub/modules/api_helpers.rb

@@ -1,60 +0,0 @@
-module Ahub
-  module APIHelpers
-    require 'base64'
-
-    def headers(username:'answerhub', password:'answerhub')
-      encoded = "Basic #{::Base64.strict_encode64("#{username}:#{password}")}"
-
-      {
-        'Authorization' => encoded,
-        'Accept' => "application/json",
-        'Content-type' => "application/json",
-      }
-    end
-
-    def admin_headers
-      headers(username: Ahub::ADMIN_USER, password: Ahub::ADMIN_PASS)
-    end
-
-    def find(id)
-      url = "#{base_url}/#{id}.json"
-
-      new get_resource(url: url, headers:admin_headers)
-    rescue RestClient::ResourceNotFound => e
-      nil
-    end
-
-    def find_all(params: nil, page: 1, pageSize: 30)
-      url = "#{base_url}.json?page=#{page}&pageSize=#{pageSize}"
-
-      if params
-        params.each{|k,v| url << "&#{k}=#{URI.encode(v)}"}
-      end
-
-      get_resource(url: url, headers: admin_headers)[:list].map do |node|
-        new(node)
-      end
-    end
-
-    def base_url
-      class_name = name.gsub(/Ahub::/, '').downcase
-      "#{Ahub::DOMAIN}/services/v2/#{class_name}"
-    end
-
-    def object_id_from_response(response)
-      response.headers[:location].match(/(?<id>\d*)\.json/)[:id].to_i
-    end
-
-    def get_resource(url:, headers:)
-      JSON.parse(RestClient.get(url, admin_headers), symbolize_names:true)
-    end
-
-    private
-
-    def create_resource(url:, payload:, headers:)
-      response = RestClient.post(url, payload.to_json, headers)
-      find(object_id_from_response(response))
-    end
-
-  end
-end

data/lib/ahub/modules/class_helpers.rb

@@ -1,21 +0,0 @@
-module Ahub
-  module ClassHelpers
-    def update
-      raise NotImplementedError
-    end
-
-    def destroy
-      raise NotImplementedError
-    end
-
-    def initialize(attrs)
-      attrs.each_pair do |k,v|
-        self.instance_variable_set("@#{k.to_s.underscore}", v)
-
-        self.class.send(:define_method, k.to_s.underscore.to_sym) do
-          instance_variable_get("@#{__method__}")
-        end
-      end
-    end
-  end
-end