apidiesel 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: def62c1af888b8e8b6f85817415b289dbbad9096
-  data.tar.gz: 0715e50f02634518ffdbd07b3994ec8e8b165918
+  metadata.gz: 94c0a261f4ccfcd6025dfde175bc042a418928b3
+  data.tar.gz: f34f072965617508439a5c676dd04f5fc43c3304
 SHA512:
-  metadata.gz: 551528a0457520bc8f974b4703a083f3292e88214117966e16d8d41737ae1c0bc282040978dc4f5b85cdcc1bee8d3d3000713c1168d878cd3419f1ec20f1b1b8
-  data.tar.gz: 614b06def512b127a7228866b183280357c2488099e9683d1517994e1b14b1e1e28f9907278d90401378fa169b1a0c27c86433c87ef1003b699b26a0bc38cc15
+  metadata.gz: d8f8bb9bd49c8b4ce07c0f22c390d32a82119561f9fc437adf24f954b7ea983cb4c802b43c9c5c3c5c55fff7522bd3a5dedcc09d7d12ff6983a1adfa3a70a96f
+  data.tar.gz: bd2b116e023ff02f989f633f3c806b320b12e4716950ac4d529a23011c4c11d5bdd72a380736e3d9329dc468597e1306c115c6f24717bab846541c95b1c447ec

data/apidiesel.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '~> 2.0'
+
   spec.add_runtime_dependency 'activesupport', '>= 4.2.0'
   spec.add_runtime_dependency 'httpi', '>= 2.4.1'
 

data/lib/apidiesel/action.rb

@@ -7,6 +7,7 @@ module Apidiesel
     # accessors for class instance variables
     # (class-level variables, not shared with subclasses)
     class << self
+      attr_reader :url_args
 
       # Hash for storing validation closures. These closures are called with the request
       # parameters before the request is made and have the opportunity to check and modify them.
@@ -49,11 +50,13 @@ module Apidiesel
       # Falls back to the Api setting if blank.
       #
       # @param [String] value
-      def url(value = nil)
+      def url(value = nil, **args)
+        return @url unless value || args.any?
+
         if value
-          @url = value
+          @url = URI.parse(value)
         else
-          @url
+          @url_args = args
         end
       end
 
@@ -122,7 +125,15 @@ module Apidiesel
     end
 
     def url
-      self.class.url || @api.class.url
+      url = self.class.url || @api.class.url
+
+      if self.class.url_args
+        self.class.url_args.each do |key, value|
+          url.send("#{key}=", value)
+        end
+      end
+
+      url
     end
 
     def http_method

data/lib/apidiesel/api.rb

@@ -55,7 +55,7 @@ module Apidiesel
       # @param [String] value
       def url(base_url = nil)
         if base_url
-          config[:url] = base_url
+          config[:url] = URI.parse(base_url)
         else
           config[:url]
         end

data/lib/apidiesel/dsl.rb

@@ -63,6 +63,7 @@ module Apidiesel
       # @param [Hash] *args
       # @option *args [Boolean] :optional (false) defines whether this parameter may be omitted
       # @option *args [Symbol] :optional_if_present param_name is optional, if the parameter given here is present instead
+      # @option *args [Symbol] :required_if_present param_name is required if param_name is also present
       # @option *args [Symbol] :submitted_as submit param_name to the API under the name given here
       # @option *args [Object] :default a default parameter to be set when no value is specified
       # @option *args [Enumerable] :allowed_values only accept the values in this Enumerable.
@@ -101,6 +102,25 @@ module Apidiesel
         validation_builder(:to_s, param_name, *args)
       end
 
+      # Defines a date, time or datetime parameter.
+      #
+      #
+      # @example
+      #   expects do
+      #     datetime :starts_at, format: '%d-%m-%Y'
+      #   end
+      #
+      # @param (see #string)
+      # @option *args [String] :format strftime format string
+      # @option (see #string)
+      def datetime(param_name, **args)
+        if args[:format]
+          args[:processor] = ->(value) { value.try(:strftime, args[:format]) }
+        end
+
+        validation_builder(:strftime, param_name, **args)
+      end
+
         protected
 
       def validation_builder(duck_typing_check, param_name, *args)
@@ -115,6 +135,10 @@ module Apidiesel
             options[:optional] = true unless given_params[ options[:optional_if_present] ].blank?
           end
 
+          if options.has_key?(:required_if_present)
+            options[:optional] = given_params[ options[:required_if_present] ].present? ? false : true
+          end
+
           unless options.has_key?(:optional) && options[:optional] == true
             raise Apidiesel::InputError, "missing arg: #{param_name} - options: #{options.inspect}" unless given_params.has_key?(param_name) && !given_params[param_name].blank?
             raise Apidiesel::InputError, "invalid arg #{param_name}: must respond to #{duck_typing_check}" unless given_params[param_name].respond_to?(duck_typing_check)
@@ -130,6 +154,10 @@ module Apidiesel
             end
           end
 
+          if options[:processor]
+            given_params[param_name] = options[:processor].call(given_params[param_name])
+          end
+
           if options[:submitted_as]
             processed_params[ options[:submitted_as] ] = given_params[param_name]
           else

data/lib/apidiesel/handlers/http_request_helper.rb

@@ -11,7 +11,7 @@ module Apidiesel
       #               instance, as given to the handlers #run method
       #
       def execute_request(request:, payload:, api_config:)
-        http_request      = HTTPI::Request.new(request.action.url)
+        http_request      = HTTPI::Request.new(request.action.url.try(:to_s))
         http_request.body = payload
 
         http_request.auth.ssl.verify_mode = api_config[:ssl_verify_mode] || :peer

data/lib/apidiesel/request.rb

@@ -31,7 +31,7 @@ module Apidiesel
       [
         "Apidiesel::Request",
         action.http_method.to_s.upcase,
-        action.url,
+        action.url.try(:to_s),
         action.endpoint,
         parameters.collect { |key, value| "#{key}: #{value}"}.join(',')
       ].join(' ')

data/lib/apidiesel/version.rb

@@ -1,3 +1,3 @@
 module Apidiesel
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/apidiesel.rb

@@ -1,3 +1,4 @@
+require 'uri'
 require 'httpi'
 
 HTTPI.log = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidiesel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jan-Christian Foeh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -103,9 +103,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="