neuron-client 0.2.1 → 0.2.2

data/lib/neuron-client/api.rb

@@ -50,8 +50,8 @@ module Neuron
       def configure_membase_connection
         required(@config, :membase_servers)
         self.connection = MembaseConnection.new(config.membase_servers,
-          :local_cache_size => config[:local_cache_size],
-          :local_cache_expires => config[:local_cache_expires]
+          :local_cache_size => config.local_cache_size,
+          :local_cache_expires => config.local_cache_expires
         )
       end
 

data/lib/neuron-client/membase_connection.rb

@@ -5,7 +5,7 @@ module Neuron
   module Client
     class MembaseConnection
 
-      attr_reader :client
+      attr_reader :client, :local_cache
 
       def initialize(servers, opts={})
         @client = Dalli::Client.new(servers)
@@ -22,7 +22,7 @@ module Neuron
 
       def fetch(key, ttl=nil, options=nil, &callback)
         @local_cache.fetch(key, local_ttl(ttl)) do
-          @client.fetch(key, options, &callback)
+          @client.fetch(key, ttl, options, &callback)
         end
       end
 

data/lib/neuron-client/model/membase/ad.rb

@@ -9,14 +9,14 @@ module Neuron
 
           def total_impressed
             key = "count_delivery_ad_#{self.id}"
-            self.class.connection.get(key).to_f
+            self.class.connection.get(key,1).to_f
           end
 
           def today_impressed
             now_adjusted_for_ad_time_zone = Time.now.in_time_zone(self.time_zone)
             formatted_date = now_adjusted_for_ad_time_zone.strftime('%Y%m%d') # format to YYYYMMDD
             key = "count_delivery_#{formatted_date}_ad_#{self.id}"
-            self.class.connection.get(key).to_f
+            self.class.connection.get(key,1).to_f
           end
 
           def active?
@@ -33,11 +33,13 @@ module Neuron
 
           class << self
             def find(id)
-              ad = nil
-              membase_key = "Ad:#{id}"
-              cached_json = self.connection.get(membase_key)
-              ad = self.new(Yajl.load(cached_json)[superclass.resource_name]) if cached_json.present?
-              ad
+              self.connection.local_cache.fetch("Neuron::Client::Model::Ad:#{id}") do
+                ad = nil
+                membase_key = "Ad:#{id}"
+                cached_json = self.connection.get(membase_key)
+                ad = self.new(Yajl.load(cached_json)[superclass.resource_name]) if cached_json.present?
+                ad
+              end
             end
           end
         end

data/lib/neuron-client/model/membase/blocked_referer.rb

@@ -5,10 +5,12 @@ module Neuron
         class BlockedReferer < Common::BlockedReferer
           class << self
             def all
-              blocked_referers = []
-              cached_json = self.connection.get('blocked_referers')
-              blocked_referers = Yajl.load(cached_json).collect{|item| self.new(item[superclass.resource_name])} if cached_json.present?
-              blocked_referers
+              self.connection.local_cache.fetch("Neuron::Client::Model::BlockedReferer:all") do
+                blocked_referers = []
+                cached_json = self.connection.get('blocked_referers')
+                blocked_referers = Yajl.load(cached_json).collect{|item| self.new(item[superclass.resource_name])} if cached_json.present?
+                blocked_referers
+              end
             end
           end
         end

data/lib/neuron-client/model/membase/blocked_user_agent.rb

@@ -5,10 +5,12 @@ module Neuron
         class BlockedUserAgent < Common::BlockedUserAgent
           class << self
             def all
-              blocked_user_agents = []
-              cached_json = self.connection.get('blocked_user_agents')
-              blocked_user_agents = Yajl.load(cached_json).collect{|item| self.new(item[superclass.resource_name])} if cached_json.present?
-              blocked_user_agents
+              self.connection.local_cache.fetch("Neuron::Client::Model::BlockedUserAgent:all") do
+                blocked_user_agents = []
+                cached_json = self.connection.get('blocked_user_agents')
+                blocked_user_agents = Yajl.load(cached_json).collect{|item| self.new(item[superclass.resource_name])} if cached_json.present?
+                blocked_user_agents
+              end
             end
           end
         end

data/lib/neuron-client/model/membase/zone.rb

@@ -14,11 +14,13 @@ module Neuron
 
           class << self
             def find(id)
-              zone = nil
-              membase_key = "Zone:#{id}"
-              cached_json = self.connection.get(membase_key)
-              zone = self.new(Yajl.load(cached_json)[superclass.resource_name]) if cached_json.present?
-              zone
+              self.connection.local_cache.fetch("Neuron::Client::Model::Zone:#{id}") do
+                zone = nil
+                membase_key = "Zone:#{id}"
+                cached_json = self.connection.get(membase_key)
+                zone = self.new(Yajl.load(cached_json)[superclass.resource_name]) if cached_json.present?
+                zone
+              end
             end
           end
         end

data/lib/neuron-client/version.rb

@@ -1,5 +1,5 @@
 module Neuron
   module Client
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/spec/lib/model/membase/ad_spec.rb

@@ -7,7 +7,7 @@ module Neuron
             it "should call the expected methods and return the expected value" do
               a = Ad.allocate
               a.should_receive(:id).and_return(7)
-              Ad.stub_chain(:connection, :get).with('count_delivery_ad_7').and_return('999.999')
+              Ad.stub_chain(:connection, :get).with('count_delivery_ad_7',1).and_return('999.999')
 
               a.total_impressed.should == 999.999
             end
@@ -19,7 +19,7 @@ module Neuron
               a.should_receive(:time_zone).and_return('time_zone_value')
               Time.stub_chain(:now, :in_time_zone).with('time_zone_value').and_return(Time.parse("2011-05-06 07:08"))
               a.should_receive(:id).and_return(7)
-              Ad.stub_chain(:connection, :get).with('count_delivery_20110506_ad_7').and_return('99.99')
+              Ad.stub_chain(:connection, :get).with('count_delivery_20110506_ad_7',1).and_return('99.99')
 
               a.today_impressed.should == 99.99
             end
@@ -28,7 +28,9 @@ module Neuron
           describe "Ad.find(id)" do
             context "when the connection returns a value" do
               it "should call the expected methods and return the expected value" do
-                Ad.stub_chain(:connection, :get).with('Ad:7').and_return('{"ad":{"attr":"value","attr2":"value2"}}')
+                connection = MembaseConnection.new("example.com:11211")
+                Ad.stub(:connection).and_return(connection)
+                connection.stub(:get).with('Ad:7').and_return('{"ad":{"attr":"value","attr2":"value2"}}')
                 a = stub(:ad)
                 Ad.should_receive(:new).with({'attr' => 'value', 'attr2' => 'value2'}).and_return(a)
 
@@ -37,7 +39,9 @@ module Neuron
             end
             context "when the connection returns nil" do
               it "should call the expected methods and return nil" do
-                Ad.stub_chain(:connection, :get).with('Ad:7').and_return(nil)
+                connection = MembaseConnection.new("example.com:11211")
+                Ad.stub(:connection).and_return(connection)
+                connection.stub(:get).with('Ad:7').and_return(nil)
 
                 Ad.find(7).should be_nil
               end

data/spec/lib/model/membase/blocked_referer_spec.rb

@@ -6,7 +6,9 @@ module Neuron
           describe "BlockedReferer.all" do
             context "when connection returns a value" do
               it "should call the expected methods and return the expected value" do
-                BlockedReferer.stub_chain(:connection, :get).with('blocked_referers').and_return('[{"blocked_referer":{"attr":"value"}},{"blocked_referer":{"attr2":"value2"}}]')
+                conn = MembaseConnection.new("example.com:11211")
+                BlockedReferer.stub(:connection).and_return(conn)
+                conn.stub(:get).with('blocked_referers').and_return('[{"blocked_referer":{"attr":"value"}},{"blocked_referer":{"attr2":"value2"}}]')
                 br = stub(:blocked_referer)
                 br2 = stub(:blocked_referer2)
                 BlockedReferer.should_receive(:new).with({'attr' => 'value'}).and_return(br)
@@ -17,7 +19,9 @@ module Neuron
             end
             context "when connection returns nil" do
               it "should call the expected methods and return the expected value" do
-                BlockedReferer.stub_chain(:connection, :get).with('blocked_referers').and_return(nil)
+                conn = MembaseConnection.new("example.com:11211")
+                BlockedReferer.stub(:connection).and_return(conn)
+                conn.stub(:get).with('blocked_referers').and_return(nil)
 
                 BlockedReferer.all.should == []
               end

data/spec/lib/model/membase/blocked_user_agent_spec.rb

@@ -6,7 +6,9 @@ module Neuron
           describe "BlockedUserAgent.all" do
             context "when connection returns a value" do
               it "should call the expected methods and return the expected value" do
-                BlockedUserAgent.stub_chain(:connection, :get).with('blocked_user_agents').and_return('[{"blocked_user_agent":{"attr":"value"}},{"blocked_user_agent":{"attr2":"value2"}}]')
+                conn = MembaseConnection.new("example.com:11211")
+                BlockedUserAgent.stub(:connection).and_return(conn)
+                conn.stub(:get).with('blocked_user_agents').and_return('[{"blocked_user_agent":{"attr":"value"}},{"blocked_user_agent":{"attr2":"value2"}}]')
                 bua = stub(:blocked_user_agent)
                 bua2 = stub(:blocked_user_agent2)
                 BlockedUserAgent.should_receive(:new).with({'attr' => 'value'}).and_return(bua)
@@ -17,7 +19,9 @@ module Neuron
             end
             context "when connection returns nil" do
               it "should call the expected methods and return the expected value" do
-                BlockedUserAgent.stub_chain(:connection, :get).with('blocked_user_agents').and_return(nil)
+                conn = MembaseConnection.new("example.com:11211")
+                BlockedUserAgent.stub(:connection).and_return(conn)
+                conn.stub(:get).with('blocked_user_agents').and_return(nil)
 
                 BlockedUserAgent.all.should == []
               end

data/spec/lib/model/membase/zone_spec.rb

@@ -6,7 +6,9 @@ module Neuron
           describe "Zone.all" do
             context "when connection.get returns a value" do
               it "should call the expected methods and return the expected result" do
-                Zone.stub_chain(:connection, :get).with('Zone:7').and_return('{"zone":{"attr":"value","attr2":"value2"}}')
+                conn = MembaseConnection.new("example.com:11211")
+                Zone.stub(:connection).and_return(conn)
+                conn.stub(:get).with('Zone:7').and_return('{"zone":{"attr":"value","attr2":"value2"}}')
                 z = stub(:zone)
                 Zone.should_receive(:new).with({'attr' => 'value', 'attr2' => 'value2'}).and_return(z)
 
@@ -15,7 +17,9 @@ module Neuron
             end
             context "when connection.get returns nil" do
               it "should call the expected methods and return nil" do
-                Zone.stub_chain(:connection, :get).with('Zone:7').and_return(nil)
+                conn = MembaseConnection.new("example.com:11211")
+                Zone.stub(:connection).and_return(conn)
+                conn.stub(:get).with('Zone:7').and_return(nil)
 
                 Zone.find(7).should be_nil
               end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: neuron-client
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - RMM Online