fuzzyclock 0.0.1 → 0.0.2

data/Rakefile

@@ -1,2 +1,19 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+#
+# Rspec
+#
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+end
+
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+  spec.rcov_opts = ['--exclude', 'spec']
+end
+
+task :default => :spec

data/bin/fuzzyclock

@@ -17,9 +17,7 @@ class FuzzyClockCommand
   end
   
   def execute
-    t = FuzzyClock.new
-    print "It's about " if options[:about]
-    puts t.to_s
+    puts FuzzyClock.parse(nil, options)
   end
   
   def parse_options
@@ -29,6 +27,19 @@ class FuzzyClockCommand
       opts.on("-a", "--about", "Say about?") do |v|
         self.options[:about] = v
       end
+      
+      opts.on("-l", "--locale [lang]", String, "Langage") do |v|
+        self.options[:locale] = v
+      end
+      
+      opts.on("-U", "--uppercase", "UPPERCASE OUTPUT") do |v|
+        self.options[:upcase] = v
+      end
+      
+      opts.on("-C", "--capitalize", "Capitalize Output") do |v|
+        self.options[:capitalize] = v
+      end
+      
     }.parse!
   end
   

data/fuzzyclock.gemspec

@@ -18,4 +18,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  
+  s.add_development_dependency 'rspec', '>= 2.5.0'
+  
 end

data/lib/fuzzyclock/locale/en.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+
+class FuzzyClock
+  @@locales ||= {}
+  @@locales[:en] = {
+    :about => "it's about %t",
+    :hour => {
+      0  => "twelve",
+      1  => "one",
+      2  => "two",
+      3  => "three",
+      4  => "four",
+      5  => "five",
+      6  => "six",
+      7  => "seven",
+      8  => "eight",
+      9  => "nine",
+      10 => "ten",
+      11 => "eleven",
+      12 => "twelve",
+    },
+    :min => {
+      0..0   => "%0 o'clock",
+      1..2   => "a bit after %0",
+      3..7   => "five past %0",
+      8..12  => "ten past %0",
+      13..17 => "quarter past %0",
+      18..22 => "twenty past %0",
+      23..27 => "twenty five past %0",
+      28..32 => ["half past %0", "%0 thirty"],
+      33..37 => "twenty five to %1",
+      38..42 => "twenty to %1",
+      43..47 => "quarter to %1",
+      48..52 => "ten to %1",
+      53..57 => "five to %1",
+      58..59 => ["almost %1", "nearly %1"]
+    }
+  }
+end

data/lib/fuzzyclock/locale/se.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+
+class FuzzyClock
+  @@locales ||= {}
+  @@locales[:se] = {
+    :about => "runt %t",
+    :hour => {
+      0  => "tolv",
+      1  => "ett",
+      2  => "två",
+      3  => "tree",
+      4  => "fyra",
+      5  => "fem",
+      6  => "sex",
+      7  => "sju",
+      8  => "åtta",
+      9  => "nio",
+      10 => "tio",
+      11 => "elva",
+      12 => "tolv",
+    },
+    :min => {
+      0..0   => "klockan %0",
+      1..2   => "lite efter %0",
+      3..7   => "fem över %0",
+      8..12  => "tio över %0",
+      13..17 => "kvart över %0",
+      18..22 => "tjugo över %0",
+      23..27 => "tjugofem över %0",
+      28..32 => ["halv %1", "%0 och tretti"],
+      33..37 => "tjugofem i %1",
+      38..42 => "tjugo i %1",
+      43..47 => "kvart i %1",
+      48..52 => "tio i %1",
+      53..57 => "fem i %1",
+      58..59 => ["nästan %1", "strax före %1"]
+    }
+  }
+end

data/lib/fuzzyclock/version.rb

@@ -1,3 +1,3 @@
 class Fuzzyclock
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/fuzzyclock.rb

@@ -1,61 +1,56 @@
 # encoding: utf-8
 
+require 'fuzzyclock/locale/en'
+require 'fuzzyclock/locale/se'
 require 'fuzzyclock/version'
 
 class FuzzyClock
-  @@HourToString = {
-    0  => "twelve",
-    1  => "one",
-    2  => "two",
-    3  => "three",
-    4  => "four",
-    5  => "five",
-    6  => "six",
-    7  => "seven",
-    8  => "eight",
-    9  => "nine",
-    10 => "ten",
-    11 => "eleven",
-    12 => "twelve",
-  }
-
-  attr_writer :time
-
-  def initialize(time=Time.now)
-    @time = time
+  
+  class UnsupportedLocale < ArgumentError; end
+  
+  @@locales ||= {}
+  
+  def self.parse(time, opts = {})
+    self.new(time, opts).to_s
   end
-
-  # :s = suffix, :p = prefix
-  def fuzziness(min=0)
-    case min
-    when 0       then [:s, "o'clock"]
-    when 1..2    then [:p, "a bit after"]
-    when 3..7    then [:p, "five past"]
-    when 8..12   then [:p, "ten past"]
-    when 13..17  then [:p, "quarter past"]
-    when 18..22  then [:p, "twenty past"]
-    when 23..27  then [:p, "twenty five past"]
-    when 28..32  then rand(2) == 0 ? [:p, "half past"] : [:s, "thirty"] 
-    when 33..37  then [:p, "twenty five to"]
-    when 38..42  then [:p, "twenty to"]
-    when 43..47  then [:p, "quarter to"]
-    when 48..52  then [:p, "ten to"]
-    when 53..57  then [:p, "five to"]
-    when 58..59  then rand(2) == 0 ? [:p, "almost"] : [:p, "nearly"]
-    end
+  
+  attr_accessor :time
+  attr_accessor :locale
+  attr_accessor :about
+  attr_accessor :capitalize
+  attr_accessor :upcase
+  
+  def initialize(time = nil, opts = {})
+    @time       = time              || Time.now
+    @locale     = opts[:locale]     || :en
+    @about      = opts[:about]      || false
+    @capitalize = opts[:capitalize] || false
+    @upcase     = opts[:upcase]     || false
   end
-
-  def to_s
-    hr, min = @time.hour, @time.min
-    if (33..59) === min
-      hr += 1
-    end
-    str = @@HourToString[hr % 12]
-    fuzz = fuzziness(min)
-    if fuzz[0] == :p
-      str = fuzz[1] + " " + str
-    elsif fuzz[0] == :s
-      str = str + " " + fuzz[1]
+  
+  def parse
+    raise UnsupportedLocale, %Q{Locale "#{@locale}" is not supported.} unless @@locales.has_key?(@locale.to_sym)
+    lang = @@locales[@locale.to_sym]
+    
+    this_hour = lang[:hour][@time.hour % 12]
+    next_hour = lang[:hour][@time.hour % 12 + 1]
+    
+    fuzz = nil
+    lang[:min].each do |range, value|
+      if range.include?(@time.min)
+        fuzz = value.is_a?(Array) ? value[rand(value.size)] : value
+      end
     end
+    
+    fuzz.gsub!('%0', this_hour)
+    fuzz.gsub!('%1', next_hour)
+    
+    fuzz = lang[:about].gsub('%t', fuzz) if @about
+    fuzz.capitalize! if @capitalize
+    fuzz.upcase! if @upcase
+    
+    fuzz
   end
+  alias :to_s :parse
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fuzzyclock
 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: 
 - Sam Grover
@@ -16,10 +16,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 +01:00
+date: 2011-04-16 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
+        version: 2.5.0
+  type: :development
+  version_requirements: *id001
 description: A Ruby class to imitate the basic functionality of the cool FuzzyClock application
 email: 
 executables: 
@@ -36,6 +51,8 @@ files:
 - bin/fuzzyclock
 - fuzzyclock.gemspec
 - lib/fuzzyclock.rb
+- lib/fuzzyclock/locale/en.rb
+- lib/fuzzyclock/locale/se.rb
 - lib/fuzzyclock/version.rb
 has_rdoc: true
 homepage: https://github.com/samgrover/fuzzyclock.rb