typeform_data 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08af965b58a09c76f9fe8f5937c431cb73a4b09d
-  data.tar.gz: a9764f0ba29abe0b8ea53a7b82ebb037f1766c79
+  metadata.gz: 876713987fcf2c378c84995bf1a5c3b0d460755a
+  data.tar.gz: eaf7a7355ffda4252d318934b02aa806a215544d
 SHA512:
-  metadata.gz: b5f151253223bff48b951c368ed3822d1df15292ddf3c400ab0104ea3dd1286767497e6ec682681781abb561103a0ab642d60d5e850c9af0093fabfe5cdbc067
-  data.tar.gz: a8025b7f9b7557086ebf127cbe4b6756e16af1223c96bbcfd4f28c795de1131da494d697a47e760c016746b88c2a16f9d2e341c8584f481340dd5f578139721f
+  metadata.gz: 3d0b3c91030dd7e26f4f9eb89ce2adf4ba02b7b6e09f885fa22ea1ad12979951cfb88e968d1272cfa9d093cfee8223151b32b8cbf9b469c1251f8435f3295afd
+  data.tar.gz: e1c74927ec69c7f570d25e5bf8e363faf4df9fde039ca91fee591d7bdebcd3d74ae33f0f6fb62336ee8245c0041e8c0300b348ce99b780392e7c5a615f4cf1ea

data/README.md

@@ -6,10 +6,17 @@ This is alpha software and doesn't currently cover all the use cases you'd proba
 
 Unless you're eager to dive into the code, I'd suggest waiting until next week to check out this gem.
 
+Ruby 2.3
+
 TODO:
   - Add more detail, and example method calls.
   - Add an explanation: why another gem? What makes this gem different?
 
+Goals:
+  - Typeform data (and invidual response data) must work with `Marshal#load` and `Marshal#dump`.
+
+We have to do a lot of reverse-engineering to get an API that feels reasonably intuitive.
+
 ### Notes on the API
 
   - ID vs. UID: they aren't used consistently across the docs and actual API responses.

data/bin/console

@@ -8,8 +8,9 @@ require 'typeform_data'
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-require 'pry'
-Pry.start
 
+require 'pry'
 require 'irb'
+
+Pry.start
 IRB.start

data/lib/typeform_data.rb

@@ -1,5 +1,24 @@
 # frozen_string_literal: true
 module TypeformData
+
+  def self.dump(object)
+    Marshal.dump(object)
+  end
+
+  # Currently only handles single objects and arrays.
+  # @param [TypeformData::ValueClass]
+  # @param [TypeformData::Config]
+  def self.load(value_class_instance, config)
+    Marshal.load(value_class_instance).tap { |marshaled|
+      case marshaled
+      when Array
+        marshaled.each { |object| object.reconfig(config) }
+      else
+        marshaled.reconfig(config)
+      end
+    }
+  end
+
 end
 
 require 'net/http'
@@ -10,12 +29,16 @@ require 'json'
 require 'typeform_data/version'
 require 'typeform_data/client'
 require 'typeform_data/errors'
+require 'typeform_data/config'
+require 'typeform_data/value_class'
 
 require 'typeform_data/requestor'
-require 'typeform_data/requestor/config'
 require 'typeform_data/api_response'
 
 require 'typeform_data/typeform'
+require 'typeform_data/typeform/by_id'
 require 'typeform_data/typeform/stats'
 require 'typeform_data/typeform/response'
 require 'typeform_data/typeform/question'
+require 'typeform_data/typeform/answer'
+require 'typeform_data/typeform/field'

data/lib/typeform_data/client.rb

@@ -4,18 +4,15 @@ require 'typeform_data/version'
 module TypeformData
   class Client
 
+    # For the sake of usability, we're breaking convention here and accepting an API key as the
+    # first parameter instead of an instance of TypeformData::Config.
     def initialize(api_key:)
-      @_requestor = ::TypeformData::Requestor.new(api_key: api_key)
+      @config = TypeformData::Config.new(api_key: api_key)
     end
 
-    def all_typeforms
-      get('forms').parsed_json.map do |form_hash|
-        ::TypeformData::Typeform.new(self, form_hash)
-      end
-    end
-
-    def typeform(id)
-      ::TypeformData::Typeform.new(self, id)
+    def self.new_from_config(config)
+      raise ArgumentError, 'Missing config' unless config
+      new(api_key: config.api_key)
     end
 
     # Your API key will automatically be added to the request URL as a query param, as required by
@@ -25,7 +22,17 @@ module TypeformData
     # @param Hash
     # @return TypeformData::ApiResponse
     def get(endpoint, params = {})
-      @_requestor.get(endpoint, params)
+      TypeformData::Requestor.get(@config, endpoint, params)
+    end
+
+    def all_typeforms
+      get('forms').parsed_json.map do |form_hash|
+        ::TypeformData::Typeform.new(@config, form_hash)
+      end
+    end
+
+    def typeform(id)
+      ::TypeformData::Typeform.new(@config, id: id)
     end
 
   end

data/lib/typeform_data/config.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+module TypeformData
+  class Config
+    attr_reader :api_key
+
+    def initialize(api_key:)
+      unless api_key.is_a?(String) && api_key.length.positive?
+        raise ArgumentError, 'An API key (as a nonempty String) is required'
+      end
+      @api_key = api_key
+    end
+
+    # These values were determined via URI.parse('https://api.typeform.com').
+
+    def host
+      'api.typeform.com'
+    end
+
+    def port
+      443
+    end
+
+    def api_version
+      1
+    end
+
+    def ==(other)
+      other.api_key == api_key
+    end
+
+  end
+end

data/lib/typeform_data/errors.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-module TypeformDataClient
+module TypeformData
   class Error < StandardError; end
   class InvalidApiKey < Error; end
   class ConnectionRefused < Error; end

data/lib/typeform_data/requestor.rb

@@ -1,29 +1,25 @@
 # frozen_string_literal: true
 
 module TypeformData
-  class Requestor
+  module Requestor
 
-    def initialize(api_key:)
-      @config = ::TypeformData::Requestor::Config.new(api_key: api_key)
+    def self.get(config, endpoint, params = nil)
+      request(config, Net::HTTP::Get, request_path(config, endpoint), params)
     end
 
-    def get(endpoint, params = nil)
-      request(Net::HTTP::Get, request_path(endpoint), params)
+    def self.request_path(config, endpoint)
+      "/v#{config.api_version}/#{endpoint}"
     end
 
-    private
-
-    def request_path(endpoint)
-      "/v#{@config.api_version}/#{endpoint}"
-    end
+    private_class_method :request_path
 
     # rubocop:disable Metrics/MethodLength
     # @return TypeformData::ApiResponse
-    def request(method_class, path, input_params = {})
+    def self.request(config, method_class, path, input_params = {})
       params = input_params.dup
-      params[:key] = @config.api_key
+      params[:key] = config.api_key
 
-      response = Net::HTTP.new(@config.host, @config.port).tap { |http|
+      response = Net::HTTP.new(config.host, config.port).tap { |http|
         http.use_ssl = true
 
         # Uncomment this line for debugging:
@@ -37,23 +33,25 @@ module TypeformData
 
       case response
       when Net::HTTPNotFound then
-        raise TypeformDataClient::InvalidEndpointOrMissingResource, path
+        raise TypeformData::InvalidEndpointOrMissingResource, path
       when Net::HTTPForbidden then
-        raise TypeformDataClient::InvalidApiKey, "Invalid api key: #{@config.api_key}"
+        raise TypeformData::InvalidApiKey, "Invalid api key: #{config.api_key}"
       when Net::HTTPBadRequest then
-        raise TypeformDataClient::BadRequest, 'There was an error processing your request: '\
+        raise TypeformData::BadRequest, 'There was an error processing your request: '\
           "#{response.body}, with params: #{params}"
       when Net::HTTPSuccess
         return TypeformData::ApiResponse.new(response)
       else
-        raise TypeformDataClient::UnexpectedError, "A #{response.code} error has occurred: "\
+        raise TypeformData::UnexpectedError, "A #{response.code} error has occurred: "\
           "'#{response.message}'"
       end
 
     rescue Errno::ECONNREFUSED
-      raise TypeformDataClient::ConnectionRefused, 'The connection was refused'
+      raise TypeformData::ConnectionRefused, 'The connection was refused'
     end
     # rubocop:enable Metrics/MethodLength
 
+    private_class_method :request
+
   end
 end

data/lib/typeform_data/typeform.rb

@@ -2,43 +2,12 @@
 require 'typeform_data/version'
 
 module TypeformData
-  class Typeform
-    attr_reader :id
-    attr_reader :name
-
-    MAX_PAGE_SIZE = 1000 # This is documented at https://www.typeform.com/help/data-api/.
-
-    # @param TypeformData::Client
-    # @param Hash<[String, Symbol], String>]
-    def initialize(client, attrs)
-      input_id = attrs['id'] || attrs[:id]
-      name = attrs['name'] || attrs[:name]
-
-      unless client.is_a?(::TypeformData::Client)
-        raise TypeformData::Error, 'Expected to receive a TypeformData::Client'
-      end
 
-      str_id = ''
-
-      begin
-        str_id = input_id.to_s
-      rescue NoMethodError
-        raise TypeformData::Error, "The provided ID is not a String, or can't be converted to one."
-      end
-
-      @id = str_id
-      @name = name if name
-      @client = client
-    end
+  class Typeform
+    include TypeformData::ValueClass
+    readable_attributes :id, :name
 
-    PERMITTED_KEYS = {
-      'completed' => Object,
-      'since'     => Object,
-      'until'     => Object,
-      'offset'    => Fixnum,
-      'limit'     => Fixnum,
-      'token'     => String,
-    }.freeze
+    # TODO: define comparison methods <=>, etc.
 
     # See https://www.typeform.com/help/data-api/ under "Filtering Options" for the full list of
     # options.
@@ -58,33 +27,59 @@ module TypeformData
       # handle the awkwardness of returning multiple kinds of data at the same time.
       response = responses_request(collapse_and_validate_responses_params(params))
       set_stats(response['stats']['responses'])
+
+      # It's important that we set the questions first, since the Answer constructor (called
+      # inside the Response constructor) looks up and denormalizes the question text.
       set_questions(response['questions'])
 
-      response['responses'].map { |hash|
-        Response.from_hash(self, hash)
+      response['responses'].map { |api_hash|
+        Response.new(config, api_hash.dup.tap { |hash| hash[:typeform_id] = id }, fields)
       }
     end
 
+    def fields
+      @_fields ||= Field.from_questions(config, questions)
+    end
+
+    # In general, Typeform's "question" concept is less useful than the field concept. TODO: add
+    # more notes on this.
     def questions
-      @_questions ||= fetch_questions
+      (@_questions ||= fetch_questions).reject(&:hidden_field?)
+    end
+
+    def hidden_fields
+      (@_questions ||= fetch_questions).select(&:hidden_field?)
     end
 
     def stats
       @_stats ||= fetch_stats
     end
 
+    def ==(other)
+      other.id == id && other.config == config
+    end
+
+    def name
+      return name if name
+      @name ||= client.all_typeforms.find { |typeform| typeform.id == id }.name
+    end
+
+    private
+
     def fetch_questions
-      questions = responses_request(limit: 1).parsed_json['questions'] || []
-      questions.map { |hash| Question.from_hash(self, hash) }
+      questions = responses_request(limit: 1)['questions'] || []
+      questions.map { |hash| Question.new(config, hash) }
     end
 
     def fetch_stats
-      stats_hash = responses_request(limit: 1)['stats']['responses']
-      Stats.from_stats_hash(stats_hash)
+      hash = responses_request(limit: 1)['stats']['responses']
+      Stats.new(config, hash)
     end
 
+    MAX_PAGE_SIZE = 1000 # This is documented at https://www.typeform.com/help/data-api/.
+
     ResponsesRequest = Struct.new(:params, :response) do
-      # Check if we've got everything.
+      # The inverse of 'do we need at least one more request to get all the data we want?'
       # @return Boolean
       def last_request?
         params['limit'] || responses_count < MAX_PAGE_SIZE
@@ -95,22 +90,17 @@ module TypeformData
       end
     end
 
-    # TODO: make this private once the implementation is solid.
-    #
     # It looks like sometimes the Typeform API will report stats that are out-of-date relative to
-    # the responses it actually returns.
+    # the responses it actually returns. TODO: look into this more.
     def responses_request(input_params = {})
       params = input_params.dup
-      requests = [ResponsesRequest.new(params, @client.get('form/' + id, params))]
+      requests = [ResponsesRequest.new(params, client.get('form/' + id, params))]
 
       loop do
-        if requests.last.last_request?
-          break
-        else
-          next_params = requests.last.params.dup
-          next_params['offset'] += requests.last.responses_count
-          requests << ResponsesRequest.new(next_params, @client.get('form/' + id, next_params))
-        end
+        break if requests.last.last_request?
+        next_params = requests.last.params.dup
+        next_params['offset'] += requests.last.responses_count
+        requests << ResponsesRequest.new(next_params, client.get('form/' + id, next_params))
       end
 
       requests.map(&:response).map(&:parsed_json).reduce do |combined, next_set|
@@ -120,26 +110,33 @@ module TypeformData
       end
     end
 
-    private
-
     # rubocop:disable Style/AccessorMethodName
     def set_questions(questions_hashes = [])
-      @_questions = questions_hashes.map { |hash| Question.from_hash(self, hash) }
+      @_questions = questions_hashes.map { |hash| Question.new(config, hash) }
     end
 
     # @param Hash stats_hash of the form {"responses"=>{"showing"=>2, "total"=>2, "completed"=>0}}
-    def set_stats(stats_hash)
-      @_stats = Stats.from_stats_hash(stats_hash)
+    def set_stats(hash)
+      @_stats = Stats.new(config, hash)
     end
     # rubocop:enable Style/AccessorMethodName
 
+    PERMITTED_KEYS = {
+      'completed' => Object,
+      'since'     => Object,
+      'until'     => Object,
+      'offset'    => Fixnum,
+      'limit'     => Fixnum,
+      'token'     => String,
+    }.freeze
+
     def collapse_and_validate_responses_params(input_params)
       params = input_params.dup
 
       params.keys.select { |key| key.is_a?(Symbol) }.each do |sym|
         raise ::TypeformData::ArgumentError, 'Duplicate keys' if params.key?(sym.to_s)
-        params[sym.to_s] = params[key]
-        params.delete(key)
+        params[sym.to_s] = params[sym]
+        params.delete(sym)
       end
 
       params.keys.each do |key|

data/lib/typeform_data/typeform/answer.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+module TypeformData
+  class Typeform
+
+    class Answer
+      include TypeformData::ValueClass
+      include TypeformData::Typeform::ById
+
+      # field_text may be removed in the future: we may want to normalize our data model. For
+      # now, it's quite convenient to have.
+      readable_attributes :id, :value, :field_text, :response_token, :typeform_id
+
+      # IDs are of the form:
+      #
+      # - "textfield_12316024"
+      # - "listimage_12316029_choice_12322262"
+      #
+      # This list may not be exhaustive-- there may be other ID formats not covererd above-- since
+      # this part of the API isn't mentioned in the documentation.
+      def question_field_id
+        id.split('_')[1]
+      end
+
+      def question_type
+        id.split('_').first
+      end
+
+      # TODO: this is not working-- Typeform is giving us back a 404. Perhaps it's an encoding
+      # issue with the token?
+      # def response
+      #   typeform.responses(token: response_token)
+      # end
+    end
+
+  end
+end

data/lib/typeform_data/typeform/by_id.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+module TypeformData
+  class Typeform
+
+    module ById
+      def typeform
+        raise UnexpectedError, 'Expected a defined typeform_id' unless typeform_id
+        client.typeform(typeform_id)
+      end
+    end
+
+  end
+end

data/lib/typeform_data/typeform/field.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+module TypeformData
+  class Typeform
+
+    class Field
+      include TypeformData::ValueClass
+      include TypeformData::Typeform::ById
+      readable_attributes :id, :text, :typeform_id, :question_ids
+
+      # The Data API includes 'statements' as part of a Typeform's "questions", despite the fact
+      # that these statements don't have associated answers.
+      def statement?
+        id.split('_').first == 'statement'
+      end
+
+      def self.from_questions(config, input_questions)
+        input_questions.group_by(&:field_id).map do |field_id, questions|
+          unless questions.map(&:text).uniq.length == 1
+            raise UnexpectedError, 'Expected question text to be the same based on field_id'
+          end
+
+          new(config, id: field_id, text: questions.first.text, question_ids: questions.map(&:id),
+                      typeform_id: questions.first.typeform_id)
+        end
+      end
+
+    end
+
+  end
+end

data/lib/typeform_data/typeform/question.rb

@@ -3,24 +3,21 @@ module TypeformData
   class Typeform
 
     class Question
-      attr_reader :id
-      attr_reader :question
-      attr_reader :field_id
+      include TypeformData::ValueClass
+      include TypeformData::Typeform::ById
+      readable_attributes :id, :question, :field_id, :typeform_id
 
-      def initialize(typeform, id:, question:, field_id:)
-        @typeform = typeform
-        @id = id
-        @question = question
-        @field_id = field_id
+      # Question#question makes for a bad API. Ideally, use Question#text instead.
+      alias text question
+
+      def hidden_field?
+        id.split('_').first == 'hidden'
       end
 
-      def self.from_hash(typeform, hash)
-        new(
-          typeform,
-          id: hash['id'],
-          question: hash['question'],
-          field_id: hash['field_id'],
-        )
+      # The Data API includes 'statements' as part of a Typeform's "questions", despite the fact
+      # that these statements don't have associated answers.
+      def statement?
+        id.split('_').first == 'statement'
       end
     end
 

data/lib/typeform_data/typeform/response.rb

@@ -3,34 +3,52 @@ module TypeformData
   class Typeform
 
     class Response
-      attr_reader :typeform
-      attr_reader :token
-      attr_reader :metadata
-      attr_reader :hidden
+      include TypeformData::ValueClass
+      include TypeformData::Typeform::ById
+      readable_attributes :token, :metadata, :hidden, :typeform_id, :answers, :completed
 
+      # It's correct to name this attribute "completed?" and not "complete?" since it's always in
+      # the past tense-- once a potential respondent leaves a Typeform unsubmitted, they can never
+      # go back and complete it.
       def completed?
         @completed == 1
       end
 
       alias hidden_fields hidden
 
-      def initialize(typeform, token:, metadata:, hidden:, completed:)
-        @typeform = typeform
-        @token = token
-        @metadata = metadata
-        @hidden = hidden
-        @completed = completed
+      def date_submitted
+        DateTime.strptime(metadata['date_submit'], '%Y-%m-%d %H:%M:%S')
       end
 
-      def self.from_hash(typeform, hash)
-        new(
-          typeform,
-          token: hash['token'],
-          metadata: hash['metadata'],
-          hidden: hash['hidden'],
-          completed: hash['completed']
-        )
+      def initialize(config, attrs, fields)
+        mapped_attrs = attrs.dup
+
+        mapped_attrs[:answers] = (attrs[:answers] || attrs['answers']).map { |id, value|
+          matching_field = fields.find { |field| field.id.to_s == id.split('_')[1] }
+          raise UnexpectedError, 'Expected to find a matching field' unless matching_field
+
+          Answer.new(
+            config,
+            id: id,
+            value: value,
+            field_text: matching_field.text,
+            response_token: attrs[:token] || attrs['token'],
+            typeform_id: attrs[:typeform_id] || attrs['typeform_id'],
+          )
+        }
+
+        super(config, mapped_attrs)
+      end
+
+      def reconfig(config)
+        @config = config
+        answers.each { |answer| answer.config = config }
+      end
+
+      def ==(other)
+        other.token == token && other.config == config
       end
+
     end
 
   end

data/lib/typeform_data/typeform/stats.rb

@@ -3,23 +3,8 @@ module TypeformData
   class Typeform
 
     class Stats
-      attr_reader :showing
-      attr_reader :total
-      attr_reader :completed
-
-      def initialize(showing:, total:, completed:)
-        @showing = showing
-        @total = total
-        @completed = completed
-      end
-
-      def self.from_stats_hash(stats_hash)
-        new(
-          showing: stats_hash['showing'],
-          total: stats_hash['total'],
-          completed: stats_hash['completed'],
-        )
-      end
+      include TypeformData::ValueClass
+      readable_attributes :showing, :total, :completed
     end
 
   end

data/lib/typeform_data/value_class.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+require 'set'
+
+module TypeformData
+  module ValueClass
+
+    def initialize(config, attrs)
+      unless config && config.is_a?(TypeformData::Config)
+        raise ArgumentError, 'Expected a TypeformData::Config instance as the first argument'
+      end
+      @config = config
+
+      keys = attribute_keys
+
+      attrs.each do |key, value|
+        unless keys.include?(key) || keys.include?(key.to_sym)
+          raise ArgumentError, "Unexpected key: #{key}"
+        end
+        instance_variable_set("@#{key}", value)
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      # @param [Array<Symbol>]
+      def readable_attributes(*keys)
+        @keys = Set.new(keys)
+
+        keys.each do |key|
+          attr_reader(key)
+        end
+      end
+
+    end
+
+    def marshal_dump
+      # For the sake of security, we don't want to serialize our API key.
+      attribute_keys.to_a.map do |key|
+        [key, instance_variable_get("@#{key}")]
+      end
+    end
+
+    def marshal_load(hash)
+      hash.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
+    end
+
+    # Compond classes (e.g. a Response which has many Answers) should use this method to re-set
+    # 'config' on each child object. ValueClass#reconfig is called in TypeformData#load.
+    def reconfig(config)
+      self.config = config
+    end
+
+    protected
+
+    attr_accessor :config
+
+    def client
+      TypeformData::Client.new_from_config(@config)
+    end
+
+    private
+
+    def attribute_keys
+      self.class.instance_eval { @keys } || []
+    end
+
+  end
+end

data/lib/typeform_data/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module TypeformData
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/typeform_data.gemspec

@@ -31,11 +31,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'flexmock', '~> 2.0'
 
-  spec.add_development_dependency 'pry', '0.10'
-  spec.add_development_dependency 'pry-byebug', '3.3'
-  spec.add_development_dependency 'pry-doc', '0.8'
-  spec.add_development_dependency 'byebug', '8.2'
-  spec.add_development_dependency 'rubocop', '0.39'
+  spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'pry-byebug', '~> 3.3'
+  spec.add_development_dependency 'pry-doc', '~> 0.8'
+  spec.add_development_dependency 'byebug', '~> 8.2'
+  spec.add_development_dependency 'rubocop', '~> 0.39'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typeform_data
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Max Wallace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,74 +52,88 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '8.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '8.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.39'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.39'
 description: typeform_data is a minimal, opinionated client for the Typeform.com Data
@@ -146,13 +160,17 @@ files:
 - lib/typeform_data.rb
 - lib/typeform_data/api_response.rb
 - lib/typeform_data/client.rb
+- lib/typeform_data/config.rb
 - lib/typeform_data/errors.rb
 - lib/typeform_data/requestor.rb
-- lib/typeform_data/requestor/config.rb
 - lib/typeform_data/typeform.rb
+- lib/typeform_data/typeform/answer.rb
+- lib/typeform_data/typeform/by_id.rb
+- lib/typeform_data/typeform/field.rb
 - lib/typeform_data/typeform/question.rb
 - lib/typeform_data/typeform/response.rb
 - lib/typeform_data/typeform/stats.rb
+- lib/typeform_data/value_class.rb
 - lib/typeform_data/version.rb
 - typeform_data.gemspec
 homepage: https://github.com/shearwater-intl/typeform_data
@@ -180,4 +198,3 @@ signing_key:
 specification_version: 4
 summary: An opinionated client for the Typeform.com Data API
 test_files: []
-has_rdoc: 

data/lib/typeform_data/requestor/config.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-module TypeformData
-  class Requestor
-
-    class Config
-      attr_reader :api_key
-
-      def initialize(api_key:)
-        @api_key = api_key
-      end
-
-      # These values were determined via URI.parse('https://api.typeform.com')
-
-      def host
-        'api.typeform.com'
-      end
-
-      def port
-        443
-      end
-
-      def api_version
-        1
-      end
-
-    end
-
-  end
-end