tp_common 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed27b3a106184d6ded87fd3e1e9c44e3b1472ac
-  data.tar.gz: 180eae84761affca9fa2f8f393365db944acd879
+  metadata.gz: b356520bfa9dafe1b9d9faf0085ab4036e1e5dca
+  data.tar.gz: a015f6bd07598ffe465aa90e51730670e73ca2b5
 SHA512:
-  metadata.gz: 85052c146352ec174b59140ebf194035559fa2890fa9c0c46bc36894065232e29599ce32738df489f6ed43867b92d4e80328f5a3404161546d01cf91e0dc9710
-  data.tar.gz: cdef719622e6034ed4dd2a85d79fa15619870002b07d56f81ad0b9fccfde506fbbe9f09ce0182b86c1fa497b619ea96262a21b15793e4e4b908d97797c9ad03f
+  metadata.gz: 2bb409e4a85367d909016d000374132818be6ea00c9f18b5dfa9c2ce554ead08144ecdd9d8d7255a2775f28ffcdb3c86fca45a9a3701c2850afb67b05c6738d7
+  data.tar.gz: c7dbe6e37ca7f854a9883f2550fa7c4b3b992b95820cb20e965f0728157e398b519386e3afa61cc7edc273be672b4682ce001d2335a2593d59b6aebb16477858

data/lib/tp_common/railtie.rb

@@ -0,0 +1,7 @@
+module TpCommon
+  class Railtie < ::Rails::Railtie
+    config.after_initialize do
+      TpCommon::Timezones::Config.config
+    end
+  end
+end

data/lib/tp_common/timezones/config.rb

@@ -0,0 +1,38 @@
+module TpCommon
+  module Timezones
+    class Config
+      def self.config
+        return if TpCommon::Timezones.const_defined?("LIST_ZONES")
+        if defined?(::Rails::Railtie)
+          begin
+            TpCommon::Timezones.const_set("LIST_ZONES", Rails.application.config_for(:timezones))
+            return
+          rescue NameError, NoMethodError
+            puts "Couldn't load Rails or config methods. Use default."
+          rescue StandardError
+            puts "Couldn't load file config/timezones.yml. Use default."
+          end
+        end
+
+        TpCommon::Timezones.const_set("LIST_ZONES", load_default_timezones)
+      end
+
+      def self.load_default_timezones
+        file_path = File.join(File.dirname(__FILE__),"config/timezones.yml")
+        yaml = Pathname.new(file_path)
+
+        if yaml.exist?
+          require "erb"
+          (YAML.load(ERB.new(yaml.read).result) || {})["all_zones"] || {}
+        else
+          raise "Could not load configuration. No such file - #{yaml}"
+        end
+      rescue Psych::SyntaxError => e
+        raise "YAML syntax error occurred while parsing #{yaml}. ",
+                "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. ",
+                "Error: #{e.message}"
+      end
+      private_class_method :load_default_timezones
+    end
+  end
+end

data/lib/tp_common/timezones/zone.rb

@@ -2,7 +2,6 @@ module TpCommon
   module Timezones
     class Zone
       SECONDS_IN_AN_HOUR = 3600
-      DAY_LIGHT_SAVING_ZONES = ['Etc/GMT+9', 'Etc/GMT+8', 'Etc/GMT+7', 'Etc/GMT+6', 'Etc/GMT+5'].freeze
 
       attr_reader :key
 
@@ -30,14 +29,12 @@ module TpCommon
 
       private
 
-      attr_reader :time, :name
-
       def gmt_12
-        time.in_time_zone('Etc/GMT-12')
+        @time.in_time_zone('Etc/GMT-12')
       end
 
       def organization_time
-        time.in_time_zone(name)
+        @time.in_time_zone(@name)
       end
 
       def time_difference_in_seconds

data/lib/tp_common/timezones.rb

@@ -1,6 +1,8 @@
+require 'tp_common/timezones/config'
+
 module TpCommon
   module Timezones
-    LIST_ZONES = TpCommon.load_timezones.freeze
+    # LIST_ZONES = # Dynamic defined in TpCommon::Timezones::Config
 
     def self.current_date_in_time_zone(time_zone_key)
       self.converted_time(Time.now, time_zone_key).strftime('%Y-%m-%d %H:%M:%S').to_date

data/lib/tp_common/version.rb

@@ -1,3 +1,3 @@
 module TpCommon
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/tp_common.rb

@@ -3,24 +3,13 @@ require 'active_support/all'
 require 'psych'
 require 'yaml'
 
-# require 'pry-byebug'
+require 'pry-byebug'
 
-module TpCommon
-  def self.load_timezones
-    file_path = File.join(File.dirname(__FILE__),"config/timezones.yml")
-    yaml = Pathname.new(file_path)
+if defined?(::Rails::Railtie)
+  require 'tp_common/railtie'
+end
 
-    if yaml.exist?
-      require "erb"
-      (YAML.load(ERB.new(yaml.read).result) || {})["all_zones"] || {}
-    else
-      raise "Could not load configuration. No such file - #{yaml}"
-    end
-  rescue Psych::SyntaxError => e
-    raise "YAML syntax error occurred while parsing #{yaml}. ",
-            "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. ",
-            "Error: #{e.message}"
-  end
+module TpCommon
 end
 
 require "tp_common/timezones"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tp_common
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - An Vo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,9 +153,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/config/timezones.yml
 - lib/tp_common.rb
+- lib/tp_common/railtie.rb
 - lib/tp_common/timezones.rb
+- lib/tp_common/timezones/config.rb
+- lib/tp_common/timezones/config/timezones.yml
 - lib/tp_common/timezones/zone.rb
 - lib/tp_common/version.rb
 - tp_common.gemspec