shogun 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd1b08acc6a147b6ab44179c28906239ac5a13d2
-  data.tar.gz: 465198a776d34f132b1fea6ed9a458f17b9accdd
+  metadata.gz: 0cba5f44740220ceed421671ca29aaf67451e1c8
+  data.tar.gz: 94496c87fe09aed639148d73f84ab094abe7db52
 SHA512:
-  metadata.gz: dd26244a7c5bd904b194d0775f9ae8ed73284b752f0c0c02eeee21dad4a949aafdee830ccde331cacb8845f6897aba3550083454a1c5f163f890b90d4755c4f7
-  data.tar.gz: 9ba3fb577d5992e37178e9251cf8da82587f22fe41fdf3b29cc0318ab1af425bac593ad817b96c25f86af9ffd904914a8a3856e46b69c458c3fe645d839776cc
+  metadata.gz: 4b6a4534a71e86e45934c7f049b3cc8e761061c71b796373d308a5406ea067a9749801e8568ccc9703e5c7e74f16125dcacbc84be7bfd5f7c579d38e5965d5a0
+  data.tar.gz: fb797d95f7f69233ad534fbb3c09270c01c02b076717b4ba18d8ed818dc14813f3d42b2de6245ccb165fec069f164b2e92ef1d151ccb4ffee768e25b003c5692

data/lib/shogun/control.rb

@@ -62,7 +62,6 @@ module Shogun
 
     require_relative "control/null"
 
-
     def to_a
       [status, headers, body]
     end

data/lib/shogun/database.rb

@@ -36,9 +36,33 @@ module Shogun
       ActiveRecord::LogSubscriber.logger = @logger
       ActiveRecord::LogSubscriber.colorize_logging = false
       ActiveRecord::Base.time_zone_aware_attributes = true
-      ActiveRecord::Base.default_timezone = (self.class.const_get("TIMEZONE") || self.class.const_get("DEFAULT_TIMEZONE")).to_sym
+      ActiveRecord::Base.default_timezone = (timezone || default_timezone).to_sym
       ActiveRecord::Base.logger = @logger
-      ActiveRecord::Base.establish_connection("#{self.class.const_get("URL")}?#{self.class.const_get("CONFIGURATION").to_query}")
+      ActiveRecord::Base.establish_connection(uri)
+    end
+
+    private def url
+      self.class.const_get("URL")
+    end
+
+    private def uri
+      "#{url}?#{query}"
+    end
+
+    private def query
+      configuration.to_query
+    end
+
+    private def configuration
+      self.class.const_get("CONFIGURATION")
+    end
+
+    private def timezone
+      self.class.const_get("TIMEZONE")
+    end
+
+    private def default_timezone
+      self.class.const_get("DEFAULT_TIMEZONE")
     end
   end
 end

data/lib/shogun/denormalizer.rb

@@ -14,7 +14,7 @@ module Shogun
 
     def as_document
       {
-        document_key => document,
+        namespace => document,
         meta_key => @meta,
         links_key => @links,
         linked_key => @linked
@@ -31,8 +31,8 @@ module Shogun
       end
     end
 
-    private def document_key
-      self.class.const_get("DOCUMENT_KEY")
+    private def namespace
+      self.class.const_get("NAMESPACE")
     end
 
     private def meta_key

data/lib/shogun/normalizer.rb

@@ -27,5 +27,9 @@ module Shogun
     private def metadata
       self.class.const_get("METADATA")
     end
+
+    private def namespace
+      self.class.const_get("NAMESPACE")
+    end
   end
 end

data/lib/shogun/version.rb

@@ -1,3 +1,3 @@
 module Shogun
-  VERSION = "2.1.1"
+  VERSION = "3.0.0"
 end

data/spec/lib/shogun/denormalizer_spec.rb

@@ -7,7 +7,7 @@ describe Shogun::Denormalizer do
     end
   end
   let(:denormalizer) { denormalizer_klass.new(object: presenter, fields: fields) }
-  let(:document_key) { "accounts" }
+  let(:namespace) { "accounts" }
   let(:presenter) { instance_double("Presenter") }
   let(:links) { { "a" => "b" } }
   let(:meta) { { "c" => "d" } }
@@ -23,7 +23,7 @@ describe Shogun::Denormalizer do
     allow(presenter).to receive(:linked).and_return(linked)
     allow(presenter).to receive(:a).and_return(a)
     allow(presenter).to receive(:b).and_return(b)
-    allow(denormalizer).to receive(:document_key).and_return(document_key)
+    allow(denormalizer).to receive(:namespace).and_return(namespace)
     allow(denormalizer).to receive(:mapping).and_return(mapping)
   end
 
@@ -46,8 +46,8 @@ describe Shogun::Denormalizer do
       expect(as_document).to have_key(Shogun::Denormalizer::LINKED_KEY)
     end
 
-    it "contains the document key" do
-      expect(as_document).to have_key(document_key)
+    it "contains the namespace key" do
+      expect(as_document).to have_key(namespace)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shogun
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Kurtis Rainbolt-Greene