comable_frontend 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe65bcf31263e266c7bac888896e42e1cf9fe632
-  data.tar.gz: 3178cdd2a4a40456628b29d021c361bf277d891e
+  metadata.gz: 2e18a1a32cd24d81953d61a45d5e1d7c5459c918
+  data.tar.gz: 7fa017ca373052d48d4cad8be453eed4d214a0c7
 SHA512:
-  metadata.gz: 78eefb1e487c62ca3f68e038d7bc03746e0a290a01ed7be4e1e7cbf18b7bebf5b72523a768ea31ebb164db87b3f98d4627e1c0aad36ebcf324ea1a11948def55
-  data.tar.gz: 0fd2d5bd6372f451fe7a3608271fe590d523d8b68c93d4cae3a74b209c00a8f67cb0584cf29d525c1c4fed2961b52080ad33c3297938ba7fbffbb6f245652515
+  metadata.gz: 22ad663df05149b50686ff90d1cfb5b07119eaedcd33ace5d717fe9cc346fb44e7cf84a1143e5c11c7d61a76414cd60592ab2fa90a04840a8ad7275fff2a6bfa
+  data.tar.gz: 99cb67e68337b468a594689ea80c6d280ed1df312a73bdb06af57e8d8590dd41043a65d4cd930feae60c6a0b8b7fa04fb9e1b84fbd930bd1f968321cf720aea0

data/app/controllers/comable/application_controller.rb

@@ -3,5 +3,10 @@ module Comable
     include Comable::ApplicationHelper
 
     protect_from_forgery with: :exception
+    before_filter :set_view_path
+
+    def set_view_path
+      prepend_view_path "themes/#{current_store.theme_name}" if current_store.theme_name
+    end
   end
 end

data/app/controllers/comable/pages_controller.rb

@@ -0,0 +1,19 @@
+module Comable
+  class PagesController < Comable::ApplicationController
+    def show
+      if Rails::VERSION::MAJOR == 3
+        @page = Comable::Page.find(params[:id])
+      else
+        @page = Comable::Page.friendly.find(params[:id])
+      end
+      fail ActiveRecord::RecordNotFound unless @page && (@page.published? || preview?)
+    end
+
+    private
+
+    def preview?
+      session[Comable::Page::PREVIEW_SESSION_KEY] ||= {}
+      session[Comable::Page::PREVIEW_SESSION_KEY][@page.slug]
+    end
+  end
+end

data/app/views/comable/pages/show.slim

@@ -0,0 +1,7 @@
+- set_meta_tags(title: @page.page_title, description: @page.meta_description, keywords: @page.meta_keywords)
+
+section
+  h1
+    = @page.title
+
+== @page.content

data/app/views/layouts/comable/application.slim

@@ -1,13 +1,7 @@
 doctype html
 html
   head
-    title = current_store.name
-
-    - if current_store.meta_keywords.present?
-      meta name="keywords" content="#{current_store.meta_keywords}"
-
-    - if current_store.meta_description.present?
-      meta name="description" content="#{current_store.meta_description}"
+    = display_meta_tags site: current_store.name, description: current_store.meta_description, keywords: current_store.meta_keywords
 
     = stylesheet_link_tag "comable/frontend/application", media: "all"
     = javascript_include_tag "comable/frontend/application"

data/config/routes.rb

@@ -21,6 +21,8 @@ Comable::Core::Engine.routes.draw do
     end
   end
 
+  resources :pages, only: [:show]
+
   devise_for :user, path: :member, class_name: Comable::User.name, module: :devise
 
   resource :user, path: :member do

data/lib/comable/frontend/engine.rb

@@ -9,6 +9,8 @@ require 'kaminari'
 require 'jquery-rails'
 require 'jquery-ui-rails'
 
+require 'meta-tags'
+
 module Comable
   module Frontend
     class Engine < ::Rails::Engine

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_frontend
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: comable_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +196,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.3
+- !ruby/object:Gem::Dependency
+  name: meta-tags
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: Provide frontend functions for Comable.
 email:
 - hyoshida@appirits.com
@@ -215,6 +229,7 @@ files:
 - app/controllers/comable/carts_controller.rb
 - app/controllers/comable/home_controller.rb
 - app/controllers/comable/orders_controller.rb
+- app/controllers/comable/pages_controller.rb
 - app/controllers/comable/products_controller.rb
 - app/controllers/comable/users_controller.rb
 - app/controllers/concerns/comable/payment_action.rb
@@ -229,6 +244,7 @@ files:
 - app/views/comable/orders/payment.slim
 - app/views/comable/orders/shipment.slim
 - app/views/comable/orders/signin.slim
+- app/views/comable/pages/show.slim
 - app/views/comable/products/index.slim
 - app/views/comable/products/show.slim
 - app/views/comable/shared/_address.slim