pupa 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4353e8efbfcc1d35395992a2005bd9bb1c253899
-  data.tar.gz: af747ed629cb093d03977844f676b2f868a03ef2
+  metadata.gz: c0b3361fdbe89fad7482ffc7661a04f6a610351e
+  data.tar.gz: 49066676fd5b7519c300eb9e3dfc05655bb6d864
 SHA512:
-  metadata.gz: 22d4ae25dfcaab964e1e013ac3b15f8c91c7b33a25f4404d24c076923cf73bd9c32006d2b1fa4828941675a148d461ff75cebd3d644f7b63ee5e8ff1aed4d0ea
-  data.tar.gz: 1e4c5a7134b49757a4fa1083241783723cfec3c7638909284c76ec566f3ec7949556931590d0727806b4feb4f2a5cbe7dda2d5320f62d9f54ed0478eee53e55c
+  metadata.gz: 97f44c06bae5f107264135b2fb82a84fc17cf9ac521903e75fd4653c1a975bc5516f8f33711be9e9d1063a2be1178e728a1ff83752554074b32d895172c768d8
+  data.tar.gz: 330535ef6392fb0990a28ca8e0b30e0ce217ab68407d4afdf7f917a65d0fc8349b1a953547b5be7158f372c85aefd611c7d4e1e480f8d287f63195b3b09cdc82

data/lib/pupa/models/model.rb

@@ -6,10 +6,6 @@ require 'active_support/callbacks'
 require 'active_support/core_ext/object/try'
 require 'json-schema'
 
-require 'pupa/refinements/json-schema'
-
-JSON::Validator.cache_schemas = true
-
 module Pupa
   # Adds methods expected by Pupa processors.
   module Model
@@ -22,6 +18,7 @@ module Pupa
       define_callbacks :create, :save
 
       class_attribute :json_schema
+      class_attribute :validator
       class_attribute :properties
       class_attribute :foreign_keys
       class_attribute :foreign_objects
@@ -88,6 +85,11 @@ module Pupa
         else
           JSON.load(File.read(File.expand_path(File.join('..', '..', '..', 'schemas', "#{value}.json"), __dir__)))
         end
+
+        self.validator = JSON::Validator.new(self.json_schema, {}, {
+          clear_cache: false,
+          parse_data: false,
+        })
       end
     end
 
@@ -169,7 +171,10 @@ module Pupa
     # @raises [JSON::Schema::ValidationError] if the object is invalid
     def validate!
       if self.class.json_schema
-        JSON::Validator.validate!(self.class.json_schema, stringify_keys(to_h(persist: true)))
+        self.class.validator.instance_variable_set('@errors', [])
+        self.class.validator.instance_variable_set('@data', stringify_keys(to_h(persist: true)))
+        self.class.validator.validate
+        true
       end
     end
 

data/lib/pupa/processor/client.rb

@@ -14,6 +14,12 @@ rescue LoadError
   # pass
 end
 
+begin
+  require 'faraday-cookie_jar'
+rescue LoadError
+  # pass
+end
+
 module Pupa
   class Processor
     # An HTTP client factory.
@@ -32,9 +38,12 @@ module Pupa
       # @param [String] memcached_password the Memcached password
       # @param [String] level the log level
       # @param [String,IO] logdev the log device
+      # @param [Hash] faraday_options Faraday initialization options
       # @return [Faraday::Connection] a configured Faraday HTTP client
-      def self.new(cache_dir: nil, expires_in: 86400, value_max_bytes: 1048576, memcached_username: nil, memcached_password: nil, level: 'INFO', logdev: STDOUT) # 1 day
-        Faraday.new do |connection|
+      def self.new(cache_dir: nil, expires_in: 86400, value_max_bytes: 1048576, memcached_username: nil, memcached_password: nil, level: 'INFO', logdev: STDOUT, faraday_options: {}) # 1 day
+        follow_redirects = faraday_options.delete(:follow_redirects)
+
+        Faraday.new(faraday_options) do |connection|
           connection.request :url_encoded
           connection.use Middleware::Logger, Logger.new('faraday', level: level)
           connection.use Faraday::Response::RaiseError
@@ -53,6 +62,14 @@ module Pupa
             connection.use FaradayMiddleware::ParseXml, preserve_raw: true, content_type: /\bxml$/
           end
 
+          if follow_redirects
+            connection.use FaradayMiddleware::FollowRedirects, follow_redirects
+          end
+
+          if Faraday.const_defined?('CookieJar')
+            connection.use Faraday::CookieJar
+          end
+
           # Must come after the parser middlewares.
           connection.use FaradayMiddleware::Gzip
 

data/lib/pupa/processor.rb

@@ -31,10 +31,11 @@ module Pupa
     # @param [Boolean] validate whether to validate JSON documents
     # @param [String] level the log level
     # @param [String,IO] logdev the log device
+    # @param [Hash] faraday_options Faraday initialization options
     # @param [Hash] options criteria for selecting the methods to run
-    def initialize(output_dir, pipelined: false, cache_dir: nil, expires_in: 86400, value_max_bytes: 1048576, memcached_username: nil, memcached_password: nil, database_url: 'mongodb://localhost:27017/pupa', validate: true, level: 'INFO', logdev: STDOUT, options: {})
+    def initialize(output_dir, pipelined: false, cache_dir: nil, expires_in: 86400, value_max_bytes: 1048576, memcached_username: nil, memcached_password: nil, database_url: 'mongodb://localhost:27017/pupa', validate: true, level: 'INFO', logdev: STDOUT, faraday_options: {}, options: {})
       @store      = DocumentStore.new(output_dir, pipelined: pipelined)
-      @client     = Client.new(cache_dir: cache_dir, expires_in: expires_in, value_max_bytes: value_max_bytes, memcached_username: memcached_username, memcached_password: memcached_password, level: level, logdev: logdev)
+      @client     = Client.new(cache_dir: cache_dir, expires_in: expires_in, value_max_bytes: value_max_bytes, memcached_username: memcached_username, memcached_password: memcached_password, level: level, logdev: logdev, faraday_options: faraday_options)
       @connection = Connection.new(database_url)
       @logger     = Logger.new('pupa', level: level, logdev: logdev)
       @validate   = validate

data/lib/pupa/runner.rb

@@ -23,6 +23,7 @@ module Pupa
         database_url:       'mongodb://localhost:27017/pupa',
         validate:           true,
         level:              'INFO',
+        faraday_options:    {},
         dry_run:            false,
       }.merge(defaults))
 
@@ -82,6 +83,9 @@ module Pupa
         opts.on('-c', '--cache_dir PATH', 'The directory or Memcached address (e.g. memcached://localhost:11211) in which to cache HTTP requests') do |v|
           options.cache_dir = v
         end
+        opts.on('--no-cache', 'Disable HTTP request caching') do |v|
+          options.cache_dir = nil
+        end
         opts.on('-e', '--expires_in SECONDS', "The cache's expiration time in seconds") do |v|
           options.expires_in = v
         end
@@ -160,6 +164,7 @@ module Pupa
         database_url: options.database_url,
         validate: options.validate,
         level: options.level,
+        faraday_options: options.faraday_options,
         options: Hash[*rest])
 
       options.actions.each do |action|

data/lib/pupa/version.rb

@@ -1,3 +1,3 @@
 module Pupa
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/pupa.rb

@@ -8,6 +8,8 @@ require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/object/blank'
 require 'active_support/inflector'
 
+require 'mail'
+
 require 'pupa/models/concerns/indifferent_access'
 require 'pupa/models/concerns/contactable'
 require 'pupa/models/concerns/identifiable'
@@ -65,3 +67,20 @@ class String
   # @see http://api.rubyonrails.org/classes/String.html#method-i-blank-3F
   alias_method :blank?, :empty?
 end
+
+# @see https://github.com/ruby-json-schema/json-schema/tree/master/lib/json-schema/attributes/formats
+JSON::Validator.register_format_validator('email', lambda{|data|
+  return unless data.is_a?(String)
+  address = Mail::Address.new(data)
+  unless address.address == data && address.domain && address.domain.split('.').size > 1
+    raise JSON::Schema::CustomFormatError.new("must be a valid email address (#{data})")
+  end
+})
+
+JSON::Validator.register_format_validator('uri', lambda{|data|
+  return unless data.is_a?(String)
+  re = URI::DEFAULT_PARSER.regexp[:ABS_URI]
+  unless re.match(data)
+    raise JSON::Schema::CustomFormatError.new("must be a valid email URI (#{data})")
+  end
+})

data/spec/refinements/json-schema_spec.rb

@@ -1,8 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe Pupa::Refinements do
+describe JSON::Validator do
   let(:schema) do
     {
+      '$schema' => 'http://json-schema.org/draft-04/schema#',
       'properties' => {
         'email' => {
           'type' => ['string', 'null'],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pupa
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - James McKinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-04 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -329,7 +329,6 @@ files:
 - lib/pupa/processor/yielder.rb
 - lib/pupa/refinements/faraday.rb
 - lib/pupa/refinements/faraday_middleware.rb
-- lib/pupa/refinements/json-schema.rb
 - lib/pupa/runner.rb
 - lib/pupa/version.rb
 - pupa.gemspec
@@ -452,3 +451,4 @@ test_files:
 - spec/runner_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_connection_adapters.rb
+has_rdoc: 

data/lib/pupa/refinements/json-schema.rb

@@ -1,45 +0,0 @@
-require 'mail'
-
-module Pupa
-  module Refinements
-    # Validates "email" and "uri" formats. Using Ruby's refinements doesn't seem
-    # to work, possibly because `refine` can't be used with `prepend`.
-    module FormatAttribute
-      # @see http://my.rails-royce.org/2010/07/21/email-validation-in-ruby-on-rails-without-regexp/
-      def validate(current_schema, data, fragments, processor, validator, options = {})
-        case current_schema.schema['format']
-        when 'email'
-          if String === data
-            address = Mail::Address.new(data)
-            unless address.address == data && address.domain && address.domain.split('.').size > 1
-              error_message = "The property '#{build_fragment(fragments)}' must be a valid email address (#{data})"
-              validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
-            end
-          else
-            error_message = "The property '#{build_fragment(fragments)}' must be a string (#{data})"
-            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
-          end
-        when 'uri'
-          if String === data
-            re = URI::DEFAULT_PARSER.regexp[:ABS_URI]
-            unless re.match(data)
-              error_message = "The property '#{build_fragment(fragments)}' must be a valid URI (#{data})"
-              validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
-            end
-          else
-            error_message = "The property '#{build_fragment(fragments)}' must be string (#{data})"
-            validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors])
-          end
-        else
-          super
-        end
-      end
-    end
-  end
-end
-
-class JSON::Schema::FormatAttribute
-  class << self
-    prepend Pupa::Refinements::FormatAttribute
-  end
-end