simplec 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c321ea208ca11d4f51f7f14b78860240c552691
-  data.tar.gz: 9c6f4ed8b8f77ff80f33db6bfb129c11a78e0a3e
+  metadata.gz: 3e3189399a08bf6dc14a452311b79f7f48eb6a16
+  data.tar.gz: 179e5ac787ed6456ac46282808591748ba10e560
 SHA512:
-  metadata.gz: cceb2399b420e69f3f04f8e39fdbc34b4a60884fe8caba37005b73a7ce22f7f85609e3e15b64d8dfa8763b17225dab6046bece6c5e713c9c06554aa5058ae7cb
-  data.tar.gz: d0bbce5fd5760a1dad808f12a07d2ed27497821879a1041c59b96ce69275acedf735489fcf816c66a3f4af209c9ca6a272497461ed452ab6a8f47c99ffd4dc05
+  metadata.gz: 61dcc253ee7661aaea00164e559700fedd731d5932049fb9f21e285a65fd4840e35a3c1dbc84f433cd79bf61611cf75b0bffe7abd6876a4db7ce63774dba7f72
+  data.tar.gz: 8d0115591036074ab888821f17b04fdfdd2692bb941273a8329fa61d25104763ea1630215a06b5fac7ed714bd1ea9bfff5b1a44f93f05a1d1589f825cb51fa1e

data/README.md

@@ -11,9 +11,10 @@ ecosystem.
 
 ## Dependencies
 
-- rails >= 5.0.5
+- rails >= 5.1.0
 
-    This probably can be lowered to older versions.
+    If you want to use this with earlier versions of rails, please create a
+    github issue.
 
 - pg >= 0.21.0; Postgres >= 9.5
 
@@ -331,6 +332,11 @@ See this page for a good cheat sheet: http://markevans.github.io/dragonfly/image
         gem install yard
         yard server -r --no-cache --no-save --verbose --debug --backtrace
 
+## Moving Backwards
+
+- Depends on 5.1.x because of on_load hooks, specifically
+  :action_controller_base. Could be moved back, but need to figure out
+  equivalent ways of loading in the engine.
 
 ## Contributors
 

data/lib/simplec.rb

@@ -12,6 +12,13 @@ module Simplec
 
   # Get application view helpers.
   #
+  # @note
+  #   A copy of ApplicationHelper has been removed from the module tree but is still active!
+  #
+  #   If that occurs it is because the Module has been changed but app needs to
+  #   be restarted because they are loaded at initialize. require_dependency
+  #   might be able to fix it.
+  #
   # @example append helper
   #   Simplec.helpers << ::ApplicationHelper
   #

data/lib/simplec/action_controller/extensions.rb

@@ -22,14 +22,12 @@ module Simplec
       # @return [Simplec::Page]
       def page(path, options={})
         @_page ||= Hash.new
-        return @_page[path] if @_page[path]
-
-        _subdomain = options[:subdomain] ?
-          Subdomain.find_by!(name: options[:subdomain]) :
-          subdomain
+        key = "#{subdomain(options[:subdomain])};#{path}"
+        return @_page[key] if @_page[key]
 
         # TODO add raise option for find_by!
-        @_page[path] = _subdomain.pages.find_by!(path: path)
+        @_page[key] = subdomain(options[:subdomain]).pages.
+          includes(:subdomain).find_by!(path: path)
       end
 
       # Get the path of a page.

data/lib/simplec/action_view/helper.rb

@@ -83,7 +83,7 @@ module Simplec
       #
       # Example:
       #
-      #   <% subpages('/give-volunteer', conditions: ->{ order(title: :asc) }).each do |page| %>
+      #   <% subpages('give-volunteer', conditions: ->{ order(title: :asc) }).each do |page| %>
       #     ... do something with page ...
       #   <% end%>
       def subpages(page_or_path, options={})
@@ -106,7 +106,7 @@ module Simplec
             return @_subpages[key] = Array.new
           end
 
-          @_subpages[key] = page.children
+          @_subpages[key] = page.children.includes(:subdomain)
         end
 
         @_subpages[key].respond_to?(:merge) && options[:conditions] ?

data/lib/simplec/version.rb

@@ -1,3 +1,3 @@
 module Simplec
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplec
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Matt Smith
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement