smg 0.2.1 → 0.2.2

data/README.rdoc

@@ -20,7 +20,7 @@ http://github.com/SSDany/smg/tree/master/examples
 == REQUIREMENTS:
 
 * nokogiri (>=1.3)
-* addressable (>=2.1.1)
+* addressable (>=2.1.2)
 
 == LICENSE:
 

data/lib/smg/http.rb

@@ -1,11 +1,22 @@
 require 'smg/http/request'
 require 'smg/http/exceptions'
+require 'smg/http/hooks'
 
 module SMG #:nodoc:
-  module HTTP
+  module HTTP #:nodoc:
+
+    VERBS = Hash[ Request::VERBS.map { |v| v.to_s.gsub(/^.*::/,'').downcase.to_sym }.zip(Request::VERBS) ]
 
     module Model
 
+      HTTP::VERBS.keys.each do |verb|
+        self.class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{verb}(path, options = {})
+            http(:#{verb}, path, options)
+          end
+        EOS
+      end
+
       def site(value)
         @site = value
       end
@@ -14,37 +25,24 @@ module SMG #:nodoc:
         @params = value
       end
 
-      def get(path, options = {}, &block)
-        http Net::HTTP::Get, path, options, &block
-      end
-
-      def head(path, options = {}, &block)
-        http Net::HTTP::Head, path, options, &block
-      end
-
-      def delete(path, options = {}, &block)
-        http Net::HTTP::Delete, path, options, &block
-      end
-
-      def post(path, options = {}, &block)
-        http Net::HTTP::Post, path, options, &block
-      end
-
-      def put(path, options = {}, &block)
-        http Net::HTTP::Put, path, options, &block
+      def on_parse(&block)
+        raise ArgumentError, "No block given" unless block_given?
+        @on_parse = block
       end
 
       private
 
       def http(verb, path, options = {})
-        raise "site URI missed" unless @site
-        opts = options.dup
-        uri = uri_for(path, opts.delete(:query))
-        response = SMG::HTTP::Request.new(verb, uri, opts).perform
-        parse block_given? ? yield(response) : response.body
+        options = options.dup
+        request = SMG::HTTP::Request.new(HTTP::VERBS[verb], uri_for(path,options.delete(:query)), options)
+        run_callbacks(:before_request, request, :verb => verb)
+        response = request.perform
+        run_callbacks(:after_request, response, :verb => verb)
+        parse @on_parse ? @on_parse[response.body] : response.body
       end
 
       def uri_for(path, query = nil)
+        raise "site URI missed" unless @site
         ret = Addressable::URI.parse(@site)
         ret.path = path
         qvalues = {}
@@ -58,6 +56,7 @@ module SMG #:nodoc:
 
     def self.append_features(base)
       base.extend Model
+      base.extend Hooks
     end
 
   end

data/lib/smg/http/exceptions.rb

@@ -3,6 +3,8 @@ module SMG #:nodoc:
 
     class ConnectionError < StandardError
 
+      attr_reader :response
+
       def initialize(response, message = nil)
         @response = response
         @message = message
@@ -19,16 +21,10 @@ module SMG #:nodoc:
     class RedirectionError < ConnectionError
     end
 
-    class TimeoutError < ConnectionError
-
-      def initialize(message)
-        @message = message
-      end
-
-      def to_s
-        @message
-      end
+    class TimeoutError < ::Timeout::Error
+    end
 
+    class SSLError < StandardError
     end
 
   end

data/lib/smg/http/hooks.rb

@@ -0,0 +1,43 @@
+module SMG #:nodoc:
+  module HTTP #:nodoc:
+    module Hooks
+
+      def before_request(options = {}, &block)
+        callback(:before_request, options, &block)
+      end
+
+      def after_request(options = {}, &block)
+        callback(:after_request, options, &block)
+      end
+
+      private
+
+      def run_callbacks(kind, *args)
+        options = Hash === args.last ? args.pop : {}
+        callbacks(kind).each do |callback, conditions|
+          next unless conditions.all? { |k,v| Array === v ? v.include?(options[k]) : options[k] == v }
+          callback[*args]
+        end
+      end
+
+      def callback(kind, options = {}, &block)
+        raise ArgumentError, "Block not given" unless block_given?
+        conditions = {}
+        if options.key?(:only)
+          conditions[:verb] = Array(options[:only]) & HTTP::VERBS.keys
+        elsif options.key?(:except)
+          conditions[:verb] = HTTP::VERBS.keys - Array(options[:except])
+        end
+        callbacks(kind) << [block, conditions]
+      end
+
+      def callbacks(kind)
+        @callbacks ||= {}
+        @callbacks[kind] ||= []
+      end
+
+    end
+  end
+end
+
+# EOF

data/lib/smg/http/request.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'net/https'
 
 gem 'addressable', '>= 2.1.1'
 require 'addressable/uri'
@@ -23,6 +24,7 @@ module SMG #:nodoc:
         @limit    = options[:no_follow] ? 1 : options[:limit] || DEFAULT_LIMIT
         @body     = options[:body]
         @timeout  = options[:timeout] ? options[:timeout].to_i : nil
+        @pem      = options[:pem]
       end
 
       def perform
@@ -31,6 +33,8 @@ module SMG #:nodoc:
         handle_response(response)
       rescue Timeout::Error => e
         raise TimeoutError, e.message
+      rescue OpenSSL::SSL::SSLError => e
+        raise SSLError, e.message
       end
 
       protected
@@ -101,6 +105,12 @@ module SMG #:nodoc:
         end
       end
 
+      def ssl?
+        @uri.scheme == "https"
+      end
+
+      alias :use_ssl? :ssl?
+
       def setup
         @request = verb.new(@uri.request_uri, @headers)
         @request.basic_auth(@uri.user, @uri.password) if @uri.user && @uri.password
@@ -110,8 +120,19 @@ module SMG #:nodoc:
 
       def http
         http = @proxy ?
-          Net::HTTP.new(@uri.host, @uri.port, @proxy.host, @proxy.port, @proxy.user, @proxy.password) :
-          Net::HTTP.new(@uri.host, @uri.port)
+          Net::HTTP.new(@uri.host, @uri.inferred_port, @proxy.host, @proxy.inferred_port, @proxy.user, @proxy.password) :
+          Net::HTTP.new(@uri.host, @uri.inferred_port)
+
+        if ssl?
+          http.use_ssl = true
+          if @pem
+            http.cert = OpenSSL::X509::Certificate.new(@pem)
+            http.key = OpenSSL::PKey::RSA.new(@pem)
+            http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          else
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
+        end
 
         return http unless @timeout
         http.open_timeout = @timeout

data/lib/smg/mapping.rb

@@ -3,7 +3,6 @@ module SMG #:nodoc:
 
     attr_reader :elements, :nested, :attributes
     attr_reader :root
-    attr_reader :parsed
 
     def initialize
       @elements   = {}
@@ -45,8 +44,7 @@ module SMG #:nodoc:
 
     def handle_path(path)
       ret = normalize_path(path)
-      ret.unshift(@root) if @root
-      ret.flatten!
+      ret.unshift(*@root) if @root
       ret
     end
 

data/lib/smg/mapping/element.rb

@@ -16,11 +16,7 @@ module SMG #:nodoc:
         @context    = nil
 
         if options.key?(:context)
-          raise ArgumentError, "+options[:context]+ should be an Array of Symbols" unless
-            Array === options[:context] &&
-            options[:context].all?{ |c| Symbol === c }
-
-          @context = options[:context].compact
+          @context = Array(options[:context]).compact
           @context.uniq!
           @context = nil if @context.empty?
         end

data/lib/smg/mapping/typecasts.rb

@@ -11,7 +11,7 @@ module SMG #:nodoc:
 
         def [](key,value)
           return typecasts[key][value] if typecasts.key?(key)
-          raise ArgumentError, "Can't typecast to #{key.inspect}"
+          raise ArgumentError, "Can't typecast #{value.class} into #{key.inspect}"
         end
 
         def key?(key)

data/lib/smg/model.rb

@@ -21,20 +21,20 @@ module SMG #:nodoc:
       thing = Class === options[:class] ? mapping.attach_nested(tag,options) : mapping.attach_element(tag,options)
 
       if (instance_methods & [thing.accessor, thing.accessor.to_s]).empty?
-        class_eval <<-CODE
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
         def #{thing.accessor}(value)
           @#{thing.name} ||= []
           @#{thing.name} << value
         end
-        CODE
+        EOS
       end
 
       if (instance_methods & [thing.name, thing.name.to_s]).empty?
-        class_eval <<-CODE
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
         def #{thing.name}
           @#{thing.name} ||= []
         end
-        CODE
+        EOS
       end
 
     end

data/lib/smg/version.rb

@@ -1,5 +1,5 @@
 module SMG
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end
 
 # EOF

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: smg
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - SSDany
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 +04:00
+date: 2010-07-16 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 1
         - 3
@@ -34,16 +37,34 @@ dependencies:
   name: addressable
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 1
-        - 1
-        version: 2.1.1
+        - 2
+        version: 2.1.2
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  type: :development
+  version_requirements: *id003
 description: |
   XML to Object mapping library with simple declarative syntax.
   Supports 'contextual' parsing and conditions.
@@ -60,6 +81,7 @@ files:
 - README.rdoc
 - lib/smg/document.rb
 - lib/smg/http/exceptions.rb
+- lib/smg/http/hooks.rb
 - lib/smg/http/request.rb
 - lib/smg/http.rb
 - lib/smg/mapping/element.rb
@@ -69,37 +91,6 @@ files:
 - lib/smg/resource.rb
 - lib/smg/version.rb
 - lib/smg.rb
-- examples/crazy.rb
-- examples/discogs/label.rb
-- examples/discogs/search.rb
-- examples/helper.rb
-- examples/plant.rb
-- examples/twitter.rb
-- examples/weather.rb
-- spec/collect_spec.rb
-- spec/context_spec.rb
-- spec/extract_spec.rb
-- spec/filtering_spec.rb
-- spec/fixtures/discogs/948224.xml
-- spec/fixtures/discogs/Enzyme+Records.xml
-- spec/fixtures/discogs/Genosha+Recordings.xml
-- spec/fixtures/discogs/Ophidian.xml
-- spec/fixtures/fake/malus.xml
-- spec/fixtures/fake/valve.xml
-- spec/fixtures/twitter/pipopolam.xml
-- spec/fixtures/yahoo.weather.com.xml
-- spec/http/request_spec.rb
-- spec/http/shared/automatic.rb
-- spec/http/shared/non_automatic.rb
-- spec/http/shared/redirectable.rb
-- spec/http_spec.rb
-- spec/lib/helpers/http_helpers.rb
-- spec/lib/matchers/instance_methods.rb
-- spec/mapping/element_spec.rb
-- spec/mapping/typecasts_spec.rb
-- spec/resource_spec.rb
-- spec/root_spec.rb
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/SSDany/smg
 licenses: []
@@ -110,23 +101,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: smg
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple declaratibve XML parsing library. Backed by Nokogiri

data/examples/crazy.rb

@@ -1,37 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-class A
-  include SMG::Resource
-  extract "a"   , :as => :href    , :at => :href
-  extract "a"   , :as => :content
-end
-
-class P
-  include SMG::Resource
-  extract "p"   , :as => :raw
-  collect "p/a" , :as => :links   , :class => A
-end
-
-class Requirements
-  include SMG::Resource
-  root "div"
-  extract "p"   , :as => :raw
-  extract "p"   , :as => :p       , :class => P
-  collect "p/a" , :as => :links   , :class => A
-end
-
-data = <<-HTML
-<div><p>Requirements: <a href="http://github.com/tenderlove/nokogiri">nokogiri</a> and <a href="http://github.com/sporkmonger/addressable">addressable</a>.</p></div>
-HTML
-
-parsed = Requirements.parse(data)
-
-puts parsed.raw                           #=> "Requirements: nokogiri and addressable."
-puts parsed.links.map { |a| a.href }      #=> ["http://github.com/tenderlove/nokogiri", "http://github.com/sporkmonger/addressable"]
-puts parsed.links.map { |a| a.content }   #=> ["nokogiri", "addressable"]
-
-puts parsed.p.raw                         #=> "Requirements: nokogiri and addressable."
-puts parsed.p.links.map { |a| a.href }    #=> ["http://github.com/tenderlove/nokogiri", "http://github.com/sporkmonger/addressable"]
-puts parsed.p.links.map { |a| a.content } #=> ["nokogiri", "addressable"]
-
-# EOF