ahora 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 62ad288812b561ef44fb7da891c744a3f703bff7
+  data.tar.gz: 2022328ba2e73d65a131cafa976389e3b443cd5b
+SHA512:
+  metadata.gz: f9ab7f72fe0aceb9dad7b35e9b9da672dd11a1dd1b60e12fdc8a8e77ebae33a9bc08e509de75d10b0acde640ca6d4811eece4faf51ef079f76a48955cb15eaf4
+  data.tar.gz: 93f01442df08707277bf9860e91212fda599c2809b1cec67f95a287184b943a27f507e97e2cd941fab75c74a815d99325a27bf0932d82816c39a8338d444fb2a

data/lib/ahora/representation.rb

@@ -7,6 +7,7 @@ require 'delegate'
 module Ahora
   class Representation < Nibbler
     INTEGER_PARSER = lambda { |node| Integer(node.content) if node.content.present? }
+    FLOAT_PARSER = lambda { |node| Float(node.content) if node.content.present? }
     DATE_PARSER = lambda { |node| Date.parse(node.content) if node.content.present? }
     TIME_PARSER = lambda { |node| Time.parse(node.content) if node.content.present? }
     BOOL_PARSER =
@@ -26,27 +27,12 @@ module Ahora
         parser = names.pop if names.last.is_a?(Proc)
         names.each do |name|
           selector = name
-          if name.is_a? Hash
-            selector, name = name.first
-          end
-          element to_selector(selector.to_s.camelcase(:lower)) => name.to_s, :with => parser
+          selector, name = name.first if name.is_a? Hash
+          selector = "./#{selector.to_s.camelcase(:lower)}"
+          element selector => name.to_s, :with => parser
         end
       end
 
-      # Public: define Java style object id mapping
-      #
-      # *names - Array of String or Symbol ruby style names
-      #
-      # Examples
-      #
-      # objectid :id, parent_id
-      # # is equivalent to
-      # element 'objectId' => 'id'
-      # element 'parentObjectId' => 'parent_id'
-      def objectid(*names)
-        attribute names.map { |name| { name.to_s.gsub('id', 'object_id') => name } }, INTEGER_PARSER
-      end
-
       def string(*names)
         attribute(names)
       end
@@ -55,6 +41,10 @@ module Ahora
         attribute(names, INTEGER_PARSER)
       end
 
+      def float(*names)
+        attribute(names, FLOAT_PARSER)
+      end
+
       def date(*names)
         attribute(names, DATE_PARSER)
       end
@@ -69,10 +59,11 @@ module Ahora
       end
 
       private
-      # Convert to XPATH selector for current node or
-      # one level deep.
-      def to_selector(name)
-        "./*/#{name}|./#{name}"
+
+      # allows using block sub-parsers without explicitly stating they need to
+      # inherit from Ahora::Representation
+      def base_parser_class
+        Representation
       end
     end
 
@@ -85,7 +76,13 @@ module Ahora
           send("#{key}=", val)
         end
       else
-        super
+        doc = doc_or_atts
+        doc = XmlParser.parse(doc) unless doc.respond_to?(:search)
+        if doc.node_type == Nokogiri::XML::Node::DOCUMENT_NODE
+          # immediately scope to root element
+          doc = doc.at('/*')
+        end
+        super(doc)
       end
     end
   end
@@ -96,16 +93,10 @@ module Ahora
       @instantiator = instantiator
       @document_parser = document_parser
       @response = response
-      @cache_key = response.env[:response_headers]['X-Ahora-Cache-Key']
       super([])
     end
 
-    def cache_key
-      @cache_key or raise NoCacheKeyAvailable,
-          "No caching middleware is used or resource does not support caching."
-    end
-
-    %w( to_s to_a size each first last [] inspect pretty_print ).each do |method_name|
+    %w( to_s to_a size each first last [] inspect pretty_print find detect map collect inject select select! delete_if ).each do |method_name|
       eval "def #{method_name}(*); kicker; super; end"
     end
 
@@ -126,4 +117,4 @@ module Ahora
       Nokogiri::XML.parse(body, nil, nil, Nokogiri::XML::ParseOptions::STRICT)
     end
   end
-end
+end

data/lib/ahora/resource.rb

@@ -4,43 +4,51 @@ module Ahora
   module Resource
     attr_writer :document_parser
 
-    def get(url, params = {})
-      connection.get do |req|
-        set_common_headers(req)
-        req.url url, params
+    def get(url, params = nil)
+      connection.run_request(:get, url, nil, nil) do |req|
+        req.params.update(params) if params
+        yield req if block_given?
       end
     end
 
     # FIXME test
-    def post(url, body)
-      connection.post do |req|
-        set_common_headers(req)
-        req.url url
-        req.body = body
+    def post(url, body = nil)
+      connection.run_request(:post, url, body, nil) do |req|
+        yield req if block_given?
       end
     end
 
     # FIXME test
-    def put(url, body)
-      connection.put do |req|
-        set_common_headers(req)
-        req.url url
-        req.body = body
+    def put(url, body = nil)
+      connection.run_request(:put, url, body, nil) do |req|
+        yield req if block_given?
       end
     end
 
     def connection
-      conn = Faraday.new(host, :ssl => { :verify => false }) do |builder|
-        builder.use Faraday::Response::RaiseError
-        extend_middleware(builder)
-        builder.adapter Faraday.default_adapter
+      Faraday.new(host.dup, connection_options) do |conn|
+        conn.use Faraday::Response::RaiseError
+        extend_middleware(conn.builder)
+        unless conn.builder.handlers.any? {|mid| mid.klass < Faraday::Adapter }
+          conn.adapter Faraday.default_adapter
+        end
       end
-      conn.headers['User-Agent'] = 'Ahora'
-      conn
     end
 
     # @abstract override to use custom Faraday middleware
-    def extend_middleware(builder); end;
+    def extend_middleware(builder)
+      super if defined? super
+    end
+
+    # FIXME test (FakeWeb cannot test request headers)
+    # @abstract override to set custome headers
+    # returns a hash with a string for each key
+    def headers
+      (defined?(super) ? super.dup : {}).update \
+        :user_agent   => 'Ahora',
+        :content_type => 'application/xml',
+        :accept       => 'application/xml'
+    end
 
     def collection(*args, &block)
       if args.size == 2
@@ -60,9 +68,9 @@ module Ahora
       @document_parser ||= XmlParser.method(:parse)
     end
 
-    def set_common_headers(req)
-      req.headers['Content-Type'] = 'application/xml'
-      req.headers['Accept'] = 'application/xml'
+    def connection_options
+      (defined?(super) ? super.dup : {}).update \
+        :headers => headers
     end
   end
-end
+end

data/lib/ahora/version.rb

@@ -1,3 +1,3 @@
 module Ahora
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/ahora/representation_test.rb

@@ -5,6 +5,7 @@ require_relative '../../lib/ahora/representation'
 
 class Employee < Ahora::Representation
   boolean :is_rockstar, :slacker, :fired
+  float :rating
 end
 
 describe "boolean elements" do
@@ -36,4 +37,13 @@ describe "boolean elements" do
   it "parsing missing value adds the correct question mark reader" do
     employee.fired?.must_equal false
   end
+end
+
+describe "float elements" do
+  let(:employee) { Employee.parse(fixture('employee').read) }
+
+  it "parses float elements" do
+    employee.rating.must_equal 7.8
+  end
+
 end

data/test/ahora/resource_test.rb

@@ -0,0 +1,79 @@
+require 'minitest/autorun'
+require 'minitest/pride'
+require 'fakeweb'
+require_relative '../test_helper'
+require_relative '../../lib/ahora/resource'
+
+FakeWeb.allow_net_connect = false
+
+class DefaultPost
+  include Ahora::Resource
+
+  def host
+    'http://test.net/'
+  end
+end
+
+class CustomPost < DefaultPost
+  def headers
+    super.update \
+      'Accept' => 'text/plain',
+      'X-Custom' => 'foobar'
+  end
+
+  def extend_middleware builder
+    builder.adapter :rack
+  end
+end
+
+describe 'default headers' do
+  before do
+    @default = DefaultPost.new.connection.headers
+    @custom = CustomPost.new.connection.headers
+  end
+
+  it 'includes the user agent, accept and content-type' do
+    @default['User-Agent'].must_equal 'Ahora'
+    @default['Accept'].must_equal 'application/xml'
+    @default['Content-Type'].must_equal 'application/xml'
+  end
+
+  it 'allows overriding and setting custom headers' do
+    @custom['User-Agent'].must_equal 'Ahora'
+    @custom['Accept'].must_equal 'text/plain'
+    @custom['Content-Type'].must_equal 'application/xml'
+    @custom['X-Custom'].must_equal 'foobar'
+  end
+end
+
+describe 'connection adapter' do
+  it 'includes the default Faraday adapter' do
+    faraday = DefaultPost.new.connection
+    adapter = faraday.builder.handlers.last
+    adapter.klass.ancestors.must_include Faraday::Adapter
+  end
+
+  it 'can configure a custom Faraday adapter' do
+    faraday = CustomPost.new.connection
+    adapter = faraday.builder.handlers.last
+    adapter.klass.must_equal Faraday::Adapter::Rack
+  end
+end
+
+describe '#put' do
+  before do
+    @post = DefaultPost.new
+  end
+
+  it "supports passing an url and a body" do
+    FakeWeb.register_uri :put, 'http://test.net/posts', :body => 'body'
+    @post.put("posts", "body").body.must_equal 'body'
+  end
+
+  it "supports passing an url and a params hash" do
+    FakeWeb.register_uri :put, 'http://test.net/posts?foo=bar', :body => 'param'
+    @post.put("posts") { |req|
+      req.params[:foo] = 'bar'
+    }.body.must_equal 'param'
+  end
+end

data/test/ahora_test.rb

@@ -42,14 +42,16 @@ class PostRepository
 end
 
 class Post < Ahora::Representation
-  objectid :id, :user_id, :parent_id
+  element './objectId' => :id, :with => lambda {|n| n.content.to_i }
+  element './userObjectId' => :user_id, :with => lambda {|n| n.content.to_i }
+  element './parentObjectId' => :parent_id, :with => lambda {|n| n.content.to_i }
   date  :created_at
   element :body
-  element 'user', :with => Ahora::Representation do
+  element 'user' do
     string :first_name, :last_name
   end
   boolean :hidden
-  elements 'replies/userPost' => :replies, :with => Post
+  elements 'replies/userPost' => :replies, :with => self
 end
 
 class PostDomainRepository < PostRepository
@@ -93,10 +95,6 @@ describe "requesting a collection" do
     @posts.size.must_equal 2
   end
 
-  it "raises on #cache_key, because the backend does not has support for it" do
-    -> { @posts.cache_key }.must_raise(Ahora::Collection::NoCacheKeyAvailable)
-  end
-
   describe "a single post from the collection" do
     subject { @posts.first }
 
@@ -153,13 +151,6 @@ describe 'requesting a collection with if-modified-since support' do
 
   it "has a cache key" do
     @posts = @repository.find_by_user_id(1)
-    @posts.cache_key.
-        must_equal 'http://test.net/users/1/posts.xml:fragment_Mon, 02 Apr 2012 15:20:41 GMT'
-  end
-
-  it "has a cache key for cached response" do
-    @repository.find_by_user_id(1).cache_key.
-        must_equal @repository.find_by_user_id(1).cache_key
   end
 
   it "caches when response header includes Last-Modified" do
@@ -215,4 +206,4 @@ describe "passing a block instead of a class to collection" do
     repository = BlogPostRepository.new
     repository.all.first.id.must_equal 1
   end
-end
+end

data/test/fixtures/employee.xml

@@ -3,4 +3,5 @@
 	<firstName>John</firstName>
 	<isRockstar>true</isRockstar>
 	<slacker>false</slacker>
+  <rating>7.8</rating>
 </employee>

metadata

@@ -1,82 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: ahora
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Matthijs Langenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nibbler
-  requirement: &70334212827160 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334212827160
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70334212826660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70334212826660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70334212826200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70334212826200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70334212825820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70334212825820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70334212825360 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334212825360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70334212824940 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334212824940
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Consume Java-ish XML HTTP Resources easily
 email:
 - matthijs.langenberg@nedap.com
@@ -99,32 +116,32 @@ files:
 - lib/ahora/resource.rb
 - lib/ahora/version.rb
 - test/ahora/representation_test.rb
+- test/ahora/resource_test.rb
 - test/ahora_test.rb
 - test/fixtures/employee.xml
 - test/fixtures/user_posts.xml
 - test/test_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Consume Java-ish XML HTTP Resources easily
 test_files: []