jap_mag 0.0.5 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7bb049bf1942ece81fbef16d27ac022f24dfd9de
-  data.tar.gz: 4db95a3a13708284828a1ea402a8fcd98e0d824f
+SHA256:
+  metadata.gz: e12032e8112941ff8369025bf1756381d5a5b22a76e21292563929ec89782596
+  data.tar.gz: e43f8d23973ccb798833fa483cec7f836a64409583ebde40946492e16985519c
 SHA512:
-  metadata.gz: 20d4382142b372cd4ca1978d81d3073985e1858ab554470f26a6cfb7fe674aef9a638691befa3f58bd9bb7b6f420dfa05a6de8e87dda6b7643330be0706bc318
-  data.tar.gz: ac045e87b10ad72566865abd6385e9931646a8e8d98f370a8cb35ffc092e6889b1a727840a87849352a6ac4411e667c7fc268469e3a8160ca7a167af5a55cf6a
+  metadata.gz: 6279e898283afdc86c595b23f9cb460fd4060bee96a7c2c0e7c4b597794660bb602c7cf6e734a07daaf525d69456dd04395afcfdc9adf784aa8455390d5ae4bd
+  data.tar.gz: '01790e45450d4eab622000f333619716bcc2e5fc1cc3c4538d39ca9745032b2d599af2ad5178793e6260c57235282965fb2e5d04ec5d6585d8585f5488fb63cb'

data/README.md

@@ -1,10 +1,8 @@
-# JapMag
+# Introduction
 
-JapMag is the design language created by Felix Ding in the spring of 2012. The essential idea behind JapMag is Japanese Minimalism. It focuses on content itself, and aims to solve information overload. On interaction design, JapMag advocates a flat information architecutre, a one-task-one-step method and a natural content flow on each page. Visually, JapMag stresses typography, whitespace and uses graphical elements as little as possible. Technically, JapMag avoids using Javascript, or overriding browsers' default behaviors.
+JapMag is a collection of frequently-used Rails controller methods and helpers.
 
-This gem helps designers start a project that follows JapMag design language. It consists of several CSS definations, Rails helpers and view templates. Think this gem as an UI kit similar to Twitter's Bootstrap, but more tightly integrated with Ruby on Rails.
-
-## Installation
+## Installation & Usage
 
 Please note JapMag only supports Rails 3+.
 
@@ -29,14 +27,10 @@ In your Javascript manifest (application.js in default):
 In your app/controllers/application_controll.rb, add
 
      include JapMag
-     
+
 For a new Rails app, delete app/views/layout/application.html.erb.
 
 Done! Now start your Rails app and you will see a JapMag-powered website!
-     
-## Usage
-
-Documentation is on the way. Stay tuned!
 
 ## Contributing
 
@@ -45,3 +39,7 @@ Documentation is on the way. Stay tuned!
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## License
+
+Code released under the [MIT License](https://opensource.org/licenses/MIT).

data/app/helpers/jap_mag_widgets_helper.rb

@@ -23,7 +23,7 @@ module JapMagWidgetsHelper
     c.collect{|e| e.titleize.gsub(/\s/, "")}.join " "
   end
 
-  def title(*titles)
+  def title *titles
     seperator = " - "
 
     default_options = {sitename: _("/logo")}
@@ -32,23 +32,15 @@ module JapMagWidgetsHelper
     page_title = page_title_for_return = titles.join(seperator)
     page_title = options[:sitename] + seperator + page_title_for_return if not options[:sitename].blank?
 
-    content_for(:title, page_title)
+    content_for :title, page_title
 
     page_title_for_return
   end
 
-  def paginator(collections, options={})
+  def paginator collections, options = {}
     will_paginate collections, options
   end
 
-  def time_difference time
-    "#{distance_of_time_in_words(time, Time.now, true)} ago" if time
-  end
-
-  def current_or_null(condition)
-    condition ? "current" : nil
-  end
-
   def last_deployed_at
     file = File.join("tmp", "restart.txt")
     File.exists?(file) ? File.atime(file) : nil
@@ -74,13 +66,15 @@ module JapMagWidgetsHelper
   end
 
   def bootstrap_scope_button scopes, options = {}
-    content_tag :ul, class: "nav nav-tabs" do
+    content_tag :ul, class: "nav nav-tabs simple-tabs" do
       scopes.collect do |scope|
         url = eval("#{options[:path].to_s}(scope: :#{scope[:key]})")
         current = ((params[:scope] == scope[:key].to_s) or (scope[:default] and scope[:default] == true and params[:scope].blank?))
-        link = link_to("#{content_tag(:span, scope[:text])} (#{scope[:count]})".html_safe, url)
+        klass = %w(nav-link)
+        klass << :active if current
+        link = link_to("#{content_tag(:span, scope[:text])} (#{scope[:count]})".html_safe, url, class: klass.join(' '))
 
-        concat content_tag(:li, link, class: (current ? :active : nil))
+        concat content_tag(:li, link, class: 'nav-item')
       end
     end
   end
@@ -128,7 +122,7 @@ module JapMagWidgetsHelper
     end
   end
 
-  def link_to_external text, link, options={}
+  def link_to_external text, link, options = {}
     options.merge!(target: :_blank)
 
     if options[:anonymous]
@@ -136,26 +130,26 @@ module JapMagWidgetsHelper
       options.delete(:anonymous)
     end
 
-    link_to "#{text}#{fa_icon "external-link"}".html_safe, link, options
+    link_to "#{text}#{fa_icon "external-link-alt", type: :fas}".html_safe, link, options
   end
 
   def input_for_selection text
-    (content_tag :input, nil, value: text, class: "form-input for-selection").html_safe
+    (content_tag :input, nil, value: text, size: text.length, class: "form-input for-selection").html_safe
   end
 
   #
   # call to action
   #
-  def cta text, url, opts = {}
+  def cta text, url, options = {}
     klass = %w(button button-rounded button-caution)
-    klass << opts[:class] if opts[:class].present?
-    opts[:class] = klass.join(" ")
+    klass << options[:class] if options[:class].present?
+    options[:class] = klass.join(" ")
 
-    link_to text, url, opts
+    link_to text, url, options
   end
 
-  def cta_params opts = {}
-    {data: {disable_with: _("/actions.wait")}, class: "button button-rounded button-caution"}.merge opts
+  def cta_params options = {}
+    {data: {disable_with: _("/actions.wait")}, class: "button button-rounded button-caution"}.merge options
   end
 
   def long_date date
@@ -167,6 +161,32 @@ module JapMagWidgetsHelper
     I18n.l date, format: :short
   end
 
+  def retina_image_tag name_at_1x, options = {}
+    # webp for Chrome
+    if options[:webp]
+      name_at_1x = name_at_1x.gsub /\.[a-zA-Z]+$/, '.webp'
+
+      options.delete :webp
+    end
+
+    # retina
+    name_at_2x = name_at_1x.gsub /\.\w+$/, "@2x\\0"
+
+    # i18n
+    if options[:i18n]
+      name_at_1x = name_at_1x.gsub /\.[a-zA-Z]+$/, ".#{I18n.locale}\\0"
+      name_at_2x = name_at_2x.gsub /\.[a-zA-Z]+$/, ".#{I18n.locale}\\0"
+
+      options.delete :i18n
+    end
+
+    # HTML 5 specific tag attributes
+    srcset = "#{asset_path(name_at_1x)} 1x, #{asset_path(name_at_2x)} 2x"
+    options = options.merge(srcset: srcset)
+
+    image_tag name_at_1x, options
+  end
+
   protected
 
   def current_template

data/jap_mag.gemspec

@@ -2,9 +2,9 @@
 require File.expand_path('../lib/jap_mag/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Felix Ding"]
+  gem.authors       = ["DING Yu"]
   gem.email         = ["felixding@gmail.com"]
-  gem.description   = %q{JapMag is the design language created by Felix Ding. This gem helps designers start a project that follows JapMag.}
+  gem.description   = %q{JapMag is a collection of frequently-used Rails controller methods and helpers.}
   gem.summary       = "jap_mag-#{gem.version}"
   gem.homepage      = "https://github.com/felixding/JapMag"
 
@@ -14,4 +14,6 @@ Gem::Specification.new do |gem|
   gem.name          = "jap_mag"
   gem.require_paths = ["lib"]
   gem.version       = JapMag::VERSION
+
+  gem.add_runtime_dependency :will_paginate
 end

data/lib/jap_mag.rb

@@ -13,6 +13,28 @@ module JapMag
     t(key, options)
   end
 
+  def current_locale
+    params[:locale] || I18n.default_locale || extract_locale_from_accept_language_header
+  end
+
+  def extract_locale_from_accept_language_header
+    if request.env and request.env['HTTP_ACCEPT_LANGUAGE']
+      lang = request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first
+    else
+      lang = nil
+    end
+
+    lang == "zh" ? "zh-CN" : "en"
+  end
+
+  def current_path
+    URI.encode(request.fullpath)
+  end
+
+  def current_url
+    URI.encode(request.original_url)
+  end
+
   #
   # the args can be one of the following:
   #
@@ -56,6 +78,9 @@ module JapMag
   def self.included base
     base.helper_method :_
     base.helper_method :current_controller_action_in?
+    base.helper_method :current_locale
+    base.helper_method :current_url
+    base.helper_method :current_path
   end
 
   class Engine < Rails::Engine

data/lib/jap_mag/version.rb

@@ -1,3 +1,3 @@
 module JapMag
-  VERSION = "0.0.5"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,26 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: jap_mag
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.3.1
 platform: ruby
 authors:
-- Felix Ding
+- DING Yu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
-dependencies: []
-description: JapMag is the design language created by Felix Ding. This gem helps designers
-  start a project that follows JapMag.
+date: 2020-06-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: JapMag is a collection of frequently-used Rails controller methods and
+  helpers.
 email:
 - felixding@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
-- LICENSE
 - README.md
 - Rakefile
 - app/assets/javascripts/jap_mag.js
@@ -50,17 +63,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: jap_mag-

data/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2012 Felix Ding
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.