simple_model 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40145db9483512a0a6d4209605362c68fdac9679
-  data.tar.gz: aaac8adad7bcbba5e3a08058c2b8b8a6df19317f
+  metadata.gz: 5d0480495e4e082cfe0aa97259f7267a42b14a10
+  data.tar.gz: d011d540617029664f7487593fd00c532de03ca4
 SHA512:
-  metadata.gz: ab3cf5ed3c7a3213ba5bb2853da12181015e7c6a6110eebf5fb72d3043c2a3686636b3cc29431a44a458558f092498a4e8407cb35eafbe1f45d5b12cd5c35f14
-  data.tar.gz: cd6bcd5f4e94bd2e8985a62179026401ce55efe8cc5d01359021463d352ee207d35ddb509d673702b659d6c53b79ca1a8e3e7bff88eb4fbaa50b057e32171804
+  metadata.gz: b12d771e2752809cc8122eaf778291c58657068377a434756074c196e59a3569e7f48d7fd21cae2ac8f11efecdc651337973c6186c43ecb68fc1b6e44fe4df56
+  data.tar.gz: 87486a5fbf7a4137ba4cde89cd5cc48ff7d12a0894158f8d654f79b6119c7f37e6c79a20dd0b315e80bf4da4a9ceaea0ac768cbd71f15a3c739554e2ca79dc67

data/benchmarks/extend_core.rb

@@ -0,0 +1,99 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'benchmark/ips'
+require 'simple_model'
+
+puts `ruby -v`
+
+
+# HotTub uses persisted blocks in several places.
+
+# Tests performance of passing a known block to block call or yield.
+
+
+us = "07/14/2011 13:43:37"
+iso = "2011-07-14 13:43:37"
+json = "\/Date(1310669017000)\/"
+
+puts us.to_time
+puts iso.to_time
+puts json.to_time
+
+
+Benchmark.ips do |x|
+
+  x.report("date iso") do
+    iso.to_date
+  end
+
+  x.report("date us") do
+    us.to_date
+  end
+
+  x.report("date json") do
+    json.to_date
+  end
+
+  x.report("time iso") do
+    iso.to_time
+  end
+
+  x.report("time us") do
+    us.to_time
+  end
+
+  x.report("time json") do
+    json.to_time
+  end
+
+  x.compare!
+end
+
+# V-1.4.3
+# ruby 2.2.3p173 (2015-08-18 revision 51636) [x86_64-darwin14]
+# Calculating -------------------------------------
+#             date iso    12.056k i/100ms
+#              date us    11.120k i/100ms
+#            date json     9.113k i/100ms
+#             time iso     2.409k i/100ms
+#              time us     2.098k i/100ms
+#            time json    10.795k i/100ms
+# -------------------------------------------------
+#             date iso    200.936k (± 2.9%) i/s -      1.013M
+#              date us    184.495k (± 3.3%) i/s -    922.960k
+#            date json    130.588k (± 1.4%) i/s -    656.136k
+#             time iso     27.103k (± 1.7%) i/s -    137.313k
+#              time us     23.126k (± 1.0%) i/s -    117.488k
+#            time json    187.509k (± 2.4%) i/s -    939.165k
+
+# Comparison:
+#             date iso:   200935.7 i/s
+#            time json:   187508.9 i/s - 1.07x slower
+#              date us:   184494.7 i/s - 1.09x slower
+#            date json:   130588.2 i/s - 1.54x slower
+#             time iso:    27103.4 i/s - 7.41x slower
+#              time us:    23126.3 i/s - 8.69x slower
+
+# V-1.4.2
+# ruby 2.2.3p173 (2015-08-18 revision 51636) [x86_64-darwin14]
+# Calculating -------------------------------------
+#             date iso     3.499k i/100ms
+#              date us     2.997k i/100ms
+#            date json     2.391k i/100ms
+#             time iso     2.484k i/100ms
+#              time us     2.219k i/100ms
+#            time json     1.760k i/100ms
+# -------------------------------------------------
+#             date iso     41.965k (± 1.9%) i/s -    209.940k
+#              date us     35.729k (± 1.2%) i/s -    179.820k
+#            date json     27.491k (± 1.5%) i/s -    138.678k
+#             time iso     27.247k (± 1.6%) i/s -    136.620k
+#              time us     23.937k (± 1.2%) i/s -    119.826k
+#            time json     19.031k (± 1.4%) i/s -     96.800k
+
+# Comparison:
+#             date iso:    41964.9 i/s
+#              date us:    35729.2 i/s - 1.17x slower
+#            date json:    27491.2 i/s - 1.53x slower
+#             time iso:    27247.5 i/s - 1.54x slower
+#              time us:    23937.0 i/s - 1.75x slower
+#            time json:    19031.1 i/s - 2.21x slower

data/lib/simple_model/base.rb

@@ -83,6 +83,8 @@ module SimpleModel
 
     class << self
 
+      # a call back that runs after a call to save, update, create or destroy
+      # even if the action fails validation (helpful for extra logging)
       def after_any(meth=nil)
         @after_any = meth if meth
         @after_any

data/lib/simple_model/config.rb

@@ -2,7 +2,7 @@ module SimpleModel
   class Config
     DEFAULTS = {
       :initialize_defaults  => false,
-      :attributes_store     => (RUBY_VERSION =~ /^2.2/ ? :symbol : :string) # OPTIONS => :string, :symbol, :indifferent
+      :attributes_store     => (RUBY_VERSION >= "2.2" ? :symbol : :string) # OPTIONS => :string, :symbol, :indifferent
     }.freeze
 
     ATTRIBUTE_STORES = {

data/lib/simple_model/extend_core.rb

@@ -53,9 +53,29 @@ module SimpleModel
     #Extend Ruby String.rb
     String.class_eval do
 
+      US_DATE_REGEX = (/(^[0-9]{1,2}[- \/.][0-9]{1,2}[- \/.][0-9]{4})/).freeze
+
+      JSON_DATE_REGEX = (/^(\/Date\().*(\)\/)$/).freeze
+
+      DIGIT_ONLY_REGEX = (/^+d$/).freeze
+
+      SPLIT_DATE_REGEX = (/\-|\/|\./).freeze
+
+      DATE_TR = ('/\/|\./').freeze
+
+      JSON_DATE_TR = ('/[a-zA-z\(\)\\\/]*/').freeze
+
+      EMPTY_STRING = ''.freeze
+
+      US_DATE_FORMAT = "%m-%d-%Y".freeze
+
+      ISO_DATE_FORMAT = "%Y-%m-%d".freeze
+
+      BOOLEAN_REGEX = (/^(true|t|yes|y|1)$/i).freeze
+
       # returns boolean value for common boolean string values
       def to_b
-        return true if self =~ (/^(true|t|yes|y|1)$/i)
+        return true if self =~ BOOLEAN_REGEX
         false
       end
 
@@ -69,20 +89,10 @@ module SimpleModel
       # * safe_date_string("\/Date(1310669017000)\/") # =>
       def safe_datetime_string
         safe_date = nil
-        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 = ""
-          if splt[2].length > 4
-            time = splt[2][4..(splt[2].length - 1)]
-            splt[2] = splt[2][0..3]
-          end
-          if splt.length == 3 && splt[2].length == 4
-            safe_date << "#{splt[2]}-#{splt[0]}-#{splt[1]}"
-            safe_date << "#{time}" unless time.nil? || time.to_s.length == 0
-          end
-        elsif self =~ /^\/Date\(/
-          safe_date = Time.at(((self.gsub(/(\/Date\()/,"")).gsub(/\)\/$/,"").to_i) / 1000).to_s
+        if self =~ US_DATE_REGEX
+          safe_date = us_date_to_iso_str
+        elsif self =~ JSON_DATE_REGEX
+          safe_date = json_date_to_time.to_s
         else
           safe_date = self
         end
@@ -92,28 +102,56 @@ 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 =~ /^+d$/
-        Date.parse(safe_datetime_string)
+        return self.to_i.to_date if self =~ DIGIT_ONLY_REGEX
+        if self =~ US_DATE_REGEX
+          Date.strptime(self.tr(DATE_TR,'-'), US_DATE_FORMAT)
+        elsif self =~ JSON_DATE_REGEX
+          json_date_to_time.to_date
+        else
+          Date.strptime(self.tr(DATE_TR,'-'), ISO_DATE_FORMAT)
+        end
       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 =~ /^+d$/
-        Time.parse(safe_datetime_string)
+        return self.to_i.to_time if self =~ DIGIT_ONLY_REGEX
+        if self =~ US_DATE_REGEX
+          Time.parse(us_date_to_iso_str)
+        elsif  self =~ JSON_DATE_REGEX
+          json_date_to_time
+        else
+          Time.parse(self)
+        end
       end
 
       alias :core_to_f :to_f
 
+      SCRUB_NUMBER_REGEX = /[^0-9\.\+\-]/.freeze
+
       # Remove none numeric characters then run default ruby float cast
       def to_f
-        gsub(/[^0-9\.\+\-]/, '').core_to_f
+        gsub(SCRUB_NUMBER_REGEX, EMPTY_STRING).core_to_f
       end
 
       alias :core_to_d :to_d
 
       def to_d
-        gsub(/[^0-9\.\+\-]/, '').core_to_d
+        gsub(SCRUB_NUMBER_REGEX, EMPTY_STRING).core_to_d
+      end
+
+      private
+
+      def json_date_to_time
+        (Time.at(self.tr(JSON_DATE_TR,EMPTY_STRING).to_i / 1000))
+      end
+
+      def us_date_to_iso_str
+        date_split = split(US_DATE_REGEX)
+        time = date_split[2]
+        date = date_split[1]
+        date_split = date.split(SPLIT_DATE_REGEX)
+        "#{date_split[2]}-#{date_split[0]}-#{date_split[1]}#{time}"
       end
     end
 
@@ -124,6 +162,7 @@ module SimpleModel
         !zero?
       end
     end
+
     Fixnum.class_eval do
       include ToCurrencyS
 

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/spec/simple_model/base_spec.rb

@@ -104,7 +104,6 @@ describe SimpleModel::Base do
           @log = "stuff"
         end
 
-
         def my_save_method
           true
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Joshua T Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -107,6 +107,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmarks/extend_core.rb
 - benchmarks/simple_model.rb
 - gemfiles/3.2.gemfile
 - gemfiles/4.0.gemfile
@@ -147,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_model
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simpifies building tableless models or models backed by webservices