simple_model 1.2.24 → 1.2.25

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDEzYmZjZjIzM2Q1NDM0OTdkYWVkMmNhZDAzOGViMWZiZThkMjdmNg==
+    MDRhM2I3NjM1YThmYzJkOTU5YzNlMTVkNjVmMDE3Y2E4OGRmOTMzOQ==
   data.tar.gz: !binary |-
-    NmRhN2Q3MmVkNTFhMWE2NmVjNzMxMmFhN2YyYTE1NjgyMmIzZjdjZg==
+    ZmRjNDE4M2MyZTI2M2VmZDQwNTczNmFjMjc5MGFiYmY2NmViYTc2MQ==
 SHA512:
   metadata.gz: !binary |-
-    NWQzZmYyZDRlNGU1MGU2OTJhYjM2MjA5NzMxZWM1MDM1ZTY1Yjg1YTk0YmI3
-    NmYxNGM4YTIwNDI2MWRmNmMzNjAwZDdiMmM1OWU0NjBjOTc1NDI4N2UxOTJh
-    YmZjOTk1NmYyMmUzNjlkZWQxYmNiYTFiNTNjZTc1N2EwNmJkMTI=
+    NjNmMDVjYzIzYTcxMzUwYzFlZjcwNzgxYzgyZjU0NTg1ODk5NTZhYWM5OTJk
+    NmE5ZGU1ZDAxZDBhMmNjZDU1NmE3YzcwMzRiZWM3OGFjMGVjMTY3YTQwM2M1
+    ZDc1ZjI4ZDAwMGZmYWM3NWJmNmQwODZlZDc0ODBiNDFhYTEwN2E=
   data.tar.gz: !binary |-
-    MWM1Zjc4ZTljOGE5MWM2MGUxMjViNTYzZjE3ZWZiNzgwYjc5YWFmNTI2MDNi
-    ZjJjMzE2YjgxMmYzNmMzYWVlOGVkMzRiMTcwNjFlMWVkMDgxNDc1MzU0YmU3
-    NjY1NWQ1N2U5Y2Y0YjE1YWJkZWM2OGFiZDRiYjgwM2IzM2NlYTQ=
+    MDM4NTljY2IzOTRlNmVjMmZkNTM1NzJjNmI0NzA2Njc0OWVmMDBmMjlmMTk3
+    YTczZTJjOGQ2ODQ0OTMxMWEwOTc5MzAyM2JkMjYxNDFlZWQ1MzY0Mjk3OTBh
+    NTU2ZmU3NDlmMWJjYjRiNWM4MmIyZDJiZDYwNDY0ZDUxZjljZDU=

data/benchmarks/simple_model.rb

@@ -19,7 +19,7 @@ Benchmark.bm do |b|
       BenchClass.new(:num => 1, :dec => "12.4")
     end
   end
-  
+
   b.report("get") do
     30000.times.each  do
       klass = BenchClass.new

data/gemfiles/4.2.gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'activesupport','~> 4.2.0.rc1'
-gem 'activemodel','~> 4.2.0.rc1'
+gem 'activesupport','~> 4.2.0.rc3'
+gem 'activemodel','~> 4.2.0.rc3'
 
 gemspec :path => "../"

data/lib/simple_model/attributes.rb

@@ -61,13 +61,13 @@ module SimpleModel
     end
 
     def get_attribute?(attr)
-      val = get_attribute(attr)
+      return false unless val = get_attribute(attr)
       if val.respond_to?(:blank?)
         return !val.blank?
       elsif val.respond_to?(:to_b) 
         return val.to_b
       end
-      val
+      !val.nil?
     end
 
     private
@@ -247,7 +247,7 @@ module SimpleModel
         define_method(attr) do
           get_attribute(attr)
         end
-        define_method("#{attr.to_s}?") do
+        define_method("#{attr}?") do
           get_attribute?(attr)
         end
       end
@@ -256,7 +256,7 @@ module SimpleModel
       # On set, it will mark the attribute as changed if the attributes has been
       # initialized.
       def define_setter_with_options(attr,options)
-        define_method("#{attr.to_s}=") do |val|
+        define_method("#{attr}=") do |val|
           set_attribute(attr,val)
         end
       end
@@ -280,7 +280,7 @@ module SimpleModel
         define_method("#{new_alias}?") do
           send("#{attr}?")
         end
-        define_method("#{new_alias.to_s}=") do |*args, &block|
+        define_method("#{new_alias}=") do |*args, &block|
           send("#{attr}=",*args, &block)
         end
       end

data/lib/simple_model/extend_core.rb

@@ -74,7 +74,7 @@ module SimpleModel
       # * safe_date_string("\/Date(1310669017000)\/") # =>
       def safe_datetime_string
         safe_date = nil
-        if self[0..9].match(/^(0[1-9]|[1-9]|1[012])[- \/.]([1-9]|0[1-9]|[12][0-9]|3[01])[- \/.][0-9][0-9][0-9][0-9]/)
+        if self[0..9] =~ (/^(0[1-9]|[1-9]|1[012])[- \/.]([1-9]|0[1-9]|[12][0-9]|3[01])[- \/.][0-9][0-9][0-9][0-9]/)
           safe_date = ""
           splt = split(/\-|\/|\./)
           time = ""
@@ -86,8 +86,8 @@ module SimpleModel
             safe_date << "#{splt[2]}-#{splt[0]}-#{splt[1]}"
             safe_date << "#{time}" unless time.nil? || time.to_s.length == 0
           end
-        elsif self.match(/^\/Date\(/)
-          safe_date = Time.at(((self.gsub(/(\/Date\()/,"")).gsub(/\)\/$/,"").to_f) / 1000).to_s
+        elsif self =~ /^\/Date\(/
+          safe_date = Time.at(((self.gsub(/(\/Date\()/,"")).gsub(/\)\/$/,"").to_i) / 1000).to_s
         else
           safe_date = self
         end
@@ -97,14 +97,14 @@ module SimpleModel
       # Use safe_datetime_string help with those pesky US date formats in Ruby 1.9
       # or to change an integer string to date
       def to_date
-        return safe_datetime_string.to_i.to_date if self.match(/^+d$/)
+        return safe_datetime_string.to_i.to_date if self =~ /^+d$/
         Date.parse(safe_datetime_string)
       end
 
       # Use safe_datetime_string help with those pesky US date formats in Ruby 1.9
       # or to change an integer string to date
       def to_time
-        return safe_datetime_string.to_i.to_time if self.match(/^+d$/)
+        return safe_datetime_string.to_i.to_time if self =~ /^+d$/
         Time.parse(safe_datetime_string)
       end
 

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.2.24"
+  VERSION = "1.2.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.2.24
+  version: 1.2.25
 platform: ruby
 authors:
 - Joshua T Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport