spacetimeid 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93090963880cbbf02e25a5296c4456bd2637c0e4
-  data.tar.gz: bbb8634e5b39dc4e5e1f302cdff8c0feb51acef3
+  metadata.gz: 5fc79cd5165be1f56d4c372249430fff31c28e64
+  data.tar.gz: edcb65f0d8d7f0f5902dfaaa54256e57cc2f042b
 SHA512:
-  metadata.gz: 8031c66c95bd89eb0048813ad0cc75339549be400529c6126242ebbfa91641f9377d6c221d18250d29b1a9b41129eb234cce33eb3b8be963af65c2fa142fe352
-  data.tar.gz: 123ae0bed81d9881bc1650ed97068a2b60803dd06a3ecd92f5e047471cbcddb45a17f33407adf6c5e076d29ceae8d86df6981ffc8432596d6687d93dfaa63fb7
+  metadata.gz: b4abe4d9baba994033bdaf94c9825e7f207a3b676a65fa5770c061f75ba10965264ab423875ddd9ec97c4a67373c4a715a6afb5d971fa057122ba9b084aa0ec5
+  data.tar.gz: 9cea49cdf67f08364d9c72a30cd26d10b316384f982e295b32abce40d77de91bda789eaf29cf1b32d9c0ce98875c9b5c936d8076bd2ad9b048e78704e7755bd1

data/README.md

@@ -24,8 +24,8 @@ id.id
 # DEFAULTS = {
 #   xy_base_step: 0.01, # 0.01 degrees
 #   xy_expansion: 5,    # expands into a 5x5 grid recursively
-#   ts_base_step: 600,  # 10 minutes
-#   ts_expansion: [1, 3, 2, 3, 2], # each time interval expands this many times the previous one
+#   ts_base_step: 3600, # 1 hour
+#   ts_expansion: 2,    # each time interval expands this many times the previous one
 #   decimals: 2
 # }
 

data/lib/inheritable_attribute.rb

@@ -0,0 +1,36 @@
+module InheritableAttribute
+
+  def inheritable_attr(name, options={})
+    instance_eval %Q{
+      def #{name}=(v)
+        @#{name} = v
+      end
+
+      def #{name}
+        return @#{name} if instance_variable_defined?(:@#{name})
+        @#{name} = InheritableAttribute.inherit_for(self, :#{name}, #{options})
+      end
+    }
+  end
+
+  def self.inherit_for(klass, name, options={})
+    return unless klass.superclass.respond_to?(name)
+
+    value = klass.superclass.send(name) # could be nil
+
+    return value if options[:clone] == false
+    Clone.(value) # this could be dynamic, allowing other inheritance strategies.
+  end
+
+  class Clone
+    # The second argument allows injecting more types.
+    def self.call(value, uncloneable=uncloneable())
+      uncloneable.each { |klass| return value if value.kind_of?(klass) }
+      value.clone
+    end
+
+    def self.uncloneable
+      [Symbol, TrueClass, FalseClass, NilClass]
+    end
+  end
+end

data/lib/space_time_id.rb

@@ -1,10 +1,12 @@
 class SpaceTimeId
-
-  DEFAULTS = {
-    xy_base_step: 0.01, # 0.01 degrees
-    xy_expansion: 5,    # expands into a 5x5 grid recursively
-    ts_base_step: 600,  # 10 minutes
-    ts_expansion: [1, 3, 2, 3, 2], # expands 3 times each interval, then 2, then 3....
+  extend InheritableAttribute
+
+  inheritable_attr :default_options
+  self.default_options = {
+    xy_base_step: 0.01,    # 0.01 degrees
+    xy_expansion: 5,       # expands into a 5x5 grid recursively
+    ts_base_step: 60 * 60, # 1 hour
+    ts_expansion: 2,       # expands 2 times each interval
     decimals: 2
   }
 
@@ -16,10 +18,9 @@ class SpaceTimeId
   attr_accessor :level
 
   def initialize(*args)
-    self.options = DEFAULTS.merge(args.extract_options!)
+    self.options = self.class.default_options.merge(args.extract_options!)
     self.interval = options.delete(:interval) || 0
     self.level = options.delete(:level) || 0
-    options[:ts_expansion] = Array(options[:ts_expansion])
     if args.length == 1 && args.first.is_a?(String)
       initialize(*args.first.split("_").map(&:to_f), original_options)
     elsif args.length == 1 && args.first.is_a?(Array) && args.first.length == 2
@@ -119,11 +120,7 @@ class SpaceTimeId
   end
 
   def ts_step
-    @ts_step ||= ts_step_aux(interval)
-  end
-
-  def ts_step_aux(interval)
-    ts_base_step * ts_expansion
+    interval == 0 ? ts_base_step : ts_base_step * ts_expansion * interval
   end
 
   def ts_base_step
@@ -131,15 +128,7 @@ class SpaceTimeId
   end
 
   def ts_expansion
-    ts_expansion_aux
-    options[:ts_expansion][0..interval].reduce(:*)
-  end
-
-  def ts_expansion_aux
-    if interval >= options[:ts_expansion].length
-      padd = [options[:ts_expansion].last] * (options[:ts_expansion].length - interval + 1)
-      options[:ts_expansion] += padd
-    end
+    options[:ts_expansion]
   end
 
   # # # # # # # # # # # # # T I M E   R E L A T I O N S # # # # # # # # # # # #

data/lib/spacetimeid.rb

@@ -1,2 +1,3 @@
 require 'extract_options'
+require 'inheritable_attribute'
 autoload :SpaceTimeId, 'space_time_id'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spacetimeid
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - George Lamprianidis
@@ -33,6 +33,7 @@ files:
 - Gemfile
 - README.md
 - lib/extract_options.rb
+- lib/inheritable_attribute.rb
 - lib/space_time_id.rb
 - lib/spacetimeid.rb
 homepage: https://github.com/glampr/spacetimeid