active_hash_fields 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/active_hash_fields.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "active_hash_fields"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Snitko"]
-  s.date = "2013-10-17"
+  s.date = "2013-10-19"
   s.description = "Adds nested fields to an AR model stored in a serialized field as hash"
   s.email = "roman.snitko@gmail.com"
   s.extra_rdoc_files = [
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/snitko/active_hash_fields"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "1.8.24"
   s.summary = "Adds nested fields to an AR model"
 
   if s.respond_to? :specification_version then

data/lib/active_hash_fields.rb

@@ -7,8 +7,9 @@ module ActiveHashFields
     def initialize(hash, defaults={})
       hash ||= {}
       defaults.stringify_keys!; hash.stringify_keys!
-      @hash = defaults.merge(hash)
-      @hash.each { |k,v| @hash[k] = self.class.convert_to_boolean(v) }
+      @defaults = defaults
+      @hash     = defaults.merge(hash)
+      @hash.each { |k,v| @hash[k] = convert_to_correct_type(k,v) }
       @hash.delete_if { |k,v| defaults[k].nil? }
     end
 
@@ -20,7 +21,7 @@ module ActiveHashFields
         elsif name.match(/=$/)
           k = name.sub(/=$/, "")
           if @hash.has_key?(k)
-            @hash[k] = self.class.convert_to_boolean(args[0])
+            @hash[k] = convert_to_correct_type(k, args[0])
           end
         end
       else
@@ -29,11 +30,19 @@ module ActiveHashFields
       nil
     end
 
-    def self.convert_to_boolean(v)
-      if (v == "1" || v == "true" || v == true)
-        true
-      elsif v == "0" || v == "false" || v == false
-        false
+    def convert_to_correct_type(k,v)
+      if @defaults[k] == false || @defaults[k] == true
+        if (v == "1" || v == "true" || v == true)
+          true
+        elsif v == "0" || v == "false" || v == false
+          false
+        end
+      elsif @defaults[k].kind_of?(Numeric)
+        if @defaults[k] =~ /\./
+          v.to_f
+        else
+          v.to_i
+        end 
       else
         v
       end

data/spec/lib/active_hash_fields_spec.rb

@@ -2,9 +2,10 @@ require 'spec_helper'
 
 class Dummy < ActiveRecord::Base
   active_hash_fields :notifications,
-    hello:                   false,
-    hi:                      false,
+    hello:                   "",
+    hi:                      "",
     some_boolean_value:      false,
+    some_integer_value:      0,
     answers_to_my_questions: true,
     news:                    false
 end
@@ -21,13 +22,20 @@ describe ActiveHashFields do
     @dummy.notifications.hi.should    == "hi"
   end
 
-  it "converts 0 and 1 strings to boolean values" do
+  it "converts 0 and 1 strings to boolean values for boolean fields" do
     @dummy.valid?
     @dummy.notifications.some_boolean_value.should be_true
     @dummy.notifications.some_boolean_value = "0"
     @dummy.notifications.some_boolean_value.should be_false
   end
 
+  it "converts number strings to integers" do
+    @dummy.valid?
+    @dummy.notifications.some_integer_value.should == 0
+    @dummy.notifications.some_integer_value        = "1"
+    @dummy.notifications.some_integer_value.should == 1
+  end
+
   it "sets default values to the hash as soon as object is initialized" do
     user1 = Dummy.new(notifications: { news: false } )
     user2 = Dummy.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash_fields
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4192656926053817055
+      hash: 2859436679583182602
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Adds nested fields to an AR model