objectified_sessions 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  metadata.gz: 3ddbe03428f2939faa0bae986029767c4bcfa112
-  data.tar.gz: 8f562df0cc6716bcf4262d413a54375e1eca5810
 SHA512: 
-  metadata.gz: f10073ecd7bf153818d79d20d8470641e1f84c9493b8e2ec67f7e61fe1a38ec16ebeee57416b2abe39e172e08cc398a341a0e332b6d328d65940b0db69c83157
-  data.tar.gz: 39f589ecdb7e1422a4651843974c4c35bf10d720a9f3353eee551578b9d06fe12485a37e4f108410b3308526be2ded60c14b562671c73e7148314d2a0b7e7ed2
+  data.tar.gz: e57eb2d7c2aaebc88310d412bafa67bd20f99268153bac567234776f77169a027e495e5a9010fe1b86d8d5bbbef3f7b8c74c2cc3b4209435ecafdf1a9bb4245e
+  metadata.gz: d896af16837d0fbfdd9d3db4f4c2d66223fbbb60d975be3101355f5338907840c573d41b51389c0430f5ff46238e4f2425c912c4e1dbd4e0115f31f4e14c483f
+SHA1: 
+  data.tar.gz: 3aceba4aa45c04acb79fecfac7f63220bf55411f
+  metadata.gz: 63dcb0a0ba471ba0e15b3dd1f7ab4c06abc77505

data/lib/objectified_sessions/base.rb

@@ -186,13 +186,13 @@ module ObjectifiedSessions
         new_field = ObjectifiedSessions::FieldDefinition.new(self, name, options)
 
         # Check for a conflict with the field name.
-        if @fields[new_field.name]
+        if (other_field = @fields[new_field.name]) && (other_field != new_field)
           raise ObjectifiedSessions::Errors::DuplicateFieldNameError.new(self, new_field.name)
         end
 
         # Check for a conflict with the storage name.
-        if @fields_by_storage_name[new_field.storage_name]
-          raise ObjectifiedSessions::Errors::DuplicateFieldStorageNameError.new(self, @fields_by_storage_name[new_field.storage_name].name, new_field.name, new_field.storage_name)
+        if (other_field = @fields_by_storage_name[new_field.storage_name]) && (other_field != new_field)
+          raise ObjectifiedSessions::Errors::DuplicateFieldStorageNameError.new(self, other_field.name, new_field.name, new_field.storage_name)
         end
 
         @fields[new_field.name] = new_field

data/lib/objectified_sessions/field_definition.rb

@@ -37,6 +37,19 @@ module ObjectifiedSessions
       create_methods!
     end
 
+    # Allow field comparison. We do this when you define a field that has the exact same name or storage name as another
+    # field -- we allow it if (and only if) they are identical in every other way.
+    def ==(other)
+      return false unless other.kind_of?(ObjectifiedSessions::FieldDefinition)
+      session_class == other.send(:session_class) && name == other.name && storage_name == other.storage_name &&
+        type == other.send(:type) && visibility == other.send(:visibility)
+    end
+
+    # Make sure eql? works the same as ==.
+    def eql?(other)
+      self == other
+    end
+
     # Returns the key under which this field should read and write its data. This will be its name, unless a
     # +:storage+ option was passed to the constructor, in which case it will be that value, instead.
     def storage_name
@@ -56,7 +69,7 @@ module ObjectifiedSessions
     end
 
     private
-    attr_reader :type, :visibility
+    attr_reader :type, :visibility, :session_class
 
     # Process the options passed in; this validates them, and sets +@type+, +@visibility+, and +@storage_name+
     # appropriately.
@@ -86,7 +99,7 @@ module ObjectifiedSessions
       return unless type == :normal
 
       fn = name
-      dmm = @session_class._dynamic_methods_module
+      dmm = session_class._dynamic_methods_module
       mn = name.to_s.downcase
 
       dmm.define_method(mn) do

data/lib/objectified_sessions/version.rb

@@ -1,3 +1,3 @@
 module ObjectifiedSessions
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/objectified_sessions/system/basic_system_spec.rb

@@ -35,6 +35,18 @@ describe "ObjectifiedSessions basic operations" do
     @controller_instance.objsession.foo.should == 234
   end
 
+  it "should let you redefine a field if it's exactly identical" do
+    define_objsession_class { field :foo, :visibility => :private, :storage => :baz }
+
+    @objsession_class.class_eval { field :foo, :visibility => :private, :storage => :baz }
+
+    lambda { @objsession_class.class_eval { field :foo, :visibility => :public, :storage => :baz } }.should raise_error(ObjectifiedSessions::Errors::DuplicateFieldNameError)
+    lambda { @objsession_class.class_eval { field :foo, :visibility => :private, :storage => :aaa } }.should raise_error(ObjectifiedSessions::Errors::DuplicateFieldNameError)
+    lambda { @objsession_class.class_eval { field :quux, :visibility => :public, :storage => :baz } }.should raise_error(ObjectifiedSessions::Errors::DuplicateFieldStorageNameError)
+    lambda { @objsession_class.class_eval { inactive :foo, :visibility => :private, :storage => :baz } }.should raise_error(ObjectifiedSessions::Errors::DuplicateFieldNameError)
+    lambda { @objsession_class.class_eval { retired :foo, :visibility => :private, :storage => :baz } }.should raise_error(ObjectifiedSessions::Errors::DuplicateFieldNameError)
+  end
+
   it "should allow hash access to the underlying session" do
     define_objsession_class do
       field :foo, :visibility => :private

data/spec/objectified_sessions/system/error_handling_system_spec.rb

@@ -171,11 +171,11 @@ describe "ObjectifiedSessions error handling" do
     e.message.should match(/baz/i)
   end
 
-  it "should not let you define more than one field with the same name" do
+  it "should not let you define more than one field with the same name, but that differ" do
     e = capture_exception(ObjectifiedSessions::Errors::DuplicateFieldNameError) do
       define_objsession_class do
         field :foo
-        field 'foo'
+        field 'foo', :visibility => :private
       end
     end
 

data/spec/objectified_sessions/unit/objectified_sessions/field_definition_spec.rb

@@ -5,16 +5,22 @@ describe ObjectifiedSessions::FieldDefinition do
     ObjectifiedSessions::FieldDefinition
   end
 
-  before :each do
-    @session_class = double("session_class")
-    allow(@session_class).to receive(:kind_of?).with(Class).and_return(true)
+  def new_session_class
+    out = double("session_class")
+    allow(out).to receive(:kind_of?).with(Class).and_return(true)
 
-    @dmm = Module.new do
+    dmm = Module.new do
       class << self
         public :define_method, :private
       end
     end
-    allow(@session_class).to receive(:_dynamic_methods_module).with().and_return(@dmm)
+    allow(out).to receive(:_dynamic_methods_module).with().and_return(dmm)
+    out
+  end
+
+  before :each do
+    @session_class = new_session_class
+    @dmm = @session_class._dynamic_methods_module
   end
 
   it "should normalize field names properly" do
@@ -58,6 +64,42 @@ describe ObjectifiedSessions::FieldDefinition do
     klass.new(@session_class, :foo, { :type => :retired, :visibility => :public }).allow_access_to_data?.should_not be
   end
 
+  [ "==", "eql?" ].each do |method_name|
+    describe method_name do
+      before :each do
+        @mn = method_name
+        @basis = klass.new(@session_class, :foo, { :type => :normal, :visibility => :public })
+      end
+
+      it "should match for fields that are identical" do
+        expect(@basis.send(@mn, klass.new(@session_class, :foo, { :type => :normal, :visibility => :public }))).to be_true
+        expect(@basis.send(@mn, klass.new(@session_class, :foo, { :type => :normal, :visibility => :public, :storage => :foo }))).to be_true
+      end
+
+      it "should not match if the session class is different" do
+        session_class_2 = new_session_class
+        expect(@basis.send(@mn, klass.new(session_class_2, :foo, { :type => :normal, :visibility => :public, :storage => :foo }))).not_to be_true
+      end
+
+      it "should not match if the name is different" do
+        expect(@basis.send(@mn, klass.new(@session_class, :bar, { :type => :normal, :visibility => :public }))).not_to be_true
+      end
+
+      it "should not match if the type is different" do
+        expect(@basis.send(@mn, klass.new(@session_class, :foo, { :type => :inactive, :visibility => :public }))).not_to be_true
+        expect(@basis.send(@mn, klass.new(@session_class, :foo, { :type => :retired, :visibility => :public }))).not_to be_true
+      end
+
+      it "should not match if the visibility is different" do
+        expect(@basis.send(@mn, klass.new(@session_class, :bar, { :type => :normal, :visibility => :private }))).not_to be_true
+      end
+
+      it "should not match if the storage is different" do
+        expect(@basis.send(@mn, klass.new(@session_class, :bar, { :type => :normal, :visibility => :public, :storage => :baz }))).not_to be_true
+      end
+    end
+  end
+
   context "with dynamic-methods module testing" do
     before :each do
       dmm = @dmm

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: objectified_sessions
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Andrew Geweke