resterl 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eefda67e9d4b1b634f09e64d6744a43a6733dfd4
-  data.tar.gz: 302093e3f36f08d49d1918759047255aa9c28867
+  metadata.gz: 42807a99a184545bb89ab8fe4d4ad206d129afe0
+  data.tar.gz: e409066f93c585ef5e809c03596f706f32e867d1
 SHA512:
-  metadata.gz: 1ccf4876bf18424c64528b8a257d651b531ce92979f52ebbc9cf54e51a4372f881b5e7072accf557b56f5b0385b47c553f52d9df5ef6b07429a348639815f473
-  data.tar.gz: 654b12d576e911c072d58426edb17b37cbd97ce3626b179cebb7a837536d32c93867387e93cdaca8a6e5acefe4a1d15ce9976968bfcbfb2ff2bea1e14d3a98be
+  metadata.gz: 6e75e6a17b9d4c389bb1c16b5e66484786c671dbafbfb9a5160bf606102421af95d2c56909336267adc8dfa1741e4fa3f3e93bc555b78edb55790de66997ccb1
+  data.tar.gz: 51086ae900df5c26bc8fc5d64c8627f04614bef94662c3771ee050b9864f9b53aa9677aaee17348374939d0d9079fa4616fa09f7f61c66e22ba4af777d7cab94

data/lib/resterl/base_object.rb

@@ -1,98 +1,80 @@
 require 'hashie'
 
-# Idee: If-Match wäre bei .delete_object und .put_object ein interessantes
-#       Feature.
+module Resterl
+  class BaseObject
+    include ClassLevelInheritableAttributes
+    cattr_inheritable :resterl_client, :parser, :composer, :complete_mime_type,
+                      :mapper
+    attr_reader :response
 
-class Resterl::BaseObject #< Hashie::Mash
+    def initialize data = {}, response = nil
+      @data = Hashie::Mash.new data
+      @response = response
+    end
 
-  include ClassLevelInheritableAttributes
-  cattr_inheritable :resterl_client, :parser, :composer, :complete_mime_type,
-                    :mapper
-  attr_reader :response
+    def method_missing sym, *args, &block
+      @data.send sym, *args, &block
+    end
 
-  #self.resterl_client = nil
-  #self.complete_mime_type = 'text/plain'
+    def respond_to? sym
+      super || @data.respond_to?(sym)
+    end
 
-  def initialize data = {}, response = nil
-    @data = Hashie::Mash.new data
-    @response = response
-  end
+    class << self
+      def get_object url, params = {}
+        response = resterl_client.get(url, params, accept_header)
+        new_from_response(response)
+      end
 
-  def method_missing sym, *args, &block
-    # Vielleicht lassen sich auch feste Attribute delegieren, das wäre als
-    # method_missing.
-    @data.send sym, *args, &block
-  end
+      def post_to_object url, params = {}, data = {}
+        post_put_object(:post, url, params, data)
+      end
 
-  protected
+      def delete_object url
+        resterl_client.delete(url, {}, accept_header, {})
+      end
 
-  def self.get_object url, params = {}
-    headers = { 'Accept' => complete_mime_type }
-    response = resterl_client.get(url, params, headers)
-    doc = response.body
-    doc = parser.call(doc)
-    doc = mapper.map(doc) if @mapper
-    new(doc, response)
-  end
-  
-  def self.post_to_object url, params = {}, data = {}
-    # TODO: Refactoring
+      def put_object url, params = {}, data = {}
+        post_put_object(:put, url, params, data)
+      end
 
-    headers = {
-      'Accept' => complete_mime_type,
-      'Content-Type' => complete_mime_type
-    }
-    data = composer.call(data)
-    response = resterl_client.post(url, params, data, headers)
-    
-    doc = response.body
-    doc = parser.call(doc)
-    doc = mapper.map(doc) if @mapper
-    new(doc, response)
-  end
-  
-  def self.delete_object url
-    headers = {
-      'Accept' => complete_mime_type,
-    }
-    resterl_client.delete(url, {}, headers, {})
-    # TODO: Antwort parsen?
-  end
-  
-  def self.put_object url, params = {}, data
-    # TODO: Refactoring
-    
-    headers = {
-      'Accept' => complete_mime_type,
-      'Content-Type' => complete_mime_type
-    }
-    data = composer.call(data)
-    response = resterl_client.put(url, params, data, headers)
-    
-    doc = response.body
-    doc = parser.call(doc)
-    doc = mapper.map(doc) if @mapper
-    
-    # TODO: In Ordnung?
-    new(doc, response)
-  end
-  
+      def mime_type= t
+        self.parser, self.composer, self.complete_mime_type =
+          case t
+          when :json
+            [proc { |str| JSON.parse(str) },
+             proc(&:to_json),
+             'application/json'
+            ]
+          when :xml
+            [proc { |str| Hash.from_xml(str) },
+             proc(&:to_xml),
+             'application/xml'
+            ]
+          end
+      end
+
+      private
 
-  def self.mime_type= t
-    self.parser, self.composer, self.complete_mime_type = case t
-    when :json
-      # TODO prio 2: Only works when Rails is loaded?
-      [ proc {|str| JSON.parse(str)},
-        proc(&:to_json),
-        'application/json'
-      ]
-    when :xml
-      # TODO prio 2: Only works when Rails is loaded?
-      [ proc {|str| Hash.from_xml(str)},
-        proc(&:to_xml),
-        'application/xml'
-      ]
+      def post_put_object method, url, params, data
+        headers = accept_header.merge(
+          'Content-Type' => complete_mime_type
+        )
+        data = composer.call(data)
+        response = resterl_client.send(method, url, params, data, headers)
+        new_from_response response
+      end
+
+      def new_from_response response
+        doc = response.body
+        doc = parser.call(doc)
+        doc = mapper.map(doc) if @mapper
+        new(doc, response)
+      end
+
+      def accept_header
+        { 'Accept' => complete_mime_type }
+      end
     end
   end
-
 end

data/lib/resterl/version.rb

@@ -1,3 +1,3 @@
 module Resterl
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

data/spec/lib/resterl/base_object_spec.rb

@@ -0,0 +1,18 @@
+require_relative '../../spec_helper'
+
+require 'active_support/core_ext/object/try'
+
+describe Resterl::BaseObject do
+  subject { described_class.new(foo: :bar) }
+  context '#try from ActiveSupport' do
+    it 'returns a value if the key exists' do
+      expect(subject.try(:foo)).to eq :bar
+    end
+    it 'returns nil if the key does not exist' do
+      expect(subject.try(:fox)).not_to be
+    end
+  end
+  it { is_expected.to respond_to(:response) }
+  it { is_expected.to respond_to(:foo) }
+  it { is_expected.not_to respond_to(:fox) }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resterl
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Florian Dütsch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,7 +120,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- TODO.rdoc
 - lib/resterl.rb
 - lib/resterl/base_object.rb
 - lib/resterl/caches/cache_interface.rb
@@ -139,6 +138,7 @@ files:
 - lib/resterl/response.rb
 - lib/resterl/version.rb
 - resterl.gemspec
+- spec/lib/resterl/base_object_spec.rb
 - spec/lib/resterl/client_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/Nix-wie-weg/resterl
@@ -160,11 +160,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Rudimentary HTTP client with focus on caching
 test_files:
+- spec/lib/resterl/base_object_spec.rb
 - spec/lib/resterl/client_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/TODO.rdoc

@@ -1,7 +0,0 @@
-* Edit README.rdoc
-* Tests!
-* Use technoweenie's faraday as base (http://github.com/technoweenie/faraday)
-* Secure caching with tests
-* Store parsed objects in cache (instead of the plain response)
-* Persistent connections
-* Documentation