tableless_model 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,9 +1,7 @@
 PATH
   remote: .
   specs:
-    tableless_model (0.0.1)
-      activerecord
-      hashie
+    vitobotta/tableless_model (0.0.1)
       validatable
 
 GEM
@@ -21,20 +19,8 @@ GEM
     activesupport (3.0.3)
     arel (2.0.6)
     builder (2.1.2)
-    diff-lcs (1.1.2)
-    hashie (0.4.0)
     i18n (0.5.0)
-    mocha (0.9.10)
-      rake
-    rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    minitest (2.0.2)
     tzinfo (0.3.23)
     validatable (1.6.7)
 
@@ -43,8 +29,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord
-  hashie
-  mocha
-  rspec
-  tableless_model!
+  minitest
   validatable
+  vitobotta/tableless_model!

data/README.rdoc

@@ -64,7 +64,7 @@ Using Tableless Model, we could remove the association and the table seo_options
 
 		class SeoOptions < ActiveRecord::TablelessModel
 
-		  attribute :title_tag,         :type => :string,  :default => ""
+		  attribute :title_tag,         :type => :string,  :default => "default title tag"
 		  attribute :meta_description,  :type => :string,  :default => ""  
 		  attribute :meta_keywords,     :type => :string,  :default => ""  
 		  attribute :noindex,           :type => :boolean, :default => false 
@@ -74,14 +74,48 @@ Using Tableless Model, we could remove the association and the table seo_options
 		end
 
 
-That's it. Each instance of Page will now store directly its YAML-serialized SEO settings in the column named "seo". This is how the content of that column would look like in the database:
+That's it. 
+
+When you now create an instance of SeoOptions, you can get and set its attributes as you would do with a normal model:
+
+		seo_options = SeoOptions.new
+		 	=> <#SeoOptions meta_description="" meta_keywords="" noarchive=false nofollow=false noindex=false
+		 	title_tag="default title tag">
+
+		seo_options.title_tag
+			=> "default title tag"
+
+		seo_options.title_tag = "new title tag"
+			=> "new title tag"
+			
+Note that inspect	shows the properties of the Tableless Model in the same way it does for ActiveRecord models.
+Of course, you can also override the default values for the attributes when creating a new instance:
+
+		seo_options = SeoOptions.new( :title_tag => "a different title tag" )
+		 	=> <#SeoOptions meta_description="" meta_keywords="" noarchive=false nofollow=false noindex=false 
+			title_tag="a different title tag">
+
+Now, if you have used the has_tabless macro in the parent class, Page, each instance of Page will store directly its YAML-serialized SEO settings in the column named "seo". 
+
+		page = Page.new
+		
+		page.seo
+		 	=> <#SeoOptions meta_description="" meta_keywords="" noarchive=false nofollow=false noindex=false
+		 	title_tag="default title tag">
+
+		page.seo.title_tag = "changed title tag"
+		 	=> <#SeoOptions meta_description="" meta_keywords="" noarchive=false nofollow=false noindex=false
+		 	title_tag="changed title tag">
+
+
+And this is how the content of the serialized column would look like in the database if you saved the changes as in the example
 
 		--- !map:SeoOptions 
 		noarchive: false
 		meta_description: 
 		meta_keywords: 
 		nofollow: false
-		title_tag: 
+		title_tag: "changed title tag"
 		noindex: false
 
 

data/lib/tableless_model/class_methods.rb

@@ -62,20 +62,21 @@ module Tableless
       begin
         case type
           when :string    then (value.is_a?(String) ? value : String(value))
-          when :integer   then (value.is_a?(Integer) ? value : Integer(value))
-          when :float     then (value.is_a?(Float) ? value : Float(value))
-          when :decimal   then (value.is_a?(Float) ? value : Float(value))
+          when :integer   then (value.is_a?(Integer) ? value : value.to_s.to_i)
+          when :float     then (value.is_a?(Float) ? value : value.to_s.to_f)
+          when :decimal   then (value.is_a?(BigDecimal) ? value : BigDecimal(value.to_s))
           when :time      then (value.is_a?(Time) ? value : Time.parse(value))
           when :date      then (value.is_a?(Date) ? value : Date.parse(value))
           when :datetime  then (value.is_a?(DateTime) ? value : DateTime.parse(value))
-          when :boolean   then (value == true || value == 1 || value.to_s =~ /^(true|1)$/i)
+          when :boolean   then (["true", "1"].include?(value.to_s))
           else value
         end
       rescue Exception => e
-        raise StandardError, "Invalid value '#{value.inspect}' for attribute #{attribute_name} - expected data type is #{type} but value is a #{value.class} (Exception details: #{e})"    
+        raise StandardError, "Invalid value #{value.inspect} for attribute #{attribute_name} - expected data type is #{type.to_s.capitalize} but value is a #{value.class} (Exception details: #{e})"    
         value
       end
     end
 
   end
-end
+end
+

data/lib/tableless_model/version.rb

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

data/spec/tableless_model_spec.rb

@@ -1,8 +1,93 @@
+require "rubygems"
+require "active_record"
 require "lib/tableless_model"
+require 'minitest/autorun'
 
-describe ActiveRecord::TablelessModel do
-  it "should say bla" do
-    true
+class TestTablelessModel < ActiveRecord::TablelessModel 
+end
+
+
+describe TestTablelessModel do
+  it "has the accessor 'attributes', originally an empty hash" do
+    TestTablelessModel.must_respond_to("attributes")
+    TestTablelessModel.attributes.must_be_kind_of Hash
+    TestTablelessModel.attributes.must_be_empty
   end
   
+  it "responds to 'attribute'" do
+    TestTablelessModel.must_respond_to "attribute"
+  end
+
+  it "responds to 'attribute', 'cast'" do
+    TestTablelessModel.must_respond_to "attribute"
+    TestTablelessModel.must_respond_to "cast"
+  end
+
+  describe "'attribute' macro" do
+    before do
+      TestTablelessModel.class_eval do
+        attribute :test_attribute
+      end
+    end
+    
+    it "adds a key-value pair to the attributes accessor" do
+      TestTablelessModel.attributes.wont_be_empty
+      TestTablelessModel.attributes.key?("test_attribute").must_equal true, "An attribute named 'test_attribute' should have been defined"
+    end
+  end
+
+  describe "An instance of TablelessModel" do
+    before do
+      TestTablelessModel.class_eval do
+        attribute :test_attribute
+      end
+    end
+
+    it "tries to enforce type casting if a type has been specified for an attribute" do
+
+      test_values = [ "test", 1234, true, "1234.12", "2011-01-02 15:23" ]
+      
+      [ :string, :integer, :float, :decimal, :time, :date, :datetime, :boolean ].each do |type|
+
+        # temporarily changing type
+        TestTablelessModel.attributes["test_attribute"][:type] = type
+
+        instance = TestTablelessModel.new
+        
+        # instance.must_respond_to "test_attribute", "Getter for test_attribute should have been defined"
+        # instance.must_respond_to "test_attribute=", "Setter for test_attribute should have been defined"
+
+        type_name = case type
+        when :datetime then :date_time
+        when :decimal then :big_decimal
+        else type
+        end
+
+
+        # excluding some test values that would always faild depending on the type
+        exclude_test_values = case type
+        when :decimal then [ "test", true ]
+        when :time then [ 1234, true ]
+        when :date then [ "test", 1234, true, "1234.12" ]
+        when :datetime then [ "test", 1234, true ]
+        else []
+        end
+
+
+        (test_values - exclude_test_values).each do |value|
+
+          instance.test_attribute = value
+
+          if type == :boolean
+            [true, false].include?(instance.test_attribute).must_equal true, "Expected #{instance.test_attribute.inspect} to be boolean, not #{type.class}"
+          else
+            instance.test_attribute.must_be_kind_of type_name.to_s.classify.constantize
+          end
+          
+        end
+
+      end
+    end
+  end
+
 end

data/tableless_model.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
+
 require "tableless_model/version"
 
 Gem::Specification.new do |s|
@@ -12,11 +13,10 @@ Gem::Specification.new do |s|
   s.summary     = %q{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}
   s.description = %q{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}
 
-  s.add_dependency "hashie"
   s.add_dependency "validatable"
 
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "mocha"
+  s.add_development_dependency "activerecord"
+  s.add_development_dependency "minitest"
   
   s.rubyforge_project = "tableless_model"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tableless_model
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Vito Botta
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-02 00:00:00 +00:00
+date: 2011-01-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hashie
+  name: validatable
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: validatable
+  name: activerecord
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,10 +44,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: minitest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,20 +60,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        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