eoat 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33824679f01ed8ef08285e1a43f892a3bbf1509e
-  data.tar.gz: 06c77ddb6e07cdbb98a4a4c84e1be1e9b7645d9d
+  metadata.gz: 0def34809c9e1f489c393467806f6cd4ddf98819
+  data.tar.gz: bbed96f4dc56a7022e83229e7cbcde434e3c773e
 SHA512:
-  metadata.gz: 1f8205d81c51f61b5f89e4d349ed4bbda9b8ea51653a5827f9de7db40355e101a5327ed48409386d104155bd4de827da74a11663327c1c1ce9806d994606c0f2
-  data.tar.gz: 2e918aed6e907be0a8b38150a6f77f472c6c1918f8d2261c98071103a72d9500f4805b1af21f8d955ffa55d499390fe288d130acef9f16e20e4cf0a6f8f8ecfe
+  metadata.gz: 167dbbe3a201fa422a098ab97614653cc761e02d40bf0e14035fbd4c3c775c742ecb3c0f65dc5aba718fcca471658fcb1193e95633f9f58ac224950771691e92
+  data.tar.gz: ce32beaa74de1e8ea61800ad0024bb33021de078b73d2d086747134384927c0a74ba47b0bdce321b9b768a10a079db4b47ae2fec7af380e0d4b8ca5591c4e80f

data/lib/eoat/cache/memcached_cache.rb

@@ -28,8 +28,8 @@ module EOAT
         key = EOAT::Cache.md5hash(host + uri)
         response = @backend.get(key)
         if response
-          if EOAT::Cache.md5hash(response.to_yaml) == @backend.get(key + '_hash')
-            return response
+          if EOAT::Cache.md5hash(response) == @backend.get(key + '_hash')
+            return YAML::load(response)
           else
             @backend.delete(key)
             @backend.delete(key + '_hash')
@@ -51,14 +51,15 @@ module EOAT
         if expire > 0
           # Set key as md5 string
           key = EOAT::Cache.md5hash(host + uri)
+          yaml = content.to_yaml
           @backend.set(
               key,
-              content,
+              yaml,
               :expiry => expire
           )
           @backend.set(
               key + '_hash',
-              EOAT::Cache.md5hash(content.to_yaml),
+              EOAT::Cache.md5hash(yaml),
               :expiry => expire
           )
         end

data/lib/eoat/eve_api.rb

@@ -28,9 +28,9 @@ module EOAT
     # Create an request according to the method called.
     # This is used to dynamically create api calls.
     # @return [Object] the result class
-    def method_missing(method, **kwargs)
+    def method_missing(method, cache: true, **kwargs)
       uri = create_uri(method.id2name, kwargs)
-      EOAT::Request.new(@host, uri, EOAT::Result::EveType::Result).get
+      EOAT::Request.new(@host, uri, EOAT::Result::EveType::Result).get(cache)
     end
 
     private

data/lib/eoat/request.rb

@@ -29,15 +29,14 @@ module EOAT
     end
 
     # Method-collector of private methods. Performs basic algorithm of output.
-    def get
-      cache = cache_get
+    def get(cache)
       if cache
-        cache
-      else
-        result = @result.new(http_request)
-        cache_save(result)
-        result
+        cache_response = cache_get
+        return(cache_response) if cache_response
       end
+      response = @result.new(http_request)
+      cache_save(response)
+      response
     end
 
     private

data/lib/eoat/result/eve_type.rb

@@ -69,6 +69,22 @@ module EOAT
             end
           end
         end
+
+        def method_missing(meth, *args, &block)
+          if instance_variable_defined?("@#{meth.to_s}")
+            instance_variable_get("@#{meth.to_s}")
+          else
+            super
+          end
+        end
+
+        def respond_to?(meth)
+          if instance_variable_defined?("@#{meth.to_s}")
+            true
+          else
+            super
+          end
+        end
       end
 
       # Rowset container for xml data.
@@ -121,7 +137,7 @@ module EOAT
         # Return first fount Row.
         # @param [Integer, String] key the value that been search
         def get(key)
-          index = @entries_index[key]
+          index = @entries_index[key.to_i]
           if index
             case index
               when Array
@@ -132,6 +148,22 @@ module EOAT
           end
           nil
         end
+
+        def method_missing(meth, *args, &block)
+          if instance_variable_defined?("@#{meth.to_s}")
+            instance_variable_get("@#{meth.to_s}")
+          else
+            super
+          end
+        end
+
+        def respond_to?(meth)
+          if instance_variable_defined?("@#{meth.to_s}")
+            true
+          else
+            super
+          end
+        end
       end
 
       # Key-values container. All methods generated automatically.
@@ -182,6 +214,22 @@ module EOAT
             end
           end
         end
+
+        def method_missing(meth, *args, &block)
+          if instance_variable_defined?("@#{meth.to_s}")
+            instance_variable_get("@#{meth.to_s}")
+          else
+            super
+          end
+        end
+
+        def respond_to?(meth)
+          if instance_variable_defined?("@#{meth.to_s}")
+            true
+          else
+            super
+          end
+        end
       end
     end
   end

data/lib/eoat/version.rb

@@ -1,4 +1,4 @@
 module EOAT
   # Current gem version
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/eoat/zk_api.rb

@@ -16,9 +16,9 @@ module EOAT
 
     # Create an request according to the method called.
     # This is used to dynamically create api calls.
-    def method_missing(method, **kwargs)
+    def method_missing(method, cache: true, **kwargs)
       uri = create_uri(method.id2name, kwargs)
-      EOAT::Request.new(@host, uri, EOAT::Result::EveType::Result).get
+      EOAT::Request.new(@host, uri, EOAT::Result::EveType::Result).get(cache)
     end
 
     # Collect all request parameters and combine it to query string.

data/spec/eoat/file_cache_spec.rb

@@ -13,7 +13,10 @@ describe EOAT::Cache::FileCache do
     EOAT.cache = EOAT::Cache::FileCache.new(
         File.expand_path(File.join(File.dirname(__FILE__), '..', 'fixtures/cache'))
     )
-    EOAT::EveApi.new.ErrorList.from_cache.should == true
+    response = EOAT::EveApi.new.ErrorList
+    response.from_cache.should == true
+    response.errors.class.should == EOAT::Result::EveType::RowSet
+    response.errors.get(513).errorCode.should == '513'
   end
 
   it 'was return result again from http' do

data/spec/eoat/memcached_cache_spec.rb

@@ -9,6 +9,9 @@ describe EOAT::Cache::MemcachedCache do
 
   it 'return result from cache' do
     EOAT.cache = EOAT::Cache::MemcachedCache.new
-    EOAT::EveApi.new.ErrorList.from_cache.should == true
+    response = EOAT::EveApi.new.ErrorList
+    response.from_cache.should == true
+    response.errors.class.should == EOAT::Result::EveType::RowSet
+    response.errors.get(513).errorCode.should == '513'
   end
 end

data/spec/eoat/redis_cache_spec.rb

@@ -9,6 +9,9 @@ describe EOAT::Cache::RedisCache do
 
   it 'return result from cache' do
     EOAT.cache = EOAT::Cache::RedisCache.new
-    EOAT::EveApi.new.ErrorList.from_cache.should == true
+    response = EOAT::EveApi.new.ErrorList
+    response.from_cache.should == true
+    response.errors.class.should == EOAT::Result::EveType::RowSet
+    response.errors.get(513).errorCode.should == '513'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eoat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ivan Kotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty