heroix 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4a626b0bb6cc29165f374538446926680004929
-  data.tar.gz: f8cd5cc204af787401cfb68eb7bfd9122c84c459
+  metadata.gz: c7631547c7d39fbec4cd974b8e582b6350b6b216
+  data.tar.gz: af1e343ba5e3d16cef171d0b652cd7d22baae4b2
 SHA512:
-  metadata.gz: 62cc251d11d4b14ebcc1106bee0f8fef2b21e0e8b6275c22b70ff35101ed1ad0da99aff03b4b26d58fa4a0ec4d5ce9b9cb210dcc3d1ea30b91a61607660a045d
-  data.tar.gz: dd5e41d029a3a7eefac97d83785a166fa4273cafeaf10d7126de3626d8b93ed20b0f6737f9ab372a6884e5bd9e113dcbb65fbc950a7548815dff0ea1840c969f
+  metadata.gz: b5b67c923fa0b726179f0f10c98889861548b106679cd1f9122a8b138b2d66b55434249fa0b7d002a3482094afd03eb3d444da6172210083d0ddb10d73829130
+  data.tar.gz: 1aa099c027230a26546a951734bff5f3d0244862b1eddca795e3cc2e8b3a63f1a31b4b90b822a482c942a5698ca1c9a8b32e0bae7fc74a7316652806f97625f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heroix (0.2.0)
+    heroix (0.2.1)
       rest-client (~> 1.6.1)
 
 GEM

data/heroix.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = []
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 

data/lib/heroix.rb

@@ -51,12 +51,16 @@ module Heroix
       build_resource :microsite_pages, :microsite_page
     end
 
+    def search(type, params)
+      build_resource("search/#{type}", type).index(params).fetch(type, [])
+    end
+
     private
 
-    def build_resource(path, namespace)
+    def build_resource(path, type)
       Resource.new :url => url_for(path),
                    :token => token,
-                   :namespace => namespace
+                   :type => type
     end
   end
 end

data/lib/heroix/resource.rb

@@ -1,17 +1,16 @@
 require 'rest_client'
-require 'cgi'
 require 'json'
 
 module Heroix
   Unauthorized = RestClient::Unauthorized
 
   class Resource
-    attr_reader :url, :token, :namespace
+    attr_reader :url, :token, :type
 
     def initialize(params)
       @url = params[:url]
       @token = params[:token]
-      @namespace = params[:namespace]
+      @type = params[:type]
     end
 
     def with_token(value)
@@ -19,12 +18,8 @@ module Heroix
       self
     end
 
-    def resource
-      @resource ||= JSON.parse RestClient.get(url)
-    end
-
     def index(params = {})
-      request(:get, url_with_params(params))
+      request(:get, url, :query => params)
     end
 
     def show(id)
@@ -32,11 +27,11 @@ module Heroix
     end
 
     def create(data)
-      request(:post, url, data)
+      request(:post, url, :data => data)
     end
 
     def update(id, data)
-      request(:put, url_for(id), data)
+      request(:put, url_for(id), :data => data)
     end
 
     def delete(id)
@@ -51,27 +46,19 @@ module Heroix
 
     private
 
-    def url_with_params(params)
-      if params.empty?
-        url
-      else
-        "#{url}?#{query_string(params)}"
-      end
-    end
-
-    def query_string(params)
-      params
-        .map { |key, value| "#{escape(key)}=#{escape(value)}" }
-        .join('&')
-    end
-
-    def escape(value)
-      CGI.escape(value.to_s)
+    def request(method, url, options = {})
+      handle RestClient::Request.execute(
+        :method => method,
+        :url => url,
+        :payload => prepare_data(options[:data]),
+        :headers => {
+          :authorization => "Token token=\"#{token}\"",
+          :content_type => :json, :params => options[:query]
+        }
+      )
     end
 
-    def request(method, url, data = nil)
-      response = RestClient.send(method, url, *request_args(data))
-
+    def handle(response)
       deprecation = response.headers[:x_deprecation]
       puts "[heroix] DEPRECATION WARNING #{deprecation}" if deprecation
 
@@ -80,22 +67,11 @@ module Heroix
 
     def parse_response(response)
       return {} if response.empty?
-      JSON.parse response
-    end
-
-    def request_args(data)
-      headers = { 'Authorization' => "Token token=\"#{token}\"" }
-      args = []
-
-      if data
-        args << prepare_data(data)
-        headers[:content_type] = :json
-      end
-      args << headers
+      JSON.parse(response)
     end
 
     def prepare_data(data)
-      data = { namespace => data } if namespace
+      data = { type => data } if data && type
       data.to_json
     end
   end

data/lib/heroix/version.rb

@@ -1,3 +1,3 @@
 module Heroix
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroix
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Leon Fu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -85,8 +85,7 @@ dependencies:
 description: Heroix global client
 email:
 - edh-dev@everydayhero.com.au
-executables:
-- ci
+executables: []
 extensions: []
 extra_rdoc_files: []
 files: