comable_core 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 479954f8dc99bd292299c33a2165b403f97a6aa8
-  data.tar.gz: 045371d05a4e0dce724bbe1aff1881dac6577fc2
+  metadata.gz: 27c718d8e2e2faf373aed914672a299e0a7e12ee
+  data.tar.gz: 28e127acba3cd8d68afc95499c4fcbc25d8fd70c
 SHA512:
-  metadata.gz: 01192b146f265c2e1012c10ad41f6abd3a8ee6700884a5c2797a304d44e300b7fa78245ebe76e8ec9d34cd8998acf538735db8d8df76fb741245eb619d6d406b
-  data.tar.gz: f0eb496dd837e94dcc6740628fa5e7b33d573d26e37506c99e7798e23621c955864ae21ac76f18f3e0b77139e4e8bbdc7c81a9f2bd407913b1a4fdbc1e5f2e9d
+  metadata.gz: e8906c5656b2c1669bb587b92586d1563d3639f62858a9944ba7ae67c0f0c06bdc8d3d5448aebf02503b2b3a7011157a86a7bcf9f9b83681cc2129938ad2ee61
+  data.tar.gz: 02757921e5d6a64da82ecc8769c80519b6d28733a230747f1ba8b7224e5e0c3c7e29d0e703bcb1e0a03212bd958bbe4a5705ee034fd98bb8f124a63ebc5e2ead

data/app/helpers/comable/application_helper.rb

@@ -48,6 +48,17 @@ module Comable
       string.respond_to?(:html_safe) ? string.html_safe : string
     end
 
+    # To use the functionality of liquid-rails
+    def liquid_assigns
+      view_context.assigns.merge(
+        current_store: current_store,
+        current_comable_user: current_comable_user,
+        current_order: current_order,
+        current_trackers: current_trackers,
+        form_authenticity_token: form_authenticity_token
+      ).stringify_keys
+    end
+
     private
 
     def after_sign_in_path_for(_resource)

data/app/models/comable/image.rb

@@ -1,9 +1,13 @@
 module Comable
   class Image < ActiveRecord::Base
+    include Comable::Liquidable
+
     mount_uploader :file, ImageUploader
 
     belongs_to :product, class_name: Comable::Product.name
 
+    liquid_methods :url
+
     delegate :url, to: :file, allow_nil: true
     delegate :current_path, to: :file, allow_nil: true
     delegate :identifier, to: :file, allow_nil: true

data/app/models/comable/order.rb

@@ -8,6 +8,7 @@ module Comable
   class Order < ActiveRecord::Base
     include Comable::Checkout
     include Comable::Ransackable
+    include Comable::Liquidable
     include Comable::Order::Associations
     include Comable::Order::Callbacks
     include Comable::Order::Scopes
@@ -16,7 +17,7 @@ module Comable
 
     ransack_options attribute_select: { associations: [:payment, :shipment] }, ransackable_attributes: { except: [:bill_address_id, :ship_address_id] }
 
-    liquid_methods :code, :payment_fee, :shipment_fee, :item_total_price, :total_price
+    liquid_methods :code, :payment_fee, :shipment_fee, :item_total_price, :total_price, :order_items
 
     delegate :full_name, to: :bill_address, allow_nil: true, prefix: :bill
     delegate :full_name, to: :ship_address, allow_nil: true, prefix: :ship

data/app/models/comable/order_item.rb

@@ -2,6 +2,7 @@ module Comable
   class OrderItem < ActiveRecord::Base
     include Comable::SkuItem
     include Comable::SkuChoice
+    include Comable::Liquidable
     include Comable::OrderItem::Csvable
 
     belongs_to :stock, class_name: Comable::Stock.name, autosave: true

data/app/models/comable/page.rb

@@ -0,0 +1,30 @@
+module Comable
+  class Page < ActiveRecord::Base
+    include Comable::Ransackable
+
+    extend FriendlyId
+    friendly_id :title, use: :slugged
+
+    validates :title, length: { maximum: 255 }, presence: true
+    validates :content, presence: true
+    validates :page_title, length: { maximum: 255 }
+    validates :meta_description, length: { maximum: 255 }
+    validates :meta_keywords, length: { maximum: 255 }
+    validates :slug, length: { maximum: 255 }, presence: true, uniqueness: true
+
+    PREVIEW_SESSION_KEY = :preview_page
+
+    def published?
+      published_at.present? && published_at <= Time.now
+    end
+
+    def default_slug
+      id ||= self.class.maximum(:id).next
+      "pages_#{id}"
+    end
+
+    def normalize_slug(string)
+      normalize_friendly_id(string).presence || default_slug
+    end
+  end
+end

data/app/models/comable/product.rb

@@ -2,6 +2,7 @@ module Comable
   class Product < ActiveRecord::Base
     include Comable::SkuItem
     include Comable::Ransackable
+    include Comable::Liquidable
     include Comable::Product::Search
     include Comable::Product::Csvable
 
@@ -17,6 +18,8 @@ module Comable
     validates :sku_h_item_name, length: { maximum: 255 }
     validates :sku_v_item_name, length: { maximum: 255 }
 
+    liquid_methods :id, :code, :name, :price, :images, :image_url
+
     ransack_options attribute_select: { associations: :stocks }
 
     # Add conditions for the images association.

data/app/models/comable/stock.rb

@@ -7,6 +7,7 @@ module Comable
     include Comable::SkuItem
     include Comable::SkuChoice
     include Comable::Ransackable
+    include Comable::Liquidable
     include Comable::Stock::Csvable
 
     belongs_to :product, class_name: Comable::Product.name

data/app/models/comable/store.rb

@@ -1,10 +1,18 @@
 module Comable
   class Store < ActiveRecord::Base
+    include Comable::Liquidable
+
+    belongs_to :theme, class_name: Comable::Theme.name
+
     validates :name, length: { maximum: 255 }
     validates :meta_keywords, length: { maximum: 255 }
     validates :meta_description, length: { maximum: 255 }
     validates :email, length: { maximum: 255 }
 
+    liquid_methods :name, :meta_keywords, :meta_description, :email
+
+    delegate :name, to: :theme, prefix: true, allow_nil: true
+
     class << self
       def instance
         first || new(name: default_name)

data/app/models/comable/theme.rb

@@ -0,0 +1,25 @@
+module Comable
+  class Theme < ActiveRecord::Base
+    has_one :store, class_name: Comable::Store.name
+
+    validates :name, uniqueness: { scope: :version }
+    validates :name, presence: true, length: { maximum: 255 }
+    validates :version, presence: true, length: { maximum: 255 }
+    validates :display, length: { maximum: 255 }
+    validates :description, length: { maximum: 255 }
+    validates :homepage, length: { maximum: 255 }
+    validates :author, length: { maximum: 255 }
+
+    def default_version
+      '0.1.0'
+    end
+
+    def to_param
+      name
+    end
+
+    def display_name
+      display.presence || name
+    end
+  end
+end

data/app/models/comable/user.rb

@@ -3,6 +3,7 @@ module Comable
     include Comable::CartOwner
     include Comable::RoleOwner
     include Comable::Ransackable
+    include Comable::Liquidable
 
     has_many :orders, class_name: Comable::Order.name
     has_many :addresses, class_name: Comable::Address.name, dependent: :destroy
@@ -23,6 +24,8 @@ module Comable
 
     ransack_options ransackable_attributes: { except: [:encrypted_password, :reset_password_token, :reset_password_sent_at, :remember_created_at, :bill_address_id, :ship_address_id] }
 
+    liquid_methods :email, :bill_full_name, :ship_full_name, :cart
+
     delegate :full_name, to: :bill_address, allow_nil: true, prefix: :bill
     delegate :full_name, to: :ship_address, allow_nil: true, prefix: :ship
 

data/app/models/concerns/comable/liquidable.rb

@@ -0,0 +1,12 @@
+module Comable
+  module Liquidable
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      # from: http://www.codedisqus.com/0SHjkUjjgW/how-can-i-expose-all-available-liquid-methods-for-a-model.html
+      def available_liquid_methods
+        self::LiquidDropClass.public_instance_methods - Liquid::Drop.public_instance_methods
+      end
+    end
+  end
+end

data/config/locales/en.yml

@@ -109,11 +109,13 @@ en:
       back_to_store: 'Back to Store'
       confirmation_to_remove_product: 'This operation cannot be undone. Would you like to proceed?'
       confirmation_to_remove_stock: 'This operation cannot be undone. Would you like to proceed?'
+      confirmation_to_remove_page: 'This operation cannot be undone. Would you like to proceed?'
       you_can_drag_and_drop: 'Edit the category tree by drag-and-drop.'
       you_can_right_click: 'Open the context menu by right click.'
       link_to_add_new_node: 'Add a new category from the following link: '
       link_to_add_new_stock: 'Add a new stock from the following link: '
       check_this_product_in_frontend: 'Check this product in Store'
+      preview: 'preview'
       note: 'NOTE:'
       results: 'results'
       times: 'times'
@@ -152,20 +154,32 @@ en:
       list_of_usable_variables: 'Available variables are as follows.'
       mote_infomation_for_syntax: 'For more information about the syntax please refer to the following page:'
       help_of_store_email: 'This field will be used as sender of mail that send to customers. The mail will not be sent when the field is empty.'
+      files: 'Files'
+      use_this_theme: 'Use this theme'
+      available_assigns: 'Available assigns'
+      available_assigns_in_all_pages: 'Available assigns in all pages'
+      available_filters: 'Available filters'
+      about_sintax: 'About sintax'
+      please_see_following_page_for_syntax: 'Please see the following page for the syntax:'
+      please_select_file_form_directory_tree_to_edit: 'Please select a file form the directory tree to edit.'
+      here_editor_will_be_displayed_and_you_can_edit_file: 'Here the editor will be displayed, you can edit file.'
       nav:
         dashboard: 'Dashboard'
         order: 'Orders'
         product: 'Products'
         stock: 'Stocks'
         category: 'Categories'
+        page: 'Pages'
         user: 'Users'
         general_settings: 'General settings'
         store: 'Store'
         shipment_method: 'Shipment methods'
         payment_method: 'Payment methods'
         tracker: 'Tracker'
+        theme: 'Theme'
         products:
           detail: 'Product details'
+          list: 'Product list'
         orders:
           detail: 'Order details'
           cart: 'Cart infomation'
@@ -176,6 +190,12 @@ en:
           detail: 'User details'
           edit: 'Editing user'
           new_orders: 'Recently orders (%{count})'
+        pages:
+          general: 'General'
+          seo: 'SEO'
+          visibility: 'publishing/closed'
+          published: 'Published'
+          unpublished: 'Unpublished'
         stores:
           edit: 'Editing store'
         shipment_methods:
@@ -190,6 +210,7 @@ en:
         destroy: 'Destroy'
         save: 'Save'
         cancel: 'Cancel'
+        property: 'property'
       categories:
         new_node: 'New category'
 
@@ -364,7 +385,18 @@ en:
         state: 'Status'
         tracking_number: 'Tracking number'
         completed_at: 'Completed at'
-
+      comable/page:
+        id: 'ID'
+        title: 'Title'
+        content: 'Content'
+        seo: 'SEO'
+        page_title: 'PageTitle'
+        meta_description: 'Meta Description'
+        meta_keywords: 'Meta Keywords'
+        slug: 'Slug'
+        published_at: 'Published at'
+        created_at: 'Created at'
+        updated_at: 'Updated at'
   enumerize:
     comable/user:
       role:

data/config/locales/ja.yml

@@ -109,11 +109,13 @@ ja:
       back_to_store: ストアに戻る
       confirmation_to_remove_product: この操作は元に戻せません。商品を削除してもよろしいですか？
       confirmation_to_remove_stock: この操作は元に戻せません。在庫を削除してもよろしいですか？
+      confirmation_to_remove_page: この操作は元に戻せません。ページを削除してもよろしいですか？
       you_can_drag_and_drop: ドラッグ＆ドロップの操作でツリーを編集できます。
       you_can_right_click: 右クリックでメニューを表示できます。
       link_to_add_new_node: '次のリンクから新しいカテゴリを追加できます: '
       link_to_add_new_stock: '次のリンクから新しい在庫を追加できます: '
       check_this_product_in_frontend: 'この商品をフロントで確認する'
+      preview: プレビュー
       note: 'NOTE:'
       results: 件
       times: 回
@@ -152,20 +154,32 @@ ja:
       list_of_usable_variables: '利用可能な変数は次の通りです。'
       mote_infomation_for_syntax: '構文についての詳しい情報は次のページをご覧ください:'
       help_of_store_email: 'この項目は顧客に送信するメールの送信元として利用されます。未入力の場合はメールが送信されません。'
+      files: 'ファイル一覧'
+      use_this_theme: 'このテーマを使う'
+      available_assigns: '利用可能な変数'
+      available_assigns_in_all_pages: 'すべてのページで利用可能な変数'
+      available_filters: '利用可能なフィルター'
+      about_sintax: '構文について'
+      please_see_following_page_for_syntax: '構文については次のページを参照してください:'
+      please_select_file_form_directory_tree_to_edit: 'ディレクトリーツリーから編集したいファイルを選択してください。'
+      here_editor_will_be_displayed_and_you_can_edit_file: 'ここにエディタが表示されてファイルの内容を編集できます。'
       nav:
         dashboard: ダッシュボード
         order: 注文管理
         product: 商品管理
         stock: 在庫管理
         category: カテゴリ
+        page: ページ
         user: ユーザー
         general_settings: 一般設定
         store: ストア設定
         shipment_method: 発送管理
         payment_method: 決済管理
         tracker: トラッキング情報
+        theme: 'テーマ'
         products:
           detail: 商品詳細
+          list: '商品一覧'
         orders:
           detail: 注文明細
           cart: カート情報
@@ -176,6 +190,12 @@ ja:
           detail: ユーザー詳細
           edit: 編集
           new_orders: '最新の注文 (%{count}件)'
+        pages:
+          general: 一般
+          seo: SEO
+          visibility: 公開/非公開
+          published: 公開
+          unpublished: 非公開
         stores:
           edit: 編集
         shipment_methods:
@@ -190,6 +210,7 @@ ja:
         destroy: 削除する
         save: 保存する
         cancel: キャンセル
+        property: 'プロパティ'
       categories:
         new_node: 新しいカテゴリ
 
@@ -364,6 +385,18 @@ ja:
         state: 'ステータス'
         tracking_number: 'トラッキング番号'
         completed_at: '発送日時'
+      comable/page:
+        id: ID
+        title: タイトル
+        content: 内容
+        seo: 検索対策
+        page_title: ページタイトル
+        meta_description: メタディスクリプション
+        meta_keywords: メタキーワード
+        slug: スラッグ
+        published_at: 公開日
+        created_at: 作成日
+        updated_at: 更新日
 
   enumerize:
     comable/user:

data/db/migrate/20150519080729_create_comable_pages.rb

@@ -0,0 +1,17 @@
+class CreateComablePages < ActiveRecord::Migration
+  def change
+    create_table :comable_pages do |t|
+      t.string :title, null: false
+      t.text :content, null: false
+      t.string :page_title
+      t.string :meta_description
+      t.string :meta_keywords
+      t.string :slug, null: false
+      t.datetime :published_at
+
+      t.timestamps null: false
+    end
+
+    add_index :comable_pages, :slug, unique: true
+  end
+end

data/db/migrate/20150612143226_create_comable_themes.rb

@@ -0,0 +1,15 @@
+class CreateComableThemes < ActiveRecord::Migration
+  def change
+    create_table :comable_themes do |t|
+      t.string :name, null: false
+      t.string :version, null: false
+      t.string :display
+      t.string :description
+      t.string :homepage
+      t.string :author
+      t.timestamps null: false
+    end
+
+    add_index :comable_themes, [:name, :version], unique: true
+  end
+end

data/db/migrate/20150612143445_add_theme_id_to_comable_stores.rb

@@ -0,0 +1,7 @@
+class AddThemeIdToComableStores < ActiveRecord::Migration
+  def change
+    change_table :comable_stores do |t|
+      t.references :theme
+    end
+  end
+end

data/lib/comable_core.rb

@@ -9,6 +9,8 @@ require 'comma'
 require 'axlsx_rails'
 require 'roo'
 require 'liquid'
+require 'liquid-rails'
+require 'friendly_id'
 
 require 'comable/core/configuration'
 require 'comable/core/engine'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_core
 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: rails
@@ -198,6 +198,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
+- !ruby/object:Gem::Dependency
+  name: liquid-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: friendly_id
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 description: Provide core functions for Comable.
 email:
 - hyoshida@appirits.com
@@ -225,6 +259,7 @@ files:
 - app/models/comable/order/validations.rb
 - app/models/comable/order_item.rb
 - app/models/comable/order_item/csvable.rb
+- app/models/comable/page.rb
 - app/models/comable/payment.rb
 - app/models/comable/payment_method.rb
 - app/models/comable/product.rb
@@ -234,11 +269,13 @@ files:
 - app/models/comable/stock.rb
 - app/models/comable/stock/csvable.rb
 - app/models/comable/store.rb
+- app/models/comable/theme.rb
 - app/models/comable/tracker.rb
 - app/models/comable/user.rb
 - app/models/concerns/comable/cart_owner.rb
 - app/models/concerns/comable/checkout.rb
 - app/models/concerns/comable/importable.rb
+- app/models/concerns/comable/liquidable.rb
 - app/models/concerns/comable/product/search.rb
 - app/models/concerns/comable/ransackable.rb
 - app/models/concerns/comable/role_owner.rb
@@ -264,6 +301,9 @@ files:
 - db/migrate/20150423095210_create_comable_shipments.rb
 - db/migrate/20150511171940_create_comable_payments.rb
 - db/migrate/20150513185230_create_comable_trackers.rb
+- db/migrate/20150519080729_create_comable_pages.rb
+- db/migrate/20150612143226_create_comable_themes.rb
+- db/migrate/20150612143445_add_theme_id_to_comable_stores.rb
 - db/seeds.rb
 - db/seeds/comable/users.rb
 - lib/comable/core/configuration.rb