tableless_model 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -8,7 +8,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     ansi (1.2.2)
+    ffi (1.0.4)
+      rake (>= 0.8.7)
     minitest (2.0.2)
+    rake (0.8.7)
+    sqlite3 (0.1.1)
+      ffi (>= 0.6.3)
     validatable (1.6.7)
 
 PLATFORMS
@@ -17,5 +22,6 @@ PLATFORMS
 DEPENDENCIES
   ansi
   minitest
+  sqlite3
   tableless_model!
   validatable

data/README.rdoc

@@ -16,7 +16,7 @@ Tableless Model is available as a Rubygem:
 
 		gem install tableless_model
 
-		(current version: 0.0.4)
+		(current version: 0.0.5)
 		
 
 == Usage

data/lib/activerecord/base/class_methods.rb

@@ -27,20 +27,15 @@ module Base
       
       # if only the column name is given, the tableless model's class is expected to have that name, classified, as class name
       class_type = column.class == Hash ? column.collect{|k,v| v}.last : column.to_s.classify.constantize
-
-
+    
       # injecting in the parent object a getter and a setter for the
       # attribute that will store an instance of a tableless model
       class_eval do
-        
-        # Making sure the serialized column contains a new instance of the tableless model
-        # if it hasn't been set yet
-        default_value_for column_name, class_type.new 
-        
+
         # Telling AR that the column has to store an instance of the given tableless model in 
         # YAML serialized format
         serialize column_name, ActiveRecord::TablelessModel
-
+    
         # Adding getter for the serialized column,
         # making sure it always returns an instance of the specified tableless
         # model and not just a normal hash or the value of the attribute in the database,
@@ -48,7 +43,7 @@ module Base
         define_method column_name.to_s do
           class_type.new(read_attribute(column_name.to_sym) || {})
         end
-
+    
         # Adding setter for the serialized column,
         # making sure it always stores in it an instance of 
         # the specified tableless model (as the argument may also be a regular hash)
@@ -57,35 +52,6 @@ module Base
         end
       end
     end
-    
-
-      
-    # 
-    # 
-    # Overriding the setter for the serialized column in the AR model,
-    # to make sure that, if it is still nil, the column always
-    # returns at least a new instance of the specified tableless model
-    # having the default values, if any, declared in the tableless model itself
-    # 
-    def default_value_for(property, default_value)
-      unless method_defined? "after_initialize_with_default_value_for_#{property.to_s}"
-      
-        unless method_defined? "after_initialize"
-          define_method "after_initialize" do |*args|
-          end
-        end
-      
-        define_method "after_initialize_with_default_value_for_#{property.to_s}" do |*args| 
-          send("after_initialize_without_default_value_for_#{property.to_s}", *args)
-          return unless new_record? 
-          return unless self.respond_to?(property.to_sym)
-      
-          self.send("#{property.to_s}=".to_sym, self.send(property.to_sym) || default_value)    
-        end
-      
-        alias_method_chain "after_initialize", "default_value_for_#{property.to_s}"
-      end
-    end
 
   end
 end

data/lib/tableless_model/version.rb

@@ -1,3 +1,3 @@
 module TablelessModel
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/tableless_model_spec.rb

@@ -148,13 +148,56 @@ describe "An ActiveRecord::Base model" do
       attribute :bbb, :default => "bbb"
     end
     
-    class Model < ActiveRecord::Base
-      # has_tableless :options => ModelOptions
+    ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+    ActiveRecord::Base.connection.execute(" create table test_models (options varchar(50)) ")
+
+    class TestModel < ActiveRecord::Base
+      has_tableless :options => ModelOptions
     end
   end
   
   it "responds to default_value_for, has_tableless" do
-    [:default_value_for, :has_tableless].each {|method| Model.must_respond_to(method)}
+    TestModel.must_respond_to(:has_tableless)
+  end
+  
+  describe "new instance" do
+    before do
+      @instance = TestModel.new
+    end
+    
+    it "has a getter and a setter for :options" do
+      %w(options options=).each{|m| @instance.must_respond_to m }
+      @instance.options.must_be_kind_of ModelOptions
+      @instance.options.wont_be_nil
+      @instance.options.aaa.must_equal "111"
+      @instance.options.bbb.must_equal "bbb"
+      proc { @instance.options = "test" }.must_raise NoMethodError, "should not accept other values than a hash or ModelOptions instance"
+    end
+    
+    describe "setter" do
+      before do
+        @return_value = @instance.send("options=", { :aaa => "CCC", :bbb => "DDD"  })
+      end
+      
+      it "correctly sets the serialized column" do
+        @return_value.must_be_kind_of ModelOptions
+        %w(aaa bbb).each{|m| @return_value.must_respond_to m}
+        @instance.options.aaa.must_equal "CCC"
+        @instance.options.bbb.must_equal "DDD"
+      end
+      
+      it "should save the serialized column correctly" do
+        @instance.save!
+        @instance = TestModel.first
+        
+        @instance.options.aaa.must_equal "CCC"
+        @instance.options.bbb.must_equal "DDD"
+        
+        # Ensuring the serialize macro is used
+        @instance.options.must_be_kind_of ModelOptions
+        
+      end
+    end
   end
   
 end

data/spec/test_helper.rb

@@ -75,7 +75,8 @@ class MiniTest::Unit
                     end)
 
 
-        @@out.print " #{test.humanize.gsub(/Test\s\d+\s(.*)/,"\\1")} "
+        # @@out.print " #{test.humanize.gsub(/Test\s\d+\s(.*)/,"\\1")} "
+        @@out.print " #{test} "
         @@out.print " (%.2fs) " % (Time.now - t)
 
         if @broken

data/tableless_model.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency "validatable"
   s.add_development_dependency "minitest"
   s.add_development_dependency "ansi"
+  s.add_development_dependency "sqlite3"
   
   s.rubyforge_project = "tableless_model"
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Vito Botta
@@ -56,6 +56,19 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  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 serialisable and validatable table-less model with support for associations, useful to store settings, options, etc in a serialized form in a parent object
 email: 
 - vito@botta.name