delighted 1.0.0.beta → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bc320d60146375054cb83726a1bd7df4624d149
-  data.tar.gz: 6d467dc9ac6662f2a9ae2f045008276bfc1eaa08
+  metadata.gz: 3328aa5e8d5da9e0aa18d14b249638e8fa18fbab
+  data.tar.gz: ed423baff436f425bdbc72a531bd337ae890b84a
 SHA512:
-  metadata.gz: ef65c316539d20f8487489b08cb9da594dfe55fe386da5a5132a42759c73b6777eee60cba895009cf314da1f1ab8eaa7ce88dd89f7f7cc13ac9e55059e8b046b
-  data.tar.gz: bcfd565b6dec672678975cd4e0d1b138d03566bb1977c6242ebf5712813bd77ac83c38608422a8b95424a4c9d961cb04ac38b5edf2e97ba54b0f3e475856e1f7
+  metadata.gz: f63f19f6995a497ff70d0cd0265cfaef551cc4617a2640ff88e2803095c0f71b35f1609fc8cb91759920335f61abff8d608ef0d78f3e18bb4f5bb13fb23272a5
+  data.tar.gz: cc0421d791025dfcc08564b5efcc1bc46095790cc7eae3faee3812b9e11a2e34ba66eb85b9e8a0831787535b0f55847070e1f99fcfa63ba0bfcba758bf492517

data/README.md

@@ -1,7 +1,7 @@
 # Delighted API client for Ruby [![Build Status](https://travis-ci.org/delighted/delighted-ruby.png)](https://travis-ci.org/delighted/delighted-ruby)
 
 
-Official Ruby client for the [Delighted API](https://delightedapp.com).
+Official Ruby client for the [Delighted](https://delightedapp.com) API.
 
 For installation and usage instructions, please [sign in to your Delighted account](https://delightedapp.com/signin) and follow the API documentation under Settings.
 

data/lib/delighted.rb

@@ -3,13 +3,13 @@ require 'uri'
 require 'cgi'
 require 'multi_json'
 require 'set'
+require 'thread'
 
 require 'delighted/utils'
 require 'delighted/json'
 
 require 'delighted/enumerable_resource_collection'
 require 'delighted/resource'
-require 'delighted/operations'
 require 'delighted/operations/all'
 require 'delighted/operations/create'
 require 'delighted/operations/retrieve'
@@ -19,7 +19,21 @@ require 'delighted/resources/person'
 require 'delighted/resources/survey_responses'
 
 require 'delighted/errors'
-require 'delighted/resource_interface'
 require 'delighted/http_response'
 require 'delighted/http_adapter'
 require 'delighted/client'
+
+module Delighted
+  @mutex = Mutex.new
+
+  class << self
+    attr_accessor :api_key, :api_base_url, :http_adapter
+    attr_writer :shared_client
+
+    def shared_client
+      @mutex.synchronize do
+        @shared_client ||= Client.new(:api_key => api_key, :api_base_url => api_base_url, :http_adapter => http_adapter)
+      end
+    end
+  end
+end

data/lib/delighted/client.rb

@@ -4,19 +4,11 @@ module Delighted
     DEFAULT_HTTP_ADAPTER = HTTPAdapter.new
 
     def initialize(opts = {})
-      @api_key = opts[:api_key] or raise ArgumentError, "You must pass an :api_key."
+      @api_key = opts[:api_key] or raise ArgumentError, "You must provide an API key by setting Delighted.api_key = '123abc' or passing { :api_key => '123abc' } when instantiating Delighted::Client.new"
       @api_base_url = opts[:api_base_url] || DEFAULT_API_BASE_URL
       @http_adapter = opts[:http_adapter] || DEFAULT_HTTP_ADAPTER
     end
 
-    Resource.resources.each do |resource|
-      class_eval <<-END, __FILE__, __LINE__
-        def #{resource.interface_name}
-          @#{resource.interface_name} ||= ResourceInterface.new(self, #{resource.name})
-        end
-      END
-    end
-
     def get_json(path, params = {})
       headers = default_headers.dup.merge('Accept' => 'application/json')
 

data/lib/delighted/operations/all.rb

@@ -2,20 +2,16 @@ module Delighted
   module Operations
     module All
       def self.included(klass)
-        klass.extend(AuxiliaryClassMethods)
-        Operations.add_operations(klass, OperationClassMethods)
+        klass.extend(ClassMethods)
       end
 
-      module OperationClassMethods
-        def all(client, opts = {})
+      module ClassMethods
+        def all(opts = {}, client = Delighted.shared_client)
+          opts = Utils.serialize_values(opts)
           json = client.get_json(path, opts)
           EnumerableResourceCollection.new(json.map { |attributes| new(attributes) })
         end
       end
-
-      module AuxiliaryClassMethods
-        # pagination, enumerable stuff etc.
-      end
     end
   end
 end

data/lib/delighted/operations/create.rb

@@ -2,12 +2,13 @@ module Delighted
   module Operations
     module Create
       def self.included(klass)
-        Operations.add_operations(klass, OperationClassMethods)
+        klass.extend(ClassMethods)
       end
 
-      module OperationClassMethods
-        def create(client, attributes = {})
-          params = Utils.hash_removing_key(attributes, :id)
+      module ClassMethods
+        def create(attributes = {}, client = Delighted.shared_client)
+          params = Utils.hash_without_key(attributes, :id)
+          params = Utils.serialize_values(params)
           json = client.post_json(path, params)
           new(json)
         end

data/lib/delighted/operations/retrieve.rb

@@ -3,22 +3,19 @@ module Delighted
     module Retrieve
       def self.included(klass)
         if klass.singleton_resource?
-          Operations.add_operations(klass, Singleton::OperationClassMethods)
+          klass.extend(Singleton::ClassMethods)
         else
-          klass.extend(Pluralton::AuxiliaryClassMethods)
-          Operations.add_operations(klass, Pluralton::OperationClassMethods)
+          klass.extend(Pluralton::ClassMethods)
         end
       end
 
       module Pluralton
-        module OperationClassMethods
-          def retrieve(client, id)
+        module ClassMethods
+          def retrieve(id, client = Delighted.shared_client)
             json = client.get_json(path(id))
             new(json)
           end
-        end
 
-        module AuxiliaryClassMethods
           def path(id = nil)
             id ? "#{@path}/#{id}" : @path
           end
@@ -26,8 +23,9 @@ module Delighted
       end
 
       module Singleton
-        module OperationClassMethods
-          def retrieve(client, opts = {})
+        module ClassMethods
+          def retrieve(opts = {}, client = Delighted.shared_client)
+            opts = Utils.serialize_values(opts)
             json = client.get_json(path, opts)
             new(json)
           end

data/lib/delighted/resource.rb

@@ -1,14 +1,6 @@
 module Delighted
   class Resource
     class << self
-      def interface_name=(interface_name)
-        @interface_name = interface_name
-      end
-
-      def interface_name
-        @interface_name
-      end
-
       def path=(path)
         @path = path
       end
@@ -24,18 +16,6 @@ module Delighted
       def singleton_resource?
         !!@singleton_resource
       end
-
-      def operations
-        @operations ||= Set.new
-      end
-
-      def resources
-        @resources ||= Set.new
-      end
-
-      def inherited(klass)
-        resources << klass
-      end
     end
 
     undef :id if method_defined?(:id)
@@ -45,7 +25,7 @@ module Delighted
     def initialize(attributes = {})
       @id = attributes[:id]
       define_id_reader if @id
-      @attributes = Utils.hash_removing_key(attributes, :id)
+      @attributes = Utils.hash_without_key(attributes, :id)
       define_attribute_accessors(@attributes.keys)
     end
 

data/lib/delighted/resources/metrics.rb

@@ -1,6 +1,5 @@
 module Delighted
   class Metrics < Resource
-    self.interface_name = "metrics"
     self.path = "/metrics"
     self.singleton_resource = true
 

data/lib/delighted/resources/person.rb

@@ -1,6 +1,5 @@
 module Delighted
   class Person < Resource
-    self.interface_name = "people"
     self.path = "/people"
 
     include Operations::Create

data/lib/delighted/resources/survey_responses.rb

@@ -1,6 +1,5 @@
 module Delighted
   class SurveyResponse < Resource
-    self.interface_name = "survey_responses"
     self.path = "/survey_responses"
 
     include Operations::Create

data/lib/delighted/utils.rb

@@ -4,7 +4,7 @@ module Delighted
       class << object; self; end
     end
 
-    def self.hash_removing_key(hash, key)
+    def self.hash_without_key(hash, key)
       hash.reject { |k,v| k == key }.inject({}) { |memo,(k,v)| memo[k] = v; memo }
     end
 
@@ -38,6 +38,22 @@ module Delighted
         object
       end
     end
+
+    def self.serialize_values(object)
+      case object
+      when Time, Date
+        object.to_i
+      when Hash
+        object.inject({}) { |memo,(k,v)|
+          memo[k] = serialize_values(v)
+          memo
+        }
+      when Array
+        object.map { |v| serialize_values(v) }
+      else
+        object
+      end
+    end
   end
 end
 

data/lib/delighted/version.rb

@@ -1,3 +1,3 @@
 module Delighted
-  VERSION = "1.0.0.beta"
+  VERSION = "1.0.0.beta2"
 end

data/test/delighted_test.rb

@@ -14,8 +14,7 @@ class Delighted::MetricsTest < Delighted::TestCase
     response = Delighted::HTTPResponse.new(200, {}, Delighted::JSON.dump({ :nps => 10 }))
     mock_http_adapter.expects(:request).with(:get, uri, headers).once.returns(response)
 
-    client = Delighted::Client.new(:api_key => '123abc', :http_adapter => mock_http_adapter)
-    metrics = client.metrics.retrieve
+    metrics = Delighted::Metrics.retrieve
     assert_kind_of Delighted::Metrics, metrics
     assert_equal({ :nps => 10 }, metrics.to_hash)
     assert_equal 10, metrics.nps
@@ -31,8 +30,7 @@ class Delighted::PeopleTest < Delighted::TestCase
     response = Delighted::HTTPResponse.new(200, {}, Delighted::JSON.dump({ :id => '123', :email => 'foo@bar.com' }))
     mock_http_adapter.expects(:request).with(:post, uri, headers, data).once.returns(response)
 
-    client = Delighted::Client.new(:api_key => '123abc', :http_adapter => mock_http_adapter)
-    person = client.people.create(:email => 'foo@bar.com')
+    person = Delighted::Person.create(:email => 'foo@bar.com')
     assert_kind_of Delighted::Person, person
     assert_equal({ :email => 'foo@bar.com' }, person.to_hash)
     assert_equal 'foo@bar.com', person.email
@@ -48,8 +46,7 @@ class Delighted::SurveyResponseTest < Delighted::TestCase
     response = Delighted::HTTPResponse.new(200, {}, Delighted::JSON.dump({ :id => '456', :person => '123', :score => 10 }))
     mock_http_adapter.expects(:request).with(:post, uri, headers, data).once.returns(response)
 
-    client = Delighted::Client.new(:api_key => '123abc', :http_adapter => mock_http_adapter)
-    survey_response = client.survey_responses.create(:person => '123', :score => 10)
+    survey_response = Delighted::SurveyResponse.create(:person => '123', :score => 10)
     assert_kind_of Delighted::SurveyResponse, survey_response
     assert_equal({ :person => '123', :score => 10 }, survey_response.to_hash)
     assert_equal '123', survey_response.person
@@ -63,8 +60,7 @@ class Delighted::SurveyResponseTest < Delighted::TestCase
     response = Delighted::HTTPResponse.new(200, {}, Delighted::JSON.dump([{ :id => '123', :comment => 'One' }, { :id => '456', :comment => 'Two' }]))
     mock_http_adapter.expects(:request).with(:get, uri, headers).once.returns(response)
 
-    client = Delighted::Client.new(:api_key => '123abc', :http_adapter => mock_http_adapter)
-    survey_responses = client.survey_responses.all
+    survey_responses = Delighted::SurveyResponse.all
     assert_kind_of Delighted::EnumerableResourceCollection, survey_responses
     assert_kind_of Delighted::SurveyResponse, survey_responses[0]
     assert_equal({ :comment => 'One' }, survey_responses[0].to_hash)

data/test/test_helper.rb

@@ -5,6 +5,11 @@ require 'mocha/setup'
 class Delighted::TestCase < Minitest::Test
   include Mocha
 
+  def setup
+    super
+    Delighted.shared_client = Delighted::Client.new(:api_key => '123abc', :http_adapter => mock_http_adapter)
+  end
+
   def mock_http_adapter
     @mock ||= mock
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delighted
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Mark Dodwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -87,12 +87,10 @@ files:
 - lib/delighted/http_adapter.rb
 - lib/delighted/http_response.rb
 - lib/delighted/json.rb
-- lib/delighted/operations.rb
 - lib/delighted/operations/all.rb
 - lib/delighted/operations/create.rb
 - lib/delighted/operations/retrieve.rb
 - lib/delighted/resource.rb
-- lib/delighted/resource_interface.rb
 - lib/delighted/resources/metrics.rb
 - lib/delighted/resources/person.rb
 - lib/delighted/resources/survey_responses.rb

data/lib/delighted/operations.rb

@@ -1,8 +0,0 @@
-module Delighted
-  module Operations
-    def self.add_operations(klass, operation_module)
-      klass.extend(operation_module)
-      operation_module.instance_methods.each { |operation| klass.operations << operation }
-    end
-  end
-end

data/lib/delighted/resource_interface.rb

@@ -1,19 +0,0 @@
-module Delighted
-  class ResourceInterface
-    def initialize(client, resource)
-      @resource = resource # more helpful inspect
-
-      Utils.eigenclass(self).instance_eval do
-        resource.operations.each do |operation|
-          define_method(operation) do |*args, &block|
-            resource.send(operation, *args.unshift(client), &block)
-          end
-        end
-      end
-    end
-
-    def to_s
-      inspect
-    end
-  end
-end