h2ocube_rails_helper 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98d190df931ced4c044766e99eeebcf8b919fad0
-  data.tar.gz: 5256b8f7852b970ab90cf17c7925eb53978f77d6
+  metadata.gz: 55dab7f856af3ade14b8678dd3fa0a88173307cf
+  data.tar.gz: e5dcff28c9c48499d67c1db233193eab1c7fd29e
 SHA512:
-  metadata.gz: a00ca62e798dcc89f301516cd545bb9395350dfac5505a6601fd00c0cf682d091474f5b3e2470d0090ce43064ef96115acaf01b909f4c041776a75752f9f004e
-  data.tar.gz: 0bf887356575bf47460e9456146fffc2ecc2cf2b54229764710fd05c54ff4a750f46b094614f23211d39ce8dba6f172b2d7fe26dd4868ba0af2b08e4e236127d
+  metadata.gz: 0326543897681548b45a4ed6bb67ccbb27cb213a734bd139fe6f5a2bf9d520832b79b8fa5868d6fdc0bff0c4c4046ba892bb8abd901b8d68abd619343a54c5dc
+  data.tar.gz: 15f88fb00dafb719a41c1bab8d65de0b532594071fd7425e6adfd099f7b95fcb3198ee82e375d983535fef5f39fd7a5636ab4e2d7d714420ac0ea9ec2d8d7baf

data/h2ocube_rails_helper.gemspec

@@ -4,18 +4,18 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'h2ocube_rails_helper'
-  gem.version       = '0.1.0'
+  gem.version       = '0.1.1'
   gem.authors       = ['Ben']
   gem.email         = ['ben@h2ocube.com']
-  gem.description   = %q{Just an helper collection}
-  gem.summary       = %q{Just an helper collection}
+  gem.description   = 'Just an helper collection'
+  gem.summary       = 'Just an helper collection'
   gem.homepage      = 'https://github.com/h2ocube/h2ocube_rails_helper'
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
   gem.add_dependency 'settingslogic'
   gem.add_dependency 'browser'
@@ -25,6 +25,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rr'
   gem.add_development_dependency 'capybara'
-  gem.add_development_dependency 'rails', '< 4.0.0'
+  gem.add_development_dependency 'rails'
   gem.add_development_dependency 'sqlite3'
 end

data/lib/h2ocube_rails_helper.rb

@@ -1,114 +1,180 @@
 require 'settingslogic'
 require 'browser'
 
+module Browser
+  class Base
+    def wechat?
+      !(ua =~ /MicroMessenger/i).nil?
+    end
+
+    def mobile?
+      !ua.blank? && (device.mobile? || device.tablet?)
+    end
+
+    def desktop?
+      !ua.blank? && !device.mobile?
+    end
+  end
+
+  class Generic < Base
+    alias _full_version full_version
+
+    def full_version
+      ua.blank? ? '0.0' : _full_version
+    end
+  end
+
+  class Device
+    alias _detect_mobile detect_mobile?
+
+    def detect_mobile?
+      !ua.blank? && _detect_mobile
+    end
+  end
+
+  module Meta
+    class Wechat < Base
+      def meta
+        'wechat' if browser.wechat?
+      end
+    end
+
+    class Desktop < Base
+      def meta
+        'desktop' if browser.desktop?
+      end
+    end
+
+    class Tablet < Base
+      def meta
+        'tablet mobile' if browser.device.tablet?
+      end
+    end
+  end
+end
+
 module H2ocubeRailsHelper
-  module ActionViewExtension
-    def render_html_class
-      cls = []
-      if params[:controller].include?('/')
-        cls.push params[:controller].gsub('/', '_')
-        params[:controller].split('/').each { |c| cls.push c }
-      else
-        cls.push params[:controller]
-      end
-
-      cls.push params[:action]
-      cls.push cls[0] + '_' + params[:action]
-
-      if params.has_key?(:html_class)
-        if params[:html_class].class != Array
-          cls.push params[:html_class].to_s
+  module ActionView
+    module Helpers
+      def render_html_class
+        cls = []
+        if params[:controller].include?('/')
+          cls.push params[:controller].gsub('/', '_')
+          params[:controller].split('/').each { |c| cls.push c }
+        else
+          cls.push params[:controller]
+        end
+
+        cls.push params[:action]
+        cls.push cls[0] + '_' + params[:action]
+
+        if params.key?(:html_class)
+          if params[:html_class].class != Array
+            cls.push params[:html_class].to_s
+          else
+            params[:html_class].each { |c| cls.push c }
+          end
+        end
+
+        cls.push Browser.new(request.env['HTTP_USER_AGENT']).to_s
+
+        cls.compact.uniq.join ' '
+      end
+
+      def _title(opts = {})
+        return [@_title] if defined?(@_title)
+        if defined?(@title) && !@title.blank?
+          title = @title.is_a?(Array) ? @title : [ @title.to_s ]
         else
-          params[:html_class].each { |c| cls.push c }
+          begin
+            title = [resource.title, resource.class.model_name.human] if defined?(resource) && resource.respond_to?(:title) && resource.class.respond_to?(:model_name)
+          rescue
+          end
+
+          title ||= []
         end
+
+        if opts.key? :title
+          title.push opts[:title]
+        else
+          title.push HelperSettings.title
+        end
+        title.compact.map { |t| t = t.strip; t == '' ? nil : t }.compact
       end
 
-      cls.push Browser.new(accept_language: request.headers['Accept-Language'], ua: request.headers['User-Agent']).to_s
+      def _render_title(opts = {})
+        strip_tags _title(opts).join(' - ')
+      end
 
-      cls.compact.uniq.join ' '
-    end
+      def render_title(opts = {})
+        "<title>#{_render_title opts}</title>".html_safe
+      end
 
-    def _title opts = {}
-      return [@_title] if defined?(@_title)
-      if defined?(@title) && !@title.blank?
-        title = @title.is_a?(Array) ? @title : [ @title.to_s ]
-      else
-        begin
-          title = [resource.title, resource.class.model_name.human] if defined?(resource) && resource.respond_to?(:title) && resource.class.respond_to?(:model_name)
-        rescue
+      def _keywords(opts = {})
+        if defined? @keywords
+          keywords = @keywords
+        elsif defined?(@item) && @item.respond_to?(:keywords) && !@item.keywords.blank?
+          keywords = @item.keywords.strip.split(/(,|，)/)
+        else
+          keywords = opts.key?(:keywords) ? opts[:keywords] : HelperSettings.keywords
         end
-        
-        title ||= []
+        [keywords].flatten.compact.map{ |k| k.to_s.strip.split(/(,|，)/) }.flatten.map { |k| k.gsub(/(,|，)/, '').blank? ? nil : k }.compact.uniq
       end
 
-      if opts.has_key? :title
-        title.push opts[:title]
-      else
-        title.push HelperSettings.title
+      def _render_keywords(opts = {})
+        strip_tags _keywords(opts).join(',')
       end
-      title.compact.map{ |t| t = t.strip; t == '' ? nil : t }.compact
-    end
 
-    def render_title opts = {}
-      "<title>#{_title(opts).join(' - ')}</title>".html_safe
-    end
+      def render_keywords(opts = {})
+        return '' if _keywords.blank?
+        "<meta name=\"keywords\" content=\"#{_render_keywords opts}\" />".html_safe
+      end
 
-    def _keywords opts = {}
-      if defined? @keywords
-        keywords = @keywords
-      elsif defined?(@item) && @item.respond_to?(:keywords) && !@item.keywords.blank?
-        keywords = @item.keywords.strip.split(/(,|，)/)
-      else
-        keywords = opts.has_key?(:keywords) ? opts[:keywords] : HelperSettings.keywords
+      def _description(opts = {})
+        if defined? @description
+          description = @description
+        elsif defined?(@item) && @item.respond_to?(:description) && !@item.description.blank?
+          description = @item.description
+        else
+          description = opts.key?(:description) ? opts[:description] : HelperSettings.description
+        end
+        strip_tags description.to_s.strip
       end
-      [keywords].flatten.compact.map{ |k| k.to_s.strip.split(/(,|，)/) }.flatten.map{ |k| k.gsub(/(,|，)/, '').blank? ? nil : k }.compact.uniq
-    end
 
-    def render_keywords opts = {}
-      return '' if _keywords.length == 0
-      "<meta name=\"keywords\" content=\"#{_keywords(opts).join(',')}\" />".html_safe
-    end
+      def render_description(opts = {})
+        return '' if _description == ''
+        "<meta name=\"description\" content=\"#{_description(opts)}\" />".html_safe
+      end
 
-    def _description opts = {}
-      if defined? @description
-        description = @description
-      elsif defined?(@item) && @item.respond_to?(:description) && !@item.description.blank?
-        description = @item.description
-      else
-        description = opts.has_key?(:description) ? opts[:description] : HelperSettings.description
+      def render_canonical(opts = {})
+        !@canonical.blank? ? "<link rel=\"canonical\" href=\"#{@canonical}\" />".html_safe : ''
       end
-      description.to_s.strip
-    end
 
-    def render_description opts = {}
-      return '' if _description == ''
-      "<meta name=\"description\" content=\"#{_description(opts)}\" />".html_safe
-    end
+      def render_seo(opts = {})
+        render_title(opts) << render_canonical(opts) << render_keywords(opts) << render_description(opts) << render_ga(opts) << csrf_meta_tags
+      end
 
-    def render_canonical opts = {}
-      defined?(@canonical) && !@canonical.blank? ? "<link rel=\"canonical\" href=\"#{@canonical}\" />".html_safe : ''
-    end
+      def render_ga(opts = {})
+        return '' if Rails.env.development?
+        ga = opts.key?(:ga) ? opts[:ga] : HelperSettings.ga
+        domain = opts.key?(:domain) ? opts[:domain] : HelperSettings.domain
+        return '' if ga.nil?
+        "<script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','//www.google-analytics.com/analytics.js','ga');ga('create', '#{ga}', '#{domain}');ga('send', 'pageview');</script>".html_safe
+      end
 
-    def render_seo opts = {}
-      render_title(opts) << render_canonical(opts) << render_keywords(opts) << render_description(opts) << render_ga(opts) << csrf_meta_tags
-    end
+      private
 
-    def render_ga opts = {}
-      return '' if Rails.env.development?
-      ga = opts.has_key?(:ga) ? opts[:ga] : HelperSettings.ga
-      domain = opts.has_key?(:domain) ? opts[:domain] : HelperSettings.domain
-      return '' if ga.nil?
-      return "<script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','//www.google-analytics.com/analytics.js','ga');ga('create', '#{ga}', '#{domain}');ga('send', 'pageview');</script>".html_safe
+      def strip_tags(text)
+        Rails::Html::FullSanitizer.new.sanitize text
+      end
     end
   end
 
   class Railtie < ::Rails::Railtie
     initializer 'h2ocube_rails_helper' do
-      ActiveSupport.on_load(:action_view) do
-        ::ActionView::Base.send :include, H2ocubeRailsHelper::ActionViewExtension
+      ActiveSupport.on_load :action_view do
+        include H2ocubeRailsHelper::ActionView::Helpers
       end
     end
   end
 end
-
-

data/spec/helpers/render_canonical_spec.rb

@@ -2,15 +2,15 @@ require 'spec_helper'
 
 describe 'render_canonical' do
   it 'simple' do
-    render_canonical.should == ''
+    expect(render_canonical).to eq('')
   end
-  
+
   it '@canonical' do
     @canonical = '@canonical'
-    render_canonical.should == '<link rel="canonical" href="@canonical" />'
+    expect(render_canonical).to eq('<link rel="canonical" href="@canonical" />')
     ['   ', '', nil].each do |desc|
       @canonical = desc
-      render_canonical.should == ''
+      expect(render_canonical).to eq('')
     end
   end
 end

data/spec/helpers/render_description_spec.rb

@@ -14,24 +14,24 @@ end
 
 describe 'render_description' do
   it 'simple' do
-    render_description.should == '<meta name="description" content="description" />'
+    expect(render_description).to eq('<meta name="description" content="description" />')
   end
-  
+
   it '@description' do
     @description = '@description'
-    render_description.should == '<meta name="description" content="@description" />'
+    expect(render_description).to eq('<meta name="description" content="@description" />')
     ['   ', '', nil].each do |desc|
       @description = desc
-      render_description.should == ''
+      expect(render_description).to eq('')
     end
   end
-  
+
   it '@item' do
     @item = Item.new
-    render_description.should == '<meta name="description" content="item_description" />'
+    expect(render_description).to eq('<meta name="description" content="item_description" />')
   end
 
   it 'opts' do
-    render_description(description: 'opts').should == '<meta name="description" content="opts" />'
+    expect(render_description(description: 'opts')).to eq('<meta name="description" content="opts" />')
   end
 end

data/spec/helpers/render_ga_spec.rb

@@ -24,15 +24,14 @@ end
 
 describe 'render_ga' do
   it 'default' do
-    render_ga.include?('ga_code').should be_true
+    expect(render_ga).to include('ga_code')
   end
 
   it 'with option' do
-    render_ga(ga: '123').include?('123').should be_true
+    expect(render_ga(ga: '123')).to include('123')
   end
 
   it 'with nil' do
-    render_ga(ga: nil).should == ''
+    expect(render_ga(ga: nil)).to eq('')
   end
 end
-

data/spec/helpers/render_html_class_spec.rb

@@ -1,76 +1,77 @@
 require 'spec_helper'
 
 describe 'render_html_class' do
-	def params
-		@params || {}
-	end
+  def params
+    @params || {}
+  end
 
-	def params= data
-		@params = data
-	end
+  def params=(data)
+    @params = data
+  end
 
-	class Request
-		def env
-			@env || {}
-		end
+  class Request
+    def env
+      @env ||= {}
+      @env
+    end
 
-		def env= data
-			@env = data
-		end
-	end
+    def env=(data)
+      @env = data
+    end
+  end
 
-	def request
-		@request ||= Request.new
-	end
+  def request
+    @request ||= Request.new
+  end
 
-	it 'simple params' do
-		self.params = {
-			controller: 'controller',
-			action: 'action'
-		}
-		cls = render_html_class.split ' '
-		cls.should include('controller')
-		cls.should include('action')
-		cls.should include('controller_action')
-	end
+  it 'simple params' do
+    self.params = {
+      controller: 'controller',
+      action: 'action'
+    }
+    cls = render_html_class.split ' '
+    expect(cls).to include('controller')
+    expect(cls).to include('action')
+    expect(cls).to include('controller_action')
+  end
 
-	it 'module controller' do
-		self.params = {
-			controller: 'module/controller',
-			action: 'action'
-		}
-		cls = render_html_class.split ' '
-		cls.should include('module_controller')
-		cls.should include('controller')
-		cls.should include('action')
-		cls.should include('module_controller_action')
-	end
+  it 'module controller' do
+    self.params = {
+      controller: 'module/controller',
+      action: 'action'
+    }
+    cls = render_html_class.split ' '
+    expect(cls).to include('module_controller')
+    expect(cls).to include('controller')
+    expect(cls).to include('action')
+    expect(cls).to include('module_controller_action')
+  end
 
-	it 'addition html class' do
-		self.params = {
-			controller: 'controller',
-			action: 'action',
-			html_class: 'addition'
-		}
-		cls = render_html_class.split ' '
-		cls.should include('controller')
-		cls.should include('action')
-		cls.should include('controller_action')
-		cls.should include('addition')
-	end
+  it 'addition html class' do
+    self.params = {
+      controller: 'controller',
+      action: 'action',
+      html_class: 'addition'
+    }
+    cls = render_html_class.split ' '
+    expect(cls).to include('controller')
+    expect(cls).to include('action')
+    expect(cls).to include('controller_action')
+    expect(cls).to include('addition')
+  end
 
-	it 'mobile' do
-		self.params = {
-			controller: 'controller',
-			action: 'action'
-		}
-		self.request.user_agent = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; en-us) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/1A542a Safari/419.3'
-		cls = render_html_class.split ' '
+  it 'mobile' do
+    self.params = {
+      controller: 'controller',
+      action: 'action'
+    }
+    request.env['HTTP_USER_AGENT'] = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8C148 Safari/6533.18.5'
+    cls = render_html_class.split ' '
 
-		cls.should include('controller')
-		cls.should include('action')
-		cls.should include('controller_action')
-		cls.should include('mobile')
-		cls.should include('iphone')
-	end
+    expect(cls).to include('controller')
+    expect(cls).to include('action')
+    expect(cls).to include('controller_action')
+    expect(cls).to include('mobile')
+    expect(cls).to include('iphone')
+  end
 end

data/spec/helpers/render_keywords_spec.rb

@@ -14,26 +14,26 @@ end
 
 describe 'render_keywords' do
   it 'simple' do
-  render_keywords.should == '<meta name="keywords" content="keywords" />'
+    expect(render_keywords).to eq('<meta name="keywords" content="keywords" />')
   end
-  
+
   it '@keywords' do
     @keywords = '@keywords'
-    render_keywords.should == '<meta name="keywords" content="@keywords" />'
+    expect(render_keywords).to eq('<meta name="keywords" content="@keywords" />')
     @keywords = ['@keywords', '   ', '', nil]
-    render_keywords.should == '<meta name="keywords" content="@keywords" />'
+    expect(render_keywords).to eq('<meta name="keywords" content="@keywords" />')
     ['   ', '', nil].each do |key|
       @keywords = key
-      render_keywords.should == ''
+      expect(render_keywords).to eq('')
     end
   end
-  
+
   it '@item' do
     @item = Item.new
-    render_keywords.should == '<meta name="keywords" content="item,item_keywords" />'
+    expect(render_keywords).to eq('<meta name="keywords" content="item,item_keywords" />')
   end
 
   it 'opts' do
-    render_keywords(keywords: 'opts,a,b,c').should == '<meta name="keywords" content="opts,a,b,c" />'
+    expect(render_keywords(keywords: 'opts,a,b,c')).to eq('<meta name="keywords" content="opts,a,b,c" />')
   end
 end

data/spec/helpers/render_title_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-include H2ocubeRailsHelper::ActionViewExtension
-
 class HelperSettings
   def self.title
     'title'
@@ -26,31 +24,31 @@ end
 
 describe 'render_title' do
   it 'simple' do
-    render_title.should == '<title>title</title>'
+    expect(render_title).to eq('<title>title</title>')
   end
-  
+
   it '@title' do
     @title = '@title'
-    render_title.should == '<title>@title - title</title>'
+    expect(render_title).to eq('<title>@title - title</title>')
     @title = ['@title', '   ', '', nil]
-    render_title.should == '<title>@title - title</title>'
+    expect(render_title).to eq('<title>@title - title</title>')
   end
-  
+
   it 'resource' do
     self.class_eval do
       def resource
         Resource.new
       end
     end
-    render_title.should == '<title>Resource Name - Class Name - title</title>'
+    expect(render_title).to eq('<title>Resource Name - Class Name - title</title>')
   end
 
   it '@_title' do
     @_title = '@_title'
-    render_title.should == '<title>@_title</title>'
+    expect(render_title).to eq('<title>@_title</title>')
   end
 
   it 'opts' do
-    render_title(title: 'opts').should == '<title>opts</title>'
+    expect(render_title(title: 'opts')).to eq('<title>opts</title>')
   end
 end

data/spec/spec_helper.rb

@@ -1,13 +1,9 @@
-ENV['RAILS_ENV'] = "test"
+ENV['RAILS_ENV'] = 'test'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-begin
-  require 'rails'
-rescue LoadError
-end
-
+require 'rails'
 require 'bundler/setup'
 Bundler.require
 
@@ -15,10 +11,11 @@ require 'capybara/rspec'
 require 'fake_app/rails_app'
 require 'rspec/rails'
 
-
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
   config.mock_with :rr
-  config.filter_run_excluding :generator_spec => true if !ENV['GENERATOR_SPEC']
+  config.filter_run_excluding generator_spec: true unless ENV['GENERATOR_SPEC']
+  config.raise_errors_for_deprecations!
+  config.include H2ocubeRailsHelper::ActionView::Helpers
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h2ocube_rails_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ben
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: settingslogic
@@ -112,16 +112,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,6 @@ files:
 - README.md
 - Rakefile
 - h2ocube_rails_helper.gemspec
-- h2ocube_rails_helper.sublime-project
 - lib/generators/h2ocube_rails_helper_generator.rb
 - lib/generators/source/helper.yml.erb
 - lib/generators/source/helper_settings.rb.erb
@@ -184,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Just an helper collection

data/h2ocube_rails_helper.sublime-project

@@ -1,15 +0,0 @@
-{
-	"folders":
-	[
-    {
-      "path": "./",
-      "folder_exclude_patterns": ["tmp", "log", "dump"],
-      "file_exclude_patterns": ["*.sassc", "*.log", "*.scssc"]
-    }
-	],
-  "tab_size": 2,
-  "translate_tabs_to_spaces": true,
-  "ensure_newline_at_eof_on_save": true,
-  "trim_trailing_white_space_on_save": true,
-  "scroll_past_end": true
-}