lazy_ant 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26098317ee3b2d85a22f413947081f79b46d3a10
-  data.tar.gz: a51b5237282e3e25e16fd81399df763f8997c871
+  metadata.gz: dc1b0f698c8286a77d8d2ec94e5de45f3259372c
+  data.tar.gz: e1b0e7cf90b6d1f14baf596f12017da9d631d7f4
 SHA512:
-  metadata.gz: b2a4199fcd6ef7108ecb322f5ad0ecfba4990ad20947fae836d89f568c7540c977d260a136aeee4c753a3a72cd03fd4b982dc797d73fda14e7e3381ce7cc2192
-  data.tar.gz: a770fd7c63460a97e75e2fdbb11a912e9e292bba92712de2f6fb59db10852021ed68fd6a11cf44613af635d2623afbcbe25cab45e0c8d2dc0a800a14665292d0
+  metadata.gz: 47eae520dbda96471446ad74d84fe0ae03acc4178b6e99de4da1067cb871767ec31c28d41bbb7dfc42d246c9516051d794d3670ff434f1759c924c3d40b0e490
+  data.tar.gz: 8def470c1337cecc099870e084802730ca49b605a65a374693657f9e25551c3df795546c3ac72412550fb57c9aa929a8ff0ec22757fdad9f6981f8f6bd8aa5fe

data/lib/lazy_ant/dsl/connection.rb

@@ -17,13 +17,6 @@ module LazyAnt
           con.adapter Faraday.default_adapter
           instance_exec(con, &default_callback) if default_callback
         end
-        fix_params
-      end
-
-      def fix_params
-        @default_params = @connection.params.dup
-        @connection.params.clear
-        @connection
       end
 
       def use_converter(con)

data/lib/lazy_ant/dsl/endpoint.rb

@@ -8,26 +8,16 @@ module LazyAnt
       include DSL::Connection
       include Grouping
 
-      def update_params(req)
-        case req.method
-        when :get, :head, :delete
-          default_params.each { |k, v| req.params[k] = v }
-        when :post, :put
-          default_params.each { |k, v| req.body[k] = v }
-        end
-        yield(req) if block_given?
-      end
-
       module ClassMethods
         def api(name, options = {}, &block)
           method, path = endpoint(options)
+          klazz = Class.new(LazyAnt::Endpoint) do
+            send(method, path) if method && path
+            instance_eval(&block) if block
+          end
           converter = entity_converter(options)
           define_method name do |*args|
-            params = args.extract_options!
-            path = generate_url(path, args)
-            response = connection.send(method, path, params) do |req|
-              update_params(req, &block)
-            end
+            response = klazz.new(*args).execute(connection)
             converter.call(response.body)
           end
         end
@@ -36,7 +26,7 @@ module LazyAnt
 
         def endpoint(options)
           method = [:get, :post, :put, :delete].find { |k| options[k] }
-          fail 'Request url not given' unless method
+          return unless method
           path = options.delete(method)
           [method, path]
         end
@@ -46,18 +36,6 @@ module LazyAnt
           multi ? -> (x) { x.map(&conv) } : -> (x) { conv.call(x) }
         end
       end
-
-      protected
-
-      def generate_url(path, args)
-        arg_names = path.scan(/:([\w_]+)/).map(&:first)
-        arg_names.each do |k|
-          arg = args.shift
-          fail ArgumentError, "missing required key :#{k}" unless arg
-          path = path.gsub(/:#{k}/, arg.to_s)
-        end
-        path
-      end
     end
   end
 end

data/lib/lazy_ant/endpoint.rb

@@ -0,0 +1,91 @@
+module LazyAnt
+  #
+  # Endpoint Definition
+  #
+  # (in dsl)
+  # api :echo do
+  #   get '/echo'
+  #   param :hello, default: 'world', required: true, rename: 'SHIT_KEY'
+  # end
+  #
+  # client.echo(hello: 'test')
+  # => GET '/echo?SHIT_KEY=test'
+  #
+  class Endpoint
+    extend Forwardable
+    def_delegators :'self.class', :verb, :path, :params
+
+    def initialize(*args)
+      @query = default_query.merge(args.extract_options!)
+      @url = build_url(*args)
+    end
+
+    def execute(connection)
+      @query = connection.params.merge(@query)
+      validate!
+      connection.send(verb, @url, renamed_query) do |req|
+        req.params.clear if [:put, :post].include?(req.method)
+      end
+    end
+
+    protected
+
+    def validate!
+      params.select { |_k, v| v[:required] }.each do |k, _v|
+        fail ArgumentError, "params[:#{k}] is required!" unless @query[k]
+      end
+    end
+
+    def build_url(*args)
+      args = Array(args)
+      url = path.dup
+      arg_names = url.scan(/:([\w_]+)/).map(&:first)
+      arg_names.each do |k|
+        arg = args.shift
+        fail ArgumentError, "missing required key :#{k}" unless arg
+        url.gsub!(/:#{k}/, arg.to_s)
+      end
+      url
+    end
+
+    def default_query
+      res = {}
+      params.each do |k, v|
+        res[k] = v[:default] if v[:default]
+        res
+      end
+      res
+    end
+
+    def renamed_query
+      query = @query.dup
+      params.each do |k, v|
+        if v[:rename]
+          query[v[:rename]] = query[k]
+          query.delete k
+        end
+      end
+      query
+    end
+
+    class << self
+      attr_reader :verb, :path
+      %w(get put post delete).each do |verb|
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{verb}(path)
+            @verb = :#{verb}
+            @path = path
+          end
+        EOS
+      end
+
+      def params
+        @params ||= {}
+      end
+
+      def param(name, options = {})
+        params[name] = options
+      end
+    end
+  end
+end

data/lib/lazy_ant/version.rb

@@ -1,3 +1,3 @@
 module LazyAnt
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/lazy_ant.rb

@@ -4,3 +4,4 @@ require 'lazy_ant/dsl'
 require 'lazy_ant/config'
 require 'lazy_ant/group'
 require 'lazy_ant/converter'
+require 'lazy_ant/endpoint'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lazy_ant
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - masarakki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -248,6 +248,7 @@ files:
 - lib/lazy_ant/dsl/connection.rb
 - lib/lazy_ant/dsl/endpoint.rb
 - lib/lazy_ant/dsl/grouping.rb
+- lib/lazy_ant/endpoint.rb
 - lib/lazy_ant/group.rb
 - lib/lazy_ant/version.rb
 homepage: https://github.com/masarakki/lazy_ant