girlscout 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 958a75006f6015148ddb609d2d3059b2cd7ae080
-  data.tar.gz: eb0c4d45f0f38056164a6f9d059bab2342113a62
+  metadata.gz: 908538791e779495fcc45f18e34dcc94cb094ab9
+  data.tar.gz: 9d21eb3b17b3c419836421f552fb4f5017877ddf
 SHA512:
-  metadata.gz: c59e9f12d5f7be1589c3dbdde8d723a734b44cef989ccbe805c81e120df3961017a0734f81c7060cc32a266fa2fd38792c16113e2aa87708074a78412dc06ccc
-  data.tar.gz: 937cca1325a2288b80fb38409818b004b00c502b2e0203f2f2083d628621e81823e08ac197d80e4bcee4610fb1f4c4c36e037399b139f2faf7087e04281b70c3
+  metadata.gz: 8911698baafd657e9e7ece46f5b6804d31857e63a567b789c5cf267ed079ade70288a5baab62c2130523ff0d2404e82afd775527d0d4d50fabb0f2f88d5601c8
+  data.tar.gz: e28ae6a0cd9053c8481ee283b0fe5a9e64fbbd7a1c8106ca59bb6bc79d370b2f13122877dcc51588700d3b2d2d87ecb3711ca48700622d5e3a4155322d8000a0

data/lib/girlscout.rb

@@ -1,4 +1,4 @@
-require 'rest-client'
+require 'excon'
 
 require 'girlscout/resource'
 require 'girlscout/config'

data/lib/girlscout/concerns/has_resource.rb

@@ -4,13 +4,18 @@ module GirlScout
       attr_writer :resource
 
       def self.included(klass)
-        klass.extend self
+        klass.extend(self)
       end
 
       def resource
         @resource ||= build_resource
       end
 
+      def resource_path
+        return self.class.resource_path if self.class.respond_to?(:resource_path)
+        @path
+      end
+
       def resource_url
         "#{GirlScout::Config.api_prefix}#{@path}"
       end
@@ -22,13 +27,8 @@ module GirlScout
       private
 
       def build_resource
-        klass = self.class
-        return klass.resource if klass.respond_to?(:resource)
-
-        Resource.new(resource_url, {
-          user: Config.api_key,
-          password: 'X'
-        })
+        return self.class.resource if self.class.respond_to?(:resource)
+        Resource.new(url: resource_url)
       end
     end
   end

data/lib/girlscout/conversation.rb

@@ -10,7 +10,7 @@ module GirlScout
       def create(attributes)
         attributes = attributes.as_json if attributes.respond_to?(:as_json)
         attributes["reload"] ||= true
-        Conversation.new(resource.post(attributes)["item"])
+        Conversation.new(resource.post(payload: attributes)["item"])
       end
     end
 

data/lib/girlscout/object.rb

@@ -11,7 +11,7 @@ module GirlScout
       end
 
       @attributes = attr
-      @resource = options[:resource] if options[:resource]
+      @resource   = options[:resource] if options[:resource]
     end
   end
 end

data/lib/girlscout/resource.rb

@@ -2,41 +2,55 @@ require 'json'
 
 module GirlScout
   class Resource
-    def initialize(url="", options={})
-      @url = url
-      @options = options
-    end
-
-    def rest_resource
-      return @rest_resource if @rest_resource
-      return @rest_resource = @options[:rest_resource] if @options[:rest_resource]
+    METHODS = [:get, :put, :post, :patch, :delete]
 
-      resource_class = @options[:resource_class] || RestClient::Resource
-      @rest_resource = resource_class.new("#{@url}.json", @options)
+    def initialize(url: "")
+      @url = url
     end
 
     def url
-      rest_resource.url
+      "#{@url}.json"
     end
 
     def [](path)
-      Resource.new("#{@url}#{path}", @options)
+      Resource.new(url: "#{@url}#{path}")
     end
 
-    def get(query=nil)
-      opts = { }
-      opts[:headers] = { params: query } if query
+    METHODS.each do |method|
+      define_method(method) do |payload: nil, query: nil, &block|
+        options = { method: method }
+        if payload
+          options[:body] = JSON.generate(payload)
+          options[:headers] ||= {}
+          options[:headers]["Content-Type"] = "application/json"
+        end
+        if query
+          options[:query] = query
+        end
 
-      parse(rest_resource.get(opts))
+        request(options)
+      end
     end
 
-    [:put, :post, :patch, :delete].each do |method|
-      define_method(method.to_s) do |payload=nil|
-        payload = serialize(payload) if payload
-        parse(rest_resource.send(method, payload, content_type: :json))
-      end
+    def request(options={})
+      auth = { user: Config.api_key, password: 'X' }
+      JSON.parse(Excon.new(url, auth).request(options).body)
     end
 
+    # def get(query=nil)
+    #   opts = { }
+    #   opts[:headers] = { params: query } if query
+
+    #   parse(rest_resource.get(opts))
+    # end
+
+    # [:put, :post, :patch, :delete].each do |method|
+    #   define_method(method.to_s) do |payload=nil|
+    #     payload = serialize(payload) if payload
+    #     parse(rest_resource.send(method, payload, content_type: :json))
+    #   end
+    # end
+
     private
 
     def parse(response)
@@ -46,5 +60,8 @@ module GirlScout
     def serialize(payload)
       payload.to_json
     end
+
+    def call
+    end
   end
 end

data/lib/girlscout/search.rb

@@ -4,11 +4,18 @@ module GirlScout
 
     class << self
       def conversations(query)
-        List.new(resource['/conversations'].get(query: query), Conversation)
+        search(Conversation, query)
       end
 
       def customers(query)
-        List.new(resource['/customers'].get(query: query), Customer)
+        search(Customer, query)
+      end
+
+      private
+
+      def search(klass, query)
+        result = resource[klass.resource_path].get(query: { query: query })
+        List.new(result, klass)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: girlscout
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Chakrit Wichian
@@ -11,19 +11,33 @@ cert_chain: []
 date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.49'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.49'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -39,103 +53,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 description: Provides integration with HelpScout REST API.
 email: chakrit@omise.co
 executables: []