active_session 0.0.1 → 0.0.2

data/lib/active_session/version.rb

@@ -1,3 +1,3 @@
 module ActiveSession
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/active_session.rb

@@ -26,27 +26,35 @@ module ActiveSession
     end
 
     def belongs_to(name, options = {})
-      klass = options.fetch(:class_name, name.to_s.classify.constantize)
-      foreign_key = options.fetch(:foreign_key, "#{name}_id").to_sym
+      klass = options.fetch(:class_name, name.to_s.classify)
+      foreign_key = options.fetch(:foreign_key, "#{name}_id")
 
-      define_method(name) do
-        return instance_variable_get("@#{name}") if instance_variable_defined?("@#{name}")
-        instance_variable_set("@#{name}", klass.find(send(foreign_key)))
-      end
+      class_eval <<-END, __FILE__, __LINE__ + 1
+        def #{name}
+          return @#{name} if defined?(@#{name})
+          @#{name} = #{klass}.find(#{foreign_key})
+        end
+      END
 
-      define_method("#{name}=") do |model|
-        raise ActiveSession::AssociationTypeMismatch, "#{klass} expected, got #{model.class}" unless model.nil? or model.is_a?(klass)
-        send("#{foreign_key}=", model.try(:id))
-      end
+      class_eval <<-END, __FILE__, __LINE__ + 1
+        def #{name}=(model)
+          raise ActiveSession::AssociationTypeMismatch, "#{klass} expected, got \#\{model.class\}" unless model.nil? or model.is_a?(#{klass})
+          self.#{foreign_key} = model.try(:id)
+        end
+      END
 
-      define_method(foreign_key) do
-        @attributes[foreign_key]
-      end
+      class_eval <<-END, __FILE__, __LINE__ + 1
+        def #{foreign_key}
+          @attributes[:#{foreign_key}]
+        end
+      END
 
-      define_method("#{foreign_key}=") do |model_id|
-        remove_instance_variable("@#{name}") if instance_variable_defined?("@#{name}")
-        @attributes[foreign_key] = model_id
-      end
+      class_eval <<-END, __FILE__, __LINE__ + 1
+        def #{foreign_key}=(model_id)
+          remove_instance_variable("@#{name}") if instance_variable_defined?("@#{name}")
+          @attributes[:#{foreign_key}] = model_id
+        end
+      END
     end
   end
 

data/test/user_session_test.rb

@@ -13,6 +13,11 @@ describe UserSession do
 
   describe "valid?" do
 
+    it "returns false if new record" do
+      session = UserSession.new(@store)
+      assert_equal false, session.valid?
+    end
+
     it "returns true with existing user_id" do
       session = UserSession.new(@store, :user_id => 1)
       assert_equal true, session.valid?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_session
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-10-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &20755180 !ruby/object:Gem::Requirement
+  requirement: &19802200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *20755180
+  version_requirements: *19802200
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &20754620 !ruby/object:Gem::Requirement
+  requirement: &19801700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *20754620
+  version_requirements: *19801700
 description: ActiveModel session
 email:
 - qoobaa@gmail.com