seo_pages 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0836aa375525e9e6c036877cea72eb9ffb331739
-  data.tar.gz: 1fd803867d5524865bef3833777579bf9887cec3
+  metadata.gz: 083afe98d92c2c4a03ba25db1dfc51d609c2adf9
+  data.tar.gz: 1f6dcb3ca972f13845ebd6dba8fd9fe205fb095d
 SHA512:
-  metadata.gz: 9c963a61bf13d85a28a9bf10ce9a284dd728e741ee936536a99fc72140401d65acda774e1cc9f2838f7a3fecd1cabe77b22fe24ea127924cdac5ae356eb05687
-  data.tar.gz: ebae1a5d79899103f5c59972b42db14b125fce9e0a1e0a721858b4e2f8568c9163f07ddadf088d365f868194b3e21f38571188888c55d8061be8253c6dbc39cf
+  metadata.gz: fb982e6957535b3e9f437f41ae61d28198dcc64a9faf3945d78899172ef9f4aa86a21834c765cd47c7a0e0e561a4b22a905904ee3e284e5c926383bca0fdd9b8
+  data.tar.gz: 5403da8e53bf5b63a7fd7c6ae579559bd9d80e72f3fa1bf4a6ddefe0bddc0dc6d87e66ee6abf521a5664fb92610f40f1a44ec01046540409e1a4c2ac2167d9e4

data/app/controllers/seo_pages/seo_pages_controller.rb

@@ -57,7 +57,7 @@ module SeoPages
 
       # Only allow a trusted parameter "white list" through.
       def seo_page_params
-        params.require(:seo_page).permit(:url_identifier, :page_title, :meta_keywords, :meta_description)
+        params.require(:seo_page).permit(:url_identifier, :is_regex, :page_title, :meta_keywords, :meta_description)
       end
   end
 end

data/app/helpers/seo_pages/application_helper.rb

@@ -2,7 +2,7 @@ module SeoPages
   module ApplicationHelper
     def seo_data
       @seo_default ||= SeoPages::SeoPageDefault.first
-      @seo = SeoPages::SeoPage.where(url_identifier: request.fullpath).first || SeoPages::SeoPage.new
+      @seo = SeoPages::SeoPage.find_by_url(request.fullpath) || SeoPages::SeoPage.new
       
       @seo.page_title ||= @seo_default.page_title
       @seo.meta_keywords ||= @seo_default.meta_keywords

data/app/models/seo_pages/seo_page.rb

@@ -1,5 +1,32 @@
 module SeoPages
   class SeoPage < ActiveRecord::Base
     validates :url_identifier, uniqueness: true
+
+    scope :regex, -> { where(is_regex: true)}
+    scope :non_regex, -> { where(is_regex: false)}
+
+    @@regex = {}
+
+    def self.find_by_url(url)
+      exact_match(url) || regex_match(url)
+    end
+
+    def self.exact_match(url)
+      non_regex.where(url_identifier: url).first
+    end
+
+    def self.regex_match(url)
+      regex.to_a.find do |seo|
+        get_regex(seo.url_identifier) =~ url
+      end
+    end
+
+    def self.get_regex(url)
+      if @@regex[url].nil? 
+        @@regex[url] = Regexp.new(url)
+      else
+        @@regex[url]
+      end
+    end
   end
 end

data/app/views/seo_pages/seo_pages/_form.html.erb

@@ -17,6 +17,9 @@
   <div class="field">
     <%= f.label :url_identifier %><br>
     <%= f.text_field :url_identifier %>
+    <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+    <%= f.check_box :is_regex %>
+    <%= f.label "Regular Expression?" %>
   </div>
 
   <div class="field">

data/db/migrate/20130927173154_add_is_regex_to_seo_pages.rb

@@ -0,0 +1,5 @@
+class AddIsRegexToSeoPages < ActiveRecord::Migration
+  def change
+    add_column :seo_pages_seo_pages, :is_regex, :boolean
+  end
+end

data/lib/seo_pages/version.rb

@@ -1,3 +1,3 @@
 module SeoPages
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/test/dummy/app/assets/javascripts/products.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/test/dummy/app/assets/stylesheets/products.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/test/dummy/app/assets/stylesheets/scaffold.css

@@ -0,0 +1,56 @@
+body { background-color: #fff; color: #333; }
+
+body, p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size:   13px;
+  line-height: 18px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a { color: #000; }
+a:visited { color: #666; }
+a:hover { color: #fff; background-color:#000; }
+
+div.field, div.actions {
+  margin-bottom: 10px;
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px;
+  padding-bottom: 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+}
+
+#error_explanation h2 {
+  text-align: left;
+  font-weight: bold;
+  padding: 5px 5px 5px 15px;
+  font-size: 12px;
+  margin: -7px;
+  margin-bottom: 0px;
+  background-color: #c00;
+  color: #fff;
+}
+
+#error_explanation ul li {
+  font-size: 12px;
+  list-style: square;
+}

data/test/dummy/app/controllers/products_controller.rb

@@ -0,0 +1,58 @@
+class ProductsController < ApplicationController
+  before_action :set_product, only: [:show, :edit, :update, :destroy]
+
+  # GET /products
+  def index
+    @products = Product.all
+  end
+
+  # GET /products/1
+  def show
+  end
+
+  # GET /products/new
+  def new
+    @product = Product.new
+  end
+
+  # GET /products/1/edit
+  def edit
+  end
+
+  # POST /products
+  def create
+    @product = Product.new(product_params)
+
+    if @product.save
+      redirect_to @product, notice: 'Product was successfully created.'
+    else
+      render action: 'new'
+    end
+  end
+
+  # PATCH/PUT /products/1
+  def update
+    if @product.update(product_params)
+      redirect_to @product, notice: 'Product was successfully updated.'
+    else
+      render action: 'edit'
+    end
+  end
+
+  # DELETE /products/1
+  def destroy
+    @product.destroy
+    redirect_to products_url, notice: 'Product was successfully destroyed.'
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_product
+      @product = Product.find(params[:id])
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def product_params
+      params.require(:product).permit(:name)
+    end
+end

data/test/dummy/app/helpers/products_helper.rb

@@ -0,0 +1,2 @@
+module ProductsHelper
+end

data/test/dummy/app/models/product.rb

@@ -0,0 +1,2 @@
+class Product < ActiveRecord::Base
+end

data/test/dummy/app/views/layouts/application.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title><%= seo_page %></title>
+  <%= seo_page %>
   <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
   <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
   <%= csrf_meta_tags %>

data/test/dummy/app/views/products/_form.html.erb

@@ -0,0 +1,21 @@
+<%= form_for(@product) do |f| %>
+  <% if @product.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@product.errors.count, "error") %> prohibited this product from being saved:</h2>
+
+      <ul>
+      <% @product.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :name %><br>
+    <%= f.text_field :name %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/test/dummy/app/views/products/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing product</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @product %> |
+<%= link_to 'Back', products_path %>

data/test/dummy/app/views/products/index.html.erb

@@ -0,0 +1,27 @@
+<h1>Listing products</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th></th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @products.each do |product| %>
+      <tr>
+        <td><%= product.name %></td>
+        <td><%= link_to 'Show', product %></td>
+        <td><%= link_to 'Edit', edit_product_path(product) %></td>
+        <td><%= link_to 'Destroy', product, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Product', new_product_path %>

data/test/dummy/app/views/products/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New product</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', products_path %>

data/test/dummy/app/views/products/show.html.erb

@@ -0,0 +1,9 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Name:</strong>
+  <%= @product.name %>
+</p>
+
+<%= link_to 'Edit', edit_product_path(@product) %> |
+<%= link_to 'Back', products_path %>

data/test/dummy/config/routes.rb

@@ -1,4 +1,6 @@
 Rails.application.routes.draw do
 
+  resources :products
+
   mount SeoPages::Engine => "/seo_pages"
 end

data/test/dummy/db/migrate/20130927171851_create_products.rb

@@ -0,0 +1,9 @@
+class CreateProducts < ActiveRecord::Migration
+  def change
+    create_table :products do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/migrate/20130927173450_add_is_regex_to_seo_pages.seo_pages.rb

@@ -0,0 +1,6 @@
+# This migration comes from seo_pages (originally 20130927173154)
+class AddIsRegexToSeoPages < ActiveRecord::Migration
+  def change
+    add_column :seo_pages_seo_pages, :is_regex, :boolean
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,13 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20130909135322) do
+ActiveRecord::Schema.define(version: 20130927173450) do
+
+  create_table "products", force: true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
 
   create_table "seo_pages_seo_page_defaults", force: true do |t|
     t.string   "page_title"
@@ -28,6 +34,7 @@ ActiveRecord::Schema.define(version: 20130909135322) do
     t.string   "meta_description"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "is_regex"
   end
 
 end

data/test/dummy/test/controllers/products_controller_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class ProductsControllerTest < ActionController::TestCase
+  setup do
+    @product = products(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:products)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create product" do
+    assert_difference('Product.count') do
+      post :create, product: { name: @product.name }
+    end
+
+    assert_redirected_to product_path(assigns(:product))
+  end
+
+  test "should show product" do
+    get :show, id: @product
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @product
+    assert_response :success
+  end
+
+  test "should update product" do
+    patch :update, id: @product, product: { name: @product.name }
+    assert_redirected_to product_path(assigns(:product))
+  end
+
+  test "should destroy product" do
+    assert_difference('Product.count', -1) do
+      delete :destroy, id: @product
+    end
+
+    assert_redirected_to products_path
+  end
+end

data/test/dummy/test/fixtures/products.yml

@@ -0,0 +1,7 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  name: MyString
+
+two:
+  name: MyString

data/test/dummy/test/helpers/products_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class ProductsHelperTest < ActionView::TestCase
+end

data/test/dummy/test/models/product_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ProductTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end