active_redis_orm 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c05be7c5fafe7f5194a6dfe7d3662cc05173a3e0
-  data.tar.gz: 9b33a859fb406fa9ae081b9fe02ed63198a3b0e6
+  metadata.gz: 8b411bfb8f667027da1b252715b2558fb963a2a8
+  data.tar.gz: 55692c9536d1fbeb6be3ed325785f487f2c97c16
 SHA512:
-  metadata.gz: 707db972bd38d28f098babdfc36dadd05a2be22bb707a607ed9789d3b45c121f7894e4dc391ed3f3d78722b93b944b14dde4e45334486a79771d0040459e0c58
-  data.tar.gz: 446768c2dcebcde98d8356902ff0db0a6c97a329ed6873adb9bfa11a4f713aaadba98cd3ddcb1d5bcb13e2a125451a443c8c7e539d2f5f12faac78225bda7c60
+  metadata.gz: e22e86f443f986590ab0e9bc155d8d9c0d414fb0c1f958f3fe4440ede5141b18f09d44fc4dacba6fd34b8d2f7a48ef8d472a861b7555dbe4acda9e02e796ac59
+  data.tar.gz: 29fc748ea40c80f9f2f0d792fcbec6ba408d7a730bce41239159aa6df172134ed92a133a53959af7ac44e784599eaf2a635c133386ceb617502ad9b86a2129ff

data/lib/active_redis/attributes.rb

@@ -39,8 +39,8 @@ module ActiveRedis
     end
 
     def define_field(field_name, options)
-      define_attribute_methods field_name
-      class_eval %Q{
+      define_attribute_method field_name
+      attributes_module.module_eval %Q{
         def #{field_name}_redis_key
           "#{self.redis_namespace}:\#{id}:#{field_name}"
         end
@@ -88,12 +88,12 @@ module ActiveRedis
     end
 
     def string_field(field_name, options)
-      class_eval %Q{
+      attributes_module.module_eval %Q{
         def #{field_name}_object
           Redis::Value.new(#{field_name}_redis_key)
         end
 
-        def #{field_name}
+        def #{field_name}_val
           @attributes[:#{field_name}] ||= begin
             value = #{field_name}_object.value
             value.nil? ? value : value.to_s
@@ -119,12 +119,12 @@ module ActiveRedis
     end
 
     def integer_field(field_name, options)
-      class_eval %Q{
+      attributes_module.module_eval %Q{
         def #{field_name}_object
           Redis::Value.new(#{field_name}_redis_key)
         end
 
-        def #{field_name}
+        def #{field_name}_val
           @attributes[:#{field_name}] ||= begin
             value = #{field_name}_object.value
             value.nil? ? value : value.to_i
@@ -153,12 +153,12 @@ module ActiveRedis
     end
 
     def float_field(field_name, options)
-      class_eval %Q{
+      attributes_module.module_eval %Q{
         def #{field_name}_object
           Redis::Value.new(#{field_name}_redis_key)
         end
 
-        def #{field_name}
+        def #{field_name}_val
           @attributes[:#{field_name}] ||= begin
             value = #{field_name}_object.value
             value.nil? ? value : value.to_f
@@ -187,12 +187,12 @@ module ActiveRedis
     end
 
     def boolean_field(field_name, options)
-      class_eval %Q{
+      attributes_module.module_eval %Q{
         def #{field_name}_object
           Redis::Value.new(#{field_name}_redis_key)
         end
 
-        def #{field_name}
+        def #{field_name}_val
           return @attributes[:#{field_name}] if @attributes[:#{field_name}].boolean?
           @attributes[:#{field_name}] ||= begin
             value = #{field_name}_object.value
@@ -224,12 +224,12 @@ module ActiveRedis
     end
 
     def counter_field(field_name, options)
-      class_eval %Q{
+      attributes_module.module_eval %Q{
         def #{field_name}_object
           Redis::Counter.new(#{field_name}_redis_key)
         end
 
-        def #{field_name}
+        def #{field_name}_val
           @attributes[:#{field_name}] ||= #{field_name}_object.value.to_i
         end
 
@@ -254,12 +254,12 @@ module ActiveRedis
     end
 
     def list_field(field_name, options)
-      class_eval %Q{
+      attributes_module.module_eval %Q{
         def #{field_name}_object
           Redis::List.new(#{field_name}_redis_key)
         end
 
-        def #{field_name}
+        def #{field_name}_val
           @attributes[:#{field_name}] ||= begin
             ActiveRedis::DirtyObjects::Array.new(#{field_name}_object.values)
           end
@@ -296,12 +296,12 @@ module ActiveRedis
     end
 
     def set_field(field_name, options)
-      class_eval %Q{
+      attributes_module.module_eval %Q{
         def #{field_name}_object
           Redis::Set.new(#{field_name}_redis_key)
         end
 
-        def #{field_name}
+        def #{field_name}_val
           @attributes[:#{field_name}] ||= begin
             ActiveRedis::DirtyObjects::Array.new(#{field_name}_object.members)
           end
@@ -329,12 +329,12 @@ module ActiveRedis
     end
 
     def sorted_set_field(field_name, options)
-      class_eval %Q{
+      attributes_module.module_eval %Q{
         def #{field_name}_object
           Redis::SortedSet.new(#{field_name}_redis_key)
         end
 
-        def #{field_name}
+        def #{field_name}_val
           @attributes[:#{field_name}] ||= begin
             ActiveRedis::DirtyObjects::SortedSet.new(#{field_name}_object.members)
           end
@@ -358,12 +358,12 @@ module ActiveRedis
     end
 
     def hash_field(field_name, options)
-      class_eval %Q{
+      attributes_module.module_eval %Q{
         def #{field_name}_hash_set
           Redis::HashKey.new(#{field_name}_redis_key)
         end
 
-        def #{field_name}
+        def #{field_name}_val
           @attributes[:#{field_name}] ||= begin
             ActiveRedis::DirtyObjects::Hash[#{field_name}_hash_set.all]
           end
@@ -388,8 +388,8 @@ module ActiveRedis
 
     def date_field(field_name, options)
       string_field(field_name, options)
-      class_eval %Q{
-        def #{field_name}
+      attributes_module.module_eval %Q{
+        def #{field_name}_val
           @attributes[:#{field_name}] ||= begin
             value = #{field_name}_object.value
             if value.blank?
@@ -416,8 +416,8 @@ module ActiveRedis
 
     def time_field(field_name, options)
       string_field(field_name, options)
-      class_eval %Q{
-        def #{field_name}
+      attributes_module.module_eval %Q{
+        def #{field_name}_val
           @attributes[:#{field_name}] ||= begin
             value = #{field_name}_object.value
             if value.blank?

data/lib/active_redis/nil_object.rb

@@ -7,5 +7,17 @@ module ActiveRedis
     def present?
       false
     end
+
+    def inspect
+      "nil"
+    end
+
+    def as_json(*args)
+      nil
+    end
+
+    def to_s
+      ""
+    end
   end
 end

data/lib/active_redis/version.rb

@@ -1,3 +1,3 @@
 module ActiveRedis
-  VERSION = "0.0.7"
+  VERSION = "0.0.9"
 end

data/lib/active_redis_orm.rb

@@ -67,9 +67,13 @@ module ActiveRedis
       end
     end
 
+    def attribute(name)
+      public_send("#{name}_val")
+    end
+
     class << self
       include ActiveRedis::Attributes
-      attr_accessor :attribute_definitions
+      attr_accessor :attribute_definitions, :attributes_module
 
       def find(id)
         new(id)
@@ -116,6 +120,8 @@ module ActiveRedis
             end
           end
         end
+        klass.attributes_module = Module.new
+        klass.send(:include, klass.attributes_module)
       end
     end
   end

data/spec/lib/active_redis/nil_object_spec.rb

@@ -0,0 +1,7 @@
+require "active_redis_orm"
+
+describe ActiveRedis::NilObject do
+  it "acts as nil when serialized" do
+    {foo: ActiveRedis::NilObject.new}.to_json.should == '{"foo":null}'
+  end
+end

data/spec/lib/active_redis_spec.rb

@@ -334,4 +334,19 @@ describe ActiveRedis do
     end
   end
 
+  context "super" do
+    class ARWithSuper < ActiveRedis::Base
+      field :wagamama
+
+      def wagamama
+        "#{super}!"
+      end
+    end
+
+    it "allows super to be called on attribute definitions" do
+      object = ARWithSuper.create(wagamama: "bar")
+      object.wagamama.should == "bar!"
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_redis_orm
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Tom Caspy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,6 +134,7 @@ files:
 - lib/active_redis/timestamps.rb
 - lib/active_redis/version.rb
 - lib/active_redis_orm.rb
+- spec/lib/active_redis/nil_object_spec.rb
 - spec/lib/active_redis/validation_spec.rb
 - spec/lib/active_redis_spec.rb
 - spec/lib/attributes_spec.rb
@@ -162,6 +163,7 @@ signing_key:
 specification_version: 4
 summary: ActiveRedis is an ORM for redis written in Ruby.
 test_files:
+- spec/lib/active_redis/nil_object_spec.rb
 - spec/lib/active_redis/validation_spec.rb
 - spec/lib/active_redis_spec.rb
 - spec/lib/attributes_spec.rb