ahora 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0985b57a670034c7945f5e36a9cc90101bf8f83
-  data.tar.gz: d0092b586366a543d87a11cec7b739c325fb7f50
+  metadata.gz: 1cb06d2658dbbeb7b3ef608c0a075f6bf231a841
+  data.tar.gz: 70f9af7383998d3f989e2403d4576a1a087cb92d
 SHA512:
-  metadata.gz: 51b4dfac648230d1fd5e0e1623045e38ead1401db50509e6b982b1cd4a6b59b93e240c0dd9ce95329a139104745267db76307b0569258bfb64313cc21033b3e6
-  data.tar.gz: 1e388b5863a1f2a9808c3b1a59040464a1b35386296ad0d81afb53f578320da1b9b4745cf21b604430c695bf7b194551737e965d608d189f2a552ac98010af80
+  metadata.gz: 790ee4e933c2fa58e003f4ab6cf982680da6df0f6ba8861fa9749158cda98a7d10b0b1c51b07748601969c9f2efda1b85baaef154ca7685c9093033a8b388bbd
+  data.tar.gz: 3348a8dc3dc622b57521061cfbb219c8a2559b27f9456dd477297390df787a9c51ad59339cad49b732fd3386b8b5e1fe0531169115779d1f204ab684b5f4c6d3

data/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Matthijs Langenberg and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/ahora.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = ""
   s.summary     = %q{Consume Java-ish XML HTTP Resources easily}
   s.description = %q{Consume Java-ish XML HTTP Resources easily}
+  s.license     = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test}/*`.split("\n")
@@ -20,7 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency "nibbler", '>= 1.3.0'
   s.add_dependency "faraday", '>= 0.7'
   s.add_dependency "nokogiri", "~> 1.5"
-  s.add_dependency "activesupport"
 
   s.add_development_dependency "fakeweb"
   s.add_development_dependency "minitest"

data/lib/ahora/middleware/last_modified_caching.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module Ahora
   module Middleware
     class LastModifiedCaching < Faraday::Middleware

data/lib/ahora/representation.rb

@@ -1,17 +1,19 @@
 require 'nibbler'
 require 'nokogiri'
+require 'time'
 require 'date'
-require 'active_support/core_ext/string'
 require 'delegate'
+require 'digest/sha1'
 
 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 =
-        lambda { |node| node.content.to_s.downcase == 'true' if node.content.present? }
+    present = lambda { |obj| obj && !obj.empty? }
+
+    INTEGER_PARSER = lambda { |node| Integer(node.content) if present.call(node.content) }
+    FLOAT_PARSER = lambda { |node| Float(node.content) if present.call(node.content) }
+    DATE_PARSER = lambda { |node| Date.parse(node.content) if present.call(node.content) }
+    TIME_PARSER = lambda { |node| Time.parse(node.content) if present.call(node.content) }
+    BOOL_PARSER = lambda { |node| node.content.to_s.downcase == 'true' }
 
     module Definition
       def element(*)
@@ -26,13 +28,20 @@ module Ahora
         names = names.flatten
         parser = names.pop if names.last.is_a?(Proc)
         names.each do |name|
-          selector = name
-          selector, name = name.first if name.is_a? Hash
-          selector = "./#{selector.to_s.camelcase(:lower)}"
+          if Hash === name
+            selector, name = name.first
+          else
+            selector = attribute_selector(name)
+          end
           element selector => name.to_s, :with => parser
         end
       end
 
+      # override in subclasses for e.g. camelCase support
+      def attribute_selector(name)
+        name.to_s
+      end
+
       def string(*names)
         attribute(names)
       end
@@ -87,28 +96,30 @@ module Ahora
     end
   end
 
-  class Collection < DelegateClass(Array)
-    NoCacheKeyAvailable = Class.new(StandardError)
+  class Response < DelegateClass(Ahora::Representation)
     def initialize(instantiator, document_parser, response)
       @instantiator = instantiator
       @document_parser = document_parser
       @response = response
-      super([])
+      super(target)
     end
 
-    %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"
+    def target
+      @instantiator.call @document_parser.call(@response.body)
     end
 
-    private
-    def kicker
-      @_collection ||= __setobj__ doc.search("/*[@type='array']/*").map { |element|
-        @instantiator.call element
-      }.to_a.compact
+    def cache_key
+      uri = @response.env[:url].dup
+      uri.host = @response.env['HTTP_HOST'] if @response.env['HTTP_HOST']
+      "#{Digest::SHA1.hexdigest(uri.normalize.to_s)}/#{Digest::SHA1.hexdigest(@response.body)}"
     end
+  end
 
-    def doc
-      @document_parser.call(@response.body)
+  class Collection < Response
+    def target
+      @document_parser.call(@response.body).search("/*[@type='array']/*").map { |element|
+        @instantiator.call element
+      }.to_a.compact
     end
   end
 

data/lib/ahora/resource.rb

@@ -63,6 +63,18 @@ module Ahora
     end
 
     def collection(*args, &block)
+      instantiator, response = extract_parser_from_args(*args, &block)
+      Collection.new instantiator, document_parser, response
+    end
+
+    def single(*args, &block)
+      instantiator, response = extract_parser_from_args(*args, &block)
+      Response.new instantiator, document_parser, response
+    end
+
+    private
+
+    def extract_parser_from_args(*args, &block)
       if args.size == 2
         klass, response = args
         instantiator = lambda do |doc|
@@ -72,11 +84,9 @@ module Ahora
         response = args.first
         instantiator = block
       end
-      Collection.new instantiator, document_parser, response
+      [instantiator, response]
     end
 
-    private
-
     def document_parser
       @document_parser ||= XmlParser.method(:parse)
     end

data/lib/ahora/version.rb

@@ -1,3 +1,3 @@
 module Ahora
-  VERSION = "0.0.4"
-end
+  VERSION = "0.1.0"
+end

data/test/ahora_test.rb

@@ -31,6 +31,10 @@ class PostRepository
     collection Post, get("/users/#{id}/posts.xml")
   end
 
+  def find_by_user_id_and_post_id(user_id, id)
+    single PostDomain, get("/users/#{user_id}/posts/#{id}.xml")
+  end
+
   def extend_middleware(builder)
     builder.use Faraday::Request::BasicAuthentication, USERNAME, PASSWORD
     builder.use Ahora::Middleware::LastModifiedCaching, MemCache.instance
@@ -42,6 +46,14 @@ class PostRepository
 end
 
 class Post < Ahora::Representation
+  def self.attribute_selector(name)
+    "./#{name.to_s.gsub(/_([a-z])/){ $1.upcase }}"
+  end
+
+  def self.base_parser_class
+    Post
+  end
+
   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 }
@@ -95,6 +107,10 @@ describe "requesting a collection" do
     @posts.size.must_equal 2
   end
 
+  it "has a cache key" do
+    @posts.cache_key.must_equal 'd630281e7b240892745b975d6b3ff9abe4fb3064/c7244914c7109201527c1b59930b64d242eca842'
+  end
+
   describe "a single post from the collection" do
     subject { @posts.first }
 
@@ -140,6 +156,24 @@ describe "requesting a collection" do
   end
 end
 
+describe 'requesting a single resource' do
+  before do
+    fake_http '/users/1/posts/2.xml', fixture('user_post')
+    @post = PostRepository.new.find_by_user_id_and_post_id(1, 2)
+  end
+
+  subject { @post }
+
+  it "has the right body" do
+    subject.body.must_equal "When will world see Baby Cambridge?"
+  end
+
+  it "has a cache key" do
+    subject.cache_key.must_equal 'd2c6c472195a1f74b8271c5e7ced007cf9b2821e/c9e3c5a555a38cc7f99c3cdada0e5ec02341c674'
+  end
+
+end
+
 describe 'requesting a collection with if-modified-since support' do
   before do
     FakeWeb.register_uri :get, uri('/users/1/posts.xml'), [
@@ -207,3 +241,5 @@ describe "passing a block instead of a class to collection" do
     repository.all.first.id.must_equal 1
   end
 end
+
+

data/test/fixtures/employee.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <employee>
-	<firstName>John</firstName>
-	<isRockstar>true</isRockstar>
+	<first_name>John</first_name>
+	<is_rockstar>true</is_rockstar>
 	<slacker>false</slacker>
   <rating>7.8</rating>
-</employee>
+</employee>

data/test/fixtures/user_post.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<userPost>
+  <hidden>false</hidden>
+  <objectId>1</objectId>
+  <userObjectId>1</userObjectId>
+  <user>
+    <firstName>John</firstName>
+    <lastName>Doe</lastName>
+  </user>
+  <body>When will world see Baby Cambridge?</body>
+  <createdAt>2011-10-26T17:01:52+02:00</createdAt>
+</userPost>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahora
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Matthijs Langenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nibbler
@@ -52,20 +52,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +91,7 @@ files:
 - .travis.yml
 - AUTHORS
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - ahora.gemspec
@@ -120,10 +107,12 @@ files:
 - test/ahora/resource_test.rb
 - test/ahora_test.rb
 - test/fixtures/employee.xml
+- test/fixtures/user_post.xml
 - test/fixtures/user_posts.xml
 - test/test_helper.rb
 homepage: ''
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []