daddy 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3000f6047db32d408b37cbbcceba7f157dab54a9
-  data.tar.gz: 2a403a22449f213ab1f72a54f2b105602b514f46
+  metadata.gz: 7133ac2e202b067b33f9e9034f2ddb485b68b968
+  data.tar.gz: 768c23fe8ed2cdfeca94790167645bac1272942e
 SHA512:
-  metadata.gz: 1f73867d54a606a381f352935aa371079e9dbe7b870a1ab35a6c727efee404a2064a2243255a176817802a9bcbb146dfbf0da5b6fd2ec457b442889457997310
-  data.tar.gz: 597222cfd692849485089f21de2af0cd025b5e1ce8a089863169c0dc30f02ca7db9b124ebbd04cc1543ddd7dc3f1669f2e80973ec8611f8fe538834c3a24e9c6
+  metadata.gz: 2fbed20ee02bdbafb8b31190d2d869888a4099d8c2a7e5f875f539c30a3a38a69cab6e0e20a1a9879ee4bef36bd9892e16f44bd3cb59b326a3724d324fc14889
+  data.tar.gz: d5cedb9444b093c817f6b629eee5d728049fd0aa992ea778eede13517badcaa3e5e16ff291333bae4783bb5333baab8c394e4b4dd36eec677d309d82b5e0d90b

data/lib/daddy.rb

@@ -11,7 +11,6 @@ require 'daddy/utils/config'
 require 'daddy/utils/string_utils'
 require 'prefecture'
 require 'sql_builder'
-require 'tax'
 
 module Daddy
 

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.3.10'.freeze
+  VERSION = '0.3.11'.freeze
 end

metadata

@@ -1,263 +1,263 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: differ
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: holiday_jp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.25'
 - !ruby/object:Gem::Dependency
   name: resque-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.42'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.42'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 description: Daddy helps me build web applications since daddy knows some good practices.
@@ -269,7 +269,6 @@ extra_rdoc_files: []
 files:
 - app/assets/javascripts/daddy.js
 - app/assets/javascripts/string.js
-- app/assets/javascripts/tax.js
 - app/assets/stylesheets/daddy.css
 - app/assets/stylesheets/datepicker.css.scss
 - app/assets/stylesheets/ympicker.css.scss
@@ -359,7 +358,6 @@ files:
 - lib/tasks/unicorn.erb
 - lib/tasks/unicorn.rake
 - lib/tasks/unicorn.rb.erb
-- lib/tax.rb
 - templates/Gemfile.erb
 - templates/app/controllers/controller.rb.erb
 - templates/app/views/_form.html.erb
@@ -380,12 +378,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -395,4 +393,3 @@ signing_key:
 specification_version: 4
 summary: My rails dad
 test_files: []
-has_rdoc: 

data/app/assets/javascripts/tax.js

@@ -1,43 +0,0 @@
-if (typeof tax === "undefined") {
-  var tax = {};
-}
-
-
-tax.TAX_TYPE_NONTAXABLE = 1; // 非課税
-tax.TAX_TYPE_INCLUSIVE = 2; // 内税
-tax.TAX_TYPE_EXCLUSIVE = 3; // 外税
-
-tax.RATE_3 = Date.parse('1989-04-01');
-tax.RATE_5 = Date.parse('1997-04-01');
-tax.RATE_8 = Date.parse('2014-04-01');
-
-tax.getRateOn = function(date) {
-  if (typeof date === 'string') {
-    date = Date.parse(date);
-  }
-  
-  if (date >= tax.RATE_3 && date < tax.RATE_5) {
-    return 0.03;
-  } else if (date >= tax.RATE_5 && date < tax.RATE_8) {
-    return 0.05;
-  } else if (date >= tax.RATE_8) {
-    return 0.08;
-  }
-  
-  return 0;
-};
-
-tax.calcTaxAmount = function(taxType, rate, amount) {
-  if ( isNaN( amount ) ) {
-    return '';
-  }
-
-  if ( taxType == tax.TAX_TYPE_INCLUSIVE ) {
-    return parseInt(amount * rate / (1 + rate));
-  }
-  else if ( taxType == tax.TAX_TYPE_EXCLUSIVE ) {
-    return parseInt(amount * rate); 
-  }
-
-  return '';
-};

data/lib/tax.rb

@@ -1,36 +0,0 @@
-module Tax
-
-  # 消費税区分
-  TAX_TYPES = {
-    TAX_TYPE_NONTAXABLE = 1 => '非課税',
-    TAX_TYPE_INCLUSIVE = 2 => '内税',
-    TAX_TYPE_EXCLUSIVE = 3 => '外税',
-  }
-
-  RATE_3 = Date.parse('1989-04-01');
-  RATE_5 = Date.parse('1997-04-01');
-  RATE_8 = Date.parse('2014-04-01');
-
-  def self.get_rate_on(date, options = {})
-    if (date.is_a?(String))
-      date = Date.parse(date)
-    end
-
-    if (date >= RATE_3 && date < RATE_5)
-      ret = 0.03;
-    elsif (date >= RATE_5 && date < RATE_8)
-      ret = 0.05;
-    elsif (date >= RATE_8)
-      ret = 0.08;
-    else
-      ret = 0
-    end
-
-    if options[:percent]
-      ret *= 100
-    end
-    
-    ret
-  end
-
-end