survey-gizmo-ruby 1.0.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d64a92def211dfa2973dcf28108a0e1f5f1b9d8f
-  data.tar.gz: 232115207e4e7462fc8d8394840eea2aa0fba3f6
+  metadata.gz: 7cb1e79765bcce6a50eee8322f40b91f3eb6c07a
+  data.tar.gz: 9667fb03ea0a0e3d1fc95b5a87dc5a1244d87a3d
 SHA512:
-  metadata.gz: f089bc8915e0158e621392f3d2d748ee3ef42dc4fc98d892e7994e3cf488079de72c897fb809f8d683cca52f8e983aaf8d7c4d4c5ad9c9cd6ce4adf5906d889e
-  data.tar.gz: 5ec0d6f45dd3071e27dcbc646daba605b053f7443d0ea1f8cb33e354555c7508473ded774bfb71a1ea10c918c106531b95336432b1562ba2ba436d24e34cee7d
+  metadata.gz: 0164944250b283f6cb3b3916cd9662bc30db55bf55918dbcb8f1f95edbd8c6af2eed73ce65e5714c121fcf844a3b44a5c129af756b61633574a6f114ed04f9c5
+  data.tar.gz: 6e96c4e265af7c09d2a1f60dab253718549c8853a19dfff98332512740ee778ddd8e6ba249f4ceeb96603ffd205bc23a272af075374de64f6cb35cd80faa94fe

data/.gitignore

@@ -16,4 +16,6 @@ test/tmp
 test/version_tmp
 tmp
 test.rb
-.DS_Store
+.DS_Store
+.ruby-version
+

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
-
-gemspec
+gemspec

data/README.md

@@ -1,75 +1,111 @@
-# WARNING:
+#### WARNING:
 
-SurveyGizmo doesn't test their REST API when they roll out changes.  They don't publish a list of active defects, and when you call/email for support it is unlikely you will geto a person that knows anything about programming or the REST API.  You can't talk to level 2 support, although they might offer you a discount on their paid consulting rates if the problem persists for more than a few weeks.
+This is version `2.0.0` of the gem, which introduces breaking changes. People who need backwards compatibility can use `1.0.4`.
 
-You might be able to work around an active SurveyGizmo debacle by change which API version you use one of::
+What's fixed/better:
+* Filtering of requests is implemented
+* Requests for the questions in a survey now retrieve ALL of the questions, even the sneaky sub_questions that weren't directly returned to a basic API request.
 
-export GIZMO_URI="https://restapi.surveygizmo.com/v2"
+What broke:
+* SurveyGizmo objects (Survey, SurveyQuestion, etc) no longer track their own state (:new, :zombie, :saved, etc etc) - state tracking was useless anyways because exceptions always were raised on errors.
+* There is no more SurveyGizmo::Collection class...  now there are just Arrays.
+* There is no more lazy loading/instantiation.
 
-export GIZMO_URI="https://restapi.surveygizmo.com/head"
+What's different:
+* Variables are not autoloaded.  That is to say when you load a Survey, the API request that loads the associated questions is not executed until you ask for them with the #questions method
 
-...and then your application might work again.
-
--chorn@chorn.com 2013-03-15
+Also a past warning from another author:
+> SurveyGizmo doesn't test their REST API when they roll out changes.  They don't publish a list of active defects, and when you call/email for support it is unlikely you will geto a person that knows anything about programming or the REST API.  You can't talk to level 2 support, although they might offer you a discount on their paid consulting rates if the problem persists for more than a few weeks.
 
+— chorn@chorn.com 2013-03-15
 
 # Survey Gizmo (ruby)
 
-Integrate with the [Survey Gizmo API](http://developer.surveygizmo.com/resources/rest-api-documentation-version-1-01/) using an ActiveModel style interface. We currently support rest API **v3**. If you want to use version 1 of the API, please use gem version ~0.7.0
+Integrate with the [Survey Gizmo API](http://apisurveygizmo.helpgizmo.com/help) using an ActiveModel style interface. We currently support rest API **v3**. If you want to use version 1 of the API, please use gem version ~0.7.0
 
 ## Installation
 
-    gem install survey-gizmo-ruby
+```ruby
+gem 'survey-gizmo-ruby'
+```
 
 ## Basic Usage
 
-	require 'survey-gizmo-ruby'
-	
-	# somewhere in your app define your survey gizmo login credentials.
-	SurveyGizmo.setup(:user => 'you@somewhere.com', :password => 'mypassword')
-	
-	survey = SurveyGizmo::API::Survey.first(:id => 12345)
-	survey.title # => My Title
-	survey.pages # => [page1, page2,...]
-	
-	question = SurveyGizmo::API::Question.create(:survey_id => survey.id, :title => 'Do you like ruby?', :type => 'checkbox')
-	question.title = "Do you LOVE Ruby?"
-	question.save # => true
-	question.saved? # => true
-	
-	# Error handling
-	question.save # => false
-	question.errors # => ['There was an error']
-	
+```ruby
+require 'survey-gizmo-ruby'
+
+# somewhere in your app define your survey gizmo login credentials.
+SurveyGizmo.setup(user: 'you@somewhere.com', password: 'mypassword')
+
+# Retrieve the survey with id: 12345
+survey = SurveyGizmo::API::Survey.first(id: 12345)
+survey.title # => My Title
+survey.pages # => [page1, page2,...]
+
+# Create a question for your survey
+question = SurveyGizmo::API::Question.create(survey_id: survey.id, title: 'Do you like ruby?', type: 'checkbox')
+question.title = "Do you LOVE Ruby?"
+question.save # => question # (but now with the id assigned by SurveyGizmo as the :id property)
+
+  # Error handling
+  question.save # => false
+  question.errors # => ['There was an error']
+
+# Retrieving Questions for a given survey.  Note that page_id is a required parameter.
+questions = SurveyGizmo::API::Question.all(survey_id: survey.id, page_id: 1)
+# Or just retrieve all questions for all pages of this survey
+questions = survey.questions
+
+# Retrieving SurveyResponses for a given survey.
+# Note that because of both options being hashes, you need to enclose them both in braces to page successfully!
+responses = SurveyGizmo::API::Response.all({survey_id: survey.id}, {page: 1})
+
+# Retrieving page 2 of non test data SurveyResponses
+filters  = {page: 2, filters: [{field: 'istestdata', operator: '<>', value: 1}] }
+responses = SurveyGizmo::API::Response.all({survey_id: survey_id}, filters)
+```
+
+## Debugging
+
+The GIZMO_DEBUG environment variable will trigger full printouts of SurveyGizmo's HTTP responses and variable introspection for almost everything
+
+```bash
+cd /my/app
+export GIZMO_DEBUG=true
+bundle exec rails whatever
+```
+
 ## Adding API Objects
 
 Currently, the following API objects are included in the gem: `Survey`, `Question`, `Option`, `Page`, `Response`, `EmailMessage`, `SurveyCampaign`, `Contact`. If you want to use something that isn't included you can easily write a class that handles it. Here's an example of the how to do so:
 
-	class SomeObject
-	  # the base where most of the methods for handling the API are stored
-	  include SurveyGizmo::Resource
-      
-      # the attribtues the object should respond to
-	  attribute :id,          Integer
-	  attribute :title,       String
-	  attribute :status,      String
-	  attribute :type,        String
-	  attribute :created_on,  DateTime
-  
-      # defing the paths used to retrieve/set info
-	  route '/something/:id', :via => [:get, :update, :delete]
-	  route '/something',     :via => :create
-  		
-      # this must be defined with the params that would be included in any route
-	  def to_param_options
-	    {:id => self.id}
-	  end
-	end
+```ruby
+class SomeObject
+  # the base where most of the methods for handling the API are stored
+  include SurveyGizmo::Resource
+
+  # the attribtues the object should respond to
+  attribute :id,          Integer
+  attribute :title,       String
+  attribute :status,      String
+  attribute :type,        String
+  attribute :created_on,  DateTime
+
+  # defing the paths used to retrieve/set info
+  route '/something/:id', :via => [:get, :update, :delete]
+  route '/something',     :via => :create
+
+  # this must be defined with the params that would be included in any route
+  def to_param_options
+    {:id => self.id}
+  end
+end
+```
 
 The [Virtus](https://github.com/solnic/virtus) gem is included to handle the attributes, so please check their documentation as well.
 
 # Contributing to survey-gizmo-ruby
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Take a gander at the github issues beforehand
 * Fork the project
@@ -80,7 +116,9 @@ The [Virtus](https://github.com/solnic/virtus) gem is included to handle the att
 
 ## Missing Features
 
-There are several API objects that are available and not included in this gem. It is also missing OAuth authentication ability. Also, the error notification isn't intuitive. It'd be great if someone could help tackle those!
+* It would be nice to implement enumerable on the Question and (especially) Response objects so people don't have to implement their own paging
+* There are several API objects that are available and not included in this gem.
+* It is also missing OAuth authentication ability.
 
 
 # Copyright

data/Rakefile

@@ -1,7 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+task :default => :spec

data/lib/survey-gizmo-ruby.rb

@@ -1 +1 @@
-require "survey_gizmo/survey_gizmo"
+require 'survey_gizmo/survey_gizmo'

data/lib/survey_gizmo/api/contact.rb

@@ -38,12 +38,12 @@ module SurveyGizmo; module API
     attribute :scustomfield9,           String
     attribute :scustomfield10,          String
 
-    route '/survey/:survey_id/surveycampaign/:campaign_id/contact/:id', :via => [:get, :update, :delete]
-    route '/survey/:survey_id/surveycampaign/:campaign_id/contact', :via => :create
+    route '/survey/:survey_id/surveycampaign/:campaign_id/contact/:id', via: [:get, :update, :delete]
+    route '/survey/:survey_id/surveycampaign/:campaign_id/contact', via: :create
 
     # @see SurveyGizmo::Resource#to_param_options
     def to_param_options
-      {:id => self.id, :survey_id => self.survey_id, :campaign_id => self.campaign_id}
+      {id: self.id, survey_id: self.survey_id, campaign_id: self.campaign_id}
     end
   end
 end; end

data/lib/survey_gizmo/api/option.rb

@@ -14,8 +14,8 @@ module SurveyGizmo; module API
     attribute :properties,    Hash
 
     # routing
-    route '/survey/:survey_id/surveypage/:page_id/surveyquestion/:question_id/surveyoption',     :via => :create
-    route '/survey/:survey_id/surveypage/:page_id/surveyquestion/:question_id/surveyoption/:id', :via => [:get, :update, :delete]
+    route '/survey/:survey_id/surveypage/:page_id/surveyquestion/:question_id/surveyoption',     via: :create
+    route '/survey/:survey_id/surveypage/:page_id/surveyquestion/:question_id/surveyoption/:id', via: [:get, :update, :delete]
 
     # survey gizmo sends a hash back for :title
     # @private
@@ -27,8 +27,7 @@ module SurveyGizmo; module API
 
     # @see SurveyGizmo::Resource#to_param_options
     def to_param_options
-      {:id => self.id, :survey_id => self.survey_id, :page_id => self.page_id, :question_id => self.question_id}
+      {id: self.id, survey_id: self.survey_id, page_id: self.page_id, question_id: self.question_id}
     end
-
   end
 end; end

data/lib/survey_gizmo/api/page.rb

@@ -12,25 +12,29 @@ module SurveyGizmo; module API
     attribute :after,         Integer
     attribute :survey_id,     Integer
 
-
     # routing
     route '/survey/:survey_id/surveypage', :via => :create
     route '/survey/:survey_id/surveypage/:id', :via => [:get, :update, :delete]
 
-    # @macro collection
-    collection :questions
+    def survey
+      @survey ||= SurveyGizmo::API::Survey.first(id: survey_id)
+    end
+
+    def questions
+      @questions ||= SurveyGizmo::API::Question.all(survey_id: survey_id, page_id: id)
+    end
 
     # survey gizmo sends a hash back for :title
     # @private
     def title_with_multilingual=(val)
-      self.title_without_multilingual = val.is_a?(Hash) ? val : { "English" => val }
+      self.title_without_multilingual = val.is_a?(Hash) ? val : { 'English' => val }
     end
 
     alias_method_chain :title=, :multilingual
 
     # @see SurveyGizmo::Resource#to_param_options
     def to_param_options
-      {:id => self.id, :survey_id => self.survey_id}
+      {id: self.id, survey_id: self.survey_id}
     end
   end
 end; end

data/lib/survey_gizmo/api/question.rb

@@ -5,26 +5,40 @@ module SurveyGizmo; module API
 
     # @macro [attach] virtus_attribute
     #   @return [$2]
-    attribute :id,            Integer
-    attribute :title,         String
-    attribute :type,          String
-    attribute :description,   String
-    attribute :shortname,     String
-    attribute :properties,    Hash
-    attribute :after,         Integer
-    attribute :survey_id,     Integer
-    attribute :page_id,       Integer, :default => 1
+    attribute :id,                 Integer
+    attribute :title,              String
+    attribute :type,               String
+    attribute :description,        String
+    attribute :shortname,          String
+    attribute :properties,         Hash
+    attribute :after,              Integer
+    attribute :survey_id,          Integer
+    attribute :page_id,            Integer, :default => 1
+    attribute :sub_question_skus,  Array
+    attribute :parent_question_id, Integer
 
     alias_attribute :_subtype, :type
 
-    route '/survey/:survey_id/surveyquestion/:id', :via => :get
-    route '/survey/:survey_id/surveypage/:page_id/surveyquestion', :via => :create
-    route '/survey/:survey_id/surveypage/:page_id/surveyquestion/:id', :via => [:update, :delete]
+    route '/survey/:survey_id/surveyquestion/:id', via: :get
+    route '/survey/:survey_id/surveypage/:page_id/surveyquestion', via: :create
+    route '/survey/:survey_id/surveypage/:page_id/surveyquestion/:id', via: [:update, :delete]
 
-    # @macro collection
-    collection :options
-    collection :sub_question_skus
+    def survey
+      @survey ||= SurveyGizmo::API::Survey.first(id: survey_id)
+    end
+
+    def options
+      @options ||= SurveyGizmo::API::Option.all(survey_id: survey_id, page_id: page_id, question_id: id)
+    end
 
+    def parent_question
+      @parent_question ||= parent_question_id ? SurveyGizmo::API::Question.first(survey_id: survey_id, id: parent_question_id) : nil
+    end
+
+    def sub_questions
+      @sub_questions ||= sub_question_skus.map {|subquestion_id| SurveyGizmo::API::Question.first(survey_id: survey_id, id: subquestion_id)}
+                                          .each {|subquestion| subquestion.parent_question_id = id}
+    end
     # survey gizmo sends a hash back for :title
     # @private
     def title_with_multilingual=(val)
@@ -35,7 +49,7 @@ module SurveyGizmo; module API
 
     # @see SurveyGizmo::Resource#to_param_options
     def to_param_options
-      {:id => self.id, :survey_id => self.survey_id, :page_id => self.page_id}
+      {id: self.id, survey_id: self.survey_id, page_id: self.page_id}
     end
   end
-end; end
+end; end

data/lib/survey_gizmo/api/response.rb

@@ -10,7 +10,7 @@ module SurveyGizmo; module API
     attribute :contact_id,           Integer
     attribute :data,                 String
     attribute :status,               String
-    attribute :date_submitted,       DateTime
+    attribute :datesubmitted,        DateTime
     attribute :is_test_data,         Boolean
     attribute :sResponseComment,     String
     attribute :variable,             Hash       # READ-ONLY
@@ -20,17 +20,16 @@ module SurveyGizmo; module API
     attribute :answers,              Hash       # READ-ONLY
 
     # routing
-    route '/survey/:survey_id/surveyresponse',     :via => :create
-    route '/survey/:survey_id/surveyresponse/:id', :via => [:get, :update, :delete]
+    route '/survey/:survey_id/surveyresponse',     via: :create
+    route '/survey/:survey_id/surveyresponse/:id', via: [:get, :update, :delete]
 
-    # @see SurveyGizmo::Resource#to_param_options
-    def to_param_options
-      {:id => self.id, :survey_id => self.survey_id}
+    def survey
+      @survey ||= SurveyGizmo::API::Survey.first(id: survey_id)
     end
 
-    def datesubmitted=(value)
-      self.date_submitted = value
+    # @see SurveyGizmo::Resource#to_param_options
+    def to_param_options
+      {id: self.id, survey_id: self.survey_id}
     end
-
   end
 end; end

data/lib/survey_gizmo/api/survey.rb

@@ -7,7 +7,7 @@ module SurveyGizmo; module API
     #   @return [$2]
     attribute :id,             Integer
     attribute :team,           Integer
-    attribute :type,          String
+    attribute :type,           String
     attribute :_subtype,       String
     attribute :status,         String
     attribute :forward_only,   Boolean
@@ -23,15 +23,30 @@ module SurveyGizmo; module API
     attribute :modified_on,    DateTime
     attribute :copy,           Boolean
 
-    route '/survey/:id', :via => [:get, :update, :delete]
-    route '/survey',     :via => :create
+    route '/survey/:id', via: [:get, :update, :delete]
+    route '/survey',     via: :create
 
-    # @macro collection
-    collection :pages
+    def pages
+      @pages ||= SurveyGizmo::API::Page.all(survey_id: id)
+    end
+
+    def questions
+      @questions ||= pages.map {|p| SurveyGizmo::API::Question.all(survey_id: id, page_id: p.id)}.flatten
+    end
+
+    # Statistics array of arrays looks like:
+    # [["Partial", 2], ["Disqualified", 28], ["Complete", 15]]
+    def number_of_completed_responses
+      if statistics && !statistics.empty? && (completed_data = statistics.find {|a| a[0] == 'Complete'})
+        completed_data[1]
+      else
+        0
+      end
+    end
 
     # @see SurveyGizmo::Resource#to_param_options
     def to_param_options
-      {:id => self.id}
+      {id: self.id}
     end
   end
 end; end

data/lib/survey_gizmo/resource.rb

@@ -1,5 +1,5 @@
-require "set"
-require "addressable/uri"
+require 'set'
+require 'addressable/uri'
 
 module SurveyGizmo
   module Resource
@@ -8,7 +8,6 @@ module SurveyGizmo
     included do
       include Virtus.model
       instance_variable_set('@paths', {})
-      instance_variable_set('@collections', {})
       SurveyGizmo::Resource.descendants << self
     end
 
@@ -22,24 +21,58 @@ module SurveyGizmo
     module ClassMethods
 
       # Convert a [Hash] of filters into a query string
-      # @param [Hash] filters
+      # @param [Hash] filters - simple pagination or other options at the top level, and surveygizmo "filters" at the :filters key
       # @return [String]
+      #
+      # example input: {page: 2, filters: [{:field=>"istestdata", :operator=>"<>", :value=>1}]}
+      # The top level keys (e.g. page, resultsperpage) get simply encoded in the url, while the contents of the array of hashes
+      # passed at filters[:filters] gets turned into the format surveygizmo expects for its internal filtering, for example:
+      #
+      # filter[field][0]=istestdata&filter[operator][0]=<>&filter[value][0]=1
       def convert_filters_into_query_string(filters = nil)
-        "" unless filters && filters.size > 0
-        uri = Addressable::URI.new
-        uri.query_values = filters
-        "?#{uri.query}"
+        if filters && filters.size > 0
+          output_filters = filters[:filters] || []
+          filter_hash = {}
+          output_filters.each_with_index do |filter,i|
+            filter_hash.merge!({
+              "filter[field][#{i}]".to_sym => "#{filter[:field]}",
+              "filter[operator][#{i}]".to_sym => "#{filter[:operator]}",
+              "filter[value][#{i}]".to_sym => "#{filter[:value]}",
+            })
+          end
+          simple_filters = filters.reject {|k,v| k == :filters}
+          filter_hash.merge!(simple_filters)
+
+          uri = Addressable::URI.new
+          uri.query_values = filter_hash
+          "?#{uri.query}"
+        else
+          ''
+        end
       end
 
       # Get a list of resources
       # @param [Hash] conditions
       # @param [Hash] filters
-      # @return [SurveyGizmo::Collection, Array]
+      # @return [Array] of objects of this class
       def all(conditions = {}, filters = nil)
-        response = Response.new SurveyGizmo.get(handle_route(:create, conditions) + convert_filters_into_query_string(filters))
+        response = RestResponse.new(SurveyGizmo.get(handle_route(:create, conditions) + convert_filters_into_query_string(filters)))
         if response.ok?
-          _collection = SurveyGizmo::Collection.new(self, nil, response.data)
-          _collection.send(:options=, {:target => self, :parent => self})
+          _collection = response.data.map {|datum| datum.is_a?(Hash) ? self.new(datum) : datum}
+
+          # Add in the properties from the conditions hash because many of the important ones (like survey_id) are
+          # not often part of the SurveyGizmo returned data
+          conditions.keys.each do |k|
+            if conditions[k] && instance_methods.include?(k)
+              _collection.each { |c| c[k] ||= conditions[k] }
+            end
+          end
+
+          # Sub questions are not pulled by default so we have to retrieve them
+          if self == SurveyGizmo::API::Question
+            _collection += _collection.map {|question| question.sub_questions}.flatten
+          end
+
           _collection
         else
           []
@@ -51,8 +84,10 @@ module SurveyGizmo
       # @param [Hash] filters
       # @return [Object, nil]
       def first(conditions = {}, filters = nil)
-        response = Response.new SurveyGizmo.get(handle_route(:get, conditions) +  convert_filters_into_query_string(filters))
-        response.ok? ? load(conditions.merge(response.data)) : nil
+        response = RestResponse.new(SurveyGizmo.get(handle_route(:get, conditions) + convert_filters_into_query_string(filters)))
+        # Add in the properties from the conditions hash because many of the important ones (like survey_id) are
+        # not often part of the SurveyGizmo's returned data
+        response.ok? ? new(conditions.merge(response.data)) : nil
       end
 
       # Create a new resource
@@ -61,7 +96,7 @@ module SurveyGizmo
       #   The newly created Resource instance
       def create(attributes = {})
         resource = new(attributes)
-        resource.__send__(:_create)
+        resource.create_record_in_surveygizmo
         resource
       end
 
@@ -81,8 +116,7 @@ module SurveyGizmo
       # @param [Hash] conditions
       # @return [Boolean]
       def destroy(conditions)
-        response = Response.new SurveyGizmo.delete(handle_route(:delete, conditions))
-        response.ok?
+        RestResponse.new(SurveyGizmo.delete(handle_route(:delete, conditions))).ok?
       end
 
       # Define the path where a resource is located
@@ -95,76 +129,32 @@ module SurveyGizmo
       def route(path, options)
         methods = options[:via]
         methods = [:get, :create, :update, :delete] if methods == :any
-        methods.is_a?(Array) ? methods.each{|m| @paths[m] = path } : (@paths[methods] = path)
+        methods.is_a?(Array) ? methods.each { |m| @paths[m] = path } : (@paths[methods] = path)
         nil
       end
 
+      # This method replaces the :page_id, :survey_id, etc strings defined in each model's URI routes with the
+      # values being passed in interpolation hash with the same keys.
       # @api private
-      def load(attributes = {})
-        resource = new(attributes)
-        resource.__send__(:clean!)
-        resource
-      end
-
-      # Defines a new collection. These are child objects of the resource.
-      # @macro [new] collection
-      #   @param [Symbol] resource_name the name of the collection, pluralized
-      #   @param [Class] model and optional class name if the class name does not match the resource_name
-      #   @return [Collection]
-      #     the $1 collection
-      #   @scope instance
-      def collection(resource_name, model = nil)
-        @collections[resource_name] = {:parent => self, :target => (model ? model : resource_name)} # workaround for weird bug with passing a class to Collection
-        class_eval(<<-EOS)
-          def #{resource_name}
-            @#{resource_name} ||= []
-          end
-
-          def #{resource_name}=(array)
-            @#{resource_name} = SurveyGizmo::Collection.new(#{self}, :#{resource_name}, array)
-          end
-        EOS
-      end
-
-      # @api private
-      def collections
-        @collections.dup.freeze
-      end
-
-      # @api private
-      def handle_route(key, *interp)
+      def handle_route(key, interpolation_hash)
         path = @paths[key]
         raise "No routes defined for `#{key}` in #{self.name}" unless path
-        options = interp.last.is_a?(Hash) ? interp.pop : path.scan(/:(\w+)/).inject({}){|hash, k| hash.merge(k.to_sym => interp.shift) }
+        raise "User/password hash not setup!" if SurveyGizmo.default_params.empty?
+
         path.gsub(/:(\w+)/) do |m|
-          options[$1.to_sym].tap{ |result| raise(SurveyGizmo::URLError, "Missing parameters in request: `#{m}`") unless result }
+          raise(SurveyGizmo::URLError, "Missing RESTful parameters in request: `#{m}`") unless interpolation_hash[$1.to_sym]
+          interpolation_hash[$1.to_sym]
         end
       end
     end
 
-    # Updates attributes and saves this Resource instance
-    #
-    # @param [Hash] attributes
-    #   attributes to be updated
-    #
-    # @return [Boolean]
-    #   true if resource is saved
-    def update(attributes = {})
-      self.attributes = attributes
-      self.save
-    end
-
     # Save the instance to Survey Gizmo
-    #
-    # @return [Boolean]
-    #   true if Resource instance is saved
     def save
-      if new?
-        _create
+      if id #Then it's an update
+        handle_response(SurveyGizmo.post(handle_route(:update), query: self.attributes_without_blanks))
+        @latest_response.ok?
       else
-        handle_response SurveyGizmo.post(handle_route(:update), :query => self.attributes_without_blanks) do
-          _response.ok? ? saved! : false
-        end
+        create_record_in_surveygizmo
       end
     end
 
@@ -172,50 +162,24 @@ module SurveyGizmo
     # @return [self, false]
     #   Returns the object, if saved. Otherwise returns false.
     def reload
-      handle_response SurveyGizmo.get(handle_route(:get)) do
-        if _response.ok?
-          self.attributes = _response.data
-          clean!
-        else
-          false
-        end
+      handle_response(SurveyGizmo.get(handle_route(:get)))
+      if @latest_response.ok?
+        self.attributes = @latest_response['data']
+        self
+      else
+        false
       end
     end
 
     # Deleted the Resource from Survey Gizmo
     # @return [Boolean]
     def destroy
-      return false if new? || destroyed?
-      handle_response SurveyGizmo.delete(handle_route(:delete)) do
-        _response.ok? ? destroyed! : false
-      end
-    end
-
-    # The state of the current Resource
-    # @api private
-    def new?
-      @_state.nil?
-    end
-
-    # @todo This seemed like a good way to prevent accidently trying to perform an action
-    #   on a record at a point when it would fail. Not sure if it's really necessary though.
-    [:clean, # stored and not dirty
-      :saved, # stored and not modified
-      :destroyed, # duh!
-      :zombie  # needs to be stored
-    ].each do |state|
-      # Change the method state to $1
-      define_method("#{state}!") do
-        @_state = state
-        true
-      end
-
-      # Inquire about the method state if $1
-      define_method("#{state}?") do
-        @_state == state
+      if id
+        handle_response(SurveyGizmo.delete(handle_route(:delete)))
+        @latest_response.ok?
+      else
+        false
       end
-
-      private "#{state}!"
     end
 
     # Sets the hash that will be used to interpolate values in routes. It needs to be defined per model.
@@ -230,88 +194,41 @@ module SurveyGizmo
       @errors ||= []
     end
 
-    # @return [Hash] The raw JSON returned by Survey Gizmo
-    def raw_response
-      _response.response if _response
-    end
-
     # @visibility private
     def inspect
-      attrs = self.class.attribute_set.map do |attrib|
-        value = attrib.get!(self).inspect
-
-        "@#{attrib.name}=#{value}" if attrib.respond_to?(:name)
+      if ENV['GIZMO_DEBUG']
+        ap "CLASS: #{self.class}"
       end
 
-      "#<#{self.class.name}:#{self.object_id} #{attrs.join(' ')}>"
-    end
-
-    # This class normalizes the response returned by Survey Gizmo
-    class Response
-      def ok?
-        @response && @response['result_ok']
-      end
-
-      # The parsed JSON data of the response
-      def data
-        @_data ||= (@response['data'] || {})
-      end
-
-      # The error message if there is one
-      def message
-        @_message ||= @response['message']
-      end
-
-      attr_reader :response
-
-      private
-      def cleanup_attribute_name(attr)
-        attr.downcase.gsub(/[^[:alnum:]]+/,'_').gsub(/(url|variable|standard|shown)/,'').gsub(/_+/,'_').gsub(/^_/,'').gsub(/_$/,'')
-      end
+      attribute_strings = self.class.attribute_set.map do |attrib|
+        if ENV['GIZMO_DEBUG']
+          ap attrib
+          ap attrib.name
+          ap self.send(attrib.name)
+          ap self.send(attrib.name).class
+        end
 
-      def find_attribute_parent(attr)
-        case attr.downcase
-        when /url/
-          "url"
-        when /variable.*standard/
-          "meta"
-        when /variable.*shown/
-          "shown"
-        when /variable/
-          "variable"
-        when /question/
-          "answers"
+        if self.send(attrib.name).class == Hash
+          value = self.send(attrib.name).inspect
+        else
+          value = self.send(attrib.name).to_s
         end
-      end
 
-      def initialize(response)
-        @response = response.parsed_response
-        return if @response.nil? or not ok?
-        @_data = @response['data']
-
-        # Handle really crappy [] notation in SG API, so far just in SurveyResponse
-        items = (@_data.is_a?(Array) ? @_data : [@_data]).compact
-        items.each do |data_item|
-          data_item.keys.grep(/^\[/).each do |key|
-            next if data_item[key].nil? || data_item[key].length == 0
-
-            parent = find_attribute_parent(key)
-            data_item[parent] = {} unless data_item[parent]
-
-            case key.downcase
-            when /(url|variable.*standard)/
-              data_item[parent][cleanup_attribute_name(key).to_sym] = data_item[key]
-            when /variable.*shown/
-              data_item[parent][cleanup_attribute_name(key).to_i] = data_item[key].include?("1")
-            when /variable/
-              data_item[parent][cleanup_attribute_name(key).to_i] = data_item[key].to_i
-            when /question/
-              data_item[parent][key] = data_item[key]
-            end
+        "  \"#{attrib.name}\" => \"#{value}\"\n" unless value.strip.blank?
+      end.compact
 
-            data_item.delete(key)
-          end
-        end unless items.blank?
+      "#<#{self.class.name}:#{self.object_id}>\n#{attribute_strings.join()}"
+    end
+
+    # Returns itself if successfully saved, but with attributes added by SurveyGizmo
+    def create_record_in_surveygizmo(attributes = {})
+      http = RestResponse.new(SurveyGizmo.put(handle_route(:create), query: self.attributes_without_blanks))
+      handle_response(http)
+      if http.ok?
+        self.attributes = http.data
+        self
+      else
+        false
       end
     end
 
@@ -319,51 +236,34 @@ module SurveyGizmo
     protected
 
     def attributes_without_blanks
-      self.attributes.reject{|k,v| v.blank? }
+      self.attributes.reject { |k,v| v.blank? }
     end
 
     private
-    # The response object from SurveyGizmo. Useful for viewing the raw data returned
-    attr_reader :_response
-
-    def set_response(http)
-      @_response = Response.new(http)
-    end
-
     def handle_route(key)
       self.class.handle_route(key, to_param_options)
     end
 
-    def handle_response(resp, &block)
-      set_response(resp)
-      (self.errors << _response.message) unless _response.ok?
-      self.errors.clear if !self.errors.empty? && _response.ok?
-      instance_eval(&block)
-    end
-
-    def _create(attributes = {})
-      http = SurveyGizmo.put(handle_route(:create), :query => self.attributes_without_blanks)
-      handle_response http do
-        if _response.ok?
-          self.attributes = _response.data
-          saved!
-        else
-          false
-        end
+    def handle_response(rest_response, &block)
+      @latest_response = rest_response
+      if @latest_response.ok?
+        self.errors.clear
+        true
+      else
+        errors << @latest_response.message
+        false
       end
     end
 
     def _copy(attributes = {})
-      http = SurveyGizmo.post(handle_route(:update), :query => self.attributes_without_blanks)
-      handle_response http do
-        if _response.ok?
-          self.attributes = _response.data
-          saved!
+      http = RestResponse.new(SurveyGizmo.post(handle_route(:update), query: self.attributes_without_blanks))
+      handle_response(http) do
+        if http.ok?
+          self.attributes = http.data
         else
           false
         end
       end
     end
-
   end
 end