stockboy 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f4c7e5f39621bb22f09bd06f634cb49023d6d6c
-  data.tar.gz: 0bc7683c74a66cc5a9510cde44c2ed15a62a64e7
+  metadata.gz: e9f39ab2f4181e4a6bc9856318ae586c1ad63502
+  data.tar.gz: d182b13648a082b1adf6a50a9c4c96c208f33501
 SHA512:
-  metadata.gz: 92b3a6d076053c21f48df30fbd544bf2ac952b9fd336a4080466e1b190a632216fc07f59f64756c79238a6304d84fb49e182f1119e6ed1e85376991b4e08cb9d
-  data.tar.gz: cc0a187e65ed56537ca104d23a42a359d064cae1aa6378605d4c60fb4b7c810956a6997f14518f6d710732f8ff4de393be5766bbe3426abad8ca76b985069d16
+  metadata.gz: 4037153d318abe04dcd6aa2abfbe5c15e3c7ea7658b3f72bdefccf201f5092aecf94f4f2cf680421c75d75e12467608bac8aa8c3c293001959e560f30b880272
+  data.tar.gz: 74f16a90d396df9f7c4cea5f7ae67319553bbd577001c4dce6417a63569095fb2cfefc067c6b74d6305fb9d8c922f4ec3408e9a61b1d8198dae081ee9ce87d7c

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.5.2 / 2013-12-04
+
+[BUGFIX]      Registered :string translation that was missed
+[BUGFIX]      All date translators handle String / Date / Time correctly
+
 ## 0.5.1 / 2013-12-03
 
 [ENHANCEMENT] Link to full documentation and license

data/README.md

@@ -1,5 +1,6 @@
 # Stockboy
 
+[![Gem Version](https://badge.fury.io/rb/stockboy.png)][gem]
 [![Build Status](https://travis-ci.org/avit/stockboy.png)][travis]
 [![Code Climate](https://codeclimate.com/github/avit/stockboy.png)][climate]
 
@@ -317,3 +318,4 @@ Contributions and pull requests are welcome.
 [travis]: https://travis-ci.org/avit/stockboy
 [climate]: https://codeclimate.com/github/avit/stockboy
 [rdoc]: http://rdoc.info/gems/stockboy/frames
+[gem]: http://rubygems.org/gems/stockboy

data/lib/stockboy.rb

@@ -15,6 +15,7 @@ require 'stockboy/translations/default_false'
 require 'stockboy/translations/default_true'
 require 'stockboy/translations/default_nil'
 require 'stockboy/translations/default_zero'
+require 'stockboy/translations/string'
 require 'stockboy/translations/boolean'
 require 'stockboy/translations/integer'
 require 'stockboy/translations/decimal'
@@ -66,6 +67,7 @@ module Stockboy
     register :or_nil,   DefaultNil
     register :or_empty, DefaultEmptyString
     register :or_zero,  DefaultZero
+    register :string,   String
     register :boolean,  Boolean
     register :integer,  Integer
     register :decimal,  Decimal

data/lib/stockboy/providers/file.rb

@@ -63,7 +63,7 @@ module Stockboy::Providers
       when String
         Dir[::File.join(file_dir, file_name)]
       end
-      @matching_file = pick_from(files) if files.any?
+      @matching_file = pick_from(files.sort) if files.any?
     end
 
     def clear

data/lib/stockboy/translations/date.rb

@@ -30,12 +30,28 @@ module Stockboy::Translations
       return nil if value.blank?
 
       case value
-      when ::String then ::Date.parse(value)
+      when ::String then parse_date(value.strip)
       when ::Time, ::DateTime then ::Date.new(value.year, value.month, value.day)
       when ::Date then value
       else nil
       end
     end
 
+    private
+
+    # Generic parse action, overridden by subclasses
+    # @return [Date]
+    #
+    def parse_date(value)
+      ::Date.parse(value)
+    end
+
+    def separator(value)
+      value.include?(?/) ? ?/ : ?-
+    end
+
+    # Match date strings with 2-digit year
+    MATCH_YYYY = %r"\A\d{1,2}(/|-)\d{1,2}\1\d{4}\z"
+
   end
 end

data/lib/stockboy/translations/uk_date.rb

@@ -1,4 +1,5 @@
 require 'stockboy/translator'
+require 'stockboy/translations/us_date'
 
 module Stockboy::Translations
 
@@ -25,26 +26,13 @@ module Stockboy::Translations
   #   record.check_in = "1/2/12"
   #   date.translate(record, :check_in) # => #<Date 2012-02-01>
   #
-  class UKDate < Stockboy::Translator
-
-    # @return [Date]
-    #
-    def translate(context)
-      value = field_value(context, field_key)
-      return nil if value.blank?
-
-      ::Date.strptime(value, date_format(value))
-    end
+  class UKDate < Stockboy::Translations::USDate
 
     private
 
     def date_format(value)
-      x = value.include?(?/) ? ?/ : ?-
-      if value =~ %r"\d{1,2}(?:/|-)\d{1,2}(?:/|-)\d{2}$"
-        "%d#{x}%m#{x}%y"
-      else
-        "%d#{x}%m#{x}%Y"
-      end
+      x = separator(value)
+      value =~ MATCH_YYYY ? "%d#{x}%m#{x}%Y" : "%d#{x}%m#{x}%y"
     end
 
   end

data/lib/stockboy/translations/us_date.rb

@@ -1,4 +1,5 @@
 require 'stockboy/translator'
+require 'stockboy/translations/date'
 
 module Stockboy::Translations
 
@@ -25,26 +26,19 @@ module Stockboy::Translations
   #   record.check_in = "2-1-12"
   #   date.translate(record, :check_in) # => #<Date 2012-02-01>
   #
-  class USDate < Stockboy::Translator
+  class USDate < Stockboy::Translations::Date
+
+    private
 
     # @return [Date]
     #
-    def translate(context)
-      value = field_value(context, field_key)
-      return nil if value.blank?
-
+    def parse_date(value)
       ::Date.strptime(value, date_format(value))
     end
 
-    private
-
     def date_format(value)
-      x = value.include?(?/) ? ?/ : ?-
-      if value =~ %r"\d{1,2}(?:/|-)\d{1,2}(?:/|-)\d{4}"
-        "%m#{x}%d#{x}%Y"
-      else
-        "%m#{x}%d#{x}%y"
-      end
+      x = separator(value)
+      value =~ MATCH_YYYY ?  "%m#{x}%d#{x}%Y" : "%m#{x}%d#{x}%y"
     end
 
   end

data/lib/stockboy/version.rb

@@ -1,3 +1,3 @@
 module Stockboy
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stockboy
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Andrew Vit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake