redistry 0.1.0 → 0.1.1

data/README.md

@@ -4,3 +4,8 @@ Redistry
 Some useful Redis patterns for Ruby (and Rails)
 
 
+TODO
+----
+
+* JSON serializer does not work with strings... not sure how to deal since this technically is not valid json
+* Allow :class as option on has_list rather than always autodetecting

data/lib/redistry/has_list/collection_proxy.rb

@@ -1,19 +1,23 @@
 module Redistry
   module HasList
     class CollectionProxy
-      include Enumerable
-
       attr_accessor :klass, :collection_name, :options
       
       def initialize(klass, collection_name, options = {})
         self.klass = klass
         self.collection_name = collection_name
         self.options = default_options.merge(options)
+        setup_serializer!
+      end
+
+      def all
+        serialized_objs = Redistry.client.lrange(key,0,-1)
+        serialized_objs.nil? || serialized_objs.empty? ? [] : @serializer.deserialize(klass, serialized_objs)
       end
 
       def add(*objs)
-        serialized_objs = Redistry.serializer.serialize(klass, objs.flatten)
-        serialized_objs.each do |val|
+        serialized_objs = @serializer.serialize(klass, objs.flatten)
+        serialized_objs.reverse.each do |val|
           Redistry.client.lpush(key, val)
         end
 
@@ -28,26 +32,10 @@ module Redistry
         self
       end
 
-      def reload
-        load_collection
-        self
-      end
-
-      def each
-        to_a.each do |v|
-          yield v
-        end
-      end
-
       def key
         @key ||= "#{klass.name}-#{collection_name.to_s}"
       end
 
-      def to_ary
-        @collection ||= load_collection
-      end
-      alias_method :to_a, :to_ary
-
       private
 
         def default_options
@@ -56,12 +44,17 @@ module Redistry
           }
         end
 
-        def load_collection
-          @collection = begin
-            serialized_objs = Redistry.client.lrange(key,0,-1)
-            Redistry.serializer.deserialize(klass, serialized_objs)
+        def setup_serializer!
+          @serializer = begin
+            if Redistry.loaded_frameworks.include?(:activerecord) &&
+               klass < ActiveRecord::Base
+              Redistry::Serializers::ActiveRecord.new
+            else
+              Redistry::Serializers::JSON.new
+            end
           end
         end
+
     end
   end
 end

data/lib/redistry/has_list.rb

@@ -10,7 +10,8 @@ module Redistry
     module ClassMethods
       
       def has_list(name, options = {})
-        instance_variable_set("@_#{name}_has_list".to_sym, CollectionProxy.new(self, name, options))
+        klass = options.delete(:class) || self
+        instance_variable_set("@_#{name}_has_list".to_sym, CollectionProxy.new(klass, name, options))
 
         class_eval <<-EOF
           def self.#{name}

data/lib/redistry/serializers/json.rb

@@ -0,0 +1,15 @@
+require 'json'
+
+module Redistry
+  module Serializers
+    class JSON
+      def serialize(klass, *objs)
+        objs.flatten.map { |o| o.to_json }
+      end
+
+      def deserialize(klass, *objs)
+        objs.flatten.map { |o| ::JSON.parse(o) }
+      end
+    end
+  end
+end

data/lib/redistry/version.rb

@@ -1,5 +1,5 @@
 module Redistry
 
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 
 end

data/lib/redistry.rb

@@ -1,20 +1,29 @@
 require 'redis'
 require 'redistry/version'
-require 'redistry/serializers/activerecord'
 require 'redistry/has_list'
+require 'redistry/serializers/json'
 
 module Redistry
   extend self
 
-  attr_accessor :client, :serializer
+  attr_accessor :client
+  attr_reader   :loaded_frameworks
+
 
   def client
     @client ||= Redis.new
   end
 
-  def serializer
-    @serializer ||= Redistry::Serializers::ActiveRecord.new
+  def setup!
+    @loaded_frameworks = []
+  end
+
+  def setup_active_record!
+    require 'redistry/serializers/activerecord'
+    ActiveRecord::Base.send(:include, Redistry::HasList)   
+    @loaded_frameworks << :activerecord
   end
 end
 
-ActiveRecord::Base.send(:include, Redistry::HasList) if defined?(ActiveRecord)
+Redistry.setup!
+Redistry.setup_active_record! if defined?(ActiveRecord)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Brian Smith
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -43,8 +43,34 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: A set of useful Redis patterns/abstractions for Ruby (and Rails)
 email: 
 - bsmith@swig505.com
@@ -58,6 +84,7 @@ files:
 - lib/redistry/has_list/collection_proxy.rb
 - lib/redistry/has_list.rb
 - lib/redistry/serializers/activerecord.rb
+- lib/redistry/serializers/json.rb
 - lib/redistry/version.rb
 - lib/redistry.rb
 - LICENSE