amfetamine 0.3.0 → 0.3.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.3.1
+- memcached_instance Dalli::Client configuration setting changes (it should now start with "memcached://")
+
 0.3.0
 - Caching is now turned off by default in Rails development/test modes
 - Add `class_name` and `foreign_key` options to relationships, which allows mapping resources to local Amfetamine classes with different names

data/README.md

@@ -47,15 +47,22 @@ Create an initializer, note that you can also do this on a per object basis:
 ```ruby
 #config/initializers/amfetamine_config.rb
 Amfetamine::Config.configure do |config|
-  config.memcached_instance = [HOST:PORT, OPTION1,OPTION2] || HOST:PORT
+  config.memcached_instance = "memcached://user:pass@host:port:weight", options_hash  # See [Dalli::Client](https://github.com/mperham/dalli/blob/master/lib/dalli/client.rb)
   config.rest_client = REST_CLIENT
 
   # Optional
   config.resource_suffix = '.json' # The suffix to the path
-  config.base_uri = 'http://bla.bla/bla/' # If you either need a path or domain infront of your URI, you can do it here. Its advised to use httparty for this.
+  config.base_uri = 'http://bla.bla/bla/' # If you either need a path or domain infront of your URI, you can do it here. It's advised to use httparty for this.
 end
 ```
 
+On Heroku your `memcached_instance` variable can look like this (with the memcached addon enabled):
+
+```ruby
+config.memcached_instance = "memcached://#{ENV['MEMCACHE_USERNAME']}:#{ENV['MEMCACHE_PASSWORD']}@#{ENV['MEMCACHE_SERVERS']}:11211"
+```
+
+
 ### 3)
 Configure your object:
 
@@ -63,7 +70,7 @@ Configure your object:
 class Banana < Amfetamine::Base
   # Right now methods are set dynamically, the older syntax is deprecated. Will move to an or/or situation.
   # OPTIONAL: Per object configuration
-  amfetamine_configure memcached_instance: 'localhost:11211',
+  amfetamine_configure memcached_instance: 'memcached://localhost:11211',
                  rest_client: BananaRestclient
 
 end

data/amfetamine.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pry"
 
   # Runtime dependencies
-  s.add_runtime_dependency "dalli"
+  s.add_runtime_dependency "dalli", ['>= 2.2.1']
   s.add_runtime_dependency "activesupport" # For helper methods
   s.add_runtime_dependency "activemodel" # For validations and AM like behaviour
   s.add_runtime_dependency "json"

data/lib/amfetamine/caching_adapter.rb

@@ -7,9 +7,8 @@ module Amfetamine
       base.send(:include,ClassAndInstanceMethods)
     end
 
-
-    def initialize(server, options={})
-      @cache_server ||= Dalli::Client.new(server, options)
+    def initialize(servers, options={})
+      @cache_server ||= Dalli::Client.new(servers, options)
     end
 
     def cache_server
@@ -54,13 +53,10 @@ module Amfetamine
 
     module CacheServer
       private
+
       def cache_server
         Amfetamine::Config.memcached_instance
       end
-
-  
-
     end
   end
 end
-

data/lib/amfetamine/config.rb

@@ -9,9 +9,8 @@ module Amfetamine
         @base_uri ||= ""
       end
 
-      def memcached_instance=(value, options={})
-        raise ConfigurationInvalid, 'Invalid value for memcached_instance' if !value.is_a?(String)
-        @memcached_instance ||= Dalli::Client.new(value, options)
+      def memcached_instance=(servers, options={})
+        @memcached_instance ||= Dalli::Client.new(servers, options)
       end
 
       def rest_client=(value)

data/lib/amfetamine/version.rb

@@ -1,3 +1,3 @@
 module Amfetamine
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amfetamine
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -195,7 +195,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -333,7 +333,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4163932578961634705
+      hash: 764523330913255459
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -342,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4163932578961634705
+      hash: 764523330913255459
 requirements: []
 rubyforge_project: amfetamine
 rubygems_version: 1.8.24