comable_core 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3c189f71e2286afacd9d9607498850ab4173f88
-  data.tar.gz: 99d3320d9c08295fd80cc41e964ebeb18b957707
+  metadata.gz: 479954f8dc99bd292299c33a2165b403f97a6aa8
+  data.tar.gz: 045371d05a4e0dce724bbe1aff1881dac6577fc2
 SHA512:
-  metadata.gz: c975609caf19b813fd71634e78e484da97f03982b0ebc27ce68699fdfa03f155db2222e8fb03d6f7d8d36748c8d6dcb6b2ce8ef444e018b2657d4365d081df1a
-  data.tar.gz: 987b35810b75b2a058553510b271bd4b7e1e884a2673ab7d2cd79e85f224fa32dce162adf48d8a2b4d10741e85fb6b341729947da5661792d4733159cd6a1ee9
+  metadata.gz: 01192b146f265c2e1012c10ad41f6abd3a8ee6700884a5c2797a304d44e300b7fa78245ebe76e8ec9d34cd8998acf538735db8d8df76fb741245eb619d6d406b
+  data.tar.gz: f0eb496dd837e94dcc6740628fa5e7b33d573d26e37506c99e7798e23621c955864ae21ac76f18f3e0b77139e4e8bbdc7c81a9f2bd407913b1a4fdbc1e5f2e9d

data/Rakefile

@@ -16,6 +16,11 @@ end
 APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
+def command(string)
+  puts string
+  system string
+end
+
 if File.exist?('comable.gemspec')
   $LOAD_PATH.unshift File.expand_path('..', __FILE__)
   require 'tasks/release'
@@ -45,9 +50,7 @@ if File.exist?('comable.gemspec')
     namespace :migrate do
       task :all do
         FRAMEWORKS.each do |framework|
-          command = "cd #{framework} && test -d db && bundle exec rake db:migrate RAILS_ENV=#{Rails.env}"
-          puts command
-          system command
+          command "cd #{framework} && test -d db/migrate && bundle exec rake db:migrate RAILS_ENV=#{Rails.env}"
         end
       end
     end
@@ -59,11 +62,8 @@ if File.exist?('comable.gemspec')
 
       namespace :reset do
         task :all do
-          FRAMEWORKS.each do |framework|
-            command = "cd #{framework} && test -d db && bundle exec rake db:migrate:reset RAILS_ENV=#{Rails.env}"
-            puts command
-            system command
-          end
+          command "bundle exec rake db:drop db:create RAILS_ENV=#{Rails.env}"
+          Rake::Task['db:migrate'].invoke
         end
       end
     end
@@ -90,6 +90,7 @@ end
 namespace :brakeman do
   task :all do
     FRAMEWORKS.each do |framework|
+      next unless File.directory?("#{framework}/app")
       sh "brakeman --exit-on-warn --ignore-config .brakeman.ignore #{framework}"
     end
   end

data/app/models/comable/address.rb

@@ -4,11 +4,11 @@ module Comable
 
     validates :family_name, presence: true, length: { maximum: 255 }
     validates :first_name, presence: true, length: { maximum: 255 }
-    validates :zip_code, presence: true, length: { maximum: 8 }
+    validates :zip_code, presence: true, length: { maximum: 255 }
     validates :state_name, presence: true, length: { maximum: 255 }
     validates :city, presence: true, length: { maximum: 255 }
     validates :detail, length: { maximum: 255 }
-    validates :phone_number, length: { maximum: 18 }
+    validates :phone_number, length: { maximum: 255 }
 
     class << self
       def find_or_clone(address)

data/app/models/comable/order.rb

@@ -91,6 +91,10 @@ module Comable
       stated?(order.state) ? save! : next_state!
     end
 
+    def completed?
+      completed_at?
+    end
+
     def paid?
       payment ? payment.completed? : true
     end

data/app/models/comable/payment.rb

@@ -46,7 +46,7 @@ module Comable
 
       after_transition to: :ready, do: :next_state!
       before_transition to: :ready, do: -> (s) { s.provider_authorize! }
-      before_transition to: :completed, do: -> (s) { s.provider_complete! }
+      before_transition to: :completed, do: -> (s) { s.complete! }
       before_transition to: :canceled, do: -> (s) { s.provider_cancel! }
       before_transition to: :canceled, do: -> (s) { s.provider_resume! }
     end
@@ -64,7 +64,12 @@ module Comable
     end
 
     def completed?
-      state?(:completed) || state?(:resumed)
+      completed_at?
+    end
+
+    def complete!
+      provider_complete!
+      touch :completed_at
     end
 
     private

data/app/models/comable/shipment.rb

@@ -46,6 +46,8 @@ module Comable
       event :resume do
         transition :canceled => :resumed
       end
+
+      before_transition to: :completed, do: -> (s) { s.complete! }
     end
 
     class << self
@@ -61,7 +63,11 @@ module Comable
     end
 
     def completed?
-      state?(:completed) || state?(:resumed)
+      completed_at?
+    end
+
+    def complete!
+      touch :completed_at
     end
 
     private

data/app/models/comable/store.rb

@@ -11,7 +11,7 @@ module Comable
       end
 
       def default_name
-        'Comable store'
+        Comable.t('default_store_name')
       end
     end
 

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

@@ -54,10 +54,6 @@ module Comable
       target_state_index < current_state_index
     end
 
-    def completed?
-      state?(:completed) || state?(:resumed)
-    end
-
     def orderer_required?
       bill_address.nil? || bill_address.new_record?
     end

data/config/locales/en.yml

@@ -31,6 +31,14 @@ en:
     new_address: 'New address'
     successful: 'Successful'
     failure: 'Failure'
+    products: 'Products'
+    pages: 'Pages'
+    home: 'Home'
+    support: 'Support'
+    sample_header: 'Sample text'
+    sample_subheader: 'This is sample text.'
+    sample_text: 'Please write your message here.'
+    default_store_name: 'K&B style'
 
     price: &price
       'Price'
@@ -185,6 +193,19 @@ en:
       categories:
         new_node: 'New category'
 
+    sample:
+      suede_dress: 'Suede Dress'
+      girly_coat: 'Double Button Girly Coat'
+      fur_gloves: 'Fur Gloves with Side Stitching'
+      leather_boots: 'Leather Boots'
+      clothing: 'Clothing'
+      color: 'Color'
+      size: 'Size'
+      navy: 'Navy'
+      beige: 'Beige'
+      black_cat: 'Balck Cat'
+      credit_card: 'Credit Card'
+
   activerecord:
     state_machines:
       comable/order:

data/config/locales/ja.yml

@@ -31,6 +31,14 @@ ja:
     new_address: 新しい住所
     successful: 成功しました
     failure: 失敗しました
+    products: '商品'
+    pages: 'ページ'
+    home: 'ホーム'
+    support: 'サポート'
+    sample_header: 'サンプルテキスト'
+    sample_subheader: 'これはサンプルテキストです。'
+    sample_text: 'ここにあなたのお好きなメッセージを埋め込むことができます。'
+    default_store_name: 'K&B style'
 
     price: &price
       '価格'
@@ -185,6 +193,19 @@ ja:
       categories:
         new_node: 新しいカテゴリ
 
+    sample:
+      suede_dress: 'スウェードワンピース'
+      girly_coat: 'ダブルボタンガーリーコート'
+      fur_gloves: 'サイドステッチファー付き手袋'
+      leather_boots: '本革ロングブーツ'
+      clothing: '衣類'
+      color: 'カラー'
+      size: 'サイズ'
+      navy: 'ネイビー'
+      beige: 'ベージュ'
+      black_cat: 'クロネコ'
+      credit_card: 'クレジットカード'
+
   activerecord:
     state_machines:
       comable/order:

data/db/migrate/20141024025526_create_comable_addresses.rb

@@ -4,12 +4,12 @@ class CreateComableAddresses < ActiveRecord::Migration
       t.references :user
       t.string :family_name, null: false
       t.string :first_name, null: false
-      t.string :zip_code, null: false, limit: 8
+      t.string :zip_code, null: false
       t.references :state
       t.string :state_name, null: false
       t.string :city, null: false
       t.string :detail
-      t.string :phone_number, null: false, limit: 18
+      t.string :phone_number, null: false
       t.datetime :last_used_at
       t.timestamps null: false
     end

data/db/migrate/20150513185230_create_comable_trackers.rb

@@ -1,7 +1,6 @@
 class CreateComableTrackers < ActiveRecord::Migration
   def change
     create_table :comable_trackers do |t|
-      # TODO: Rename the column: activated_flag => activated
       t.boolean :activated_flag, null: false, default: true
       t.string :name, null: false
       t.string :tracker_id

data/lib/comable_core.rb

@@ -30,5 +30,17 @@ module Comable
     end
 
     alias_method :t, :translate
+
+    def app_name
+      'Comable'
+    end
+
+    def homepage
+      'https://github.com/appirits/comable#comable'
+    end
+
+    def license
+      'https://github.com/appirits/comable/blob/master/MIT-LICENSE'
+    end
   end
 end

data/lib/generators/comable/install/install_generator.rb

@@ -6,6 +6,7 @@ module Comable
   class InstallGenerator < Rails::Generators::Base
     class_option :migrate, type: :boolean, default: true, banner: 'Run Comable migrations'
     class_option :seed, type: :boolean, default: true, banner: 'Load seed data (migrations must be run)'
+    class_option :sample, type: :boolean, default: true, banner: 'Load sample data (migrations must be run)'
     class_option :admin_email, type: :string
     class_option :admin_password, type: :string
 
@@ -20,6 +21,7 @@ module Comable
     def prepare_options
       @migrate_flag = options[:migrate]
       @seed_flag = @migrate_flag ? options[:seed] : false
+      @sample_flag = @migrate_flag ? options[:sample] : false
     end
 
     def add_files
@@ -73,6 +75,15 @@ Comable::Core::Engine.load_seed if defined?(Comable::Core)
       end
     end
 
+    def load_sample_data
+      if @sample_flag
+        say_status :loading, 'sample data'
+        quietly { rake 'comable:sample' }
+      else
+        say_status :skipping, 'sample data (you can always run rake comable:sample)'
+      end
+    end
+
     def insert_routes
       insert_into_file File.join('config', 'routes.rb'), after: "Rails.application.routes.draw do\n" do
         <<-ROUTES
@@ -95,13 +106,7 @@ Comable::Core::Engine.load_seed if defined?(Comable::Core)
     private
 
     def rake_seed
-      cmd = -> { rake("db:seed #{rake_seed_arguments.join(' ')}") }
-
-      if options[:admin_email] && options[:admin_password]
-        quietly { cmd.call }
-      else
-        cmd.call
-      end
+      rake("db:seed #{rake_seed_arguments.join(' ')}")
     end
 
     def rake_seed_arguments

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_core
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -278,7 +278,7 @@ files:
 - lib/generators/comable/install/install_generator.rb
 - lib/generators/comable/install/templates/config/initializers/comable.rb
 - lib/tasks/comable_tasks.rake
-homepage: https://github.com/hyoshida/comable#comable
+homepage: https://github.com/appirits/comable#comable
 licenses:
 - MIT
 metadata: {}
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provide core functions for Comable.