heroix 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7631547c7d39fbec4cd974b8e582b6350b6b216
-  data.tar.gz: af1e343ba5e3d16cef171d0b652cd7d22baae4b2
+  metadata.gz: d6918e1258f70ff55500f20aa8bc3255b718a283
+  data.tar.gz: 7753d1b4968efe9cda393a115a099c9709de3653
 SHA512:
-  metadata.gz: b5b67c923fa0b726179f0f10c98889861548b106679cd1f9122a8b138b2d66b55434249fa0b7d002a3482094afd03eb3d444da6172210083d0ddb10d73829130
-  data.tar.gz: 1aa099c027230a26546a951734bff5f3d0244862b1eddca795e3cc2e8b3a63f1a31b4b90b822a482c942a5698ca1c9a8b32e0bae7fc74a7316652806f97625f7
+  metadata.gz: 0b849ec9b037a4adb6407eae7bcb337e1f056c1584e204cfb628e3fc903ba60a9f8f0a699b7b7b9607eba1cf6ab6942f20bbd415d61a856ee56b6ee5a101f6fa
+  data.tar.gz: d57adf6700ba42c4c2fbc5a51282a4f9b282b43d108c59172af11f0f23a7a88cfcc9a1816a39e7f7c375786f83632844a8a8a7b45fdde9151b273ae652c441a0

data/.rubocop.yml

@@ -8,3 +8,6 @@ Documentation:
 HashSyntax:
   Exclude:
     - '**/*'
+
+TrivialAccessors:
+  Enabled: false

data/Gemfile.lock

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

data/lib/heroix.rb

@@ -1,66 +1,13 @@
+require 'logger'
 require 'heroix/version'
-require 'heroix/resource'
+require 'heroix/client'
 
 module Heroix
-  class Client < Resource
-    def users
-      build_resource :users, :user
-    end
-
-    def session
-      build_resource :session, :session
-    end
-
-    def organisations
-      build_resource :organisations, :organisation
-    end
-
-    def beneficiaries
-      build_resource :beneficiaries, :beneficiary
-    end
-
-    def beneficiary_registrations
-      build_resource :beneficiary_registrations, :beneficiary_registration
-    end
-
-    def beneficiary_rules
-      build_resource :beneficiary_rules, :beneficiary_rule
-    end
-
-    def campaigns
-      build_resource :campaigns, :campaign
-    end
-
-    def campaign_peer_to_peers
-      build_resource :campaign_peer_to_peers, :campaign_peer_to_peer
-    end
-
-    def organisation_beneficiaries
-      build_resource :organisation_beneficiaries, :organisation_beneficiary
-    end
-
-    def campaign_beneficiaries
-      build_resource :campaign_beneficiaries, :campaign_beneficiary
-    end
-
-    def microsites
-      build_resource :microsites, :microsite
-    end
-
-    def microsite_pages
-      build_resource :microsite_pages, :microsite_page
-    end
-
-    def search(type, params)
-      build_resource("search/#{type}", type).index(params).fetch(type, [])
-    end
-
-    private
+  def self.logger
+    @logger ||= Logger.new(STDOUT)
+  end
 
-    def build_resource(path, type)
-      Resource.new :url => url_for(path),
-                   :token => token,
-                   :type => type
-    end
+  def self.logger=(logger)
+    @logger = logger
   end
 end

data/lib/heroix/client.rb

@@ -0,0 +1,65 @@
+require_relative 'resource'
+
+module Heroix
+  class Client < Resource
+    def users
+      build_resource :users, :user
+    end
+
+    def session
+      build_resource :session, :session
+    end
+
+    def organisations
+      build_resource :organisations, :organisation
+    end
+
+    def beneficiaries
+      build_resource :beneficiaries, :beneficiary
+    end
+
+    def beneficiary_registrations
+      build_resource :beneficiary_registrations, :beneficiary_registration
+    end
+
+    def beneficiary_rules
+      build_resource :beneficiary_rules, :beneficiary_rule
+    end
+
+    def campaigns
+      build_resource :campaigns, :campaign
+    end
+
+    def campaign_peer_to_peers
+      build_resource :campaign_peer_to_peers, :campaign_peer_to_peer
+    end
+
+    def organisation_beneficiaries
+      build_resource :organisation_beneficiaries, :organisation_beneficiary
+    end
+
+    def campaign_beneficiaries
+      build_resource :campaign_beneficiaries, :campaign_beneficiary
+    end
+
+    def microsites
+      build_resource :microsites, :microsite
+    end
+
+    def microsite_pages
+      build_resource :microsite_pages, :microsite_page
+    end
+
+    def search(type, params)
+      build_resource("search/#{type}", type).index(params)
+    end
+
+    private
+
+    def build_resource(path, type)
+      Resource.new :url => url_for(path),
+                   :token => token,
+                   :type => type
+    end
+  end
+end

data/lib/heroix/resource.rb

@@ -47,6 +47,15 @@ module Heroix
     private
 
     def request(method, url, options = {})
+      rest_logger = RestClient.log
+      RestClient.log = logger
+
+      perform_request(method, url, options)
+    ensure
+      RestClient.log = rest_logger
+    end
+
+    def perform_request(method, url, options)
       handle RestClient::Request.execute(
         :method => method,
         :url => url,
@@ -60,7 +69,7 @@ module Heroix
 
     def handle(response)
       deprecation = response.headers[:x_deprecation]
-      puts "[heroix] DEPRECATION WARNING #{deprecation}" if deprecation
+      logger.warn "[heroix] DEPRECATION WARNING #{deprecation}" if deprecation
 
       parse_response response.to_str
     end
@@ -74,5 +83,9 @@ module Heroix
       data = { type => data } if data && type
       data.to_json
     end
+
+    def logger
+      Heroix.logger
+    end
   end
 end

data/lib/heroix/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroix
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Leon Fu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -97,6 +97,7 @@ files:
 - bin/ci
 - heroix.gemspec
 - lib/heroix.rb
+- lib/heroix/client.rb
 - lib/heroix/resource.rb
 - lib/heroix/version.rb
 - lib/jack_and_rose.rb