client 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3da2c2f22dcab43cbb37c688cc58ec920ecd4e77
-  data.tar.gz: 73ecaf8835854991dd90eed56c4a6c17dac8abd7
+  metadata.gz: f5aed7ac9da5ce353a6e0a2eec53302163a2bfce
+  data.tar.gz: c1f8bf69fbbf02d32e192f444756eb6af4f4ea58
 SHA512:
-  metadata.gz: 8d476276275ae02148f1a04349f41c46169aa9033174a0ce422483a7d976d9086e28eb9c9789db4722e4d322e9b20ceb1dc0371d412ad5961447a9803eb73bae
-  data.tar.gz: 603555b0daa53872f40f8b2009c5e33d40e9b0ce60a48d98e830d122d51d0589858312862d6165e5c913aea53f4621de73702004e8de0604e5b13c21f826ee02
+  metadata.gz: e9491f03d4985847bea50f0508b2161d0c501f9b75535cb734653acac30ae2f68f93580069254f36356ad9c406d6808c2af7ab6c9df3d83332547a8cd252b49f
+  data.tar.gz: cf95559aecf33cbe60f31f4dc93c0d934a29567d2fc9dad5062564e2d32d70f78c840e666f712e59e4e15dd0890e6488eabe5f6d3a6f1eed74fe902cd5b0af9b

data/lib/client.rb

@@ -39,18 +39,30 @@ end
 class Client
   class Base
     class << self
-      # logger.info "Client::Base performed: #{method} to #{uri.to_s} \
-      # params: #{params} got: #{r.inspect} code: #{r.code}"
-
       def method_missing(m, *args, &block)
-        parse_method(m)
-        parse_arguments(args)
+        MetaRequest.new(self , m, args).run
+      end
+    end
+
+
+
+    class MetaRequest
+      include HTTParty
+
+      def initialize(base_klass, method, args)
+        @base_klass = base_klass
+        @method = method
+        @args = args
+      end
+
+      def run
+        parse_method
+        parse_arguments
         set_content_type
         perform_action
       end
 
       private
-
       def set_content_type
           if @opts && @opts.delete(:content_type) == :json
             @opts[:headers] = { 'Content-Type' => 'application/json' }
@@ -61,22 +73,21 @@ class Client
       def perform_action
         case @action
           when *%w{find list}
-            self.get(url,  @opts)
+            @base_klass.get(url,  @opts)
           when *%w{delete remove destroy}
-            self.delete(url, @opts)
+            @base_klass.delete(url, @opts)
           when *%w{post create}
-            self.post(url, @opts)
+            @base_klass.post(url, @opts)
         end
       end
 
-
-      def parse_method(name)
-        @action, @path = name.to_s.match(/(^[^_]+(?=_))_(.+)/).captures
+      def parse_method
+        @action, @path = @method.to_s.match(/(^[^_]+(?=_))_(.+)/).captures
       end
 
-      def parse_arguments(args)
-        @id = args.shift if args.first.is_a?(Integer)
-        @opts = args.first || {}
+      def parse_arguments
+        @id = @args.shift if @args.first.is_a?(Integer)
+        @opts = @args.first || {}
       end
 
       def url
@@ -89,7 +100,7 @@ class Client
   end
 
   class << self
-    attr_accessor :logger
+    attr_accessor :logger, :loaded_config_files
 
     def logger
       @logger ||= Logger.new(STDOUT).tap{ |l| l.level = Logger::WARN }
@@ -99,28 +110,40 @@ class Client
       @clients ||= {}
     end
 
-    def load_clients(path = "#{Dir.pwd}/client.yml")
+    def loaded_config_files
+      @loaded_config_files ||= []
+    end
+    def load_clients(path = default_config_path)
       begin
         clients.merge! YAML.load_file(path)
+        loaded_config_files << path
       rescue
-        warn '''Check that you have an client.env file in your project with
-      the following entry.
-      gitlab:
-        base_uri: http://gitlab.com/api/v3/
-      other_server:
-        base_uri: other_endpoint.com
-        '''
+        warn """Check that you have an file in:  \n\t
+        #{path}
+
+that respects the following format:  \n\t
+      example:
+        base_uri: http://example.com/api/v3/
+        """
         {}
       end
       generate_clients
     end
 
     private
+    def default_config_path
+      if ENV['RACK_ENV']
+      "#{Dir.pwd}/config/client_#{ENV['RACK_ENV']}.yml"
+    else
+      "#{Dir.pwd}/client.yml"
+    end
+  end
+
     def generate_clients
       clients.each do |name, info|
         Class.new(Base) do
           include HTTParty
-          base_uri info.fetch('base_uri')
+          self.base_uri info.fetch('base_uri')
         end.tap do |client_class|
           const_set(name.camelize, client_class)
         end

data/lib/client/version.rb

@@ -1,3 +1,3 @@
 class Client
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
 end

data/spec/client/client_spec.rb

@@ -4,11 +4,20 @@ describe Client do
   subject(:client) do
     Client::RandomClient
   end
+  before{ stub_const('ENV', {'RACK_ENV' => nil}) }
 
   it 'defaults to client.yml if no file is loaded' do
     client.should be
   end
 
+  describe 'when RACK_ENV is presence' do
+    it 'tries to load config/client_production.yml' do
+      stub_const('ENV', {'RACK_ENV' => 'production'})
+      Client.load_clients
+      Client.loaded_config_files[1].should match(/config\/client_production.yml/)
+    end
+  end
+
   describe 'when there is a config' do
     before do
       stub_request(:any, /.*twitter.*/)
@@ -69,6 +78,11 @@ describe Client do
         WebMock.should have_requested(:delete, 'http://twitter.com/tweet/1')
       end
 
+      pending "accepts id as string as long as they can be converted to number" do
+        client.send("#{action}_tweet", '1')
+        WebMock.should have_requested(:delete, 'http://twitter.com/tweet/1')
+      end
+
       it "perform a delete with params and id for #{action}" do
         client.send("#{action}_tweet", 1, body: {token: 1234})
         WebMock.should have_requested(:delete, 'http://twitter.com/tweet/1')
@@ -79,12 +93,6 @@ describe Client do
 
   end
 
-  describe 'when working with nested urls' do
-    pending 'resolves first level of nested resource' do
-      client.groups(1).should be_kind_of(client)
-    end
-  end
-
 
 
   describe 'when loading config files manually' do

data/spec/fixtures/config/client_production.yml

@@ -0,0 +1,2 @@
+another_client:
+  base_uri: 'www.google.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: client
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - bonzofenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -114,6 +114,7 @@ files:
 - lib/client/version.rb
 - spec/client/client_spec.rb
 - spec/fixtures/client.yml
+- spec/fixtures/config/client_production.yml
 - spec/fixtures/twitter.yml
 - spec/spec_helper.rb
 homepage: https://github.com/bonzofenix/client
@@ -143,5 +144,6 @@ summary: solves rest comunications
 test_files:
 - spec/client/client_spec.rb
 - spec/fixtures/client.yml
+- spec/fixtures/config/client_production.yml
 - spec/fixtures/twitter.yml
 - spec/spec_helper.rb