traitify 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddc1513959fbaa40d7eee6277c6f8c78579750bb
-  data.tar.gz: f70c23b1ebd7962997aac709f8b596c8fd7e38ad
+  metadata.gz: 6a9b25173520896cbdd7d47c2b7a18c19022b199
+  data.tar.gz: 41173e061c58c3417c68cc19293ae5c6ccf0e06d
 SHA512:
-  metadata.gz: fccc6837f3529e1c3fe1eaf46e62c3298b1aaf5683463168dbe6bf9509ebdf4d59aca0bb7ba503061517fdd78c038d3e5ff681984f58537eda3291e76bea0b86
-  data.tar.gz: 568cb75b501279b86d7eaea660893f068d92c7e30572a8400e6bd19590162684de06db3ecae8e22a2ea9db4d18c8714b79a3af0e81d80794165ba7eb582c3879
+  metadata.gz: d04436ef921a63fc4e1f712ee2bd90bd9118e23e02539ef02c81ae870f148e4563ce5d8f3602d29fe1031fe1dbf5fd4e7b9e15bfed1578c523cb9e33b74f38fb
+  data.tar.gz: 06d27eab98ea81dfa76af8c7a686eeb462f86ebc3ee3dbbc6cb3d096ea0149ec5bd58e00202a9a2e56ca3d8b698ac62f5677c189422739d8301bc777da46e61d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.1.2
+
+* Features
+  * Newer version of Faraday
+
 ### 1.1.1
 
 * Features

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    traitify (1.1.0)
-      faraday (~> 0.8.0)
+    traitify (1.2.0)
+      faraday (~> 0.9.0)
       faraday_middleware (~> 0.9.0)
       hashie
 
@@ -17,16 +17,16 @@ GEM
       safe_yaml (~> 1.0.0)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
-    hashie (2.1.1)
+    hashie (3.3.1)
     method_source (0.8.2)
-    multipart-post (1.2.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    multipart-post (2.0.0)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
     rake (10.1.1)
     rspec (2.14.1)

data/lib/traitify/client/assessments.rb

@@ -1,20 +1,22 @@
 module Traitify
+
   class Client
     module Assessment
       def create_assessment(options = {})
-        deck_id = options[:deck_id] || options["deck_id"] || self.deck_id
-        assessment_params = { deck_id: deck_id }
-        response = post("/assessments", assessment_params)
-
-        Hashie::Mash.new(response)
+        Hashie::Mash.new post("/assessments", { deck_id: deck_id_from(options) })
       end
 
       def assessment(assessment_id)
-        response = get("/assessments/#{assessment_id}")
+        Hashie::Mash.new get("/assessments/#{assessment_id}")
+      end
+      alias :find_assessment :assessment
 
-        Hashie::Mash.new(response)
+      private
+
+      def deck_id_from(options)
+        options[:deck_id] || deck_id
       end
-      alias_method :find_assessment, :assessment
+
     end
   end
 end

data/lib/traitify/client/decks.rb

@@ -1,8 +1,12 @@
 module Traitify
   class Client
     module Deck
-      def decks
-        response = get("/decks")
+      def decks(image_pack = nil)
+        image_pack ||= self.image_pack
+
+        response = image_pack ?
+          get("/decks?image_pack=#{image_pack}") :
+          get("/decks")
 
         response.collect { |deck| Hashie::Mash.new(deck) }
       end

data/lib/traitify/client/results.rb

@@ -4,26 +4,27 @@ module Traitify
       def results(assessment_id, image_pack = nil)
         image_pack ||= self.image_pack
 
-        if image_pack
-          response = get("/assessments/#{assessment_id}/personality_types?image_pack=#{image_pack}")
-        else
-          response = get("/assessments/#{assessment_id}/personality_types")
-        end
+        response = image_pack ?
+          get("/assessments/#{assessment_id}/personality_types?image_pack=#{image_pack}") :
+          get("/assessments/#{assessment_id}/personality_types")
 
         Hashie::Mash.new(response)
       end
       alias_method :find_results, :results
 
       def assessment_personality_traits(assessment_id, personality_type_id = nil)
-        if personality_type_id
-          response = get("/assessments/#{assessment_id}/personality_types/#{personality_type_id}/personality_traits")
-        else
-          response = get("/assessments/#{assessment_id}/personality_traits")
-        end
+        response = personality_type_id ?
+          get("/assessments/#{assessment_id}/personality_types/#{personality_type_id}/personality_traits") :
+          get("/assessments/#{assessment_id}/personality_traits")
 
         response.collect { |personality_trait| Hashie::Mash.new(personality_trait) }
       end
       alias_method :find_assessment_personality_traits, :assessment_personality_traits
+
+      def career_matches(assessment_id, number_of_matches=10)
+        response = get("/assessments/#{assessment_id}/matches/careers?number_of_matches=#{number_of_matches}")
+        response.collect { |career| Hashie::Mash.new(career) }
+      end
     end
   end
 end

data/lib/traitify/client/slides.rb

@@ -1,28 +1,33 @@
 module Traitify
   class Client
     module Slide
-      def find_slides(assessment_id)
-        response = get("/assessments/#{assessment_id}/slides")
+      def url_for_slides_by(assessment_id)
+        "/assessments/#{assessment_id}/slides"
+      end
 
-        response.collect { |slide| Hashie::Mash.new(slide) }
+      def find_slides(assessment_id)
+        url = url_for_slides_by(assessment_id)
+        get(url).collect do |slide|
+          Hashie::Mash.new(slide)
+        end
       end
 
       def update_slides(assessment_id, slides)
-        response = put("/assessments/#{assessment_id}/slides", slides)
-
-        response.collect { |slide| Hashie::Mash.new(slide) }
+        url = url_for_slides_by(assessment_id)
+        put(url, slides).collect do |slide|
+          Hashie::Mash.new(slide)
+        end
       end
 
       def update_slide(assessment_id, slide)
-        slide_id = slide["id"] || slide[:id] || slide.id
+        slide_id = slide[:id] || slide.id
         params = {
-          response: slide["response"] || slide[:response] || slide.response,
-          time_taken: slide["time_taken"] || slide[:time_taken] || slide.time_taken,
+          response: slide[:response] || slide.response,
+          time_taken: slide[:time_taken] || slide.time_taken,
         }
 
-        response = put("/assessments/#{assessment_id}/slides/#{slide_id}", params)
-
-        Hashie::Mash.new(response)
+        url = [url_for_slides_by(assessment_id), "/", slide_id].join
+        Hashie::Mash.new put(url, params)
       end
     end
   end

data/lib/traitify/connection.rb

@@ -3,8 +3,8 @@ require "traitify/error"
 
 module Traitify
   module Connection
-    def connection(options = {})
-      connection ||= Faraday.new(options) do |faraday|
+    def conn(options = {})
+      Faraday.new(options) do |faraday|
         faraday.request :url_encoded
         faraday.request :basic_auth, self.secret, "x"
         faraday.use ContentTypeMiddleware
@@ -12,11 +12,10 @@ module Traitify
         faraday.response :json, :content_type => /\bjson$/
         faraday.adapter Faraday.default_adapter
       end
-
-      connection
     end
 
     private
+
     class ContentTypeMiddleware < Faraday::Middleware
       def initialize(app)
         @app = app
@@ -36,7 +35,7 @@ module Traitify
 
       def call(env)
         @app.call(env).on_complete do |e|
-          if error = Traitify::Error.from(e[:response])
+          if error = Traitify::Error.from(e.status)
             raise error
           end
         end

data/lib/traitify/error.rb

@@ -2,16 +2,13 @@ module Traitify
   class Error < StandardError
     attr_accessor :response
 
-    def self.from(response)
-      status  = response.status
-
+    def self.from(status)
       if klass = case status
                  when 400 then Traitify::BadRequest
                  when 401 then Traitify::Unauthorized
                  when 404 then Traitify::NotFound
                  when 422 then Traitify::UnprocessableEntity
                  end
-
         klass.new(response)
       end
     end

data/lib/traitify/request.rb

@@ -1,46 +1,18 @@
 module Traitify
   module Request
-    def get(path, options = {})
-      request(:get, path, options)
-    end
-
-    def post(path, options = {})
-      request(:post, path, options)
-    end
-
-    def put(path, options = {})
-      request(:put, path, options)
-    end
-
-    def delete(path, options = {})
-      request(:delete, path, options)
-    end
-
-    def last_response
-      @last_response
+    def method_missing(meth, *args, &block)
+      if [:get, :post, :put, :delete].include? meth
+        request(meth, *args)
+      else
+        super
+      end
     end
 
-    private
     def request(method, path, options = {})
-      path = "#{self.api_version}#{path}"
-      connection_options = {}.merge!(url: self.api_host)
-
-      response = connection(connection_options).send(method) do |request|
+      conn(url: api_host).send(method) do |request|
+        request.url [api_version, path].join
         request.body = options.to_json if options
-        case method
-        when :get
-          request.url(path)
-        when :post
-          request.url(path)
-        when :put
-          request.url(path)
-        when :delete
-          request.url(path)
-        end
-      end
-
-      @last_response = response
-      response.body
+      end.body
     end
   end
 end

data/lib/traitify/version.rb

@@ -1,3 +1,3 @@
 module Traitify
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spec/support/mocks/careers.json

@@ -0,0 +1,15 @@
+[
+  {
+    "id": "career-id",
+    "title": "Career Title",
+    "description": "Career Description",
+    "majors": [
+      {
+        "id": "major-id",
+        "title": "Major Title",
+        "description": "Major Description",
+        "group_id": "Major Group ID"
+      }
+    ]
+  }
+]

data/spec/traitify-ruby/client/result_spec.rb

@@ -77,4 +77,17 @@ describe Traitify::Client do
       end
     end
   end
-end
+
+  describe ".career_matches" do
+    let(:careers) { tom.career_matches("assessment-uuid") }
+
+    before(:each) do
+      stub_it(:get, "/assessments/assessment-uuid/matches/careers?number_of_matches=10", "careers")
+    end
+
+    it "returns a result" do
+      expect(careers.first.title).to eq("Career Title")
+      expect(careers.first.majors.first.title).to eq("Major Title")
+    end
+  end
+end

data/traitify.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = "tom@tomprats.com"
   spec.description   = %q{Traitify Developer Gem}
   spec.summary       = spec.description
-  spec.homepage      = ""
+  spec.homepage      = "https://www.traitify.com"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "hashie"
-  spec.add_dependency "faraday", "~> 0.8.0"
+  spec.add_dependency "faraday", "~> 0.9.0"
   spec.add_dependency "faraday_middleware", "~> 0.9.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traitify
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Tom Prats
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +161,7 @@ files:
 - lib/traitify/version.rb
 - spec/spec_helper.rb
 - spec/support/mocks/assessment.json
+- spec/support/mocks/careers.json
 - spec/support/mocks/decks.json
 - spec/support/mocks/personality_traits.json
 - spec/support/mocks/result.json
@@ -172,7 +173,7 @@ files:
 - spec/traitify-ruby/client/result_spec.rb
 - spec/traitify-ruby/client/slide_spec.rb
 - traitify.gemspec
-homepage: ''
+homepage: https://www.traitify.com
 licenses:
 - MIT
 metadata: {}
@@ -199,6 +200,7 @@ summary: Traitify Developer Gem
 test_files:
 - spec/spec_helper.rb
 - spec/support/mocks/assessment.json
+- spec/support/mocks/careers.json
 - spec/support/mocks/decks.json
 - spec/support/mocks/personality_traits.json
 - spec/support/mocks/result.json
@@ -209,4 +211,3 @@ test_files:
 - spec/traitify-ruby/client/deck_spec.rb
 - spec/traitify-ruby/client/result_spec.rb
 - spec/traitify-ruby/client/slide_spec.rb
-has_rdoc: