h2ocube_rails_helper 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc635fefe9cbf7c3f383a3a85ccb2ed9d3b766bd
-  data.tar.gz: ec232863a0795eb085bbea78eefd7de8b055b18b
+  metadata.gz: 2029760de8193e513768ad738ce9a7f9cc23f528
+  data.tar.gz: 4f18712410163c22368f63910a2bf5bfabfe10b6
 SHA512:
-  metadata.gz: e601689a6498cca8bc2fbd96f0023d11db4bb78a46723b3e678ff400fb51d86d4ae5086f0aa858cff30d88c3602e055da045cc1bb4af250bd9335a192465b7d9
-  data.tar.gz: 2d23b0f1be80336ef49e55f5a52ae52be965014840d56e7f2bb151ce06f4034814a0fede5dc42a393021399c9c474983fee0c2fc093a73e477af277d8e15af2a
+  metadata.gz: bdb6d809f7fe6957fef394c0e1bce599e798a21fbdabf52011cac80b6c37e07078b3168dec5aa9a6d6f72bb30a77fa15cd3d197a6f27811439904bd89ca490a8
+  data.tar.gz: 840e34bd8329639619d24d715192038db7584e23033cfd87290e9f972fee7388853656e6ca9d2b16bd5986d230a27db4b935d9d5b3c6cf25e1d176a5aa82c919

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.0
+  - 2.4.1
 script: "bundle exec rspec"

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+# source 'https://gems.ruby-china.org'
 
 # Specify your gem's dependencies in h2ocube_rails_helper.gemspec
 gemspec

data/README.md

@@ -30,13 +30,12 @@ And then execute:
     render_keywords
     render_description
 
-    render_ga #=> show Google Analytics code at production (if require Garelic, will show Garelic code)
+    render_ga #=> show Google Analytics code at production
 
     render_seo #=> render_title << render_canonical << render_keywords << render_description << render_ga << csrf_meta_tags
 
 ## Include
 
-* settingslogic https://github.com/binarylogic/settingslogic
 * browser https://github.com/fnando/browser
 
 ## Contributing

data/h2ocube_rails_helper.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'h2ocube_rails_helper'
-  gem.version       = '0.1.3'
+  gem.version       = '0.2.0'
   gem.authors       = ['Ben']
   gem.email         = ['ben@h2ocube.com']
   gem.description   = 'Just an helper collection'
@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'settingslogic'
   gem.add_dependency 'browser'
 
   gem.add_development_dependency 'tzinfo'

data/lib/h2ocube_rails_helper.rb

@@ -1,4 +1,3 @@
-require 'settingslogic'
 require 'browser'
 
 module Browser
@@ -110,7 +109,7 @@ module H2ocubeRailsHelper
         if opts.key? :title
           title.push opts[:title]
         else
-          title.push HelperSettings.title
+          title.push Rails.application.secrets[:title]
         end
         title.compact.map { |t| t = t.strip; t == '' ? nil : t }.compact
       end
@@ -129,7 +128,7 @@ module H2ocubeRailsHelper
         elsif defined?(@item) && @item.respond_to?(:keywords) && !@item.keywords.blank?
           keywords = @item.keywords.strip.split(/(,|，)/)
         else
-          keywords = opts.key?(:keywords) ? opts[:keywords] : HelperSettings.keywords
+          keywords = opts.key?(:keywords) ? opts[:keywords] : Rails.application.secrets[:keywords]
         end
         [keywords].flatten.compact.map{ |k| k.to_s.strip.split(/(,|，)/) }.flatten.map { |k| k.gsub(/(,|，)/, '').blank? ? nil : k }.compact.uniq
       end
@@ -149,7 +148,7 @@ module H2ocubeRailsHelper
         elsif defined?(@item) && @item.respond_to?(:description) && !@item.description.blank?
           description = @item.description
         else
-          description = opts.key?(:description) ? opts[:description] : HelperSettings.description
+          description = opts.key?(:description) ? opts[:description] : Rails.application.secrets[:description]
         end
         strip_tags description.to_s.strip
       end
@@ -169,8 +168,8 @@ module H2ocubeRailsHelper
 
       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
+        ga = opts.key?(:ga) ? opts[:ga] : Rails.application.secrets[:ga]
+        domain = opts.key?(:domain) ? opts[:domain] : Rails.application.secrets[: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

data/spec/fake_app/rails_app.rb

@@ -3,13 +3,12 @@ require 'action_controller/railtie'
 require 'action_view/railtie'
 require 'active_record'
 
-ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
-ActiveRecord::Base.establish_connection('test')
+ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
 
 # config
 app = Class.new(Rails::Application)
 app.config.secret_token = '3b7cd727ee24e8444053437c36cc66c4'
-app.config.session_store :cookie_store, :key => '_myapp_session'
+app.config.session_store :cookie_store, key: '_myapp_session'
 app.config.active_support.deprecation = :log
 app.config.eager_load = false
 # Rais.root
@@ -22,7 +21,7 @@ app.routes.draw do
   resources :users
 end
 
-#models
+# models
 require 'fake_app/models'
 
 # controllers

data/spec/helpers/render_description_spec.rb

@@ -1,11 +1,5 @@
 require 'spec_helper'
 
-class HelperSettings
-  def self.description
-    'description'
-  end
-end
-
 class Item
   def description
     'item_description'
@@ -13,6 +7,10 @@ class Item
 end
 
 describe 'render_description' do
+  before do
+    Rails.application.secrets[:description] = 'description'
+  end
+
   it 'simple' do
     expect(render_description).to eq('<meta name="description" content="description" />')
   end

data/spec/helpers/render_ga_spec.rb

@@ -1,28 +1,14 @@
 require 'spec_helper'
 
-class HelperSettings
-  def self.title
-    'title'
-  end
-
-  def self.keywords
-    'keywords'
-  end
-
-  def self.description
-    'description'
-  end
-
-  def self.ga
-    'ga_code'
+describe 'render_ga' do
+  before do
+    Rails.application.secrets[:title] = 'title'
+    Rails.application.secrets[:keywords] = 'keywords'
+    Rails.application.secrets[:description] = 'description'
+    Rails.application.secrets[:ga] = 'ga_code'
+    Rails.application.secrets[:domain] = 'domain'
   end
 
-  def self.domain
-    'domain'
-  end
-end
-
-describe 'render_ga' do
   it 'default' do
     expect(render_ga).to include('ga_code')
   end

data/spec/helpers/render_keywords_spec.rb

@@ -1,11 +1,5 @@
 require 'spec_helper'
 
-class HelperSettings
-  def self.keywords
-    'keywords'
-  end
-end
-
 class Item
   def keywords
     'item，item_keywords'
@@ -13,6 +7,10 @@ class Item
 end
 
 describe 'render_keywords' do
+  before do
+    Rails.application.secrets[:keywords] = 'keywords'
+  end
+
   it 'simple' do
     expect(render_keywords).to eq('<meta name="keywords" content="keywords" />')
   end

data/spec/helpers/render_title_spec.rb

@@ -1,11 +1,5 @@
 require 'spec_helper'
 
-class HelperSettings
-  def self.title
-    'title'
-  end
-end
-
 class ResourceModelName
   def human
     'Class Name'
@@ -23,6 +17,10 @@ class Resource
 end
 
 describe 'render_title' do
+  before do
+    Rails.application.secrets[:title] = 'title'
+  end
+
   it 'simple' do
     expect(render_title).to eq('<title>title</title>')
   end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: h2ocube_rails_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: settingslogic
-  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'
 - !ruby/object:Gem::Dependency
   name: browser
   requirement: !ruby/object:Gem::Requirement
@@ -150,9 +136,6 @@ files:
 - README.md
 - Rakefile
 - h2ocube_rails_helper.gemspec
-- lib/generators/h2ocube_rails_helper_generator.rb
-- lib/generators/source/helper.yml.erb
-- lib/generators/source/helper_settings.rb.erb
 - lib/h2ocube_rails_helper.rb
 - spec/fake_app/models.rb
 - spec/fake_app/rails_app.rb
@@ -183,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Just an helper collection

data/lib/generators/h2ocube_rails_helper_generator.rb

@@ -1,19 +0,0 @@
-class H2ocubeRailsHelperGenerator < Rails::Generators::Base
-  source_root File.expand_path('../source', __FILE__)
-
-  desc 'Creates a helper.yml to your config/.'
-
-  def copy_helper_yml
-    template 'helper.yml.erb', 'config/helper.yml'
-  end
-  
-  def copy_helper_rb
-    template 'helper_settings.rb.erb', 'app/models/helper_settings.rb'
-  end
-  
-  private
-  
-  def app_name
-    Rails.application.class.to_s.split('::').first
-  end
-end

data/lib/generators/source/helper.yml.erb

@@ -1,15 +0,0 @@
-defaults: &defaults
-  ga: Google Analytics Profile Id
-  domain: h2ocube.com
-  title: <%= app_name %>
-  keywords: <%= app_name %>
-  description: <%= app_name %>
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
-
-production:
-  <<: *defaults

data/lib/generators/source/helper_settings.rb.erb

@@ -1,4 +0,0 @@
-class HelperSettings < Settingslogic
-  source "#{Rails.root}/config/helper.yml"
-  namespace Rails.env
-end