shokkenki-support 1.0.0 → 1.1.0

data/lib/shokkenki/support/version.rb

@@ -1,7 +1,7 @@
 module Shokkenki
   module Support
     module Version
-      STRING = '1.0.0'
+      STRING = '1.1.0'
     end
   end
 end

data/lib/shokkenki/term/core_ext.rb

@@ -2,4 +2,8 @@ require_relative 'core_ext/string'
 require_relative 'core_ext/hash'
 require_relative 'core_ext/regexp'
 require_relative 'core_ext/symbol'
-require_relative 'core_ext/numeric'
+require_relative 'core_ext/numeric'
+require_relative 'core_ext/date'
+require_relative 'core_ext/date_time'
+require_relative 'core_ext/time'
+require_relative 'core_ext/object'

data/lib/shokkenki/term/core_ext/date.rb

@@ -0,0 +1,9 @@
+require_relative '../date_term'
+
+class Date
+
+  def to_shokkenki_term
+    Shokkenki::Term::DateTerm.new self
+  end
+
+end

data/lib/shokkenki/term/core_ext/date_time.rb

@@ -0,0 +1,9 @@
+require_relative '../date_time_term'
+
+class DateTime
+
+  def to_shokkenki_term
+    Shokkenki::Term::DateTimeTerm.new self
+  end
+
+end

data/lib/shokkenki/term/core_ext/object.rb

@@ -0,0 +1,9 @@
+require_relative '../string_term'
+
+class Object
+
+  def to_shokkenki_term
+    Shokkenki::Term::StringTerm.new self.to_s
+  end
+
+end

data/lib/shokkenki/term/core_ext/time.rb

@@ -0,0 +1,9 @@
+require_relative '../date_time_term'
+
+class Time
+
+  def to_shokkenki_term
+    Shokkenki::Term::DateTimeTerm.new self
+  end
+
+end

data/lib/shokkenki/term/date_term.rb

@@ -0,0 +1,36 @@
+require_relative 'term'
+require 'date'
+
+module Shokkenki
+  module Term
+    class DateTerm < Term
+
+      def self.type; :date; end
+
+      def self.from_json json
+        new Date.parse(json[:value])
+      end
+
+      def initialize value
+        @value = value.to_date
+      end
+
+      def to_hash
+        {
+          :type => type,
+          :value => @value.iso8601
+        }
+      end
+
+      def example
+        @value
+      end
+
+      def match? compare
+        return false unless compare
+        datecompare = compare.respond_to?(:to_date) ? compare.to_date : Date.parse(compare.to_s)
+        datecompare == @value
+      end
+    end
+  end
+end

data/lib/shokkenki/term/date_time_term.rb

@@ -0,0 +1,35 @@
+require_relative 'term'
+
+module Shokkenki
+  module Term
+    class DateTimeTerm < Term
+
+      def self.type; :date_time; end
+
+      def self.from_json json
+        new DateTime.parse(json[:value])
+      end
+
+      def initialize value
+        @value = value.to_datetime
+      end
+
+      def to_hash
+        {
+          :type => type,
+          :value => @value.iso8601
+        }
+      end
+
+      def example
+        @value
+      end
+
+      def match? compare
+        return false unless compare
+        datecompare = compare.respond_to?(:to_datetime) ? compare.to_datetime : DateTime.parse(compare.to_s)
+        datecompare == @value
+      end
+    end
+  end
+end

data/lib/shokkenki/term/hash_term.rb

@@ -5,7 +5,7 @@ module Shokkenki
   module Term
     class HashTerm < Term
 
-      attr_reader :type, :value
+      def self.type; :hash; end
 
       def self.from_json json
         values = json[:value].inject({}) do |hash, kv|
@@ -23,8 +23,6 @@ module Shokkenki
           mapped[k] = v.to_shokkenki_term
           mapped
         end
-
-        @type = :hash
       end
 
       def to_hash
@@ -35,7 +33,7 @@ module Shokkenki
         end
 
         {
-          :type => @type,
+          :type => type,
           :value => mapped_values
         }
       end

data/lib/shokkenki/term/json_paths_term.rb

@@ -9,7 +9,7 @@ module Shokkenki
   module Term
     class JsonPathsTerm < Term
 
-      attr_reader :type, :value
+      def self.type; :json_paths; end
 
       def self.from_json json
         values = json[:value].inject({}) do |hash, kv|
@@ -27,8 +27,6 @@ module Shokkenki
           mapped[k] = v.to_shokkenki_term
           mapped
         end
-
-        @type = :json_paths
       end
 
       def match? compare
@@ -54,7 +52,7 @@ module Shokkenki
         end
 
         {
-          :type => @type,
+          :type => type,
           :value => mapped_values
         }
       end

data/lib/shokkenki/term/number_term.rb

@@ -4,7 +4,7 @@ module Shokkenki
   module Term
     class NumberTerm < Term
 
-      attr_reader :type, :value
+      def self.type; :number; end
 
       def self.from_json json
         new json[:value]
@@ -12,12 +12,11 @@ module Shokkenki
 
       def initialize value
         @value = value
-        @type = :number
       end
 
       def to_hash
         {
-          :type => @type,
+          :type => type,
           :value => @value
         }
       end

data/lib/shokkenki/term/regexp_term.rb

@@ -5,7 +5,7 @@ module Shokkenki
   module Term
     class RegexpTerm < Term
 
-      attr_reader :type, :value
+      def self.type; :regexp; end
 
       def self.from_json json
         new json[:value]
@@ -13,12 +13,11 @@ module Shokkenki
 
       def initialize value
         @value = Regexp.new value
-        @type = :regexp
       end
 
       def to_hash
         {
-          :type => @type,
+          :type => type,
           :value => value_string
         }
       end

data/lib/shokkenki/term/string_term.rb

@@ -4,7 +4,7 @@ module Shokkenki
   module Term
     class StringTerm < Term
 
-      attr_reader :type, :value
+      def self.type; :string; end
 
       def self.from_json json
         new json[:value]
@@ -12,12 +12,11 @@ module Shokkenki
 
       def initialize value
         @value = value.to_s
-        @type = :string
       end
 
       def to_hash
         {
-          :type => @type,
+          :type => type,
           :value => @value
         }
       end

data/lib/shokkenki/term/term.rb

@@ -1,9 +1,20 @@
 module Shokkenki
   module Term
     class Term
+
+      attr_reader :value
+
+      def type
+        @@type
+      end
+
       def to_shokkenki_term
         self
       end
+
+      def type
+        self.class.type
+      end
     end
   end
 end

data/lib/shokkenki/term/term_factory.rb

@@ -3,6 +3,8 @@ require_relative 'hash_term'
 require_relative 'regexp_term'
 require_relative 'number_term'
 require_relative 'json_paths_term'
+require_relative 'date_term'
+require_relative 'date_time_term'
 require 'active_support/core_ext/hash/keys'
 
 module Shokkenki
@@ -10,13 +12,12 @@ module Shokkenki
     class TermFactory
 
       def self.factories
-        @factories ||= {
-          :string => StringTerm,
-          :hash => HashTerm,
-          :regexp => RegexpTerm,
-          :number => NumberTerm,
-          :json_paths => JsonPathsTerm
-        }
+        @factories ||= [
+          StringTerm, HashTerm, RegexpTerm, NumberTerm, JsonPathsTerm, DateTerm, DateTimeTerm
+          ].inject({}) do |h, term|
+            h[term.type] = term
+            h
+          end
       end
 
       def self.factory_for type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shokkenki-support
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -100,11 +100,17 @@ files:
 - lib/shokkenki/support.rb
 - lib/shokkenki/support/version.rb
 - lib/shokkenki/term/core_ext.rb
+- lib/shokkenki/term/core_ext/date.rb
+- lib/shokkenki/term/core_ext/date_time.rb
 - lib/shokkenki/term/core_ext/hash.rb
 - lib/shokkenki/term/core_ext/numeric.rb
+- lib/shokkenki/term/core_ext/object.rb
 - lib/shokkenki/term/core_ext/regexp.rb
 - lib/shokkenki/term/core_ext/string.rb
 - lib/shokkenki/term/core_ext/symbol.rb
+- lib/shokkenki/term/core_ext/time.rb
+- lib/shokkenki/term/date_term.rb
+- lib/shokkenki/term/date_time_term.rb
 - lib/shokkenki/term/hash_term.rb
 - lib/shokkenki/term/json_path_example.rb
 - lib/shokkenki/term/json_paths_term.rb
@@ -138,11 +144,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1162778441751763225
+      hash: -631270901951395763
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: shokkenki-support-1.0.0
+summary: shokkenki-support-1.1.0
 test_files: []