version-one 0.0.5 → 0.0.6

data/lib/version-one/client.rb

@@ -9,13 +9,14 @@ module VersionOne
 
     def get(path, *fields)
       uri = path_uri(path)
+      options = fields.last.is_a?(Hash) ? fields.pop : {}
 
       unless fields.empty?
         fields.concat(Query::REQUIRED_FIELDS)
         uri.query = "sel=#{fields.join(',')}"
       end
 
-      get_uri uri
+      get_uri uri, options
     end
 
     def post_xml(path, xml)
@@ -28,16 +29,22 @@ module VersionOne
       end
     end
 
-    def post(path)
+    def post(path, &block)
       uri = path_uri(path)
-      request :post, uri do |r|
-        r.body = ''
-        r.content_type = XML_CONTENT_TYPE
+
+      if block_given?
+        request :post, uri, &block
+      else
+        request :post, uri do |r|
+          r.body = ''
+          r.content_type = XML_CONTENT_TYPE
+        end
       end
+
     end
 
-    def get_uri(uri)
-      request :get, uri
+    def get_uri(uri, options={})
+      request :get, uri, options
     end
 
     def cache_store
@@ -45,7 +52,7 @@ module VersionOne
     end
 
     def can_cache?
-      @cache && cache_store
+      !!cache_store
     end
 
     def self.service_uri
@@ -74,8 +81,34 @@ module VersionOne
       end
     end
 
-    def request(type, uri)
+    def request(type, uri, options={}, &block)
+      if (type == :get)
+        cached_request type, uri, options, &block
+      else
+        uncached_request type, uri, options, &block
+      end
+    end
+
+    def cached_request(type, uri, options={})
+      cache_options = options[:cache]
       xml = nil
+
+      if can_cache? && cache_options
+        xml = cache_store.read(cache_options[:key])
+
+        if xml
+          xml = XML::Document.string(xml).root
+          VersionOne.logger.debug('%s CACHE %s' % [type.to_s.upcase, uri.to_s])
+        end
+      end
+
+      xml ||= uncached_request type, uri, options
+      xml
+    end
+
+    def uncached_request(type, uri, options={})
+      xml = nil
+      xml_body = nil
       VersionOne.logger.debug('%s %s' % [type.to_s.upcase, uri.to_s])
 
       http = Net::HTTP.new(uri.host, uri.port)
@@ -99,12 +132,15 @@ module VersionOne
         response = http.request(request)
 
         if response.content_type == XML_CONTENT_TYPE
-          #VersionOne.logger.debug response.body
-          xml = XML::Document.string(response.body).root
+          xml_body = response.body.to_s
+          xml = XML::Document.string(xml_body).root
         end
 
         if (response.code.to_i / 100) != 2
           handle_error(xml, response, request)
+        elsif can_cache? && options[:cache]
+          cache_store.write(options[:cache][:key], xml_body, options[:cache][:options])
+          VersionOne.logger.debug "CACHED #{options[:cache][:key]}"
         end
       end
 
@@ -126,4 +162,5 @@ module VersionOne
     end
 
   end
-end
+
+end

data/lib/version-one/meta.rb

@@ -12,25 +12,19 @@ module VersionOne
     end
 
     def self.get(asset_type, client=nil)
-      xml = get_cached(asset_type)
+      client ||= VersionOne::Client.new
 
-      unless xml
-        client ||= VersionOne::Client.new
-        xml = client.get('/meta.v1/' + asset_type)
-        set_cached(asset_type, xml)
-      end
+      xml = client.get('/meta.v1/' + asset_type, cache: {
+          key: "VersionOne/meta/#{asset_type}",
+          options: {
+            expires_in: 60 * 60 * 24,
+            race_condition_ttl: 5
+          }
+      })
 
       new(xml)
     end
 
-    def self.cache
-      @@cache ||= nil
-    end
-
-    def self.cache=(c)
-      @@cache = c
-    end
-
     def [](name)
       @named_attributes[name]
     end
@@ -56,19 +50,5 @@ module VersionOne
 
     end
 
-    def self.get_cached(asset_type)
-      if cache
-        xml = XML::Document.string(cache.read("VersionOne/Meta/#{asset_type}")).root rescue nil
-        VersionOne.logger.debug("Loaded #{asset_type} meta from cache") if xml
-        xml
-      else
-        nil
-      end
-    end
-
-    def self.set_cached(asset_type, meta)
-      cache.write("VersionOne/Meta/#{asset_type}", meta.to_s) if cache
-    end
-
   end
-end
+end

data/lib/version-one/query.rb

@@ -55,10 +55,7 @@ module VersionOne
     end
 
     def find_by_url(url)
-      xml = nil
-      #xml = cache_store.read(@cache[:key]) if can_cache?
-      xml ||= @client.get(url)
-      #cache_store.write(@cache[:key], xml, @cache[:options]) if can_cache?
+      xml = @client.get(url, cache: @cache)
 
       if xml.name == 'Error'
         msg = 'VersionOne Error: %s (%s)' % [xml.find_first('Message').content, xml.attributes['href']]
@@ -176,6 +173,7 @@ module VersionOne
 
     def cache(key, options={})
       dup do
+        options[:namespace] ||= 'VersionOne'
         @cache = {
             :key => key,
             :options => options
@@ -193,35 +191,35 @@ module VersionOne
 
     private unless ENV['RAILS_ENV'] == 'test'
 
-    def http_get(uri)
-      xml = nil
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-
-      request_path = uri.path
-      request_path += '?' + uri.query unless uri.query.blank?
-      Rails.logger.debug("Uri path = #{request_path}")
-
-      http.start do
-        request = Net::HTTP::Get.new(request_path)
-        request.basic_auth(VersionOne.user, VersionOne.password)
-        response = http.request(request)
-
-        xml = response.body
-        Rails.logger.debug(xml)
-      end
-
-      xml
-    end
-
-    def cache_store
-      Rails.cache
-    end
-
-    def can_cache?
-      @cache && cache_store
-    end
+    # def http_get(uri)
+    #   xml = nil
+    #
+    #   http = Net::HTTP.new(uri.host, uri.port)
+    #   http.use_ssl = true
+    #
+    #   request_path = uri.path
+    #   request_path += '?' + uri.query unless uri.query.blank?
+    #   Rails.logger.debug("Uri path = #{request_path}")
+    #
+    #   http.start do
+    #     request = Net::HTTP::Get.new(request_path)
+    #     request.basic_auth(VersionOne.user, VersionOne.password)
+    #     response = http.request(request)
+    #
+    #     xml = response.body
+    #     Rails.logger.debug(xml)
+    #   end
+    #
+    #   xml
+    # end
+    #
+    # def cache_store
+    #   Rails.cache
+    # end
+    #
+    # def can_cache?
+    #   @cache && cache_store
+    # end
 
     def select_query
       if @select.empty?

data/lib/version-one/version.rb

@@ -1,3 +1,3 @@
 module VersionOne
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: version-one
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby