pwb 1.0.0 → 1.1.1

data/app/controllers/pwb/css_controller.rb

@@ -5,8 +5,7 @@ module Pwb
       @current_website = Website.unique_instance
       theme_name = @current_website.theme_name.present? ? @current_website.theme_name : "default"
       # @carousel_items = Content.where(tag: "landing-carousel").includes(:content_photos, :translations)
-      return render "pwb/custom_css/#{theme_name}", formats: :css
+      render "pwb/custom_css/#{theme_name}", formats: :css
     end
   end
-
 end

data/app/controllers/pwb/devise/registrations_controller.rb

@@ -1,15 +1,12 @@
 class Pwb::Devise::RegistrationsController < Devise::RegistrationsController
-
   def edit_success
-    return render "/devise/registrations/edit_success"
+    render "/devise/registrations/edit_success"
   end
 
   # The default url to be used after updating a resource. You need to overwrite
   # this method in your own RegistrationsController.
-  def after_update_path_for(resource)
+  def after_update_path_for(_resource)
     # signed_in_root_path(resource)
     pwb.user_edit_success_path
   end
-
-
 end

data/app/controllers/pwb/devise_controller.rb

@@ -1,19 +1,16 @@
 module Pwb
   class DeviseController < ApplicationController
-
     # This controller is registered in
     # pwb/config/initializers/devise.rb
     # with:
     #   config.parent_controller = 'Pwb::DeviseController'
 
-
     # # ActionController::Base
     #  protect_from_forgery with: :exception
 
     #  # before_action :current_agency, :sections, :set_locale, :set_theme_path
     #  # before_action :configure_permitted_parameters, if: :devise_controller?
 
-
     #  def set_theme_path
     #    @is_devise = true
     #    theme_name = "default"
@@ -27,7 +24,6 @@ module Pwb
     #    self.class.layout "#{Pwb::Engine.root}/app/themes/#{theme_name}/views/layouts/pwb/application"
     #  end
 
-
     #  def set_locale
     #    agency = current_agency
     #    locale = agency.default_client_locale_to_use
@@ -71,7 +67,7 @@ module Pwb
     #
     # Overwriting the sign_out redirect path method
     # By default it is the root_path.
-    def after_sign_out_path_for(resource_or_scope)
+    def after_sign_out_path_for(_resource_or_scope)
       # scope = Devise::Mapping.find_scope!(resource_or_scope)
       # router_name = Devise.mappings[scope].router_name
       # context = router_name ? send(router_name) : self
@@ -79,9 +75,8 @@ module Pwb
       pwb.home_path
     end
 
-
-    def after_sign_in_path_for(resource_or_scope)
-      # TODO - check for admin v standard users
+    def after_sign_in_path_for(_resource_or_scope)
+      # TODO: - check for admin v standard users
       pwb.admin_path
       # stored_location_for(resource_or_scope) || signed_in_root_path(resource_or_scope)
     end

data/app/controllers/pwb/export/properties_controller.rb

@@ -10,11 +10,11 @@ module Pwb
       #                 "Street Address", "Street Number", "Postal Code",
       #                 "City", "Country", "Longitude", "Latitude"]
       @prop_fields = [:id, :title_en, :title_es,
-                     :description_en, :description_es,
-                     :price_sale_current_cents, :price_rental_monthly_current_cents,
-                     :count_bedrooms, :count_bathrooms,  :count_toilets,  :count_garages,
-                     :street_address, :street_number, :postal_code,
-                     :city, :country, :longitude, :latitude]
+                      :description_en, :description_es,
+                      :price_sale_current_cents, :price_rental_monthly_current_cents,
+                      :count_bedrooms, :count_bathrooms, :count_toilets, :count_garages,
+                      :street_address, :street_number, :postal_code,
+                      :city, :country, :longitude, :latitude]
       @props_array = []
       properties.each do |prop|
         prop_field_values = []
@@ -31,6 +31,5 @@ module Pwb
       headers['Content-Type'] ||= 'text/csv'
       render "all.csv"
     end
-
   end
 end

data/app/controllers/pwb/export/translations_controller.rb

@@ -1,6 +1,5 @@
 module Pwb
   class Export::TranslationsController < ApplicationApiController
-
     # http://localhost:3000/export/translations/all
     def all
       # render plain: I18n::Backend::ActiveRecord::Translation.to_csv
@@ -8,8 +7,7 @@ module Pwb
       # above results in below message in chrome:
       # Resource interpreted as Document but transferred with MIME type application/octet-stream
 
-
-      translations = I18n::Backend::ActiveRecord::Translation.where(id: [1,2,3])
+      translations = I18n::Backend::ActiveRecord::Translation.where(id: [1, 2, 3])
       @header_cols = ["translation-id", "key", "value", "locale"]
       @translation_fields = [:id, :key, :value, :locale]
       @translations_array = []
@@ -27,8 +25,6 @@ module Pwb
       headers['Content-Disposition'] = "attachment; filename=\"pwb-translations.csv\""
       headers['Content-Type'] ||= 'text/csv'
       render "all.csv"
-
     end
-
   end
 end

data/app/controllers/pwb/export/web_contents_controller.rb

@@ -1,9 +1,8 @@
 module Pwb
   class Export::WebContentsController < ApplicationApiController
-
     # http://localhost:3000/export/web_contents/all
     def all
-      # TODO - figure out how to get associated cols like raw_en
+      # TODO: - figure out how to get associated cols like raw_en
 
       headers['Content-Disposition'] = "attachment; filename=\"pwb-web-contents.csv\""
       headers['Content-Type'] ||= 'text/csv'
@@ -11,8 +10,6 @@ module Pwb
       # above results in below message in chrome:
       # Resource interpreted as Document but transferred with MIME type application/octet-stream
       render plain: (Content.to_csv ["key", "tag", "status", "sort_order", "raw"])
-
     end
-
   end
 end

data/app/controllers/pwb/export/website_controller.rb

@@ -6,6 +6,5 @@ module Pwb
       headers['Content-Type'] ||= 'text/csv'
       render "all.csv"
     end
-
   end
 end

data/app/controllers/pwb/import/mls_controller.rb

@@ -1,13 +1,12 @@
 module Pwb
   class Import::MlsController < ApplicationApiController
-
     def retrieve
       [:username, :password, :login_url, :mls_unique_name].each do |param_name|
         unless params[param_name].present?
-          return render json: { :error => "Please provide #{param_name}."}, :status => 422
+          return render json: { error: "Please provide #{param_name}."}, status: 422
         end
       end
-      mls_name = params[:mls_unique_name] 
+      mls_name = params[:mls_unique_name]
       # || "mris"
       import_source = Pwb::ImportSource.find_by_unique_name mls_name
 
@@ -29,8 +28,7 @@ module Pwb
         count += 1
       end
 
-      return render json: retrieved_properties
-
+      render json: retrieved_properties
     end
 
     # def retrieve2
@@ -46,6 +44,5 @@ module Pwb
     #   end
     #   return render json: retrieved_properties
     # end
-
   end
 end

data/app/controllers/pwb/import/properties_controller.rb

@@ -1,10 +1,9 @@
 module Pwb
   class Import::PropertiesController < ApplicationApiController
-
     # http://localhost:3000/import/Properties/retrieve_from_pwb
     def retrieve_from_pwb
       imported_properties = Pwb::ImportProperties.new(params[:file]).import_csv
-      return render json: {
+      render json: {
         retrieved_items: imported_properties
       }
       # return render json: { "success": true }, status: :ok, head: :no_content
@@ -13,10 +12,9 @@ module Pwb
     def retrieve_from_mls
       imported_properties = Pwb::ImportProperties.new(params[:file]).import_mls_tsv
       # Pwb::Prop.import(params[:file])
-      return render json: {
+      render json: {
         retrieved_items: imported_properties
       }
     end
-
   end
 end

data/app/controllers/pwb/import/scrapper_controller.rb

@@ -2,32 +2,29 @@ require 'faraday'
 
 module Pwb
   class Import::ScrapperController < ApplicationApiController
-
     def from_webpage
       # just a proof of concept at this stage
       unless params[:url].present?
-        return render json: { :error => "Please provide url."}, :status => 422
+        return render json: { error: "Please provide url."}, status: 422
       end
 
       target_url = params[:url]
 
-      retrieved_properties = Pwb::SiteScrapper.new(target_url).retrieve_from_webpage()
+      retrieved_properties = Pwb::SiteScrapper.new(target_url).retrieve_from_webpage
 
-      return render json: retrieved_properties
+      render json: retrieved_properties
     end
 
     def from_api
       unless params[:url].present?
-        return render json: { :error => "Please provide url."}, :status => 422
+        return render json: { error: "Please provide url."}, status: 422
       end
       target_url = params[:url]
       # "https://propertywebbuilder.herokuapp.com"
 
-      retrieved_properties = Pwb::SiteScrapper.new(target_url).retrieve_from_api()
+      retrieved_properties = Pwb::SiteScrapper.new(target_url).retrieve_from_api
 
-      return render json: retrieved_properties
+      render json: retrieved_properties
     end
-
-
   end
 end

data/app/controllers/pwb/props_controller.rb

@@ -2,18 +2,18 @@ require_dependency "pwb/application_controller"
 
 module Pwb
   class PropsController < ApplicationController
-
     def show_for_rent
       @carousel_speed = 3000
       # @inmo_template = "broad"
       @property_details = Prop.find_by_id(params[:id])
       # gon.property_details =@property_details
       @operation_type = "for_rent"
+      @operation_type_key = @operation_type.camelize(:lower)
       if @property_details && @property_details.visible && @property_details.for_rent
         # below lets me know what prices to display
         @show_vacational_rental = @property_details.for_rent_short_term
 
-        js :property_details => @property_details
+        js property_details: @property_details
         js 'Pwb/Props#show'
         # page_title gets picked up automatically by meta-tags gem
         @page_title = @property_details.title
@@ -29,12 +29,13 @@ module Pwb
       @carousel_speed = 3000
       # @inmo_template = "broad"
       @operation_type = "for_sale"
+      @operation_type_key = @operation_type.camelize(:lower)
       @property_details = Prop.find_by_id(params[:id])
 
       if @property_details && @property_details.visible && @property_details.for_sale
         # gon.property_details =@property_details
 
-        js :property_details => @property_details
+        js property_details: @property_details
         js 'Pwb/Props#show'
         @page_title = @property_details.title
         @page_description = @property_details.description
@@ -45,9 +46,7 @@ module Pwb
       end
     end
 
-
     def request_property_info_ajax
-
       @error_messages = []
       I18n.locale = params["contact"]["locale"] || I18n.default_locale
       # have a hidden field in form to pass in above
@@ -57,7 +56,7 @@ module Pwb
       @client = Client.find_or_initialize_by(email: params[:contact][:email])
       @client.attributes = {
         phone_number_primary: params[:contact][:tel],
-        first_names: params[:contact][:name],
+        first_names: params[:contact][:name]
       }
 
       title = I18n.t "mailers.property_enquiry_targeting_agency.title"
@@ -70,12 +69,12 @@ module Pwb
                                origin_ip: request.ip,
                                user_agent: request.user_agent,
                                delivery_email: @current_agency.email_for_property_contact_form
-                               # origin_email: params[:contact][:email]
+        # origin_email: params[:contact][:email]
       })
 
       unless @enquiry.save && @client.save
-        @error_messages = @error_messages + @client.errors.full_messages
-        @error_messages = @error_messages + @enquiry.errors.full_messages
+        @error_messages += @client.errors.full_messages
+        @error_messages += @enquiry.errors.full_messages
         return render "pwb/ajax/request_info_errors"
       end
 
@@ -94,11 +93,9 @@ module Pwb
       return render "pwb/ajax/request_info_success", layout: false
     rescue => e
 
-      # TODO - log error to logger....
-      @error_messages = [ I18n.t("contact.error"), e ]
+      # TODO: - log error to logger....
+      @error_messages = [I18n.t("contact.error"), e]
       return render "pwb/ajax/request_info_errors", layout: false
-
     end
-
   end
 end

data/app/controllers/pwb/search_controller.rb

@@ -2,8 +2,7 @@ require_dependency 'pwb/application_controller'
 
 module Pwb
   class SearchController < ApplicationController
-
-    before_action :header_image_url 
+    before_action :header_image
 
     def search_ajax_for_sale
       @operation_type = "for_sale"
@@ -43,7 +42,7 @@ module Pwb
       @prices_till_collection = @current_website.sale_price_options_till
       # @prices_collection = @current_website.sale_price_options_from
 
-       # %W(#{''} 25,000 50,000 75,000 100,000 150,000 250,000 500,000 1,000,000 2,000,000 5,000,000 )
+      # %W(#{''} 25,000 50,000 75,000 100,000 150,000 250,000 500,000 1,000,000 2,000,000 5,000,000 )
       # ..
 
       set_common_search_inputs
@@ -58,10 +57,10 @@ module Pwb
       # initial client sort called by       INMOAPP.sortSearchResults();
       js 'Main/Search#sort' # trigger client-side paloma script
 
-      return render  "/pwb/search/buy"
+      render "/pwb/search/buy"
     end
 
-    # TODO - avoid duplication b/n rent and buy
+    # TODO: - avoid duplication b/n rent and buy
     def rent
       @page_title = I18n.t("searchForProperties")
       # in erb template for this action, I have js that will render search_results template
@@ -84,7 +83,7 @@ module Pwb
       @search_defaults = params[:search].present? ? params[:search] : {}
 
       js 'Main/Search#sort' # trigger client-side paloma script
-      return render  "/pwb/search/rent"
+      render "/pwb/search/rent"
     end
 
     private
@@ -124,17 +123,17 @@ module Pwb
       @property_states = FieldKey.get_options_by_tag("property-states")
     end
 
-    def apply_search_filter search_filtering_params
+    def apply_search_filter(search_filtering_params)
       search_filtering_params.each do |key, value|
         empty_values = ["propertyTypes."]
-        if (empty_values.include? value) || (value.empty?)
+        if (empty_values.include? value) || value.empty?
           next
         end
         price_fields = ["for_sale_price_from", "for_sale_price_till", "for_rent_price_from", "for_rent_price_till"]
         if price_fields.include? key
           currency_string = @current_website.default_currency || "usd"
-          currency =  Money::Currency.find currency_string
-          # above needed as some currencies like Chilean peso 
+          currency = Money::Currency.find currency_string
+          # above needed as some currencies like Chilean peso
           # don't have the cents field multiplied by 100
           value = value.gsub(/\D/, '').to_i * currency.subunit_to_unit
           # @properties = @properties.public_send(key, value) if value.present?
@@ -144,7 +143,6 @@ module Pwb
       # end
     end
 
-
     # def search_redirect
     #   # todo - allow choosing between buying or renting
     #   return redirect_to buy_url, locale: I18n.locale
@@ -182,14 +180,16 @@ module Pwb
     # end
 
     private
+    # def header_image_url
+    #   # used by berlin theme
+    #   hi_content = Content.where(tag: 'landing-carousel')[0]
+    #   @header_image_url = hi_content.present? ? hi_content.default_photo_url : ""
+    # end
 
-    def header_image_url
+    def header_image
       # used by berlin theme
       hi_content = Content.where(tag: 'landing-carousel')[0]
-      @header_image_url = hi_content.present? ? hi_content.default_photo_url : ""
+      @header_image = hi_content.present? ? hi_content.default_photo : nil
     end
-
-
   end
-
 end

data/app/controllers/pwb/sections_controller.rb

@@ -2,8 +2,7 @@ require_dependency 'pwb/application_controller'
 
 module Pwb
   class SectionsController < ApplicationController
-
-    before_action :header_image_url 
+    before_action :header_image
 
     def generic_page
       page_slug = params[:page_slug]
@@ -11,11 +10,11 @@ module Pwb
       @title_key = section.link_key
       @page_title = I18n.t(section.link_key)
       if section && section.contents.first
-        @content = section.contents.first       
+        @content = section.contents.first
       else
-        @content = OpenStruct.new 
+        @content = OpenStruct.new
       end
-      return render "/pwb/sections/static"
+      render "/pwb/sections/static"
     end
 
     def about_us
@@ -25,34 +24,33 @@ module Pwb
       # @page_keywords    = 'Site, Login, Members'
       # @about_us_image_url = Content.get_photo_url_by_key("aboutUs")
       # @about_us_image_url = Content.find_by_key("aboutUs").content_photos.first.image_url || "http://moodleboard.com/images/prv/estate/estate-slider-bg-1.jpg"
-      return render "/pwb/sections/about_us"
+      render "/pwb/sections/about_us"
     end
 
     def privacy_policy
       @title_key = "privacyPolicy"
       @page_title = I18n.t("privacyPolicy")
       @content = Content.find_by_key("privacyPolicy") || OpenStruct.new
-      return render "/pwb/sections/static"
+      render "/pwb/sections/static"
     end
 
     def legal
       @title_key = "legalAdvice"
       @page_title = I18n.t("legalAdvice")
       @content = Content.find_by_key("legalAdvice") || OpenStruct.new
-      return render "/pwb/sections/static"
+      render "/pwb/sections/static"
     end
 
-
     def contact_us
       # below for google map rendering via paloma:
-      js :current_agency_primary_address => @current_agency.primary_address
-      js :show_contact_map => @current_agency.show_contact_map
+      js current_agency_primary_address: @current_agency.primary_address
+      js show_contact_map: @current_agency.show_contact_map
       # could explicitly set function for Paloma to use like so:
       # js "Pwb/Sections#contact_us"
       # @enquiry = Message.new
       @page_title = I18n.t("contactUs")
 
-      return render "/pwb/sections/contact_us"
+      render "/pwb/sections/contact_us"
     end
 
     def contact_us_ajax
@@ -64,7 +62,7 @@ module Pwb
       @client = Client.find_or_initialize_by(email: params[:contact][:email])
       @client.attributes = {
         phone_number_primary: params[:contact][:tel],
-        first_names: params[:contact][:name],
+        first_names: params[:contact][:name]
       }
 
       @enquiry = Message.new(
@@ -77,11 +75,12 @@ module Pwb
           origin_ip: request.ip,
           user_agent: request.user_agent,
           delivery_email: @current_agency.email_for_general_contact_form
-          # origin_email: params[:contact][:email]
-      })
+        # origin_email: params[:contact][:email]
+      }
+)
       unless @enquiry.save && @client.save
-        @error_messages = @error_messages + @client.errors.full_messages
-        @error_messages = @error_messages + @enquiry.errors.full_messages
+        @error_messages += @client.errors.full_messages
+        @error_messages += @enquiry.errors.full_messages
         return render "pwb/ajax/contact_us_errors"
       end
 
@@ -102,19 +101,19 @@ module Pwb
       @flash = I18n.t "contact.success"
       return render "pwb/ajax/contact_us_success", layout: false
     rescue => e
-      # TODO - log error to logger....
+      # TODO: - log error to logger....
       # flash.now[:error] = 'Cannot send message.'
-      @error_messages = [ I18n.t("contact.error"), e ]
+      @error_messages = [I18n.t("contact.error"), e]
       return render "pwb/ajax/contact_us_errors", layout: false
     end
 
     private
 
-    def header_image_url
+    def header_image
       # used by berlin theme
-      @header_image_url = Content.where(tag: 'landing-carousel')[0].default_photo_url
+      hi_content = Content.where(tag: 'landing-carousel')[0]
+      @header_image = hi_content.present? ? hi_content.default_photo : nil
     end
-    
 
   end
 end