rooftop-rails-extras 0.0.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c74da683e1346ccbe1c23dddc3bca3a1861f9cc
-  data.tar.gz: 1c03eb2c4d0d05828c2006014c472320317622fc
+  metadata.gz: 146aac62fdbc7ca8d90c1751b3ea0677c50d267e
+  data.tar.gz: 476df8a7cd38c68d0b1b71d748076ab4c813fd7b
 SHA512:
-  metadata.gz: d82bded841f67c43b69db1c924c6507c53c36ff488a4abad9adc8c8f469f4171513807a1c5fe3024f2dfe7556516e1d2122f5909805dcf184f219e72f68edaa8
-  data.tar.gz: f53e402415eef03fdb60bcd1c3c6c8f2399af67b7850167ad699febddd417a4bf9f07b094158aeedb3dc1c792725403c69a3efdd3ef4ac20520bece911a014d8
+  metadata.gz: 564b6903a2805f46de117e36ce67a7779119aa604e263c0602e65c6f462d07f99faaf8aa0f0d192e8fc56c952c36a1c6ad61e1ca1f1945bacf19670606439f3c
+  data.tar.gz: cb430ca435d51dbf74e181091a67c4b8d6afe61fa4890bf60f71ca043d25f41cf251d3cbd6a7a3c5062827b7870ebd223c21faebc79a2a132ce1a1d34fbadce0

data/README.md

@@ -30,6 +30,12 @@ class SomePostType
 end
 ```
 
+Then doing a search is as simple as:
+
+```
+   SomePostType.search("your string") #will return a collection of matching objects.
+```
+
 ## Contact form handling
 Almost every website we build needs a simple mail handler. Extending the [mail_form gem](https://github.com/plataformatec/mail_form), we've added a way to handle these with minimal fuss. Some assumptions are made in the name of expedience; if you need more than this, you probably need to use `mail_form` directly.
 
@@ -49,6 +55,7 @@ class ContactForm < Rooftop::Rails::Extras::ContactForm #you can call your class
     }
     self.to = "the email you want to send the contact messages to"
     self.from = "the email from which you want to send the messages"
+    self.setup! #you need to call setup! here because there's no elegant way to call it automatically in the parent class.
 end
 ```
 

data/app/controllers/concerns/rooftop/rails/extras/contact_form_handler.rb

@@ -38,7 +38,11 @@ module Rooftop
 
         private
         def contact_form_params
-          params.require(self.class.contact_form.to_s.underscore.to_sym).permit(self.class.contact_form.fields.keys)
+          # Sometimes we might want to pass params into this which are arrays from e.g. checkboxes. So we allow the keys from the form as syms and also as hashes
+          permitted_keys = [self.class.contact_form.fields.keys, self.class.contact_form.fields.keys.inject({}) {|h,k| h[k] = []; h }]
+          self.class.contact_form.fields.keys
+          params.require(self.class.contact_form.to_s.underscore.to_sym).permit(*permitted_keys)
+
         end
       end
     end

data/app/helpers/rooftop/rails/extras/navigation_helper.rb

@@ -10,10 +10,10 @@ module Rooftop
           }.merge(opts)
           raise ArgumentError, "#{entity.class} isn't a nested class" unless entity.respond_to?(:resolved_children)
           raise ArgumentError, "You passed a current #{entity.class.to_s.downcase} which isn't a #{entity.class} object" unless (default_opts[:current].nil? || default_opts[:current].is_a?(entity.class))
-          if entity.resolved_children.any?
-            # byebug
+          resolved_children = entity.resolved_children
+          if resolved_children.any?
             content_tag(:ul, class: default_opts[:class]) do
-              items = entity.resolved_children.collect do |child|
+              items = resolved_children.collect do |child|
                 subnavigation_item_for(child, default_opts)
               end
               items.join.html_safe
@@ -41,6 +41,10 @@ module Rooftop
           }.merge(opts)
           item_path = path_for_menu_item(item)
           item_class = path_matches?(item_path) ? default_opts[:current_class] : ""
+          # add the status into the item class
+          if item.respond_to?(:status)
+            item_class += " status-#{item.status}"
+          end
           content_tag :li, class: item_class do
             link = content_tag :a, href: item_path do
               item.title.html_safe
@@ -86,6 +90,10 @@ module Rooftop
           list_opts = {}
           opts.reverse_merge!({level: 1})
           list_opts[:class] = opts[:current_class] if opts[:current].present? && opts[:current].id == entity.id
+          # add the status if the item as a class
+          if entity.respond_to?(:status)
+            list_opts[:class] += " status-#{entity.status}"
+          end
           # The link to the entity
           content_tag :li, list_opts do
 
@@ -97,7 +105,7 @@ module Rooftop
 
             # Nested ul for children if necessary
             if opts[:current].present? && (opts[:current].ancestors.collect(&:id).include?(entity.id) || opts[:current].id == entity.id)
-              children = entity.class.where(post_parent: entity.id)
+              children = entity.class.where(post_parent: entity.id, orderby: :menu_order, order: :asc)
               if children.any?
                 child_links = content_tag :ul, class: "subnavigation-level-#{opts[:level]}" do
                   items = children.collect do |child|

data/app/models/concerns/rooftop/rails/extras/resolved_children.rb

@@ -8,7 +8,7 @@ module Rooftop
           child_ids = children.collect(&:id)
 
           if child_ids.any?
-            self.class.where(post__in: child_ids)
+            self.class.where(post__in: child_ids, orderby: :post__in)
           else
             []
           end

data/app/models/{concerns/rooftop → rooftop}/rails/extras/contact_form.rb

@@ -12,24 +12,16 @@ module Rooftop
           message: :text_area
         }
 
-        def self.inherited(base)
-          (base.fields || DEFAULT_FIELDS).keys.each do |field|
-            base.send(:attribute,field, {validate: true})
+        def self.setup!
+          (self.fields || DEFAULT_FIELDS).keys.each do |field|
+            self.send(:attribute,field, {validate: true})
           end
 
-          base.subject ||= "Contact form message"
-          base.to ||= "change.me@#{base.to_s.underscore}"
-          base.from ||= "change.me@#{base.to_s.underscore}"
-          base.headers ||= {}
+          self.subject ||= "Contact form message"
+          self.to ||= "change.me@#{self.to_s.underscore}"
+          self.from ||= "change.me@#{self.to_s.underscore}"
+          self.headers ||= {}
         end
-        #
-        # attribute :salutation
-        # attribute :first_name,      validate: true
-        # attribute :last_name,     validate: true
-        # attribute :email, validate: true
-        # attribute :phone
-        # attribute :message, validate: true
-        # attribute :nickname,  captcha: true
 
         # Declare the e-mail headers. It accepts anything the mail method
         # in ActionMailer accepts.

data/lib/rooftop/rails/extras/version.rb

@@ -1,7 +1,7 @@
 module Rooftop
   module Rails
     module Extras
-      VERSION = "0.0.3"
+      VERSION = "0.2.0"
     end
   end
 end

data/rooftop-rails-extras.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
   spec.add_dependency 'require_all', '~> 1.3'
-  spec.add_dependency 'rooftop-rails', '0.0.6'
+  spec.add_dependency 'rooftop-rails', '~>0.1.0'
   spec.add_dependency 'mail_form', '~> 1.5'
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rooftop-rails-extras
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Ed Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-01 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: rooftop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: mail_form
   requirement: !ruby/object:Gem::Requirement
@@ -95,10 +95,10 @@ files:
 - app/controllers/concerns/rooftop/rails/extras/contact_form_handler.rb
 - app/helpers/rooftop/rails/extras/navigation_helper.rb
 - app/helpers/rooftop/rails/extras/related_fields_helper.rb
-- app/models/concerns/rooftop/rails/extras/contact_form.rb
 - app/models/concerns/rooftop/rails/extras/page_redirect.rb
 - app/models/concerns/rooftop/rails/extras/resolved_children.rb
 - app/models/concerns/rooftop/rails/extras/resource_search.rb
+- app/models/rooftop/rails/extras/contact_form.rb
 - lib/generators/rooftop/extras_generator.rb
 - lib/generators/rooftop/page_generator.rb
 - lib/generators/rooftop/pages_controller_generator.rb