neuron-client 0.2.0 → 0.2.1

data/.rvmrc

@@ -1 +1,21 @@
-rvm use ruby-1.9.2@neuron-client
+#!/usr/bin/env bash
+
+ruby_string="1.8.7"
+gemset_name="neuron-client"
+
+if rvm list strings | grep -q "${ruby_string}" ; then
+
+  # Load or create the specified environment
+  if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+    && -s "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}" ]] ; then
+    \. "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}"
+  else
+    rvm --create  "${ruby_string}@${gemset_name}"
+  fi
+
+else
+
+  # Notify the user to install the desired interpreter before proceeding.
+  echo "${ruby_string} was not found, please run 'rvm install ${ruby_string}' and then cd back into the project directory."
+
+fi

data/Rakefile

@@ -20,5 +20,5 @@ end
 desc "Open development console"
 task :console do
   puts "Loading development console..."
-  system "irb -I #{File.join('.', 'lib')} -r #{File.join('.', 'lib', 'neuron-client')}"
+  system "irb -I #{File.join('.', 'lib')} -r #{File.join('.', 'environment')}"
 end

data/environment.rb

@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'bundler'
+Bundler.require(:default, :test, :development)

data/lib/neuron-client.rb

@@ -1,3 +1,6 @@
+require "rubygems"
+require "tzinfo"
+require "active_support" #TODO: when we upgrade to 3.x, this can be "active_support/core_ext"
 require "active_support/core_ext"
 require "neuron-client/version"
 require "neuron-client/admin_connection"

data/lib/neuron-client/api.rb

@@ -49,7 +49,10 @@ module Neuron
 
       def configure_membase_connection
         required(@config, :membase_servers)
-        self.connection = MembaseConnection.new(config.membase_servers)
+        self.connection = MembaseConnection.new(config.membase_servers,
+          :local_cache_size => config[:local_cache_size],
+          :local_cache_expires => config[:local_cache_expires]
+        )
       end
 
       class << self

data/lib/neuron-client/membase_connection.rb

@@ -1,4 +1,5 @@
 require 'dalli'
+require 'lrucache'
 
 module Neuron
   module Client
@@ -6,12 +7,36 @@ module Neuron
 
       attr_reader :client
 
-      def initialize(servers)
+      def initialize(servers, opts={})
         @client = Dalli::Client.new(servers)
+        @local_cache = LRUCache.new(
+          :max_items => opts[:local_cache_size],
+          :ttl => opts[:local_cache_expires] || 60.seconds)
       end
 
-      def get(key)
-        @client.get(key)
+      def get(key, ttl=nil)
+        @local_cache.fetch(key, local_ttl(ttl)) do
+          @client.get(key)
+        end
+      end
+
+      def fetch(key, ttl=nil, options=nil, &callback)
+        @local_cache.fetch(key, local_ttl(ttl)) do
+          @client.fetch(key, options, &callback)
+        end
+      end
+
+      private
+
+      def local_ttl(ttl)
+        return nil if ttl.nil?
+        ttl = Float(ttl)
+        local_ttl = @local_cache.ttl
+        if local_ttl.nil? || local_ttl == 0 || local_ttl > ttl
+          ttl
+        else
+          nil
+        end
       end
     end
   end

data/lib/neuron-client/model/admin/base.rb

@@ -4,7 +4,7 @@ module Neuron
       module Admin
         module Base
           def attributes
-            self.class.attributes || []
+            self.class.superclass.attributes || []
           end
 
           def to_hash(*except)
@@ -55,7 +55,7 @@ module Neuron
           end
 
           def self.included(base)
-            base.send(:attr_accessor, :errors)
+            base.superclass.send(:attr_accessor, :errors)
             base.extend(ClassMethods)
           end
 
@@ -73,7 +73,7 @@ module Neuron
             end
 
             def create(attrs={})
-              @errors = catch (:errors) do
+              @errors = catch(:errors) do
                 return create!(attrs)
               end
               nil

data/lib/neuron-client/model/base.rb

@@ -9,7 +9,7 @@ module Neuron
         end
 
         def method_missing(meth, *args, &block)
-          (@proxied_model.methods.include?(meth) ? @proxied_model.send(meth, *args, &block) : super)
+          (@proxied_model.respond_to?(meth) ? @proxied_model.send(meth, *args, &block) : super)
         end
 
         class << self
@@ -29,7 +29,7 @@ module Neuron
           end
 
           def method_missing(meth, *args, &block)
-            (class_to_proxy.methods.include?(meth) ? class_to_proxy.send(meth, *args, &block) : super)
+            (class_to_proxy.respond_to?(meth) ? class_to_proxy.send(meth, *args, &block) : super)
           end
         end
       end

data/lib/neuron-client/model/common/ad_calculations.rb

@@ -91,7 +91,7 @@ module Neuron
           # Doesn't worry about whether or not the time is in the ad's date range.
           # Assumes ad is partitioned.
           def partitioned_hour?(time)
-            day_partitions[(time.wday * 24) + time.hour] == 'T'
+            day_partitions.at((time.wday * 24) + time.hour) == 'T'
           end
 
           # Assume time is in the time zone of the ad.

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

@@ -3,6 +3,10 @@ module Neuron
     module Model
       module Membase
         class Ad < Common::Ad
+
+          ACTIVE_TTL = 60 #seconds
+          PRESSURE_TTL = 60 #seconds
+
           def total_impressed
             key = "count_delivery_ad_#{self.id}"
             self.class.connection.get(key).to_f
@@ -15,6 +19,18 @@ module Neuron
             self.class.connection.get(key).to_f
           end
 
+          def active?
+            self.class.connection.fetch("Ad:#{id}:active", ACTIVE_TTL) do
+              calculate_active?(Time.now, total_impressed, today_impressed)
+            end
+          end
+
+          def pressure
+            self.class.connection.fetch("Ad:#{id}:pressure", PRESSURE_TTL) do
+              calculate_pressure(Time.now, total_impressed, today_impressed)
+            end
+          end
+
           class << self
             def find(id)
               ad = nil

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

@@ -3,6 +3,15 @@ module Neuron
     module Model
       module Membase
         class Zone < Common::Zone
+
+          ADS_BY_PRIORITY_TTL = 60
+
+          def ads_by_priority
+            self.class.connection.fetch("Zone:#{id}:ads_by_priority", ADS_BY_PRIORITY_TTL) do
+              calculate_ads_by_priority
+            end
+          end
+
           class << self
             def find(id)
               zone = nil

data/lib/neuron-client/version.rb

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

data/neuron-client.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_dependency "rest-client", "~> 1.6.3"
   s.add_dependency "yajl-ruby", "~> 0.8.2"
-  s.add_dependency "activesupport", "~> 3.0.10"
+  s.add_dependency "activesupport", ">= 2.3.11", "< 3.2"
   s.add_dependency "tzinfo", "~> 0.3.29"
   s.add_dependency "i18n", "~> 0.6.0"
   s.add_dependency "dalli", "~> 1.0.5"
+  s.add_dependency "lrucache", "~> 0.1.0"
 
   s.add_development_dependency "rspec", "~> 2.6.0"
   s.add_development_dependency "simplecov", "~> 0.4.2"

data/spec/fixtures/vcr_cassettes/s3_file.yml

@@ -1,403 +1,219 @@
----
-- !ruby/struct:VCR::HTTPInteraction
-  request: !ruby/struct:VCR::Request
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
     method: :post
     uri: http://127.0.0.1:3000/s3_files.json?api_key=secret
-    body: !!null 
-    headers:
-      accept:
+    body: 
+    headers: 
+      accept: 
       - application/json
-      accept-encoding:
-      - gzip, deflate
-      content-type:
+      content-type: 
       - application/json
-      content-length:
-      - '77'
-  response: !ruby/struct:VCR::Response
-    status: !ruby/struct:VCR::ResponseStatus
+      accept-encoding: 
+      - gzip, deflate
+      content-length: 
+      - "77"
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
       code: 201
       message: Created
-    headers:
-      location:
+    headers: 
+      x-ua-compatible: 
+      - IE=Edge
+      location: 
       - http://127.0.0.1:3000/s3_files/1
-      content-type:
+      content-type: 
       - application/json; charset=utf-8
-      cache-control:
-      - no-cache
-      x-ua-compatible:
-      - IE=Edge
-      x-runtime:
-      - '2.156203'
-      server:
+      date: 
+      - Thu, 08 Sep 2011 19:15:34 GMT
+      server: 
       - WEBrick/1.3.1 (Ruby/1.9.2/2011-07-09)
-      date:
-      - Tue, 26 Jul 2011 21:15:03 GMT
-      content-length:
-      - '156'
-      set-cookie:
-      - _neuron-admin_session=BAh7BkkiD3Nlc3Npb25faWQGOgZFRiIlNTkyMGNkZGRkZGEzMmI3ODFiMDhlZjI3ZjZjN2Y5ZTY%3D--abc9759030ac57f081014793dd0a18200acd40ce;
-        path=/; HttpOnly
-    body: !str
-      str: ! '{"s3_file":{"bucket":"test","created_at":"2011-07-26T21:15:03Z","filename":"filename","id":1,"purpose":"RAW_EVENT_LOG","updated_at":"2011-07-26T21:15:03Z"}}'
-      net_http_res: &30964600 !ruby/object:Net::HTTPCreated
-        http_version: '1.0'
-        code: '201'
-        message: Created
-        header:
-          location:
-          - http://127.0.0.1:3000/s3_files/1
-          content-type:
-          - application/json; charset=utf-8
-          cache-control:
-          - no-cache
-          x-ua-compatible:
-          - IE=Edge
-          x-runtime:
-          - '2.156203'
-          server:
-          - WEBrick/1.3.1 (Ruby/1.9.2/2011-07-09)
-          date:
-          - Tue, 26 Jul 2011 21:15:03 GMT
-          content-length:
-          - '156'
-          set-cookie:
-          - _neuron-admin_session=BAh7BkkiD3Nlc3Npb25faWQGOgZFRiIlNTkyMGNkZGRkZGEzMmI3ODFiMDhlZjI3ZjZjN2Y5ZTY%3D--abc9759030ac57f081014793dd0a18200acd40ce;
-            path=/; HttpOnly
-        body: !str
-          str: ! '{"s3_file":{"bucket":"test","created_at":"2011-07-26T21:15:03Z","filename":"filename","id":1,"purpose":"RAW_EVENT_LOG","updated_at":"2011-07-26T21:15:03Z"}}'
-          net_http_res: *30964600
-          args: &30979260
-            :method: :post
-            :url: http://127.0.0.1:3000/s3_files.json?api_key=secret
-            :payload: ! '{"s3_file":{"bucket":"test","filename":"filename","purpose":"RAW_EVENT_LOG"}}'
-            :headers:
-              :content_type: :json
-              :accept: :json
-          code: 201
-        read: true
-      args: *30979260
-      code: 201
-    http_version: '1.1'
-- !ruby/struct:VCR::HTTPInteraction
-  request: !ruby/struct:VCR::Request
+      x-runtime: 
+      - "0.271855"
+      content-length: 
+      - "172"
+      set-cookie: 
+      - _neuron-admin_session=BAh7BkkiD3Nlc3Npb25faWQGOgZFRiIlMGYwMjIzYzc3ZjAzYjIwNDYzYjhlN2FmN2E1MmI5MGI%3D--f9c0be3ce928c665c7e4008c87bc8ae44725dcb4; path=/; HttpOnly
+      cache-control: 
+      - no-cache
+    body: "{\"s3_file\":{\"bucket\":\"test\",\"created_at\":\"2011-09-08T19:15:34Z\",\"filename\":\"filename\",\"filesize\":null,\"id\":1,\"purpose\":\"RAW_EVENT_LOG\",\"updated_at\":\"2011-09-08T19:15:34Z\"}}"
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
     method: :get
     uri: http://127.0.0.1:3000/s3_files.json?api_key=secret
-    body: !!null 
-    headers:
-      accept:
+    body: 
+    headers: 
+      accept: 
       - application/json
-      accept-encoding:
-      - gzip, deflate
-      content-type:
+      content-type: 
       - application/json
-  response: !ruby/struct:VCR::Response
-    status: !ruby/struct:VCR::ResponseStatus
+      accept-encoding: 
+      - gzip, deflate
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
       code: 200
       message: OK
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      etag:
-      - ! '"f28f9f731f02abb52de52eeb140f3904"'
-      cache-control:
-      - max-age=0, private, must-revalidate
-      x-ua-compatible:
+    headers: 
+      x-ua-compatible: 
       - IE=Edge
-      x-runtime:
-      - '0.058083'
-      server:
+      etag: 
+      - "\"f653f39c883bdf1acabccea70ef2cb84\""
+      content-type: 
+      - application/json; charset=utf-8
+      date: 
+      - Thu, 08 Sep 2011 19:15:34 GMT
+      server: 
       - WEBrick/1.3.1 (Ruby/1.9.2/2011-07-09)
-      date:
-      - Tue, 26 Jul 2011 21:15:03 GMT
-      content-length:
-      - '158'
-    body: !str
-      str: ! '[{"s3_file":{"bucket":"test","created_at":"2011-07-26T21:15:03Z","filename":"filename","id":1,"purpose":"RAW_EVENT_LOG","updated_at":"2011-07-26T21:15:03Z"}}]'
-      net_http_res: &30899300 !ruby/object:Net::HTTPOK
-        http_version: '1.0'
-        code: '200'
-        message: OK
-        header:
-          content-type:
-          - application/json; charset=utf-8
-          etag:
-          - ! '"f28f9f731f02abb52de52eeb140f3904"'
-          cache-control:
-          - max-age=0, private, must-revalidate
-          x-ua-compatible:
-          - IE=Edge
-          x-runtime:
-          - '0.058083'
-          server:
-          - WEBrick/1.3.1 (Ruby/1.9.2/2011-07-09)
-          date:
-          - Tue, 26 Jul 2011 21:15:03 GMT
-          content-length:
-          - '158'
-        body: !str
-          str: ! '[{"s3_file":{"bucket":"test","created_at":"2011-07-26T21:15:03Z","filename":"filename","id":1,"purpose":"RAW_EVENT_LOG","updated_at":"2011-07-26T21:15:03Z"}}]'
-          net_http_res: *30899300
-          args: &30918140
-            :method: :get
-            :url: http://127.0.0.1:3000/s3_files.json?api_key=secret
-            :headers:
-              :content_type: :json
-              :accept: :json
-          code: 200
-        read: true
-      args: *30918140
-      code: 200
-    http_version: '1.1'
-- !ruby/struct:VCR::HTTPInteraction
-  request: !ruby/struct:VCR::Request
+      x-runtime: 
+      - "0.417905"
+      content-length: 
+      - "174"
+      cache-control: 
+      - max-age=0, private, must-revalidate
+    body: "[{\"s3_file\":{\"bucket\":\"test\",\"created_at\":\"2011-09-08T19:15:34Z\",\"filename\":\"filename\",\"filesize\":null,\"id\":1,\"purpose\":\"RAW_EVENT_LOG\",\"updated_at\":\"2011-09-08T19:15:34Z\"}}]"
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
     method: :get
     uri: http://127.0.0.1:3000/s3_files/1.json?api_key=secret
-    body: !!null 
-    headers:
-      accept:
+    body: 
+    headers: 
+      accept: 
       - application/json
-      accept-encoding:
-      - gzip, deflate
-      content-type:
+      content-type: 
       - application/json
-  response: !ruby/struct:VCR::Response
-    status: !ruby/struct:VCR::ResponseStatus
+      accept-encoding: 
+      - gzip, deflate
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
       code: 200
       message: OK
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      etag:
-      - ! '"67aa857a0fae3ef759591bfd7c6ce984"'
-      cache-control:
-      - max-age=0, private, must-revalidate
-      x-ua-compatible:
+    headers: 
+      x-ua-compatible: 
       - IE=Edge
-      x-runtime:
-      - '0.058488'
-      server:
+      etag: 
+      - "\"a4662af39919ae7cebe8fab76bb44b76\""
+      content-type: 
+      - application/json; charset=utf-8
+      date: 
+      - Thu, 08 Sep 2011 19:15:35 GMT
+      server: 
       - WEBrick/1.3.1 (Ruby/1.9.2/2011-07-09)
-      date:
-      - Tue, 26 Jul 2011 21:15:03 GMT
-      content-length:
-      - '156'
-    body: !str
-      str: ! '{"s3_file":{"bucket":"test","created_at":"2011-07-26T21:15:03Z","filename":"filename","id":1,"purpose":"RAW_EVENT_LOG","updated_at":"2011-07-26T21:15:03Z"}}'
-      net_http_res: &30863640 !ruby/object:Net::HTTPOK
-        http_version: '1.0'
-        code: '200'
-        message: OK
-        header:
-          content-type:
-          - application/json; charset=utf-8
-          etag:
-          - ! '"67aa857a0fae3ef759591bfd7c6ce984"'
-          cache-control:
-          - max-age=0, private, must-revalidate
-          x-ua-compatible:
-          - IE=Edge
-          x-runtime:
-          - '0.058488'
-          server:
-          - WEBrick/1.3.1 (Ruby/1.9.2/2011-07-09)
-          date:
-          - Tue, 26 Jul 2011 21:15:03 GMT
-          content-length:
-          - '156'
-        body: !str
-          str: ! '{"s3_file":{"bucket":"test","created_at":"2011-07-26T21:15:03Z","filename":"filename","id":1,"purpose":"RAW_EVENT_LOG","updated_at":"2011-07-26T21:15:03Z"}}'
-          net_http_res: *30863640
-          args: &30882500
-            :method: :get
-            :url: http://127.0.0.1:3000/s3_files/1.json?api_key=secret
-            :headers:
-              :content_type: :json
-              :accept: :json
-          code: 200
-        read: true
-      args: *30882500
-      code: 200
-    http_version: '1.1'
-- !ruby/struct:VCR::HTTPInteraction
-  request: !ruby/struct:VCR::Request
+      x-runtime: 
+      - "0.370982"
+      content-length: 
+      - "172"
+      cache-control: 
+      - max-age=0, private, must-revalidate
+    body: "{\"s3_file\":{\"bucket\":\"test\",\"created_at\":\"2011-09-08T19:15:34Z\",\"filename\":\"filename\",\"filesize\":null,\"id\":1,\"purpose\":\"RAW_EVENT_LOG\",\"updated_at\":\"2011-09-08T19:15:34Z\"}}"
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
     method: :get
     uri: http://127.0.0.1:3000/s3_files/1.json?api_key=secret
-    body: !!null 
-    headers:
-      accept:
+    body: 
+    headers: 
+      accept: 
       - application/json
-      accept-encoding:
-      - gzip, deflate
-      content-type:
+      content-type: 
       - application/json
-  response: !ruby/struct:VCR::Response
-    status: !ruby/struct:VCR::ResponseStatus
+      accept-encoding: 
+      - gzip, deflate
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
       code: 200
       message: OK
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      etag:
-      - ! '"67aa857a0fae3ef759591bfd7c6ce984"'
-      cache-control:
-      - max-age=0, private, must-revalidate
-      x-ua-compatible:
+    headers: 
+      x-ua-compatible: 
       - IE=Edge
-      x-runtime:
-      - '0.103646'
-      server:
+      etag: 
+      - "\"a4662af39919ae7cebe8fab76bb44b76\""
+      content-type: 
+      - application/json; charset=utf-8
+      date: 
+      - Thu, 08 Sep 2011 19:15:35 GMT
+      server: 
       - WEBrick/1.3.1 (Ruby/1.9.2/2011-07-09)
-      date:
-      - Tue, 26 Jul 2011 21:15:03 GMT
-      content-length:
-      - '156'
-    body: !str
-      str: ! '{"s3_file":{"bucket":"test","created_at":"2011-07-26T21:15:03Z","filename":"filename","id":1,"purpose":"RAW_EVENT_LOG","updated_at":"2011-07-26T21:15:03Z"}}'
-      net_http_res: &30800000 !ruby/object:Net::HTTPOK
-        http_version: '1.0'
-        code: '200'
-        message: OK
-        header:
-          content-type:
-          - application/json; charset=utf-8
-          etag:
-          - ! '"67aa857a0fae3ef759591bfd7c6ce984"'
-          cache-control:
-          - max-age=0, private, must-revalidate
-          x-ua-compatible:
-          - IE=Edge
-          x-runtime:
-          - '0.103646'
-          server:
-          - WEBrick/1.3.1 (Ruby/1.9.2/2011-07-09)
-          date:
-          - Tue, 26 Jul 2011 21:15:03 GMT
-          content-length:
-          - '156'
-        body: !str
-          str: ! '{"s3_file":{"bucket":"test","created_at":"2011-07-26T21:15:03Z","filename":"filename","id":1,"purpose":"RAW_EVENT_LOG","updated_at":"2011-07-26T21:15:03Z"}}'
-          net_http_res: *30800000
-          args: &30814500
-            :method: :get
-            :url: http://127.0.0.1:3000/s3_files/1.json?api_key=secret
-            :headers:
-              :content_type: :json
-              :accept: :json
-          code: 200
-        read: true
-      args: *30814500
-      code: 200
-    http_version: '1.1'
-- !ruby/struct:VCR::HTTPInteraction
-  request: !ruby/struct:VCR::Request
+      x-runtime: 
+      - "0.432809"
+      content-length: 
+      - "172"
+      cache-control: 
+      - max-age=0, private, must-revalidate
+    body: "{\"s3_file\":{\"bucket\":\"test\",\"created_at\":\"2011-09-08T19:15:34Z\",\"filename\":\"filename\",\"filesize\":null,\"id\":1,\"purpose\":\"RAW_EVENT_LOG\",\"updated_at\":\"2011-09-08T19:15:34Z\"}}"
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
     method: :put
     uri: http://127.0.0.1:3000/s3_files/1.json?api_key=secret
-    body: !!null 
-    headers:
-      accept:
+    body: 
+    headers: 
+      accept: 
       - application/json
-      accept-encoding:
-      - gzip, deflate
-      content-type:
+      content-type: 
       - application/json
-      content-length:
-      - '37'
-  response: !ruby/struct:VCR::Response
-    status: !ruby/struct:VCR::ResponseStatus
+      accept-encoding: 
+      - gzip, deflate
+      content-length: 
+      - "37"
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
       code: 200
       message: OK
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      etag:
-      - ! '"99914b932bd37a50b983c5e7c90ae93b"'
-      cache-control:
-      - max-age=0, private, must-revalidate
-      x-ua-compatible:
+    headers: 
+      x-ua-compatible: 
       - IE=Edge
-      x-runtime:
-      - '0.062569'
-      server:
+      etag: 
+      - "\"99914b932bd37a50b983c5e7c90ae93b\""
+      content-type: 
+      - application/json; charset=utf-8
+      date: 
+      - Thu, 08 Sep 2011 19:15:36 GMT
+      server: 
       - WEBrick/1.3.1 (Ruby/1.9.2/2011-07-09)
-      date:
-      - Tue, 26 Jul 2011 21:15:03 GMT
-      content-length:
-      - '2'
-      set-cookie:
-      - _neuron-admin_session=BAh7BkkiD3Nlc3Npb25faWQGOgZFRiIlODcyMjcxYjA1YzMzYjhmY2Q4YTQyY2NmMTg3ZWZlNjM%3D--3ea83e017a27c14576690a4d98b58f12c9c3b480;
-        path=/; HttpOnly
-    body: ! '{}'
-    http_version: '1.1'
-- !ruby/struct:VCR::HTTPInteraction
-  request: !ruby/struct:VCR::Request
+      x-runtime: 
+      - "0.377332"
+      content-length: 
+      - "2"
+      set-cookie: 
+      - _neuron-admin_session=BAh7BkkiD3Nlc3Npb25faWQGOgZFRiIlNDk0OWE5MjQ1MDk2OGQ3NDM5OWI2MjIyMTMwNTdkZTI%3D--b9b28d47b6b1ead701897392b8486b60cc1a8f53; path=/; HttpOnly
+      cache-control: 
+      - max-age=0, private, must-revalidate
+    body: "{}"
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
     method: :get
     uri: http://127.0.0.1:3000/s3_files/1.json?api_key=secret
-    body: !!null 
-    headers:
-      accept:
+    body: 
+    headers: 
+      accept: 
       - application/json
-      accept-encoding:
-      - gzip, deflate
-      content-type:
+      content-type: 
       - application/json
-  response: !ruby/struct:VCR::Response
-    status: !ruby/struct:VCR::ResponseStatus
+      accept-encoding: 
+      - gzip, deflate
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
       code: 200
       message: OK
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      etag:
-      - ! '"717dca0db92d340da526fc4e869d36a6"'
-      cache-control:
-      - max-age=0, private, must-revalidate
-      x-ua-compatible:
+    headers: 
+      x-ua-compatible: 
       - IE=Edge
-      x-runtime:
-      - '0.102077'
-      server:
+      etag: 
+      - "\"2e781d02ae0edd8b484cab6de90dac46\""
+      content-type: 
+      - application/json; charset=utf-8
+      date: 
+      - Thu, 08 Sep 2011 19:15:36 GMT
+      server: 
       - WEBrick/1.3.1 (Ruby/1.9.2/2011-07-09)
-      date:
-      - Tue, 26 Jul 2011 21:15:03 GMT
-      content-length:
-      - '158'
-    body: ! '{"s3_file":{"bucket":"test","created_at":"2011-07-26T21:15:03Z","filename":"filename_2","id":1,"purpose":"RAW_EVENT_LOG","updated_at":"2011-07-26T21:15:03Z"}}'
-    http_version: '1.1'
-- !ruby/struct:VCR::HTTPInteraction
-  request: !ruby/struct:VCR::Request
-    method: :put
-    uri: http://127.0.0.1:3000//1.json?api_key=secret
-    body: !!null 
-    headers:
-      accept:
-      - application/json
-      accept-encoding:
-      - gzip, deflate
-      content-type:
-      - application/json
-      content-length:
-      - '30'
-  response: !ruby/struct:VCR::Response
-    status: !ruby/struct:VCR::ResponseStatus
-      code: 404
-      message: Not Found
-    headers:
-      content-type:
-      - text/html
-      content-length:
-      - '627'
-      x-runtime:
-      - '0.299115'
-      connection:
-      - keep-alive
-      server:
-      - thin 1.2.11 codename Bat-Shit Crazy
-    body: ! "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n  <title>Action
-      Controller: Exception caught</title>\n  <style>\n    body { background-color:
-      #fff; color: #333; }\n\n    body, p, ol, ul, td {\n      font-family: verdana,
-      arial, helvetica, sans-serif;\n      font-size:   13px;\n      line-height:
-      18px;\n    }\n\n    pre {\n      background-color: #eee;\n      padding: 10px;\n
-      \     font-size: 11px;\n    }\n\n    a { color: #000; }\n    a:visited { color:
-      #666; }\n    a:hover { color: #fff; background-color:#000; }\n  </style>\n</head>\n<body>\n\n<h1>Routing
-      Error</h1>\n<p><pre>No route matches &quot;/1.json&quot;</pre></p>\n\n\n\n</body>\n</html>\n"
-    http_version: '1.1'
+      x-runtime: 
+      - "0.430121"
+      content-length: 
+      - "174"
+      cache-control: 
+      - max-age=0, private, must-revalidate
+    body: "{\"s3_file\":{\"bucket\":\"test\",\"created_at\":\"2011-09-08T19:15:34Z\",\"filename\":\"filename_2\",\"filesize\":null,\"id\":1,\"purpose\":\"RAW_EVENT_LOG\",\"updated_at\":\"2011-09-08T19:15:36Z\"}}"
+    http_version: "1.1"

data/spec/lib/admin_connection_spec.rb

@@ -1,82 +1,180 @@
 module Neuron
   module Client
     describe AdminConnection do
+      
+      def stub_rest_client(receive, with_args, yield_args)
+        expectation = RestClient.should_receive(receive).with(*with_args)
+        if RUBY_VERSION =~ /^1\.8\./
+          expectation.and_yield(yield_args)
+        elsif RUBY_VERSION =~ /^1\.9\./
+          expectation.and_yield(*yield_args)
+        end
+      end
+
+      before(:each) do
+        @ac = AdminConnection.new('url', 'key')
+        @response = mock(:response, :code=>200, :to_str=>"{}")
+        @request = mock(:request)
+        @result = mock(:result)
+      end
+
       describe "initialize(url, key)" do
-        it "should set the appropriate instance variables"
+        it "should set the appropriate instance variables" do
+          @ac.class.should == Neuron::Client::AdminConnection
+        end
       end
 
       describe "query_string(attrs={})" do
-        it "should return the expected value"
+        it "should return the expected value" do
+          @ac.query_string({}).should == "api_key=key"
+          @ac.query_string(:foo=>'foo').split('&').sort.should == ["api_key=key","foo=foo"]
+        end
       end
 
       describe "get(path="", attrs={})" do
         context "when response.code is 200" do
           context "when the format is :json" do
-            it "should call the expected methods and return the expected value"
+            it "should call the expected methods and return the expected value" do
+              stub_rest_client(:get, ["url/json?api_key=key", {:content_type=>:json, :accept=>:json}], [@response, @request, @result])
+              @ac.get().should == Yajl.load(@response.to_str)
+            end
           end
         end
         context "when response.code is not 200" do
-          it "it should raise an error"
+          it "it should raise an error" do
+            @response.should_receive(:code).twice.and_return(500)
+            stub_rest_client(:get,["url/json?api_key=key", {:content_type=>:json, :accept=>:json}],[@response, @request, @result])
+            lambda{
+              @ac.get()              
+            }.should raise_error
+          end
         end
       end
 
       describe "post(path="", form={}, attrs={})" do
         context "when response.code is 201" do
           context "when the format is :json" do
-            it "should call the expected methods and return the expected value"
+            it "should call the expected methods and return the expected value" do
+              @response.should_receive(:code).and_return(201)
+              stub_rest_client(:post,["url/json?api_key=key", "{}", {:content_type=>:json, :accept=>:json}],[@response, @request, @result])
+              @ac.post().should == Yajl.load(@response.to_str)
+            end
           end
           context "when the format is not :json" do
-            it "should call the expected methods and return the expected value"
+            it "should call the expected methods and return the expected value" do
+              @response.should_receive(:code).and_return(201)
+              stub_rest_client(:post,["url/path.html?api_key=key", "{}", {:content_type=>:html, :accept=>:html}],[@response, @request, @result])
+              @ac.post(:path, "{}", :format=>:html).should == @response.to_str
+            end
           end
         end
         context "when response.code is 422" do
           context "when the format is :json" do
-            it "should throw the expected symbol and object"
+            it "should throw the expected symbol and object" do
+              @response.should_receive(:code).and_return(422)
+              stub_rest_client(:post, ["url/json?api_key=key", "{}", {:content_type=>:json, :accept=>:json}],[@response, @request, @result])
+              lambda{
+                @ac.post()
+              }.should raise_error
+            end
           end
           context "when the format is not :json" do
-            it "should throw the expected symbol and object"
+            it "should throw the expected symbol and object" do
+              @response.should_receive(:code).and_return(422)
+              stub_rest_client(:post, ["url/path.html?api_key=key", "{}", {:content_type=>:html, :accept=>:html}],[@response, @request, @result])
+              lambda{
+                @ac.post(:path, "{}", :format=>:html)
+              }.should raise_error
+            end
           end
         end
         context "when response.code is not 201 or 422" do
-          it "should raise an error"
+          it "should raise an error" do
+            @response.should_receive(:code).and_return(500)
+            stub_rest_client(:post,["url/json?api_key=key", "{}", {:content_type=>:json, :accept=>:json}],[@response, @request, @result])
+            lambda{
+              @ac.post()
+            }.should raise_error
+          end
         end
       end
-
+      
       describe "put(path="", form={}, attrs={})" do
         context "when response.code is 200" do
           context "when the format is :json" do
-            it "should call the expected methods and return the expected value"
+            it "should call the expected methods and return the expected value" do
+              @response.should_receive(:code).and_return(200)
+              stub_rest_client(:put,["url/json?api_key=key", "{}", {:content_type=>:json, :accept=>:json}],[@response, @request, @result])
+              @ac.put().should == Yajl.load(@response.to_str)
+            end
           end
           context "when the format is not :json" do
-            it "should call the expected methods and return the expected value"
+            it "should call the expected methods and return the expected value" do
+              @response.should_receive(:code).and_return(200)
+              stub_rest_client(:put,["url/path.html?api_key=key", "{}", {:content_type=>:html, :accept=>:html}],[@response, @request, @result])
+              @ac.put(:path, "{}", :format=>:html).should == @response.to_str
+            end
           end
         end
         context "when response.code is 422" do
           context "when the format is :json" do
-            it "should throw the expected symbol and object"
+            it "should throw the expected symbol and object" do
+              @response.should_receive(:code).and_return(422)
+              stub_rest_client(:put,["url/json?api_key=key", "{}", {:content_type=>:json, :accept=>:json}],[@response, @request, @result])
+              lambda{
+                @ac.put()
+              }.should raise_error
+            end
           end
           context "when the format is not :json" do
-            it "should throw the expected symbol and object"
+            it "should throw the expected symbol and object" do
+              @response.should_receive(:code).and_return(422)
+              stub_rest_client(:put,["url/json?api_key=key", "{}", {:content_type=>:json, :accept=>:json}],[@response, @request, @result])
+              lambda{
+                @ac.put()
+              }.should raise_error
+            end
           end
         end
         context "when response.code is not 200 or 422" do
-          it "should raise an error"
+          it "should raise an error" do
+            @response.should_receive(:code).and_return(500)
+            stub_rest_client(:put,["url/json?api_key=key", "{}", {:content_type=>:json, :accept=>:json}],[@response, @request, @result])
+            lambda{
+              @ac.put()
+            }.should raise_error
+          end
         end
       end
-
+      
       describe "delete(path="", attrs={})" do
         context "when response.code is 200" do
           context "when format is :json" do
-            it "should call the expected methods and return the expected value"
+            it "should call the expected methods and return the expected value" do
+              @response.should_receive(:code).and_return(200)
+              stub_rest_client(:delete,["url/path.json?api_key=key", {:content_type=>:json, :accept=>:json}],[@response, @request, @result])
+              @ac.delete(:path).should == Yajl.load(@response.to_str)
+            end
           end
           context "when format is not :json" do
-            it "should call the expected methods and return the expected value"
+            it "should call the expected methods and return the expected value" do
+              @response.should_receive(:code).and_return(200)
+              stub_rest_client(:delete,["url/path.html?api_key=key", {:content_type=>:html, :accept=>:html}],[@response, @request, @result])
+              @ac.delete(:path, :format=>:html).should == @response.to_str
+            end
           end
         end
         context "when response.code is not 200" do
-          it "should raise an error"
+          it "should raise an error" do
+            @response.should_receive(:code).and_return(500)
+            stub_rest_client(:delete,["url/json?api_key=key", {:content_type=>:json, :accept=>:json}],[@response, @request, @result])
+            lambda{
+              @ac.delete()
+            }.should raise_error
+          end
         end
       end
+      
     end
   end
 end

data/spec/lib/membase_connection_spec.rb

@@ -14,12 +14,12 @@ module Neuron
 
       describe "get(key)" do
         it "should call the expected method and return the expected value" do
-          m = MembaseConnection.allocate
           c = stub(:client)
-          m.instance_variable_set(:@client, c)
+          Dalli::Client.should_receive(:new).with('127.0.0.1:11211').and_return(c)
+          m = MembaseConnection.new('127.0.0.1:11211')
           c.should_receive(:get).with('key_value')
 
-          m.get('key_value')
+          m.get('key_value', 42)
         end
       end
     end

data/spec/lib/model/common/ad_calculations_spec.rb

@@ -19,9 +19,12 @@ module Neuron
         describe AdCalculations do
           context "given an Ad with date range Sat, 01 Jan 2011, 00:00 -> Tue, 01 Feb 2011, 12:00; Beijing time; Day parted for 9:00 - 17:00, M-F; Daily cap of 10; Overall cap of 100; total_impressed of 50; today_impressed of 5" do
             before(:each) do
+              @time_zone = "Beijing"
+              Time.zone = @time_zone
+              Chronic.time_class = Time.zone
               @ad = FakeAd.new(
-                :start_datetime => Time.new(2011,1,1,0,0,0,"+08:00"),
-                :end_datetime => Time.new(2011,2,1,12,0,0,"+08:00"),
+                :start_datetime => Chronic.parse("2011-01-01 00:00"),
+                :end_datetime => Chronic.parse("2011-02-01 12:00"),
                 :time_zone => "Beijing",
                 :day_partitions => "F"*24 + ("F"*9 + "T"*8 + "F"*7)*5 + "F"*24,
                 :daily_cap => 10,
@@ -32,22 +35,22 @@ module Neuron
               )
             end
             it "should be inactive on December 10th, 2010" do
-              Timecop.freeze(Time.new(2010,12,10)) do
+              Timecop.freeze(Chronic.parse("2010-12-10")) do
                 @ad.active?.should be_false
               end
             end
             it "should be inactive on January 1st, 2011" do
-              Timecop.freeze(Time.new(2011,1,1,10,0,0,"+08:00")) do
+              Timecop.freeze(Chronic.parse("2011-01-01 10:00")) do
                 @ad.active?.should be_false
               end
             end
             it "should be inactive on January 3rd, 2011 at 5:00 AM" do
-              Timecop.freeze(Time.new(2011,1,3,5,0,0,"+08:00")) do
+              Timecop.freeze(Chronic.parse("2011-01-03 05:00")) do
                 @ad.active?.should be_false
               end
             end
             context "on January 3rd, 2011 at 10:00 AM" do
-              before(:each) { Timecop.freeze(Time.new(2011,1,3,10,0,0,"+08:00")) }
+              before(:each) { Timecop.freeze(Chronic.parse("2011-01-03 10:00")) }
               after(:each) { Timecop.return }
               it "should be active" do
                 @ad.active?.should be_true
@@ -57,7 +60,7 @@ module Neuron
               end
             end
             context "on January 3rd, 2011 at 16:00" do
-              before(:each) { Timecop.freeze(Time.new(2011,1,3,16,0,0,"+08:00")) }
+              before(:each) { Timecop.freeze(Chronic.parse("2011-1-3 16:00")) }
               after(:each) { Timecop.return }
               it "should be active" do
                 @ad.active?.should be_true
@@ -67,7 +70,7 @@ module Neuron
               end
             end
             context "on January 27th, 2011 at 16:00" do
-              before(:each) { Timecop.freeze(Time.new(2011,1,27,16,0,0,"+08:00")) }
+              before(:each) { Timecop.freeze(Chronic.parse("2011-1-27 16:00")) }
               after(:each) { Timecop.return }
               it "should be active" do
                 @ad.active?.should be_true
@@ -77,7 +80,7 @@ module Neuron
               end
             end
             it "should be inactive on February 1st, 2011 at 13:00" do
-              Timecop.freeze(Time.new(2011,2,1,13,0,0,"+08:00")) do
+              Timecop.freeze(Chronic.parse("2011-2-1 13:00")) do
                 @ad.active?.should be_false
               end
             end

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

@@ -17,7 +17,7 @@ module Neuron
             it "should call the expected methods and return the expected value" do
               a = Ad.allocate
               a.should_receive(:time_zone).and_return('time_zone_value')
-              Time.stub_chain(:now, :in_time_zone).with('time_zone_value').and_return(Time.new(2011, 5, 6, 7, 8, 9))
+              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')
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: neuron-client
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - RMM Online
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 -05:00
+date: 2011-09-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,14 +56,21 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 21
         segments: 
+        - 2
         - 3
-        - 0
-        - 10
-        version: 3.0.10
+        - 11
+        version: 2.3.11
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 2
+        version: "3.2"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -115,9 +122,25 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: lrucache
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -129,11 +152,11 @@ dependencies:
         - 0
         version: 2.6.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: simplecov
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -145,11 +168,11 @@ dependencies:
         - 2
         version: 0.4.2
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rb-fsevent
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -161,11 +184,11 @@ dependencies:
         - 3
         version: 0.4.3
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: guard
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -177,11 +200,11 @@ dependencies:
         - 2
         version: 0.6.2
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: guard-bundler
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -193,11 +216,11 @@ dependencies:
         - 3
         version: 0.1.3
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: guard-rspec
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -209,11 +232,11 @@ dependencies:
         - 2
         version: 0.4.2
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -225,11 +248,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: vcr
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -241,11 +264,11 @@ dependencies:
         - 1
         version: 1.11.1
   type: :development
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: timecop
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -257,11 +280,11 @@ dependencies:
         - 5
         version: 0.3.5
   type: :development
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: chronic
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -273,7 +296,7 @@ dependencies:
         - 2
         version: 0.6.2
   type: :development
-  version_requirements: *id016
+  version_requirements: *id017
 description: Neuron Admin Client Gem
 email: 
 - devteam@rmmonline.com
@@ -290,6 +313,7 @@ files:
 - Guardfile
 - README.md
 - Rakefile
+- environment.rb
 - lib/neuron-client.rb
 - lib/neuron-client/admin_connection.rb
 - lib/neuron-client/api.rb